DakuTree / manga-tracker

application/core/MY_Loader.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 		// if this class is already loaded before instantiating it. Loading it now
 		// makes sure our version is used when a controller enables query caching
 		if(!class_exists('CI_DB_Cache')) {
-			@include(APPPATH . 'libraries/MY_DB_cache.php');
+			@include(APPPATH.'libraries/MY_DB_cache.php');
 		}
 
 		// call the parent method to retain the CI functionality

application/models/User_Options_Model.php

Braces +10 added lines, -3 removed lines

@@ -137,7 +137,9 @@ 
 				}
 
 				$success = $this->set_db($idData, $valueData);
-				if($success) $this->session->unset_tempdata("option_{$option}");
+				if($success) {
+					$this->session->unset_tempdata("option_{$option}");
+				}
 			} else {
 				$success = FALSE;
 			}
@@ -164,7 +166,9 @@ 
 			}
 
 			//Overall fallback method.
-			if(!isset($value)) $value = $this->options[$option]['default'];
+			if(!isset($value)) {
+				$value = $this->options[$option]['default'];
+			}
 		} else {
 			$value = FALSE;
 		}
@@ -215,7 +219,10 @@ 
 				//This should never happen.
 				break;
 		}
-		if(!isset($value)) $value = FALSE; //FIXME: This won't play nice with BOOL type false?
+		if(!isset($value)) {
+			$value = FALSE;
+		}
+		//FIXME: This won't play nice with BOOL type false?
 
 		return $value;
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 	 * @param string   $option
 	 * @param int|null $userID
 	 *
-	 * @return mixed Returns option value as STRING, or FALSE if option does not exist.
+	 * @return string Returns option value as STRING, or FALSE if option does not exist.
 	 */
 	public function get(string $option, ?int $userID = NULL) {
 		$userID = (is_null($userID) ? (int) $this->User->id : $userID);

Indentation +8 added lines, -8 removed lines

@@ -188,18 +188,18 @@
 		//FIXME: Query duplication.
 		if($this->User->id !== $userID) {
 			$query = $this->db->select('value_str, value_int')
-			                  ->from('user_options')
-			                  ->where('user_id', $userID)
-			                  ->where('name',    $option)
-			                  ->limit(1);
+							  ->from('user_options')
+							  ->where('user_id', $userID)
+							  ->where('name',    $option)
+							  ->limit(1);
 			$data = $query->get()->row_array();
 		} else {
 			if(!($data = $this->session->tempdata("option_{$option}"))) {
 				$query = $this->db->select('value_str, value_int')
-				                  ->from('user_options')
-				                  ->where('user_id', $userID)
-				                  ->where('name',    $option)
-				                  ->limit(1);
+								  ->from('user_options')
+								  ->where('user_id', $userID)
+								  ->where('name',    $option)
+								  ->limit(1);
 				$data = $query->get()->row_array();
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
 			}

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 User_Options_Model extends CI_Model {
 	public $options = array(
@@ -200,7 +200,7 @@ 
 			$query = $this->db->select('value_str, value_int')
 			                  ->from('user_options')
 			                  ->where('user_id', $userID)
-			                  ->where('name',    $option)
+			                  ->where('name', $option)
 			                  ->limit(1);
 			$data = $query->get()->row_array();
 		} else {
@@ -208,7 +208,7 @@ 
 				$query = $this->db->select('value_str, value_int')
 				                  ->from('user_options')
 				                  ->where('user_id', $userID)
-				                  ->where('name',    $option)
+				                  ->where('name', $option)
 				                  ->limit(1);
 				$data = $query->get()->row_array();
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
@@ -261,7 +261,7 @@ 
 			);
 			//FIXME: Get a better solution than str_replace for removing special characters
 			$elements = array();
-			foreach (array_values($this->options[$option]['valid_options']) as $valid_option) {
+			foreach(array_values($this->options[$option]['valid_options']) as $valid_option) {
 				$elements[$option.'_'.str_replace(',', '_', $valid_option)] = array_merge($base_attributes, array(
 					'value' => $valid_option
 				));

application/models/Tracker_Model.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
-<?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');
 
 include_once APPPATH.'models/Tracker/Tracker_Base_Model.php';
-foreach (glob(APPPATH.'models/Tracker/*.php') as $filename) {
+foreach(glob(APPPATH.'models/Tracker/*.php') as $filename) {
 	/** @noinspection PhpIncludeInspection */
 	include_once $filename;
 }

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');
 
 include_once APPPATH.'models/Tracker/Tracker_Base_Model.php';
 foreach (glob(APPPATH.'models/Tracker/*.php') as $filename) {

application/models/Tracker/Tracker_Tag_Model.php

Indentation +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
 		$success = FALSE;
 		if(preg_match("/^[a-z0-9\\-_,:]{0,255}$/", $tag_string)) {
 			$success = (bool) $this->db->set(['tags' => $tag_string, '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) {

Spacing +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_Tag_Model extends Tracker_Base_Model {
 	public function __construct() {

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

application/models/Tracker/Tracker_Title_Model.php

Braces +6 added lines, -2 removed lines

@@ -35,9 +35,13 @@
 			$titleID = $id;
 		} else {
 			//TODO: Check if title is valid URL!
-			if($create) $titleID = $this->addTitle($titleURL, $siteID);
+			if($create) {
+				$titleID = $this->addTitle($titleURL, $siteID);
+			}
+		}
+		if(!isset($titleID) || !$titleID) {
+			$titleID = 0;
 		}
-		if(!isset($titleID) || !$titleID) $titleID = 0;
 
 		return ($returnData && $titleID !== 0 ? $query->row_array() : $titleID);
 	}

Spacing +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_Title_Model extends Tracker_Base_Model {
 	public function __construct() {

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

Doc Comments +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 	/**
 	 * @param string $site_url
 	 *
-	 * @return stdClass|object|null
+	 * @return string
 	 */
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('*')

Indentation +22 added lines, -22 removed lines

@@ -15,11 +15,11 @@ 
 	 */
 	public function getID(string $titleURL, int $siteID, bool $create = TRUE, bool $returnData = FALSE) {
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title, tracker_titles.title_url, tracker_titles.latest_chapter, tracker_titles.status, tracker_sites.site_class, (tracker_titles.last_checked > DATE_SUB(NOW(), INTERVAL 3 DAY)) AS active', FALSE)
-		                  ->from('tracker_titles')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->where('tracker_titles.title_url', $titleURL)
-		                  ->where('tracker_titles.site_id', $siteID)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->where('tracker_titles.title_url', $titleURL)
+						  ->where('tracker_titles.site_id', $siteID)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$id = (int) $query->row('id');
@@ -32,8 +32,8 @@ 
 						//Make sure last_checked is always updated on successful run.
 						//CHECK: Is there a reason we aren't just doing this in updateTitleById?
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $id)
-						         ->update('tracker_titles');
+								 ->where('id', $id)
+								 ->update('tracker_titles');
 					}
 				} else {
 					log_message('error', "{$query->row('title')} failed to update successfully");
@@ -73,9 +73,9 @@ 
 	 */
 	private function addTitle(string $titleURL, int $siteID) : int {
 		$query = $this->db->select('site, site_class')
-		                  ->from('tracker_sites')
-		                  ->where('id', $siteID)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('id', $siteID)
+						  ->get();
 
 		$titleData = $this->sites->{$query->row()->site_class}->getTitleData($titleURL, TRUE);
 
@@ -101,20 +101,20 @@ 
 	public function updateByID(int $titleID, string $latestChapter) : bool {
 		//FIXME: Really not too happy with how we're doing history stuff here, it just feels messy.
 		$query = $this->db->select('latest_chapter AS current_chapter')
-		                  ->from('tracker_titles')
-		                  ->where('id', $titleID)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->where('id', $titleID)
+						  ->get();
 		$row = $query->row();
 
 		$success = $this->db->set(['latest_chapter' => $latestChapter, 'failed_checks' => 0]) //last_updated gets updated via a trigger if something changes
-		                    ->where('id', $titleID)
-		                    ->update('tracker_titles');
+							->where('id', $titleID)
+							->update('tracker_titles');
 
 		if($this->db->affected_rows() > 0) {
 			//Clear hidden latest chapter
 			$this->db->set(['ignore_chapter' => 'NULL', 'last_updated' => 'last_updated'], NULL, FALSE)
-			         ->where('title_id', $titleID)
-			         ->update('tracker_chapters');
+					 ->where('title_id', $titleID)
+					 ->update('tracker_chapters');
 		}
 
 		//Update History
@@ -127,8 +127,8 @@ 
 
 	public function updateFailedChecksByID(int $titleID) : bool {
 		$success = $this->db->set('failed_checks', 'failed_checks + 1', FALSE)
-		                    ->where('id', $titleID)
-		                    ->update('tracker_titles');
+							->where('id', $titleID)
+							->update('tracker_titles');
 
 		return $success;
 	}
@@ -140,9 +140,9 @@ 
 	 */
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('*')
-		                  ->from('tracker_sites')
-		                  ->where('site', $site_url)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('site', $site_url)
+						  ->get();
 
 		return $query->row();
 	}

application/models/Tracker/Tracker_Portation_Model.php

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');
 
 //http://english.stackexchange.com/a/141735
 class Tracker_Portation_Model extends Tracker_Base_Model {
@@ -55,7 +55,7 @@ 
 
 		$arr = [];
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				$arr[$row->category][] = [
 					'site'            => $row->site,
 					'title_url'       => $row->title_url,

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');
 
 //http://english.stackexchange.com/a/141735
 class Tracker_Portation_Model extends Tracker_Base_Model {

application/models/Tracker/Tracker_Favourites_Model.php

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 Tracker_Favourites_Model extends Tracker_Base_Model {
 	public function __construct() {
@@ -14,8 +14,8 @@ 
 			          tf.chapter, 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)))

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

Indentation +10 added lines, -10 removed lines

@@ -71,32 +71,32 @@
 
 			////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
 					$idFQueryRow = $idFQuery->row();
 
 					$isSuccess = (bool) $this->db->where('id', $idFQueryRow->id)
-					                             ->delete('tracker_favourites');
+												 ->delete('tracker_favourites');
 
 					if($isSuccess) {
 						$success = array(

application/models/Tracker/Tracker_Category_Model.php

Indentation +8 added lines, -8 removed lines

@@ -7,9 +7,9 @@ 
 
 	public function setByID(int $userID, int $chapterID, string $category) : bool {
 		$success = $this->db->set(['category' => $category, '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');
 
 		return (bool) $success;
 	}
@@ -40,11 +40,11 @@ 
 
 	public function getUsed(int $userID) : array {
 		$query = $this->db->distinct()
-		                  ->select('category')
-		                  ->from('tracker_chapters')
-		                  ->where('tracker_chapters.active', 'Y')
-		                  ->where('user_id', $userID)
-		                  ->get();
+						  ->select('category')
+						  ->from('tracker_chapters')
+						  ->where('tracker_chapters.active', 'Y')
+						  ->where('user_id', $userID)
+						  ->get();
 
 		return array_column($query->result_array(), 'category');
 	}

Spacing +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_Category_Model extends Tracker_Base_Model {
 	public function __construct() {

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

application/views/errors/cli/error_general.php

Upper-Lower-Casing +1 added lines, -1 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');
 
 echo "\nERROR: ",
 	$heading,