DakuTree / manga-tracker

application/models/Tracker/Tracker_Favourites_Model.php

Indentation +10 added lines, -10 removed lines

@@ -115,33 +115,33 @@
 
 			////We need the series to be tracked
 			$idCQuery = $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(!($idCQuery->num_rows() > 0)) {
 				//NOTE: This pretty much repeats a lot of what we already did above. Is there a better way to do this?
 				$this->Tracker->list->update($userID, $site, $title, $chapter, FALSE);
 
 				$idCQuery = $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($idCQuery->num_rows() > 0) {
 				$idCQueryRow = $idCQuery->row();
 
 				//Check if it is already favourited
 				$idFQuery = $this->db->select('id')
-				                     ->where('chapter_id', $idCQueryRow->id)
-				                     ->where('chapter', $chapter)
-				                     ->get('tracker_favourites');
+									 ->where('chapter_id', $idCQueryRow->id)
+									 ->where('chapter', $chapter)
+									 ->get('tracker_favourites');
 				if($idFQuery->num_rows() > 0) {
 					//Chapter is already favourited, so remove it from DB
 					if($removeIfExists) {
 						$idFQueryRow = $idFQuery->row();
 
 						$isSuccess = (bool) $this->db->where('id', $idFQueryRow->id)
-						                             ->delete('tracker_favourites');
+													 ->delete('tracker_favourites');
 
 						if($isSuccess) {
 							$success = array(

Spacing +6 added lines, -6 removed lines

@@ -14,8 +14,8 @@ 
 			          tf.chapter, tf.page, tf.updated_at', FALSE)
 			->from('tracker_favourites AS tf')
 			->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left')
-			->join('tracker_titles AS tt',   'tc.title_id = tt.id',   'left')
-			->join('tracker_sites AS ts',    'tt.site_id = ts.id',    'left')
+			->join('tracker_titles AS tt', 'tc.title_id = tt.id', 'left')
+			->join('tracker_sites AS ts', 'tt.site_id = ts.id', 'left')
 			->where('tc.user_id', $this->User->id) //CHECK: Is this inefficient? Would it be better to have a user_id column in tracker_favourites?
 			->order_by('tf.id DESC')
 			->limit($rowsPerPage, ($rowsPerPage * ($page - 1)))
@@ -57,8 +57,8 @@ 
 			          tf.chapter, tf.page, tf.updated_at', FALSE)
 			->from('tracker_favourites AS tf')
 			->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left')
-			->join('tracker_titles AS tt',   'tc.title_id = tt.id',   'left')
-			->join('tracker_sites AS ts',    'tt.site_id = ts.id',    'left')
+			->join('tracker_titles AS tt', 'tc.title_id = tt.id', 'left')
+			->join('tracker_sites AS ts', 'tt.site_id = ts.id', 'left')
 			->where('tc.user_id', $this->User->id) //CHECK: Is this inefficient? Would it be better to have a user_id column in tracker_favourites?
 			->order_by('tf.id DESC')
 			->get();
@@ -145,7 +145,7 @@ 
 
 						if($isSuccess) {
 							$success = array(
-								'status' => 'Unfavourited' . ($page ? " page {$page}" : ''),
+								'status' => 'Unfavourited'.($page ? " page {$page}" : ''),
 								'bool'   => TRUE
 							);
 							$this->History->userRemoveFavourite((int) $idCQueryRow->id, $chapter);
@@ -167,7 +167,7 @@ 
 
 					if($isSuccess) {
 						$success = array(
-							'status' => 'Favourited' . ($page ? " page {$page}" : ''),
+							'status' => 'Favourited'.($page ? " page {$page}" : ''),
 							'bool'   => TRUE
 						);
 						$this->History->userAddFavourite((int) $idCQueryRow->id, $chapter);

application/models/Tracker/Tracker_Sites_Model.php

Spacing +14 added lines, -14 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);
 	}

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,20 +73,20 @@ 
 |       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
 
 defined('USERSCRIPT_VERSION') OR define('USERSCRIPT_VERSION', '1.11.1'); //This is automatically set by a PHPStorm File Watcher

Upper-Lower-Casing +28 added lines, -28 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,20 +73,20 @@ 
 |       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
 
-defined('USERSCRIPT_VERSION') OR define('USERSCRIPT_VERSION', '1.11.1'); //This is automatically set by a PHPStorm File Watcher
+defined('USERSCRIPT_VERSION') or define('USERSCRIPT_VERSION', '1.11.1'); //This is automatically set by a PHPStorm File Watcher