DakuTree / manga-tracker

application/core/MY_Log.php

Doc Comments +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
 	 * Write to defined logger. Is called from CodeIgniters native log_message()
 	 *
 	 * @param string $level
-	 * @param $msg
+	 * @param string $msg
 	 * @return bool
 	 */
 	public function write_log($level = 'error', $msg)

Spacing +14 added lines, -14 removed lines

@@ -48,15 +48,15 @@ 
 	public function __construct() {
 		$file_path = APPPATH.'config/monolog.php';
 		$found = FALSE;
-		if (file_exists($file_path)) {
+		if(file_exists($file_path)) {
 			$found = TRUE;
 			require($file_path);
 		}
 
 		// Is the config file in the environment folder?
-		if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/monolog.php')) {
+		if(file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/monolog.php')) {
 			require($file_path);
-		} elseif (!$found) {
+		} elseif(!$found) {
 			exit('monolog.php config does not exist');
 		}
 
@@ -67,7 +67,7 @@ 
 		// detect and register all PHP errors in this log hence forth
 		ErrorHandler::register($this->log);
 
-		if ($this->config['introspection_processor'])
+		if($this->config['introspection_processor'])
 		{
 			// add controller and line number info to each log message
 			// 2 = depth in the stacktrace to ignore. This gives us the file
@@ -76,9 +76,9 @@ 
 		}
 
 		// decide which handler(s) to use
-		foreach ($this->config['handlers'] as $value)
+		foreach($this->config['handlers'] as $value)
 		{
-			switch ($value)
+			switch($value)
 			{
 				case 'file':
 					$handler = new RotatingFileHandler($this->config['file_logfile']);
@@ -123,7 +123,7 @@ 
 					break;
 
 				default:
-					exit('log handler not supported: ' . $value . "\n");
+					exit('log handler not supported: '.$value."\n");
 			}
 
 			$this->log->pushHandler($handler);
@@ -145,19 +145,19 @@ 
 		$level = strtoupper($level);
 
 		// verify error level
-		if (!isset($this->_levels[$level]))
+		if(!isset($this->_levels[$level]))
 		{
-			$this->log->addError('unknown error level: ' . $level);
+			$this->log->addError('unknown error level: '.$level);
 			$level = 'ALL';
 		}
 
 		// filter out anything in $this->config['exclusion_list']
-		if (!empty($this->config['exclusion_list']))
+		if(!empty($this->config['exclusion_list']))
 		{
-			foreach ($this->config['exclusion_list'] as $findme)
+			foreach($this->config['exclusion_list'] as $findme)
 			{
 				$pos = strpos($msg, $findme);
-				if ($pos !== false)
+				if($pos !== false)
 				{
 					// just exit now - we don't want to log this error
 					return true;
@@ -165,9 +165,9 @@ 
 			}
 		}
 
-		if ($this->_levels[$level] <= $this->config['threshold'])
+		if($this->_levels[$level] <= $this->config['threshold'])
 		{
-			switch ($level)
+			switch($level)
 			{
 				case 'ERROR':
 					$this->log->addError($msg);

Braces +10 added lines, -20 removed lines

@@ -67,8 +67,7 @@ 
 		// detect and register all PHP errors in this log hence forth
 		ErrorHandler::register($this->log);
 
-		if ($this->config['introspection_processor'])
-		{
+		if ($this->config['introspection_processor']) {
 			// add controller and line number info to each log message
 			// 2 = depth in the stacktrace to ignore. This gives us the file
 			// making the call to log_message();
@@ -76,10 +75,8 @@ 
 		}
 
 		// decide which handler(s) to use
-		foreach ($this->config['handlers'] as $value)
-		{
-			switch ($value)
-			{
+		foreach ($this->config['handlers'] as $value) {
+			switch ($value) {
 				case 'file':
 					$handler = new RotatingFileHandler($this->config['file_logfile']);
 					$formatter = new LineFormatter(null, null, $config['file_multiline']);
@@ -140,35 +137,28 @@ 
 	 * @param $msg
 	 * @return bool
 	 */
-	public function write_log($level = 'error', $msg)
-	{
+	public function write_log($level = 'error', $msg) {
 		$level = strtoupper($level);
 
 		// verify error level
-		if (!isset($this->_levels[$level]))
-		{
+		if (!isset($this->_levels[$level])) {
 			$this->log->addError('unknown error level: ' . $level);
 			$level = 'ALL';
 		}
 
 		// filter out anything in $this->config['exclusion_list']
-		if (!empty($this->config['exclusion_list']))
-		{
-			foreach ($this->config['exclusion_list'] as $findme)
-			{
+		if (!empty($this->config['exclusion_list'])) {
+			foreach ($this->config['exclusion_list'] as $findme) {
 				$pos = strpos($msg, $findme);
-				if ($pos !== false)
-				{
+				if ($pos !== false) {
 					// just exit now - we don't want to log this error
 					return true;
 				}
 			}
 		}
 
-		if ($this->_levels[$level] <= $this->config['threshold'])
-		{
-			switch ($level)
-			{
+		if ($this->_levels[$level] <= $this->config['threshold']) {
+			switch ($level) {
 				case 'ERROR':
 					$this->log->addError($msg);
 					break;

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -1,4 +1,4 @@ 
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
  * CodeIgniter Monolog Plus
@@ -82,18 +82,18 @@ 
 			{
 				case 'file':
 					$handler = new RotatingFileHandler($this->config['file_logfile']);
-					$formatter = new LineFormatter(null, null, $config['file_multiline']);
+					$formatter = new LineFormatter(NULL, NULL, $config['file_multiline']);
 					$handler->setFormatter($formatter);
 					break;
 
 				case 'ci_file':
 					$handler = new RotatingFileHandler($this->config['ci_file_logfile']);
-					$formatter = new LineFormatter("%level_name% - %datetime% --> %message% %extra%\n", null, $config['ci_file_multiline']);
+					$formatter = new LineFormatter("%level_name% - %datetime% --> %message% %extra%\n", NULL, $config['ci_file_multiline']);
 					$handler->setFormatter($formatter);
 					break;
 
 				case 'new_relic':
-					$handler = new NewRelicHandler(Logger::ERROR, true, $this->config['new_relic_app_name']);
+					$handler = new NewRelicHandler(Logger::ERROR, TRUE, $this->config['new_relic_app_name']);
 					break;
 
 				case 'hipchat':
@@ -112,7 +112,7 @@ 
 
 				case 'papertrail':
 					$handler = new SyslogUdpHandler($this->config['papertrail_host'], $this->config['papertrail_port']);
-					$formatter = new LineFormatter("%channel%.%level_name%: %message% %extra%", null, $config['papertrail_multiline']);
+					$formatter = new LineFormatter("%channel%.%level_name%: %message% %extra%", NULL, $config['papertrail_multiline']);
 					$handler->setFormatter($formatter);
 					break;
 
@@ -157,10 +157,10 @@ 
 			foreach ($this->config['exclusion_list'] as $findme)
 			{
 				$pos = strpos($msg, $findme);
-				if ($pos !== false)
+				if ($pos !== FALSE)
 				{
 					// just exit now - we don't want to log this error
-					return true;
+					return TRUE;
 				}
 			}
 		}
@@ -183,7 +183,7 @@ 
 					break;
 			}
 		}
-		return true;
+		return TRUE;
 	}
 
 }

application/models/Tracker/Tracker_Admin_Model.php

Indentation +28 added lines, -28 removed lines

@@ -152,8 +152,8 @@ 
 					//Make sure last_checked is always updated on successful run.
 					//CHECK: Is there a reason we aren't just doing this in updateByID?
 					$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-					         ->where('id', $row->title_id)
-					         ->update('tracker_titles');
+							 ->where('id', $row->title_id)
+							 ->update('tracker_titles');
 
 					print " - ({$titleData['latest_chapter']})\n";
 				} else {
@@ -167,8 +167,8 @@ 
 					//Make sure last_checked is always updated on successful run.
 					//CHECK: Is there a reason we aren't just doing this in updateByID?
 					$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-					         ->where('id', $row->title_id)
-					         ->update('tracker_titles');
+							 ->where('id', $row->title_id)
+							 ->update('tracker_titles');
 
 					print " - (No chapters found?)\n";
 				} else {
@@ -191,10 +191,10 @@ 
 	 */
 	public function updateCustom() {
 		$query = $this->db->select('*')
-		                  ->from('tracker_sites')
-		                  ->where('status', 'enabled')
-		                  ->where('tracker_sites.use_custom', 'Y')
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('status', 'enabled')
+						  ->where('tracker_sites.use_custom', 'Y')
+						  ->get();
 
 		$sites = $query->result_array();
 		foreach ($sites as $site) {
@@ -211,8 +211,8 @@ 
 									//Make sure last_checked is always updated on successful run.
 									//CHECK: Is there a reason we aren't just doing this in updateByID?
 									$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-									         ->where('id', $titleID)
-									         ->update('tracker_titles');
+											 ->where('id', $titleID)
+											 ->update('tracker_titles');
 
 									print " - ({$titleData['latest_chapter']})\n";
 								} else {
@@ -241,13 +241,13 @@ 
 
 	public function refollowCustom() {
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title_url, tracker_sites.site_class')
-		                  ->from('tracker_titles')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->where('tracker_titles.followed','N')
-		                  ->where('tracker_titles !=', '255')
-		                  ->where('tracker_sites.status', 'enabled')
-		                  ->where('tracker_sites.use_custom', 'Y')
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->where('tracker_titles.followed','N')
+						  ->where('tracker_titles !=', '255')
+						  ->where('tracker_sites.status', 'enabled')
+						  ->where('tracker_sites.use_custom', 'Y')
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			foreach($query->result() as $row) {
@@ -258,8 +258,8 @@ 
 
 					if(!empty($titleData)) {
 						$this->db->set($titleData)
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 
 						print "> {$row->site_class}:{$row->id}:{$row->title_url} FOLLOWED\n";
 					} else {
@@ -307,8 +307,8 @@ 
 				if($titleData['title'] && is_array($titleData) && !is_null($titleData['latest_chapter'])) {
 					if($titleData['title'] !== $row->title) {
 						$this->db->set('title', $titleData['title'])
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 						//TODO: Add to history somehow?
 						print " - NEW TITLE ({$titleData['title']})\n";
 					} else {
@@ -318,8 +318,8 @@ 
 					//We might as well try to update as well.
 					if($this->Tracker->title->updateByID((int) $row->id, $titleData['latest_chapter'])) {
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 					}
 				} else {
 					log_message('error', "{$row->title} failed to update title successfully");
@@ -335,14 +335,14 @@ 
 		$date = $temp_now->format('Y-m-d');
 
 		$query = $this->db->select('1')
-		                  ->from('site_stats')
-		                  ->where('date', $date)
-		                  ->get();
+						  ->from('site_stats')
+						  ->where('date', $date)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$this->db->set('total_requests', 'total_requests+1', FALSE)
-			         ->where('date', $date)
-			         ->update('site_stats');
+					 ->where('date', $date)
+					 ->update('site_stats');
 		} else {
 			$this->db->insert('site_stats', [
 				'date'           => $date,

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class Tracker_Admin_Model extends Tracker_Base_Model {
 	public function __construct() {
@@ -76,7 +76,7 @@ 
 		$query = $query->get();
 
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				$this->handleUpdate($row);
 			}
 		}
@@ -133,7 +133,7 @@ 
 		$query = $query->get();
 
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				$this->handleUpdate($row);
 			}
 		}
@@ -197,10 +197,10 @@ 
 		                  ->get();
 
 		$sites = $query->result_array();
-		foreach ($sites as $site) {
+		foreach($sites as $site) {
 			$siteClass = $this->sites->{$site['site_class']};
 			if($titleDataList = $siteClass->doCustomUpdate()) {
-				foreach ($titleDataList as $titleURL => $titleData) {
+				foreach($titleDataList as $titleURL => $titleData) {
 					$titleURL = (string) $titleURL; //Number only keys get converted to int for some reason, so we need to fix that.
 					print "> {$titleData['title']} <{$site['site_class']}>"; //Print this prior to doing anything so we can more easily find out if something went wrong
 					if(is_array($titleData) && !is_null($titleData['latest_chapter'])) {
@@ -243,7 +243,7 @@ 
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title_url, tracker_sites.site_class')
 		                  ->from('tracker_titles')
 		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->where('tracker_titles.followed','N')
+		                  ->where('tracker_titles.followed', 'N')
 		                  ->where('tracker_titles !=', '255')
 		                  ->where('tracker_sites.status', 'enabled')
 		                  ->where('tracker_sites.use_custom', 'Y')
@@ -301,7 +301,7 @@ 
 		// @formatter:on
 
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				print "> {$row->title} <{$row->site_class}>"; //Print this prior to doing anything so we can more easily find out if something went wrong
 				$titleData = $this->sites->{$row->site_class}->getTitleData($row->title_url);
 				if($titleData['title'] && is_array($titleData) && !is_null($titleData['latest_chapter'])) {

application/config/config.php

Spacing +3 added lines, -3 removed lines

@@ -134,9 +134,9 @@
 $config['composer_autoload'] = FALSE;
 
 //NOTE: This doesn't work in autoload.php as it is loaded after we need it.
-spl_autoload_register(function ($class) {
-	$fileMono = APPPATH . '../vendor/monolog/monolog/src/'.strtr($class, '\\', '/').'.php';
-	$filePsr  = APPPATH . '../vendor/psr/log/'.strtr($class, '\\', '/').'.php';
+spl_autoload_register(function($class) {
+	$fileMono = APPPATH.'../vendor/monolog/monolog/src/'.strtr($class, '\\', '/').'.php';
+	$filePsr  = APPPATH.'../vendor/psr/log/'.strtr($class, '\\', '/').'.php';
 	if(file_exists($fileMono)) {
 		require $fileMono;
 		return TRUE;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------

application/config/production/migration.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------

application/config/monolog.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 $config['file_multiline'] = TRUE; //add newlines to the output
 
 /* NEW RELIC OPTIONS */
-$config['new_relic_app_name'] = 'APP NAME - ' . ENVIRONMENT;
+$config['new_relic_app_name'] = 'APP NAME - '.ENVIRONMENT;
 
 /* HIPCHAT OPTIONS */
 $config['hipchat_app_token'] = ''; //HipChat API Token

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
  * CodeIgniter Monolog Plus
@@ -37,7 +37,7 @@ 
 $config['hipchat_app_token'] = ''; //HipChat API Token
 $config['hipchat_app_room_id'] = ''; //The room that should be alerted of the message (Id or Name)
 $config['hipchat_app_notification_name'] = 'Monolog'; //Name used in the "from" field
-$config['hipchat_app_notify'] = false; //Trigger a notification in clients or not
+$config['hipchat_app_notify'] = FALSE; //Trigger a notification in clients or not
 $config['hipchat_app_loglevel'] = 'WARNING'; //The minimum logging level at which this handler will be triggered
 
 /* PAPER TRAIL OPTIONS */

application/config/development/monolog.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /* GENERAL OPTIONS */
 $config['handlers'] = array('file', 'papertrail', 'cli'); // valid handlers are ci_file | file | new_relic | hipchat | stderr | papertrail