Skip to content

Commit

Permalink
tinyMCE
Browse files Browse the repository at this point in the history
  • Loading branch information
borazslo committed Jan 5, 2016
1 parent da3067a commit 426c91f
Show file tree
Hide file tree
Showing 436 changed files with 36 additions and 32,591 deletions.
4 changes: 3 additions & 1 deletion .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
# Handle Front Controller...
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f


RewriteRule ^(vendor|kepek|fajlok|node_modules|bower_components|img)/ - [L]

RewriteRule ^api/v([0-9]{1,4})/miserend.sqlite3(/|)$ /fajlok/sqlite/miserend_v$1.sqlite3 [NC]
RewriteRule ^api/v([0-9]{1,4})/sqlite(/|)$ index.php?q=api/sqlite&v=$1 [NC,QSA]

Expand Down
3 changes: 2 additions & 1 deletion classes/Html/Church/Edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ public function __construct($path) {
if (!$this->church) {
throw new \Exception('Nincs ilyen templom.');
}

$this->setTitle($this->church->nev);

if (!$this->church->McheckWriteAccess($user)) {
$this->title = 'Hiányzó jogosultság!';
addMessage('Hiányzó jogosultság!', 'danger');
Expand Down
5 changes: 4 additions & 1 deletion classes/Mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ function send($to = false) {
$query = "INSERT INTO emails (`type`,`to`,`header`,`subject`,`body`,`timestamp`) VALUES ('" . $this->type . "','" . implode(';', $this->to) . "','" . $this->header . "','" . $this->subject . "','" . mysql_real_escape_string($this->content) . "','" . date('Y-m-d H:i:s') . "');";
if (!mysql_query($query))
addMessage('Nem sikerült elmenteni az emailt.', 'warning');
if (!mail(implode(',', $this->to), $this->subject, $this->content, $this->header))
if (!mail(implode(',', $this->to), $this->subject, $this->content, $this->header)) {
printr($this);
mail(implode(',', $this->to), $this->subject, $this->content, $this->header);
addMessage('Valami hiba történt az email elküldése közben.', 'danger');
}
else
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion classes/Remark.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function __construct($rid = false) {

$this->adminmegj = preg_replace('/=("|\'|)img\//i', '=$1/img/', $this->adminmegj);

$this->marker['url'] = "javascript:OpenScrollWindow('templom/" . $this->church_id . "/eszrevetelek',550,500);";
$this->marker['url'] = "javascript:OpenScrollWindow('/templom/" . $this->church_id . "/eszrevetelek',550,500);";
if ($this->allapot == 'u') {
$this->marker['text'] = "Új észrevétel!";
$this->marker['html'] = "<img src=/img/csomag.gif title='" . $this->marker['text'] . "' align=absmiddle border=0> ";
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"phpunit/phpunit": "4.8@stable",
"illuminate/database": "5.*",
"ext-sqlite3": "*",
"ext-mysql": "*"
"ext-mysql": "*",
"tinymce/tinymce": ">= 4"
},
"scripts": {
"post-install-cmd": [
Expand Down
9 changes: 0 additions & 9 deletions js/tiny_mce/blank.htm

This file was deleted.

41 changes: 0 additions & 41 deletions js/tiny_mce/langs/en.js

This file was deleted.

41 changes: 0 additions & 41 deletions js/tiny_mce/langs/hu.js

This file was deleted.

9 changes: 0 additions & 9 deletions js/tiny_mce/langs/readme.txt

This file was deleted.

Loading

0 comments on commit 426c91f

Please sign in to comment.