@@ -4,18 +4,18 @@ discard block |
||
| 4 | 4 | define('VER_NAME', '0.11.0'); |
| 5 | 5 | define('NAME', 'rudolf'); |
| 6 | 6 | |
| 7 | -define('APP_ROOT', dirname(__DIR__)); |
|
| 8 | -define('CORE_ROOT', APP_ROOT.'/core'); |
|
| 9 | -define('MODULES_ROOT', APP_ROOT.'/src/module'); |
|
| 7 | +define('APP_ROOT', dirname(__DIR__)); |
|
| 8 | +define('CORE_ROOT', APP_ROOT.'/core'); |
|
| 9 | +define('MODULES_ROOT', APP_ROOT.'/src/module'); |
|
| 10 | 10 | |
| 11 | -define('CONFIG_ROOT', APP_ROOT.'/config'); |
|
| 12 | -define('TEMP_ROOT', APP_ROOT.'/temp'); |
|
| 13 | -define('LOG_ROOT', APP_ROOT.'/log'); |
|
| 11 | +define('CONFIG_ROOT', APP_ROOT.'/config'); |
|
| 12 | +define('TEMP_ROOT', APP_ROOT.'/temp'); |
|
| 13 | +define('LOG_ROOT', APP_ROOT.'/log'); |
|
| 14 | 14 | |
| 15 | -define('CONTENT_ROOT', WEB_ROOT.'/content'); |
|
| 16 | -define('PLUGINS_ROOT', CONTENT_ROOT.'/plugins'); |
|
| 17 | -define('THEMES_ROOT', CONTENT_ROOT.'/themes'); |
|
| 18 | -define('UPLOADS_ROOT', CONTENT_ROOT.'/uploads'); |
|
| 15 | +define('CONTENT_ROOT', WEB_ROOT.'/content'); |
|
| 16 | +define('PLUGINS_ROOT', CONTENT_ROOT.'/plugins'); |
|
| 17 | +define('THEMES_ROOT', CONTENT_ROOT.'/themes'); |
|
| 18 | +define('UPLOADS_ROOT', CONTENT_ROOT.'/uploads'); |
|
| 19 | 19 | |
| 20 | 20 | if (dirname($_SERVER['SCRIPT_NAME']) == '/') { |
| 21 | 21 | define('DIR', ''); |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | define('DIR', dirname($_SERVER['SCRIPT_NAME'])); |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | -define('CONTENT', DIR.'/content'); |
|
| 27 | -define('PLUGINS', CONTENT.'/plugins'); |
|
| 28 | -define('THEMES', CONTENT.'/themes'); |
|
| 29 | -define('UPLOADS', CONTENT.'/uploads'); |
|
| 26 | +define('CONTENT', DIR.'/content'); |
|
| 27 | +define('PLUGINS', CONTENT.'/plugins'); |
|
| 28 | +define('THEMES', CONTENT.'/themes'); |
|
| 29 | +define('UPLOADS', CONTENT.'/uploads'); |
|
@@ -189,7 +189,7 @@ |
||
| 189 | 189 | // Sort |
| 190 | 190 | if (!isset(self::$mergedFilters[$tag])) { |
| 191 | 191 | ksort(self::$filters[$tag]); |
| 192 | - self::$mergedFilters[ $tag ] = true; |
|
| 192 | + self::$mergedFilters[$tag] = true; |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | reset(self::$filters[$tag]); |
@@ -103,15 +103,14 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | if (!isset(self::$actions[$tag])) { |
| 105 | 105 | self::$actions[$tag] = 1; |
| 106 | - } else { |
|
| 107 | - ++self::$actions[$tag]; |
|
| 106 | + } else {++self::$actions[$tag]; |
|
| 108 | 107 | } |
| 109 | 108 | |
| 110 | 109 | // Do 'all' actions first |
| 111 | 110 | if (isset(Filter::$filters['all'])) { |
| 112 | 111 | Filter::$currentFilter[] = $tag; |
| 113 | 112 | $all_args = func_get_args(); |
| 114 | - self::$_call_all_hook ($all_args); |
|
| 113 | + self::$_call_all_hook($all_args); |
|
| 115 | 114 | } |
| 116 | 115 | |
| 117 | 116 | if (!isset(Filter::$filters[$tag])) { |
@@ -137,9 +136,9 @@ discard block |
||
| 137 | 136 | } |
| 138 | 137 | |
| 139 | 138 | // Sort |
| 140 | - if (!isset(Filter::$mergedFilters[ $tag ])) { |
|
| 139 | + if (!isset(Filter::$mergedFilters[$tag])) { |
|
| 141 | 140 | ksort(Filter::$filters[$tag]); |
| 142 | - Filter::$mergedFilters[ $tag ] = true; |
|
| 141 | + Filter::$mergedFilters[$tag] = true; |
|
| 143 | 142 | } |
| 144 | 143 | |
| 145 | 144 | reset(Filter::$filters[$tag]); |
@@ -171,15 +170,14 @@ discard block |
||
| 171 | 170 | |
| 172 | 171 | if (!isset(self::$actions[$tag])) { |
| 173 | 172 | self::$actions[$tag] = 1; |
| 174 | - } else { |
|
| 175 | - ++self::$actions[$tag]; |
|
| 173 | + } else {++self::$actions[$tag]; |
|
| 176 | 174 | } |
| 177 | 175 | |
| 178 | 176 | // Do 'all' actions first |
| 179 | 177 | if (isset(Filter::$filters['all'])) { |
| 180 | 178 | Filter::$currentFilter[] = $tag; |
| 181 | 179 | $all_args = func_get_args(); |
| 182 | - self::$_call_all_hook ($all_args); |
|
| 180 | + self::$_call_all_hook($all_args); |
|
| 183 | 181 | } |
| 184 | 182 | |
| 185 | 183 | if (!isset(Filter::$filters[$tag])) { |
@@ -195,12 +193,12 @@ discard block |
||
| 195 | 193 | } |
| 196 | 194 | |
| 197 | 195 | // Sort |
| 198 | - if (!isset($merged_filters[ $tag ])) { |
|
| 196 | + if (!isset($merged_filters[$tag])) { |
|
| 199 | 197 | ksort(Filter::$filters[$tag]); |
| 200 | - $merged_filters[ $tag ] = true; |
|
| 198 | + $merged_filters[$tag] = true; |
|
| 201 | 199 | } |
| 202 | 200 | |
| 203 | - reset(Filter::$filters[ $tag ]); |
|
| 201 | + reset(Filter::$filters[$tag]); |
|
| 204 | 202 | |
| 205 | 203 | do { |
| 206 | 204 | foreach ((array) current(Filter::$filters[$tag]) as $the_) { |
@@ -2,37 +2,37 @@ |
||
| 2 | 2 | <html> |
| 3 | 3 | <head> |
| 4 | 4 | <meta charset="utf-8"> |
| 5 | - <title><?=$this->pageTitle;?></title> |
|
| 6 | - <style><?=$this->pageStyle;?></style> |
|
| 5 | + <title><?=$this->pageTitle; ?></title> |
|
| 6 | + <style><?=$this->pageStyle; ?></style> |
|
| 7 | 7 | </head> |
| 8 | 8 | <body> |
| 9 | 9 | <section class="wrapper"> |
| 10 | - <h1><?=$this->message;?></h1> |
|
| 10 | + <h1><?=$this->message; ?></h1> |
|
| 11 | 11 | <p> |
| 12 | - <span class="file"><?=$this->description['file'];?></span> |
|
| 13 | - <span class="line"><?=$this->description['line'];?></span> throws |
|
| 14 | - <span class="class"><?=$this->description['class'];?></span> |
|
| 12 | + <span class="file"><?=$this->description['file']; ?></span> |
|
| 13 | + <span class="line"><?=$this->description['line']; ?></span> throws |
|
| 14 | + <span class="class"><?=$this->description['class']; ?></span> |
|
| 15 | 15 | </p> |
| 16 | 16 | |
| 17 | 17 | <section class="trace"> |
| 18 | 18 | <h2>/* Stack trace */</h2> |
| 19 | 19 | <ol><?php foreach ($this->trace as $key => $v): ?> |
| 20 | 20 | <li title="check args"> |
| 21 | - <span class="file"><?=$v['file'];?></span> |
|
| 22 | - <span class="line"><?=$v['line'];?></span> |
|
| 23 | - <span class="class"><?=$v['class'];?></span> |
|
| 24 | - <span class="type"><?=$v['type'];?></span> |
|
| 25 | - <span class="function"><?=$v['function'];?></span> |
|
| 26 | - <pre><?=$v['args'];?></pre> |
|
| 21 | + <span class="file"><?=$v['file']; ?></span> |
|
| 22 | + <span class="line"><?=$v['line']; ?></span> |
|
| 23 | + <span class="class"><?=$v['class']; ?></span> |
|
| 24 | + <span class="type"><?=$v['type']; ?></span> |
|
| 25 | + <span class="function"><?=$v['function']; ?></span> |
|
| 26 | + <pre><?=$v['args']; ?></pre> |
|
| 27 | 27 | </li> |
| 28 | - <?php endforeach;?> |
|
| 28 | + <?php endforeach; ?> |
|
| 29 | 29 | </ol> |
| 30 | 30 | </section> |
| 31 | 31 | </section> |
| 32 | 32 | <footer class="footer"> |
| 33 | - <span><?=VER_NAME;?></span> |
|
| 34 | - <span>© <?=date('Y');?> <?=NAME;?></span> |
|
| 33 | + <span><?=VER_NAME; ?></span> |
|
| 34 | + <span>© <?=date('Y'); ?> <?=NAME; ?></span> |
|
| 35 | 35 | </footer> |
| 36 | - <script><?=$this->pageScript;?></script> |
|
| 36 | + <script><?=$this->pageScript; ?></script> |
|
| 37 | 37 | </body> |
| 38 | 38 | </html> |
| 39 | 39 | \ No newline at end of file |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | $this->data = array_merge($mergeWith, $this->data); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - return array_map(function ($a) { |
|
| 67 | + return array_map(function($a) { |
|
| 68 | 68 | return htmlspecialchars(trim($a)); |
| 69 | 69 | }, $this->data); |
| 70 | 70 | } |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - usort($items, function ($a, $b) { |
|
| 45 | + usort($items, function($a, $b) { |
|
| 46 | 46 | return strcmp($a->getPosition(), $b->getPosition()); |
| 47 | 47 | }); |
| 48 | 48 | |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | putenv('LC_ALL='.$lang.'.'.$codeset); |
| 33 | 33 | putenv('LANG='.$lang.'.'.$codeset); |
| 34 | 34 | putenv('LANGUAGE='.$lang.'.'.$codeset); |
| 35 | -setlocale(LC_ALL, $lang.'.'.$codeset); |
|
| 35 | +setlocale(LC_ALL, $lang.'.'.$codeset); |
|
| 36 | 36 | |
| 37 | 37 | $domain = 'rudolf'; |
| 38 | 38 | bindtextdomain($domain, APP_ROOT.'/locale'); |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | |
| 42 | 42 | file_put_contents($file, implode(':', $contentArray)); |
| 43 | 43 | |
| 44 | - setcookie('vote_'.$id, $type, time() + (3600 * 24 * 365 * 5), DIR); |
|
| 44 | + setcookie('vote_'.$id, $type, time() + (3600 * 24 * 365 * 5), DIR); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | return [ |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | 'published' => '', |
| 27 | 27 | ], $this->data); |
| 28 | 28 | |
| 29 | - $data = array_map(function ($a) { |
|
| 29 | + $data = array_map(function($a) { |
|
| 30 | 30 | return trim($a); |
| 31 | 31 | }, $data); |
| 32 | 32 | |