DakuTree / manga-tracker

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

application/controllers/Import_AMR.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 Import_AMR extends User_Controller {
 	public function __construct() {

application/controllers/TitleHistory.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 TitleHistory extends Auth_Controller {
 	public function __construct() {

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 			$this->body_data['totalPages']  = $historyData['totalPages'];
 			$this->body_data['titleID']     = (int) $titleID;
 
-			if($page > $this->body_data['totalPages'] && $page > 1) redirect("/history/{$titleID}/1");
+			if($page > $this->body_data['totalPages'] && $page > 1) {
+				redirect("/history/{$titleID}/1");
+			}
 
 			$this->_render_page("TitleHistory");
 

application/models/History_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 History_Model extends CI_Model {
 	public function __construct() {

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 History_Model extends CI_Model {
 	public function __construct() {
@@ -49,7 +49,7 @@ 
 			foreach($result as $row) {
 				$arrRow = [];
 
-				$arrRow['updated_at']  = $row->updated_at;
+				$arrRow['updated_at'] = $row->updated_at;
 
 				$newChapterData = $this->Tracker->sites->{$row->site_class}->getChapterData($row->title_url, $row->new_chapter);
 				$arrRow['new_chapter']      = "<a href=\"{$newChapterData['url']}\">{$newChapterData['number']}</a>";

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

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 Tracker_Stats_Model extends Tracker_Base_Model {
 	public function __construct() {
@@ -28,7 +28,7 @@ 
 				], FALSE)
 				->from('tracker_chapters')
 				->join('tracker_titles', 'tracker_titles.id = tracker_chapters.title_id', 'left')
-				->join('tracker_sites','tracker_titles.site_id = tracker_sites.id', 'left')
+				->join('tracker_sites', 'tracker_titles.site_id = tracker_sites.id', 'left')
 				->where('tracker_sites.status', 'enabled')
 				->group_by('tracker_chapters.title_id')
 				->having('count > 1')

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

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');
 
 //http://english.stackexchange.com/a/141735
 class Tracker_Portation_Model extends Tracker_Base_Model {
@@ -61,7 +61,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,
@@ -94,15 +94,15 @@ 
 		$enclosure_esc = preg_quote($enclosure, '/');
 
 		$output = array();
-		foreach ($fields as $field) {
-			if ($field === NULL && $nullToMysqlNull) {
+		foreach($fields as $field) {
+			if($field === NULL && $nullToMysqlNull) {
 				$output[] = 'NULL';
 				continue;
 			}
 
 			// Enclose fields containing $delimiter, $enclosure or whitespace
-			if ($encloseAll || preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field)) {
-				$output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure;
+			if($encloseAll || preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field)) {
+				$output[] = $enclosure.str_replace($enclosure, $enclosure.$enclosure, $field).$enclosure;
 			} else {
 				$output[] = $field;
 			}
@@ -116,10 +116,10 @@ 
 			$csvArr[] = $headers;
 		}
 
-		foreach ($fields as $field) {
-			$csvArr[] = $this->arrayToCSV($field, $delimiter, $enclosure,$encloseAll,$nullToMysqlNull);
+		foreach($fields as $field) {
+			$csvArr[] = $this->arrayToCSV($field, $delimiter, $enclosure, $encloseAll, $nullToMysqlNull);
 		}
 
-		return implode(PHP_EOL,$csvArr);
+		return implode(PHP_EOL, $csvArr);
 	}
 }

application/models/Tracker/Tracker_Favourites_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_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(

Spacing +5 added lines, -5 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)))
@@ -50,8 +50,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')
 			->get();

application/models/Tracker/Tracker_Base_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_Base_Model extends CI_Model {
 	public $sites;

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 Tracker_Base_Model extends CI_Model {
 	public $sites;
@@ -26,7 +26,7 @@ 
 			$this->enabledCategories['custom3'] = $this->User_Options->get('category_custom_3_text');
 		}
 
-		foreach (glob(APPPATH.'models/Tracker/Sites/*.php') as $filename) {
+		foreach(glob(APPPATH.'models/Tracker/Sites/*.php') as $filename) {
 			/** @noinspection PhpIncludeInspection */
 			include_once $filename;
 		}

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 +30 added lines, -30 removed lines

@@ -88,8 +88,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 {
@@ -103,8 +103,8 @@ 
 							//Make sure last_checked is always updated on successful run.
 							//CHECK: Is there a reason we aren't just doing this in updateByID?
 							$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-							         ->where('id', $row->title_id)
-							         ->update('tracker_titles');
+									 ->where('id', $row->title_id)
+									 ->update('tracker_titles');
 
 							print " - (No chapters found?)\n";
 						} else {
@@ -182,8 +182,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 {
@@ -207,10 +207,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) {
@@ -227,8 +227,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 {
@@ -257,13 +257,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) {
@@ -274,8 +274,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 {
@@ -323,8 +323,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 {
@@ -334,8 +334,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");
@@ -351,14 +351,14 @@ 
 		$date = $temp_now->format('Y-m-d');
 
 		$query = $this->db->select('1')
-		                  ->from('site_stats')
-		                  ->where('date', $date)
-		                  ->get();
+						  ->from('site_stats')
+						  ->where('date', $date)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$this->db->set('total_requests', 'total_requests+1', FALSE)
-			         ->where('date', $date)
-			         ->update('site_stats');
+					 ->where('date', $date)
+					 ->update('site_stats');
 		} else {
 			$this->db->insert('site_stats', [
 				'date'           => $date,

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class Tracker_Admin_Model extends Tracker_Base_Model {
 	public function __construct() {
@@ -75,7 +75,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_url}> | <{$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']) || $this->sites->{$row->site_class}->canHaveNoChapters)) {
@@ -172,7 +172,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_url}> | <{$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'])) {
@@ -213,10 +213,10 @@ 
 		                  ->get();
 
 		$sites = $query->result_array();
-		foreach ($sites as $site) {
+		foreach($sites as $site) {
 			$siteClass = $this->sites->{$site['site_class']};
 			if($titleDataList = $siteClass->doCustomUpdate()) {
-				foreach ($titleDataList as $titleURL => $titleData) {
+				foreach($titleDataList as $titleURL => $titleData) {
 					$titleURL = (string) $titleURL; //Number only keys get converted to int for some reason, so we need to fix that.
 					print "> {$titleData['title']} <{$site['site_class']}>"; //Print this prior to doing anything so we can more easily find out if something went wrong
 					if(is_array($titleData) && !is_null($titleData['latest_chapter'])) {
@@ -259,7 +259,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')
@@ -317,7 +317,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'])) {