@@ -31,7 +31,7 @@ |
||
| 31 | 31 | |
| 32 | 32 | case 'csv': |
| 33 | 33 | $this->output->set_content_type('text/csv', 'utf-8'); |
| 34 | - $this->_render_content($this->Tracker->portation->arrayToCSVRecursive($favouriteData, 'Date/Time,Title,Manga URL,Site,Chapter,Chapter Number, Chapter URL'), 'csv',TRUE, 'tracker-favourite'); |
|
| 34 | + $this->_render_content($this->Tracker->portation->arrayToCSVRecursive($favouriteData, 'Date/Time,Title,Manga URL,Site,Chapter,Chapter Number, Chapter URL'), 'csv', TRUE, 'tracker-favourite'); |
|
| 35 | 35 | break; |
| 36 | 36 | |
| 37 | 37 | default: |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | print "Testing site\n"; |
| 65 | 65 | switch($type) { |
| 66 | 66 | case 'update': |
| 67 | - if(!is_null($extra )) { |
|
| 67 | + if(!is_null($extra)) { |
|
| 68 | 68 | print_r($this->Tracker->sites->{$site}->getTitleData($extra)); |
| 69 | 69 | } |
| 70 | 70 | break; |
@@ -139,4 +139,4 @@ |
||
| 139 | 139 | 'History_Model' => 'History' |
| 140 | 140 | ); |
| 141 | 141 | |
| 142 | -require_once APPPATH . '../vendor/erusev/parsedown/Parsedown.php'; |
|
| 142 | +require_once APPPATH.'../vendor/erusev/parsedown/Parsedown.php'; |
|
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | //TEMP |
| 80 | 80 | $route['user/dashboard_beta'] = 'User/DashboardBeta'; |
| 81 | 81 | |
| 82 | -$route['api/internal/get_list'] = 'API/Internal/GetList'; |
|
| 82 | +$route['api/internal/get_list'] = 'API/Internal/GetList'; |
|
| 83 | 83 | $route['api/internal/get_list/(all|reading|on-hold|plan-to-read|(custom(?:1|2|3)))'] = 'API/Internal/GetList/index/$1'; |
| 84 | 84 | |
| 85 | 85 | $route['ajax/username_check']['post'] = 'Ajax/UsernameCheck'; //rate limited |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | $route['import_amr'] = 'Import_AMR'; |
| 103 | 103 | |
| 104 | -$route['report_issue'] = 'ReportIssue'; |
|
| 104 | +$route['report_issue'] = 'ReportIssue'; |
|
| 105 | 105 | |
| 106 | 106 | $route['stats'] = 'Stats'; |
| 107 | 107 | $route['help'] = 'Help'; |
@@ -48,15 +48,15 @@ discard block |
||
| 48 | 48 | public function __construct() { |
| 49 | 49 | $file_path = APPPATH.'config/monolog.php'; |
| 50 | 50 | $found = FALSE; |
| 51 | - if (file_exists($file_path)) { |
|
| 51 | + if(file_exists($file_path)) { |
|
| 52 | 52 | $found = TRUE; |
| 53 | 53 | require($file_path); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // Is the config file in the environment folder? |
| 57 | - if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/monolog.php')) { |
|
| 57 | + if(file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/monolog.php')) { |
|
| 58 | 58 | require($file_path); |
| 59 | - } elseif (!$found) { |
|
| 59 | + } elseif(!$found) { |
|
| 60 | 60 | exit('monolog.php config does not exist'); |
| 61 | 61 | } |
| 62 | 62 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | // detect and register all PHP errors in this log hence forth |
| 68 | 68 | ErrorHandler::register($this->log); |
| 69 | 69 | |
| 70 | - if ($this->config['introspection_processor']) |
|
| 70 | + if($this->config['introspection_processor']) |
|
| 71 | 71 | { |
| 72 | 72 | // add controller and line number info to each log message |
| 73 | 73 | // 2 = depth in the stacktrace to ignore. This gives us the file |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | // decide which handler(s) to use |
| 79 | - foreach ($this->config['handlers'] as $value) |
|
| 79 | + foreach($this->config['handlers'] as $value) |
|
| 80 | 80 | { |
| 81 | - switch ($value) |
|
| 81 | + switch($value) |
|
| 82 | 82 | { |
| 83 | 83 | case 'file': |
| 84 | 84 | $handler = new RotatingFileHandler($this->config['file_logfile']); |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | break; |
| 124 | 124 | |
| 125 | 125 | default: |
| 126 | - exit('log handler not supported: ' . $value . "\n"); |
|
| 126 | + exit('log handler not supported: '.$value."\n"); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | $this->log->pushHandler($handler); |
@@ -145,19 +145,19 @@ discard block |
||
| 145 | 145 | $level = strtoupper($level); |
| 146 | 146 | |
| 147 | 147 | // verify error level |
| 148 | - if (!isset($this->_levels[$level])) |
|
| 148 | + if(!isset($this->_levels[$level])) |
|
| 149 | 149 | { |
| 150 | - $this->log->addError('unknown error level: ' . $level); |
|
| 150 | + $this->log->addError('unknown error level: '.$level); |
|
| 151 | 151 | $level = 'ALL'; |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | // filter out anything in $this->config['exclusion_list'] |
| 155 | - if (!empty($this->config['exclusion_list'])) |
|
| 155 | + if(!empty($this->config['exclusion_list'])) |
|
| 156 | 156 | { |
| 157 | - foreach ($this->config['exclusion_list'] as $findme) |
|
| 157 | + foreach($this->config['exclusion_list'] as $findme) |
|
| 158 | 158 | { |
| 159 | 159 | $pos = strpos($msg, $findme); |
| 160 | - if ($pos !== false) |
|
| 160 | + if($pos !== false) |
|
| 161 | 161 | { |
| 162 | 162 | // just exit now - we don't want to log this error |
| 163 | 163 | return true; |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - if ($this->_levels[$level] <= $this->config['threshold']) |
|
| 168 | + if($this->_levels[$level] <= $this->config['threshold']) |
|
| 169 | 169 | { |
| 170 | - switch ($level) |
|
| 170 | + switch($level) |
|
| 171 | 171 | { |
| 172 | 172 | case 'ERROR': |
| 173 | 173 | $this->log->addError($msg); |
@@ -134,9 +134,9 @@ |
||
| 134 | 134 | $config['composer_autoload'] = FALSE; |
| 135 | 135 | |
| 136 | 136 | //NOTE: This doesn't work in autoload.php as it is loaded after we need it. |
| 137 | -spl_autoload_register(function ($class) { |
|
| 138 | - $fileMono = APPPATH . '../vendor/monolog/monolog/src/'.strtr($class, '\\', '/').'.php'; |
|
| 139 | - $filePsr = APPPATH . '../vendor/psr/log/'.strtr($class, '\\', '/').'.php'; |
|
| 137 | +spl_autoload_register(function($class) { |
|
| 138 | + $fileMono = APPPATH.'../vendor/monolog/monolog/src/'.strtr($class, '\\', '/').'.php'; |
|
| 139 | + $filePsr = APPPATH.'../vendor/psr/log/'.strtr($class, '\\', '/').'.php'; |
|
| 140 | 140 | if(file_exists($fileMono)) { |
| 141 | 141 | require $fileMono; |
| 142 | 142 | return TRUE; |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | $config['file_multiline'] = TRUE; //add newlines to the output |
| 32 | 32 | |
| 33 | 33 | /* NEW RELIC OPTIONS */ |
| 34 | -$config['new_relic_app_name'] = 'APP NAME - ' . ENVIRONMENT; |
|
| 34 | +$config['new_relic_app_name'] = 'APP NAME - '.ENVIRONMENT; |
|
| 35 | 35 | |
| 36 | 36 | /* HIPCHAT OPTIONS */ |
| 37 | 37 | $config['hipchat_app_token'] = ''; //HipChat API Token |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | protected $footer_data = array(); |
| 7 | 7 | public $global_data = array(); |
| 8 | 8 | |
| 9 | - public function __construct(){ |
|
| 9 | + public function __construct() { |
|
| 10 | 10 | parent::__construct(); |
| 11 | 11 | |
| 12 | 12 | //FIXME: This is pretty much a phpUnit hack. Without it phpUnit fails here. We need a proper way to fake user/admin testing. |
@@ -18,10 +18,10 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | $this->global_data['theme'] = $this->User_Options->get('theme'); |
| 20 | 20 | $css_path = "css/main.{$this->User_Options->get('theme')}"; |
| 21 | - $this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH . "../public/assets/{$css_path}.css").".css"; |
|
| 21 | + $this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH."../public/assets/{$css_path}.css").".css"; |
|
| 22 | 22 | |
| 23 | 23 | $js_path = 'js/compiled.min'; |
| 24 | - $this->global_data['complied_js_path'] = asset_url()."{$js_path}.".filemtime(APPPATH . "../public/assets/{$js_path}.js").".js"; |
|
| 24 | + $this->global_data['complied_js_path'] = asset_url()."{$js_path}.".filemtime(APPPATH."../public/assets/{$js_path}.js").".js"; |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function _render_page(/*(array) $paths*/) : void { |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | $json = is_array($json_input) ? json_encode($json_input) : $json_input; |
| 46 | 46 | |
| 47 | 47 | $this->output->set_content_type('application/json', 'utf-8'); |
| 48 | - $this->_render_content($json ?? '{}','json', $download, $filenamePrefix); |
|
| 48 | + $this->_render_content($json ?? '{}', 'json', $download, $filenamePrefix); |
|
| 49 | 49 | } |
| 50 | 50 | public function _render_content(string $content, string $filenameExt, bool $download = FALSE, string $filenamePrefix = 'tracker') : void { |
| 51 | 51 | if($download) { |
@@ -149,7 +149,7 @@ |
||
| 149 | 149 | | |
| 150 | 150 | <a href="#" class="set-mal-id" data-mal-id="<?=$row['mal_id']?>" data-mal-type="<?=$row['mal_type']?>">Set MAL ID</a> <?php if(!is_null($row['mal_id']) && $row['mal_type'] == 'chapter') { ?><span>(<small><?=($row['mal_id'] !== '0' ? $row['mal_id'] : 'none')?></small>)</span><?php } ?> |
| 151 | 151 | | |
| 152 | - Tags (<a href="#" class="edit-tags small">Edit</a>): <span class="text-lowercase tag-list"><?=($row['has_tags'] ? implode("", array_map(function ($str) { return "<i class='tag'>{$str}</i>"; }, explode(",", $row['tag_list']))) : "none")?></span> |
|
| 152 | + Tags (<a href="#" class="edit-tags small">Edit</a>): <span class="text-lowercase tag-list"><?=($row['has_tags'] ? implode("", array_map(function($str) { return "<i class='tag'>{$str}</i>"; }, explode(",", $row['tag_list']))) : "none")?></span> |
|
| 153 | 153 | <div class="input-group tag-edit" hidden> |
| 154 | 154 | <input type="text" class="form-control" placeholder="tag1,tag2,tag3" maxlength="255" pattern='[a-z0-9-_,]{0,255}' value="<?=$row['tag_list']?>"> |
| 155 | 155 | <span class="input-group-btn"> |