DakuTree / manga-tracker

application/models/Tracker/Tracker_Admin_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_Admin_Model extends Tracker_Base_Model {
 	public function __construct() {

Indentation +23 added lines, -23 removed lines

@@ -74,8 +74,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 {
@@ -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 {
@@ -177,10 +177,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) {
@@ -196,8 +196,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 {
@@ -224,13 +224,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) {
@@ -241,8 +241,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 {
@@ -290,8 +290,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 {
@@ -301,8 +301,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");

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() {
@@ -64,7 +64,7 @@ 
 		// @formatter:on
 
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				print "> {$row->title} <{$row->site_class}> | <{$row->title_id}>"; //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(is_array($titleData) && !is_null($titleData['latest_chapter'])) {
@@ -142,7 +142,7 @@ 
 		$query = $query->get();
 
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				print "> {$row->title} <{$row->site_class}> | <{$row->title_id}>"; //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(is_array($titleData) && !is_null($titleData['latest_chapter'])) {
@@ -183,10 +183,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) {
 					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'])) {
 						if($dbTitleData = $this->Tracker->title->getID($titleURL, (int) $site['id'], FALSE, TRUE)) {
@@ -226,7 +226,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')
@@ -284,7 +284,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/models/Tracker/Tracker_List_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_List_Model extends Tracker_Base_Model {
 	public function __construct() {

Indentation +26 added lines, -26 removed lines

@@ -171,14 +171,14 @@ 
 			}
 
 			$idQuery = $this->db->select('id')
-			                    ->where('user_id', $userID)
-			                    ->where('title_id', $titleID)
-			                    ->get('tracker_chapters');
+								->where('user_id', $userID)
+								->where('title_id', $titleID)
+								->get('tracker_chapters');
 			if($idQuery->num_rows() > 0) {
 				$success = (bool) $this->db->set(['current_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL, 'ignore_chapter' => NULL])
-				                           ->where('user_id', $userID)
-				                           ->where('title_id', $titleID)
-				                           ->update('tracker_chapters');
+										   ->where('user_id', $userID)
+										   ->where('title_id', $titleID)
+										   ->update('tracker_chapters');
 
 				if($success) {
 					$idQueryRow = $idQuery->row();
@@ -204,9 +204,9 @@ 
 	}
 	public function updateByID(int $userID, int $chapterID, string $chapter) : bool {
 		$success = (bool) $this->db->set(['current_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL])
-		                           ->where('user_id', $userID)
-		                           ->where('id', $chapterID)
-		                           ->update('tracker_chapters');
+								   ->where('user_id', $userID)
+								   ->where('id', $chapterID)
+								   ->update('tracker_chapters');
 
 		if($success) {
 			$this->History->userUpdateTitle($chapterID, $chapter);
@@ -216,9 +216,9 @@ 
 
 	public function ignoreByID(int $userID, int $chapterID, string $chapter) : bool {
 		$success = (bool) $this->db->set(['ignore_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL])
-		                           ->where('user_id', $userID)
-		                           ->where('id', $chapterID)
-		                           ->update('tracker_chapters');
+								   ->where('user_id', $userID)
+								   ->where('id', $chapterID)
+								   ->update('tracker_chapters');
 
 		if($success) {
 			$this->History->userIgnoreTitle($chapterID, $chapter);
@@ -231,9 +231,9 @@ 
 		//This is to allow user history to function properly.
 
 		$success = $this->db->set(['active' => 'N', 'last_updated' => NULL])
-		                    ->where('user_id', $userID)
-		                    ->where('id', $chapterID)
-		                    ->update('tracker_chapters');
+							->where('user_id', $userID)
+							->where('id', $chapterID)
+							->update('tracker_chapters');
 
 		return (bool) $success;
 	}
@@ -263,9 +263,9 @@ 
 		//TODO: OPTION, USE BACKEND MAL ID DB WHERE POSSIBLE (DEFAULT TRUE)
 
 		$queryC = $this->db->select('mal_id')
-		                   ->where('user_id', $userID)
-		                   ->where('title_id', $titleID)
-		                   ->get('tracker_chapters');
+						   ->where('user_id', $userID)
+						   ->where('title_id', $titleID)
+						   ->get('tracker_chapters');
 
 		if($queryC->num_rows() > 0 && ($rowC = $queryC->row())) {
 			$malIDArr = [
@@ -274,8 +274,8 @@ 
 			];
 		} else {
 			$queryT = $this->db->select('mal_id')
-			                   ->where('title_id', $titleID)
-			                   ->get('tracker_titles');
+							   ->where('title_id', $titleID)
+							   ->get('tracker_titles');
 
 			if($queryT->num_rows() > 0 && ($rowT = $queryT->row())) {
 				$malIDArr = [
@@ -289,9 +289,9 @@ 
 		//TODO: Remove after a few weeks!
 		if(is_null($malIDArr)) {
 			$queryC2 = $this->db->select('tags')
-			                  ->where('user_id', $userID)
-			                  ->where('title_id', $titleID)
-			                  ->get('tracker_chapters');
+							  ->where('user_id', $userID)
+							  ->where('title_id', $titleID)
+							  ->get('tracker_chapters');
 
 			if($queryC2->num_rows() > 0 && ($tag_string = $queryC2->row()->tags) && !is_null($tag_string)) {
 				$arr   = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
@@ -309,9 +309,9 @@ 
 	public function setMalID(int $userID, int $chapterID, ?int $malID) : bool {
 		//TODO: Handle NULL?
 		$success = (bool) $this->db->set(['mal_id' => $malID, 'active' => 'Y', 'last_updated' => NULL])
-		                           ->where('user_id', $userID)
-		                           ->where('id', $chapterID)
-		                           ->update('tracker_chapters');
+								   ->where('user_id', $userID)
+								   ->where('id', $chapterID)
+								   ->update('tracker_chapters');
 
 		if($success) {
 			//MAL id update was successful, update history

Braces +12 added lines, -4 removed lines

@@ -72,8 +72,12 @@ 
 
 				$arr['series'][$row->category]['manga'][] = $data;
 
-				if(!$arr['has_inactive']) $arr['has_inactive'] = !$data['title_data']['active'];
-				if($arr['has_inactive'])  $arr['inactive_titles'][$data['full_title_url']] = $data['title_data']['title'];
+				if(!$arr['has_inactive']) {
+					$arr['has_inactive'] = !$data['title_data']['active'];
+				}
+				if($arr['has_inactive']) {
+					$arr['inactive_titles'][$data['full_title_url']] = $data['title_data']['title'];
+				}
 			}
 
 			//FIXME: This is not good for speed, but we're kind of required to do this for UX purposes.
@@ -107,11 +111,15 @@ 
 
 							if($sortOrder == 'asc') {
 								$unreadSort = ($a_text <=> $b_text);
-								if($unreadSort) return $unreadSort;
+								if($unreadSort) {
+									return $unreadSort;
+								}
 								return $a_text2 <=> $b_text2;
 							} else {
 								$unreadSort = ($a_text <=> $b_text);
-								if($unreadSort) return $unreadSort;
+								if($unreadSort) {
+									return $unreadSort;
+								}
 								return $b_text2 <=> $a_text2;
 							}
 						});

Spacing +11 added lines, -11 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_List_Model extends Tracker_Base_Model {
 	public function __construct() {
@@ -29,7 +29,7 @@ 
 			];
 		}
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				$is_unread = intval(($row->latest_chapter == $row->ignore_chapter) || ($row->latest_chapter == $row->current_chapter) ? '1' : '0');
 				$arr['series'][$row->category]['unread_count'] = (($arr['series'][$row->category]['unread_count'] ?? 0) + !$is_unread);
 				$data = [
@@ -84,8 +84,8 @@ 
 			$sortOrder = $this->User_Options->get('list_sort_order', $userID);
 			switch($this->User_Options->get('list_sort_type', $userID)) {
 				case 'unread':
-					foreach (array_keys($arr['series']) as $category) {
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
+					foreach(array_keys($arr['series']) as $category) {
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['new_chapter_exists']} - {$a['title_data']['title']}");
 							$b_text = strtolower("{$b['new_chapter_exists']} - {$b['title_data']['title']}");
 
@@ -99,8 +99,8 @@ 
 					break;
 
 				case 'unread_latest':
-					foreach (array_keys($arr['series']) as $category) {
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
+					foreach(array_keys($arr['series']) as $category) {
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = $a['new_chapter_exists'];
 							$b_text = $b['new_chapter_exists'];
 
@@ -121,7 +121,7 @@ 
 					break;
 
 				case 'alphabetical':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['title_data']['title']}");
 							$b_text = strtolower("{$b['title_data']['title']}");
@@ -136,7 +136,7 @@ 
 					break;
 
 				case 'my_status':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['generated_current_data']['number']}");
 							$b_text = strtolower("{$b['generated_current_data']['number']}");
@@ -151,7 +151,7 @@ 
 					break;
 
 				case 'latest':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = new DateTime("{$a['title_data']['last_updated']}");
 							$b_text = new DateTime("{$b['title_data']['last_updated']}");
@@ -283,7 +283,7 @@ 
 		return $status;
 	}
 
-	public function getMalID(int $userID, int $titleID) : ?array{
+	public function getMalID(int $userID, int $titleID) : ? array{
 		$malIDArr = NULL;
 
 		//NEW METHOD
@@ -321,7 +321,7 @@ 
 			                  ->get('tracker_chapters');
 
 			if($queryC2->num_rows() > 0 && ($tag_string = $queryC2->row()->tags) && !is_null($tag_string)) {
-				$arr   = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
+				$arr = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
 				if(!empty($arr)) {
 					$malIDArr = [
 						'id'   => explode(':', $arr[0])[1],

application/config/development/database.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');
 
 $active_group  = 'default';
 $query_builder = TRUE;

application/config/constants.php

Spacing +21 added lines, -21 removed lines

@@ -26,10 +26,10 @@ 
 | always be used to set the mode correctly.
 |
 */
-defined('FILE_READ_MODE')  OR define('FILE_READ_MODE', 0644);
+defined('FILE_READ_MODE') OR define('FILE_READ_MODE', 0644);
 defined('FILE_WRITE_MODE') OR define('FILE_WRITE_MODE', 0666);
-defined('DIR_READ_MODE')   OR define('DIR_READ_MODE', 0755);
-defined('DIR_WRITE_MODE')  OR define('DIR_WRITE_MODE', 0755);
+defined('DIR_READ_MODE') OR define('DIR_READ_MODE', 0755);
+defined('DIR_WRITE_MODE') OR define('DIR_WRITE_MODE', 0755);
 
 /*
 |--------------------------------------------------------------------------
@@ -39,14 +39,14 @@ 
 | These modes are used when working with fopen()/popen()
 |
 */
-defined('FOPEN_READ')                           OR define('FOPEN_READ', 'rb');
-defined('FOPEN_READ_WRITE')                     OR define('FOPEN_READ_WRITE', 'r+b');
-defined('FOPEN_WRITE_CREATE_DESTRUCTIVE')       OR define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
+defined('FOPEN_READ') OR define('FOPEN_READ', 'rb');
+defined('FOPEN_READ_WRITE') OR define('FOPEN_READ_WRITE', 'r+b');
+defined('FOPEN_WRITE_CREATE_DESTRUCTIVE') OR define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
 defined('FOPEN_READ_WRITE_CREATE_DESCTRUCTIVE') OR define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
-defined('FOPEN_WRITE_CREATE')                   OR define('FOPEN_WRITE_CREATE', 'ab');
-defined('FOPEN_READ_WRITE_CREATE')              OR define('FOPEN_READ_WRITE_CREATE', 'a+b');
-defined('FOPEN_WRITE_CREATE_STRICT')            OR define('FOPEN_WRITE_CREATE_STRICT', 'xb');
-defined('FOPEN_READ_WRITE_CREATE_STRICT')       OR define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
+defined('FOPEN_WRITE_CREATE') OR define('FOPEN_WRITE_CREATE', 'ab');
+defined('FOPEN_READ_WRITE_CREATE') OR define('FOPEN_READ_WRITE_CREATE', 'a+b');
+defined('FOPEN_WRITE_CREATE_STRICT') OR define('FOPEN_WRITE_CREATE_STRICT', 'xb');
+defined('FOPEN_READ_WRITE_CREATE_STRICT') OR define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
 
 /*
 |--------------------------------------------------------------------------
@@ -73,18 +73,18 @@ 
 |       http://tldp.org/LDP/abs/html/exitcodes.html
 |
 */
-defined('EXIT_SUCCESS')        OR define('EXIT_SUCCESS', 0); // no errors
-defined('EXIT_ERROR')          OR define('EXIT_ERROR', 1); // generic error
-defined('EXIT_CONFIG')         OR define('EXIT_CONFIG', 3); // configuration error
-defined('EXIT_UNKNOWN_FILE')   OR define('EXIT_UNKNOWN_FILE', 4); // file not found
-defined('EXIT_UNKNOWN_CLASS')  OR define('EXIT_UNKNOWN_CLASS', 5); // unknown class
+defined('EXIT_SUCCESS') OR define('EXIT_SUCCESS', 0); // no errors
+defined('EXIT_ERROR') OR define('EXIT_ERROR', 1); // generic error
+defined('EXIT_CONFIG') OR define('EXIT_CONFIG', 3); // configuration error
+defined('EXIT_UNKNOWN_FILE') OR define('EXIT_UNKNOWN_FILE', 4); // file not found
+defined('EXIT_UNKNOWN_CLASS') OR define('EXIT_UNKNOWN_CLASS', 5); // unknown class
 defined('EXIT_UNKNOWN_METHOD') OR define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
-defined('EXIT_USER_INPUT')     OR define('EXIT_USER_INPUT', 7); // invalid user input
-defined('EXIT_DATABASE')       OR define('EXIT_DATABASE', 8); // database error
-defined('EXIT__AUTO_MIN')      OR define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
-defined('EXIT__AUTO_MAX')      OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
+defined('EXIT_USER_INPUT') OR define('EXIT_USER_INPUT', 7); // invalid user input
+defined('EXIT_DATABASE') OR define('EXIT_DATABASE', 8); // database error
+defined('EXIT__AUTO_MIN') OR define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
+defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
 
 /***** TIMEAGO CONSTANTS *****/
 defined('TIMEAGO_MONTH') OR define('TIMEAGO_MONTH', strtotime('-1 month')); //1 month ago
-defined('TIMEAGO_WEEK')  OR define('TIMEAGO_WEEK', strtotime('-1 week')); //1 week ago
-defined('TIMEAGO_3DAY')  OR define('TIMEAGO_3DAY', strtotime('-3 day')); //3 days ago
+defined('TIMEAGO_WEEK') OR define('TIMEAGO_WEEK', strtotime('-1 week')); //1 week ago
+defined('TIMEAGO_3DAY') OR define('TIMEAGO_3DAY', strtotime('-3 day')); //3 days ago

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

@@ -1,5 +1,5 @@ 
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -11,7 +11,7 @@ 
 | of this setting
 |
 */
-defined('SHOW_DEBUG_BACKTRACE') OR define('SHOW_DEBUG_BACKTRACE', TRUE);
+defined('SHOW_DEBUG_BACKTRACE') or define('SHOW_DEBUG_BACKTRACE', TRUE);
 
 /*
 |--------------------------------------------------------------------------
@@ -26,10 +26,10 @@ 
 | always be used to set the mode correctly.
 |
 */
-defined('FILE_READ_MODE')  OR define('FILE_READ_MODE', 0644);
-defined('FILE_WRITE_MODE') OR define('FILE_WRITE_MODE', 0666);
-defined('DIR_READ_MODE')   OR define('DIR_READ_MODE', 0755);
-defined('DIR_WRITE_MODE')  OR define('DIR_WRITE_MODE', 0755);
+defined('FILE_READ_MODE')  or define('FILE_READ_MODE', 0644);
+defined('FILE_WRITE_MODE') or define('FILE_WRITE_MODE', 0666);
+defined('DIR_READ_MODE')   or define('DIR_READ_MODE', 0755);
+defined('DIR_WRITE_MODE')  or define('DIR_WRITE_MODE', 0755);
 
 /*
 |--------------------------------------------------------------------------
@@ -39,14 +39,14 @@ 
 | These modes are used when working with fopen()/popen()
 |
 */
-defined('FOPEN_READ')                           OR define('FOPEN_READ', 'rb');
-defined('FOPEN_READ_WRITE')                     OR define('FOPEN_READ_WRITE', 'r+b');
-defined('FOPEN_WRITE_CREATE_DESTRUCTIVE')       OR define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
-defined('FOPEN_READ_WRITE_CREATE_DESCTRUCTIVE') OR define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
-defined('FOPEN_WRITE_CREATE')                   OR define('FOPEN_WRITE_CREATE', 'ab');
-defined('FOPEN_READ_WRITE_CREATE')              OR define('FOPEN_READ_WRITE_CREATE', 'a+b');
-defined('FOPEN_WRITE_CREATE_STRICT')            OR define('FOPEN_WRITE_CREATE_STRICT', 'xb');
-defined('FOPEN_READ_WRITE_CREATE_STRICT')       OR define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
+defined('FOPEN_READ')                           or define('FOPEN_READ', 'rb');
+defined('FOPEN_READ_WRITE')                     or define('FOPEN_READ_WRITE', 'r+b');
+defined('FOPEN_WRITE_CREATE_DESTRUCTIVE')       or define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
+defined('FOPEN_READ_WRITE_CREATE_DESCTRUCTIVE') or define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
+defined('FOPEN_WRITE_CREATE')                   or define('FOPEN_WRITE_CREATE', 'ab');
+defined('FOPEN_READ_WRITE_CREATE')              or define('FOPEN_READ_WRITE_CREATE', 'a+b');
+defined('FOPEN_WRITE_CREATE_STRICT')            or define('FOPEN_WRITE_CREATE_STRICT', 'xb');
+defined('FOPEN_READ_WRITE_CREATE_STRICT')       or define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
 
 /*
 |--------------------------------------------------------------------------
@@ -73,18 +73,18 @@ 
 |       http://tldp.org/LDP/abs/html/exitcodes.html
 |
 */
-defined('EXIT_SUCCESS')        OR define('EXIT_SUCCESS', 0); // no errors
-defined('EXIT_ERROR')          OR define('EXIT_ERROR', 1); // generic error
-defined('EXIT_CONFIG')         OR define('EXIT_CONFIG', 3); // configuration error
-defined('EXIT_UNKNOWN_FILE')   OR define('EXIT_UNKNOWN_FILE', 4); // file not found
-defined('EXIT_UNKNOWN_CLASS')  OR define('EXIT_UNKNOWN_CLASS', 5); // unknown class
-defined('EXIT_UNKNOWN_METHOD') OR define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
-defined('EXIT_USER_INPUT')     OR define('EXIT_USER_INPUT', 7); // invalid user input
-defined('EXIT_DATABASE')       OR define('EXIT_DATABASE', 8); // database error
-defined('EXIT__AUTO_MIN')      OR define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
-defined('EXIT__AUTO_MAX')      OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
+defined('EXIT_SUCCESS')        or define('EXIT_SUCCESS', 0); // no errors
+defined('EXIT_ERROR')          or define('EXIT_ERROR', 1); // generic error
+defined('EXIT_CONFIG')         or define('EXIT_CONFIG', 3); // configuration error
+defined('EXIT_UNKNOWN_FILE')   or define('EXIT_UNKNOWN_FILE', 4); // file not found
+defined('EXIT_UNKNOWN_CLASS')  or define('EXIT_UNKNOWN_CLASS', 5); // unknown class
+defined('EXIT_UNKNOWN_METHOD') or define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
+defined('EXIT_USER_INPUT')     or define('EXIT_USER_INPUT', 7); // invalid user input
+defined('EXIT_DATABASE')       or define('EXIT_DATABASE', 8); // database error
+defined('EXIT__AUTO_MIN')      or define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
+defined('EXIT__AUTO_MAX')      or define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
 
 /***** TIMEAGO CONSTANTS *****/
-defined('TIMEAGO_MONTH') OR define('TIMEAGO_MONTH', strtotime('-1 month')); //1 month ago
-defined('TIMEAGO_WEEK')  OR define('TIMEAGO_WEEK', strtotime('-1 week')); //1 week ago
-defined('TIMEAGO_3DAY')  OR define('TIMEAGO_3DAY', strtotime('-3 day')); //3 days ago
+defined('TIMEAGO_MONTH') or define('TIMEAGO_MONTH', strtotime('-1 month')); //1 month ago
+defined('TIMEAGO_WEEK')  or define('TIMEAGO_WEEK', strtotime('-1 week')); //1 week ago
+defined('TIMEAGO_3DAY')  or define('TIMEAGO_3DAY', strtotime('-3 day')); //3 days ago

application/controllers/User/Options.php

Spacing +9 added lines, -9 removed lines

@@ -16,16 +16,16 @@ 
 		$usedCategories   = $this->Tracker->category->getUsed($this->User->id);
 
 		//NOTE: The checkbox validation is handled in run()
-		$this->form_validation->set_rules('category_custom_1_text',  'Custom Category 1 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
-		$this->form_validation->set_rules('category_custom_2_text',  'Custom Category 2 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
-		$this->form_validation->set_rules('category_custom_3_text',  'Custom Category 3 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_1_text', 'Custom Category 1 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_2_text', 'Custom Category 2 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_3_text', 'Custom Category 3 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
 		$this->form_validation->set_rules('default_series_category', 'Default Series Category', 'required|is_valid_option_value[default_series_category]');
-		$this->form_validation->set_rules('list_sort_type',          'List Sort Type',          'required|is_valid_option_value[list_sort_type]');
-		$this->form_validation->set_rules('list_sort_order',         'List Sort Order',         'required|is_valid_option_value[list_sort_order]');
-		$this->form_validation->set_rules('theme',                   'Theme',                   'required|is_valid_option_value[theme]');
-		$this->form_validation->set_rules('mal_sync',                'MAL Sync',                'required|is_valid_option_value[mal_sync]');
+		$this->form_validation->set_rules('list_sort_type', 'List Sort Type', 'required|is_valid_option_value[list_sort_type]');
+		$this->form_validation->set_rules('list_sort_order', 'List Sort Order', 'required|is_valid_option_value[list_sort_order]');
+		$this->form_validation->set_rules('theme', 'Theme', 'required|is_valid_option_value[theme]');
+		$this->form_validation->set_rules('mal_sync', 'MAL Sync', 'required|is_valid_option_value[mal_sync]');
 
-		if ($isValid = $this->form_validation->run() === TRUE) {
+		if($isValid = $this->form_validation->run() === TRUE) {
 			foreach($customCategories as $categoryK => $category) {
 				if(!in_array($categoryK, $usedCategories)) {
 					$this->User_Options->set($category, $this->input->post($category) ? 'enabled' : 'disabled');
@@ -38,7 +38,7 @@ 
 
 			$this->User_Options->set('enable_live_countdown_timer', $this->input->post('enable_live_countdown_timer'));
 
-			$this->User_Options->set('list_sort_type',  $this->input->post('list_sort_type'));
+			$this->User_Options->set('list_sort_type', $this->input->post('list_sort_type'));
 			$this->User_Options->set('list_sort_order', $this->input->post('list_sort_order'));
 			
 			$this->User_Options->set('theme', $this->input->post('theme'));

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 extends CI_Model {
 	public function __construct() {

Braces +27 added lines, -9 removed lines

@@ -44,12 +44,16 @@ 
 
 	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;
 	}
 	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;
 	}
 
@@ -60,10 +64,16 @@ 
 		//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(!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, 'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2824.0 Safari/537.36');
@@ -234,8 +244,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);
@@ -248,8 +262,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);

Spacing +9 added lines, -9 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 extends CI_Model {
 	public function __construct() {
@@ -39,7 +39,7 @@ 
 
 	abstract public function getChapterData(string $title_url, string $chapter) : array;
 
-	abstract public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array;
+	abstract public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array;
 
 	final public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match($this->titleFormat, $title_url);
@@ -55,7 +55,7 @@ 
 	final protected function get_content(string $url, string $cookie_string = "", string $cookiejar_path = "", bool $follow_redirect = FALSE, bool $isPost = FALSE, array $postFields = []) {
 		$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);
 
@@ -73,8 +73,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);
@@ -130,7 +130,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);
@@ -138,7 +138,7 @@ 
 				$nodes_row   = $xpath->query($node_row_string);
 				if($nodes_title->length === 1 && $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);
@@ -266,11 +266,11 @@ 
 		$chapter_parts = explode('/', $chapter); //returns #LANG#/#VOLUME#/#CHAPTER#/#CHAPTER_EXTRA#(/#PAGE#/)
 		return [
 			'url'    => "{$this->baseURL}/read/{$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 getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$jsonURL = "{$this->baseURL}/api/reader/comic/stub/{$title_url}/format/json";

application/models/Tracker/Sites/GameOfScanlation.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 GameOfScanlation extends Base_Site_Model {
 	public $titleFormat   = '/^[a-z0-9\.-]+$/';

Spacing +4 added lines, -4 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 GameOfScanlation extends Base_Site_Model {
 	public $titleFormat   = '/^[a-z0-9\.-]+$/';
@@ -9,7 +9,7 @@ 
 		         The bad thing is these are interchangeable, despite them showing the exact same listing page.
 		         Thankfully the title_url of manga which use /forums/ seem to be appended with ".%ID%" which means we can easily check them. */
 
-		if (strpos($title_url, '.') !== FALSE) {
+		if(strpos($title_url, '.') !== FALSE) {
 			$format = "https://gameofscanlation.moe/forums/{$title_url}/";
 		} else {
 			$format = "https://gameofscanlation.moe/projects/{$title_url}/";
@@ -24,7 +24,7 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$fullURL = $this->getFullTitleURL($title_url);
@@ -44,7 +44,7 @@ 
 
 			$titleData['latest_chapter'] = preg_replace('/^projects\/.*?\/(.*?)\/$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$titleData['last_updated'] =  date("Y-m-d H:i:s",(int) $data['nodes_latest']->getAttribute('title'));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", (int) $data['nodes_latest']->getAttribute('title'));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);

application/models/Tracker/Sites/EGScans.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 EGScans extends Base_Site_Model {
 	public $titleFormat   = '/^[A-Za-z0-9\-_\!,]+$/';

Spacing +2 added lines, -2 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 EGScans extends Base_Site_Model {
 	public $titleFormat   = '/^[A-Za-z0-9\-_\!,]+$/';
@@ -15,7 +15,7 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$fullURL = $this->getFullTitleURL($title_url);

application/models/Tracker/Sites/MangaPanda.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 MangaPanda extends Base_Site_Model {
 	//NOTE: MangaPanda has manga pages under the root URL, so we need to filter out pages we know that aren't manga.

Spacing +3 added lines, -3 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 MangaPanda extends Base_Site_Model {
 	//NOTE: MangaPanda has manga pages under the root URL, so we need to filter out pages we know that aren't manga.
@@ -16,7 +16,7 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$fullURL = $this->getFullTitleURL($title_url);
@@ -35,7 +35,7 @@ 
 
 			$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9]+)$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);