DakuTree / manga-tracker

application/models/Tracker/Tracker_Sites_Model.php

Upper-Lower-Casing +1 added lines, -1 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_Sites_Model

Braces +36 added lines, -12 removed lines

@@ -125,7 +125,9 @@ 
 	 */
 	final public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match($this->titleFormat, $title_url);
-		if(!$success) log_message('error', "Invalid Title URL ({$this->site}): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL ({$this->site}): {$title_url}");
+		}
 		return $success;
 	}
 
@@ -139,7 +141,9 @@ 
 	 */
 	final public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match($this->chapterFormat, $chapter);
-		if(!$success) log_message('error', "Invalid Chapter ({$this->site}): {$chapter}");
+		if(!$success) {
+			log_message('error', "Invalid Chapter ({$this->site}): {$chapter}");
+		}
 		return $success;
 	}
 
@@ -168,14 +172,20 @@ 
 			//curl_setopt($ch, CURLOPT_VERBOSE, 1);
 			curl_setopt($ch, CURLOPT_HEADER, 1);
 
-			if($follow_redirect)        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);
+			if($follow_redirect) {
+				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);
+			}
 
 			if($cookies = $this->cache->get("cloudflare_{$this->site}")) {
 				$cookie_string .= "; {$cookies}";
 			}
 
-			if(!empty($cookie_string))  curl_setopt($ch, CURLOPT_COOKIE, $cookie_string);
-			if(!empty($cookiejar_path)) curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiejar_path);
+			if(!empty($cookie_string)) {
+				curl_setopt($ch, CURLOPT_COOKIE, $cookie_string);
+			}
+			if(!empty($cookiejar_path)) {
+				curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiejar_path);
+			}
 
 			//Some sites check the useragent for stuff, use a pre-defined user-agent to avoid stuff.
 			curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
@@ -206,7 +216,9 @@ 
 			$body        = substr($response, $header_size);
 			curl_close($ch);
 
-			if($status_code === 503) $refresh = $this->handleCloudFlare($url, $body);
+			if($status_code === 503) {
+				$refresh = $this->handleCloudFlare($url, $body);
+			}
 		}
 
 		return [
@@ -312,7 +324,9 @@ 
 								'nodes_chapter' => $nodes_chapter->item(0)
 							];
 
-							if(is_callable($extraCall)) $extraCall($xpath, $returnData);
+							if(is_callable($extraCall)) {
+								$extraCall($xpath, $returnData);
+							}
 
 							return $returnData;
 						} else {
@@ -326,7 +340,9 @@ 
 						$noChaptersCall($data, $xpath, $returnData);
 
 						if(is_array($returnData)) {
-							if(is_callable($extraCall) && is_array($returnData)) $extraCall($xpath, $returnData);
+							if(is_callable($extraCall) && is_array($returnData)) {
+								$extraCall($xpath, $returnData);
+							}
 						} else {
 							log_message('error', "{$this->site} : {$title_url} | canHaveNoChapters set, but doesn't match possible checks! XPath is probably broken.");
 						}
@@ -461,8 +477,12 @@ 
 		$status = FALSE;
 
 		//Make sure we have a volume element
-		if(count($oldChapterSegments) === 1) array_unshift($oldChapterSegments, 'v0');
-		if(count($newChapterSegments) === 1) array_unshift($newChapterSegments, 'v0');
+		if(count($oldChapterSegments) === 1) {
+			array_unshift($oldChapterSegments, 'v0');
+		}
+		if(count($newChapterSegments) === 1) {
+			array_unshift($newChapterSegments, 'v0');
+		}
 
 		$oldCount = count($oldChapterSegments);
 		$newCount = count($newChapterSegments);
@@ -475,8 +495,12 @@ 
 				$newVolume = substr(array_shift($newChapterSegments), 1);
 
 				//Forcing volume to 0 as TBD might not be the latest (although it can be, but that is covered by other checks)
-				if(in_array($oldVolume, ['TBD', 'TBA', 'NA', 'LMT'])) $oldVolume = 0;
-				if(in_array($newVolume, ['TBD', 'TBA', 'NA', 'LMT'])) $newVolume = 0;
+				if(in_array($oldVolume, ['TBD', 'TBA', 'NA', 'LMT'])) {
+					$oldVolume = 0;
+				}
+				if(in_array($newVolume, ['TBD', 'TBA', 'NA', 'LMT'])) {
+					$newVolume = 0;
+				}
 
 				$oldVolume = floatval($oldVolume);
 				$newVolume = floatval($newVolume);

Doc Comments +4 added lines

@@ -531,6 +531,10 @@
 	final private function _getSiteRateLimit() : int {
 		return (int) ($this->cache->get("{$this->site}_ratelimit") ?: 0);
 	}
+
+	/**
+	 * @param integer $rateLimit
+	 */
 	final private function _setSiteRateLimit(?int $rateLimit = NULL) : bool {
 		//We would just use increment(), but we can't set ttl with it...
 		$currentRateLimit = $rateLimit ?: $this->_getSiteRateLimit();

Spacing +17 added lines, -17 removed lines

@@ -118,7 +118,7 @@ 
 				//We don't want double trailing slashes, so fix this when possible.
 				$pageSeparator = '';
 			}
-			$pageURL = $chapterData['url'] . $pageSeparator . $page;
+			$pageURL = $chapterData['url'].$pageSeparator.$page;
 		}
 		return $pageURL;
 	}
@@ -212,7 +212,7 @@ 
 
 			$ch = curl_init();
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-			curl_setopt($ch, CURLOPT_ENCODING , "gzip");
+			curl_setopt($ch, CURLOPT_ENCODING, "gzip");
 			//curl_setopt($ch, CURLOPT_VERBOSE, 1);
 			curl_setopt($ch, CURLOPT_HEADER, 1);
 
@@ -234,8 +234,8 @@ 
 			curl_setopt($ch, CURLOPT_URL, $url);
 
 			if($isPost) {
-				curl_setopt($ch,CURLOPT_POST, count($postFields));
-				curl_setopt($ch,CURLOPT_POSTFIELDS, http_build_query($postFields));
+				curl_setopt($ch, CURLOPT_POST, count($postFields));
+				curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($postFields));
 			}
 
 			$response = curl_exec($ch);
@@ -282,7 +282,7 @@ 
 			$result = shell_exec('python '.APPPATH.'../_scripts/get_cloudflare_cookie.py '.escapeshellarg(json_encode($urlData)));
 			$cookieData = json_decode($result, TRUE);
 
-			$this->cache->save("cloudflare_{$this->site}", $cookieData['cookies'],  31536000 /* 1 year, or until we renew it */);
+			$this->cache->save("cloudflare_{$this->site}", $cookieData['cookies'], 31536000 /* 1 year, or until we renew it */);
 			log_message('debug', "Saving CloudFlare Cookies for {$this->site}");
 
 			$refresh = TRUE;
@@ -340,7 +340,7 @@ 
 
 				$dom = new DOMDocument();
 				libxml_use_internal_errors(TRUE);
-				$dom->loadHTML('<?xml encoding="utf-8" ?>' . $data);
+				$dom->loadHTML('<?xml encoding="utf-8" ?>'.$data);
 				libxml_use_internal_errors(FALSE);
 
 				$xpath = new DOMXPath($dom);
@@ -349,7 +349,7 @@ 
 				if($nodes_title->length === 1) {
 					if($nodes_row->length === 1) {
 						$firstRow      = $nodes_row->item(0);
-						$nodes_latest  = $xpath->query($node_latest_string,  $firstRow);
+						$nodes_latest  = $xpath->query($node_latest_string, $firstRow);
 
 						if($node_chapter_string !== '') {
 							$nodes_chapter = $xpath->query($node_chapter_string, $firstRow);
@@ -565,7 +565,7 @@ 
 	final private function _setSiteRateLimit(?int $rateLimit = NULL) : bool {
 		//We would just use increment(), but we can't set ttl with it...
 		$currentRateLimit = $rateLimit ?: $this->_getSiteRateLimit();
-		return $this->cache->save("{$this->site}_ratelimit", $currentRateLimit + 1,3600);
+		return $this->cache->save("{$this->site}_ratelimit", $currentRateLimit + 1, 3600);
 	}
 }
 
@@ -583,7 +583,7 @@ 
 		$chapter_parts = explode('/', $chapter); //returns #LANG#/#VOLUME#/#CHAPTER#/#CHAPTER_EXTRA#(/#PAGE#/)
 		return [
 			'url'    => $this->getChapterURL($title_url, $chapter),
-			'number' => ($chapter_parts[1] !== '0' ? "v{$chapter_parts[1]}/" : '') . "c{$chapter_parts[2]}" . (isset($chapter_parts[3]) ? ".{$chapter_parts[3]}" : '')/*)*/
+			'number' => ($chapter_parts[1] !== '0' ? "v{$chapter_parts[1]}/" : '')."c{$chapter_parts[2]}".(isset($chapter_parts[3]) ? ".{$chapter_parts[3]}" : '')/*)*/
 		];
 	}
 	public function getChapterURL(string $title_url, string $chapter) : string {
@@ -768,9 +768,9 @@ 
 
 							$dateString = str_replace('/', '-', trim($nodes_latest->item(0)->nodeValue)); //NOTE: We replace slashes here as it stops strtotime interpreting the date as US date format.
 							if($dateString == 'T') {
-								$dateString = date("Y-m-d",now());
+								$dateString = date("Y-m-d", now());
 							}
-							$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString . ' 00:00'));
+							$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString.' 00:00'));
 
 							$titleDataList[$title_url] = $titleData;
 						}
@@ -935,11 +935,11 @@ 
 			""
 		);
 		if($data) {
-			$titleData['title'] = trim(preg_replace('/ Added on .*$/','', $data['nodes_title']->textContent));
+			$titleData['title'] = trim(preg_replace('/ Added on .*$/', '', $data['nodes_title']->textContent));
 			$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9\.]+)$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$dateString = preg_replace('/^Added (?:on )?/', '',$data['nodes_latest']->textContent);
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime($dateString));
+			$dateString = preg_replace('/^Added (?:on )?/', '', $data['nodes_latest']->textContent);
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString));
 		}
 		return (!empty($titleData) ? $titleData : NULL);
 	}
@@ -1017,9 +1017,9 @@ 
 	public function getChapterData(string $title_url, string $chapter) : array {
 		if(strpos($chapter, '/')) {
 			$chapterArr = explode('/', $chapter);
-			$chapterN   = "v{$chapterArr[0]}/c".str_replace('chapter_','',$chapterArr[1]);
-		} else if (ctype_digit($chapter)) {
-			$chapterN = 'c'.str_replace('chapter_','', $chapter);
+			$chapterN   = "v{$chapterArr[0]}/c".str_replace('chapter_', '', $chapterArr[1]);
+		} else if(ctype_digit($chapter)) {
+			$chapterN = 'c'.str_replace('chapter_', '', $chapter);
 		}
 		return [
 			'url'    => $this->getChapterURL($title_url, $chapter),

application/models/Tracker/Tracker_Issue_Model.php

Indentation +3 added lines, -3 removed lines

@@ -11,9 +11,9 @@
 
 		//This is pretty barebones issue reporting, and honestly not a great way to do it, but it works for now (until the Github is public).
 		$body = "".
-		        (!is_null($url) && !empty($url) ? "URL: ".htmlspecialchars(substr($url, 0, 255))."<br>\n" : "").
-		        "Submitted by: ".$this->input->ip_address().(!is_null($userID) ? "| {$userID}" : "")."<br>\n".
-		        "<br>Bug report: ".htmlspecialchars(substr($text, 0, 1000));
+				(!is_null($url) && !empty($url) ? "URL: ".htmlspecialchars(substr($url, 0, 255))."<br>\n" : "").
+				"Submitted by: ".$this->input->ip_address().(!is_null($userID) ? "| {$userID}" : "")."<br>\n".
+				"<br>Bug report: ".htmlspecialchars(substr($text, 0, 1000));
 
 		$success = TRUE;
 		$this->email->from('no-reply@trackr.moe', $this->config->item('site_title', 'ion_auth'));

Upper-Lower-Casing +1 added lines, -1 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_Issue_Model extends Tracker_Base_Model {
 	public function __construct() {

application/controllers/ReportIssue.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');
 
 class ReportIssue extends MY_Controller {
 	public function __construct() {

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 		$this->header_data['page']  = 'report-issue';
 
 		$this->form_validation->set_rules('issue_description', 'Description', 'required|max_length[1000]');
-		$this->form_validation->set_rules('issue_url',         'URL',         'valid_url');
+		$this->form_validation->set_rules('issue_url', 'URL', 'valid_url');
 
 
 		$this->body_data['issue_submitted'] = FALSE;
@@ -21,9 +21,9 @@ 
 
 			if(!empty($this->input->post('website'))) {
 				$this->body_data['issue_submitted'] = FALSE;
-				log_message('error', 'Bot attempting to spam report issue form: "' . $this->input->post('issue_description') . '"');
+				log_message('error', 'Bot attempting to spam report issue form: "'.$this->input->post('issue_description').'"');
 			} else {
-				$this->body_data['issue_submitted'] = $this->Tracker->issue->report('USERID:' . $this->User->id . ' ||| ' . $this->input->post('issue_description'), NULL, $this->input->post('issue_url'));
+				$this->body_data['issue_submitted'] = $this->Tracker->issue->report('USERID:'.$this->User->id.' ||| '.$this->input->post('issue_description'), NULL, $this->input->post('issue_url'));
 			}
 		}
 

_scripts/generate_foolslide.php

Braces +10 added lines, -4 removed lines

@@ -1,6 +1,8 @@ 
 <?php declare(strict_types=1);
 
-if(!extension_loaded('gd')) die('GD ext is required to run this!');
+if(!extension_loaded('gd')) {
+	die('GD ext is required to run this!');
+}
 
 chdir(dirname(__FILE__).'/../'); //Just to make things easier, change dir to project root.
 
@@ -9,7 +11,7 @@ 
 	private $className;
 
 	public function __construct() {
-		if(isset($_SERVER['argv']) && count($_SERVER['argv']) === 3){
+		if(isset($_SERVER['argv']) && count($_SERVER['argv']) === 3) {
 			$this->baseURL   = rtrim($_SERVER['argv'][1], '/');
 			$this->className = $_SERVER['argv'][2];
 
@@ -98,7 +100,9 @@ 
 		$baseFile = file_get_contents($baseFileName);
 
 		$parse = parse_url($this->baseURL);
-		if(strpos($baseFile, $parse['host']) !== false) die("Domain already exists in userscript?");
+		if(strpos($baseFile, $parse['host']) !== false) {
+			die("Domain already exists in userscript?");
+		}
 
 		preg_match('/\@updated      ([0-9\-]+)[\r\n]+.*?\@version      ([0-9\.]+)/s', $baseFile, $matches);
 
@@ -188,7 +192,9 @@ 
 			}
 		}
 
-		if(empty($titleArr)) die("API isn't returning any titles?");
+		if(empty($titleArr)) {
+			die("API isn't returning any titles?");
+		}
 		return $titleArr;
 	}
 }

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

@@ -67,7 +67,7 @@ 
 
 		//Replace class names
 		$baseFile = str_replace('class HelveticaScans', "class {$this->className}", $baseFile);
-		$baseFile = str_replace('coversDefaultClass HelveticaScans', "coversDefaultClass {$this->className}", $baseFile);
+		$baseFile = str_replace('coversDefaultClass HelveticaScans', "coversdefaultclass {$this->className}", $baseFile);
 
 		//Replace tests
 		$titleList  = $this->getTitles();
@@ -98,7 +98,7 @@ 
 		$baseFile = file_get_contents($baseFileName);
 
 		$parse = parse_url($this->baseURL);
-		if(strpos($baseFile, $parse['host']) !== false) die("Domain already exists in userscript?");
+		if(strpos($baseFile, $parse['host']) !== FALSE) die("Domain already exists in userscript?");
 
 		preg_match('/\@updated      ([0-9\-]+)[\r\n]+.*?\@version      ([0-9\.]+)/s', $baseFile, $matches);
 
@@ -120,7 +120,7 @@ 
 		$require = <<<EOT
 // @require      https://{$baseDomain}/userscripts/sites/{$this->className}.1.js
 // @resource     fontAwesome
-EOT;
+eot;
 		$baseFile = str_replace('// @resource     fontAwesome', $require, $baseFile);
 
 		file_put_contents($baseFileName, $baseFile);
@@ -146,7 +146,7 @@ 
 	};
 })(window.trackerSites = (window.trackerSites || {}));
 
-EOT;
+eot;
 
 		file_put_contents("./public/userscripts/sites/{$this->className}.js", $siteData);
 	}
@@ -166,8 +166,8 @@ 
 
 		$ch = curl_init("{$this->baseURL}/api/reader/chapters/orderby/desc_created/format/json");
 
-		curl_setopt($ch, CURLOPT_NOBODY, true);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_NOBODY, TRUE);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
 		curl_exec($ch);
 		$status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 		curl_close($ch);
@@ -181,7 +181,7 @@ 
 		if($content = file_get_contents($jsonURL)) {
 			$json = json_decode($content, TRUE);
 			shuffle($json['comics']);
-			$comics = array_slice($json['comics'], 0, 5, true);
+			$comics = array_slice($json['comics'], 0, 5, TRUE);
 
 			foreach($comics as $comic) {
 				$titleArr[$comic['stub']] = $comic['name'];

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
 	private $className;
 
 	public function __construct() {
-		if(isset($_SERVER['argv']) && count($_SERVER['argv']) === 3){
+		if(isset($_SERVER['argv']) && count($_SERVER['argv']) === 3) {
 			$this->baseURL   = rtrim($_SERVER['argv'][1], '/');
 			$this->className = $_SERVER['argv'][2];
 
@@ -29,7 +29,7 @@ 
 
 		$this->updateDocs();
 
-		$domain =  preg_replace('#^https?://(.*?)(?:/.*?)?$#', '$1', $this->baseURL);
+		$domain = preg_replace('#^https?://(.*?)(?:/.*?)?$#', '$1', $this->baseURL);
 		say("\nAdmin SQL:");
 		say("INSERT INTO `mangatracker_development`.`tracker_sites` (`id`, `site`, `site_class`, `status`, `use_custom`) VALUES (NULL, '{$domain}', '{$this->className}', 'enabled', 'Y');");
 		say("INSERT INTO `mangatracker_production`.`tracker_sites` (`id`, `site`, `site_class`, `status`, `use_custom`) VALUES (NULL, '{$domain}', '{$this->className}', 'enabled', 'Y');");
@@ -108,12 +108,12 @@ 
 
 		//Update @updated
 		$currentDate = date("Y-m-d", time());
-		$baseFile = str_replace("@updated      {$matches[1]}","@updated      {$currentDate}", $baseFile);
+		$baseFile = str_replace("@updated      {$matches[1]}", "@updated      {$currentDate}", $baseFile);
 
 		//Update @version
 		$currentVersion = explode('.', $matches[2]);
-		$newVersion = "{$currentVersion[0]}.{$currentVersion[1]}.". (((int) $currentVersion[2]) + 1);
-		$baseFile = str_replace("@version      {$matches[2]}","@version      {$newVersion}", $baseFile);
+		$newVersion = "{$currentVersion[0]}.{$currentVersion[1]}.".(((int) $currentVersion[2]) + 1);
+		$baseFile = str_replace("@version      {$matches[2]}", "@version      {$newVersion}", $baseFile);
 
 		//Add @require
 		// @resource     fontAwesome

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)

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;

Spacing +16 added lines, -16 removed lines

@@ -48,22 +48,22 @@ 
 	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');
 		}
 
 		// Is the config file in the _secure folder?
-		if (file_exists($file_path = APPPATH.'config/_secure/monolog.php')) {
+		if(file_exists($file_path = APPPATH.'config/_secure/monolog.php')) {
 			require($file_path);
-		} elseif (!$found) {
+		} elseif(!$found) {
 			exit('monolog.php config does not exist');
 		}
 
@@ -74,7 +74,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
@@ -83,9 +83,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']);
@@ -130,7 +130,7 @@ 
 					break;
 
 				default:
-					exit('log handler not supported: ' . $value . "\n");
+					exit('log handler not supported: '.$value."\n");
 			}
 
 			$this->log->pushHandler($handler);
@@ -152,19 +152,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;
@@ -172,9 +172,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);

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
@@ -89,18 +89,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':
@@ -119,7 +119,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;
 
@@ -164,10 +164,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;
 				}
 			}
 		}
@@ -190,7 +190,7 @@ 
 					break;
 			}
 		}
-		return true;
+		return TRUE;
 	}
 
 }

application/config/config.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');
 
 /*
 |--------------------------------------------------------------------------

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/'. str_replace('\\', '/', $class) .'.php';
-	$filePsr  = APPPATH . '../vendor/psr/log/'. str_replace('\\', '/', $class) .'.php';
+spl_autoload_register(function($class) {
+	$fileMono = APPPATH.'../vendor/monolog/monolog/src/'.str_replace('\\', '/', $class).'.php';
+	$filePsr  = APPPATH.'../vendor/psr/log/'.str_replace('\\', '/', $class).'.php';
 	if(file_exists($fileMono)) {
 		require $fileMono;
 		return TRUE;

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/production/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'); // valid handlers are ci_file | file | new_relic | hipchat | stderr | papertrail