DakuTree / manga-tracker

application/migrations/018_favourites_rework.php

Indentation +4 added lines, -4 removed lines

@@ -49,10 +49,10 @@
 
 		//We need to add data from the old favourites table
 		$query = $this->db->select('tf.id AS id, tc.user_id As user_id, tc.title_id AS title_id, tf.chapter AS chapter, tf.updated_at AS updated_at')
-		                  ->from('tracker_favourites AS tf')
-		                  ->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left')
-		                  ->order_by('tf.id ASC')
-		                  ->get();
+						  ->from('tracker_favourites AS tf')
+						  ->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left')
+						  ->order_by('tf.id ASC')
+						  ->get();
 		if($data = $query->result_array()) {
 			$this->db->insert_batch('tracker_favourites_new', $data);
 		}

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;
 }

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

application/models/Tracker/Tracker_Title_Model.php

Indentation +18 added lines, -18 removed lines

@@ -7,11 +7,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');
@@ -24,8 +24,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");
@@ -52,9 +52,9 @@ 
 
 	private function addTitle(string $titleURL, int $siteID) {
 		$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);
 
@@ -74,14 +74,14 @@ 
 	public function updateByID(int $id, string $latestChapter) {
 		//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', $id)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->where('id', $id)
+						  ->get();
 		$row = $query->row();
 
 		$success = $this->db->set(['latest_chapter' => $latestChapter]) //last_updated gets updated via a trigger if something changes
-		                    ->where('id', $id)
-		                    ->update('tracker_titles');
+							->where('id', $id)
+							->update('tracker_titles');
 
 		//Update History
 		//NOTE: To avoid doing another query to grab the last_updated time, we just use time() which <should> get the same thing.
@@ -94,9 +94,9 @@ 
 
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('id, site_class')
-		                  ->from('tracker_sites')
-		                  ->where('site', $site_url)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('site', $site_url)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$siteData = $query->row();

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

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);
 	}

application/models/Tracker/Tracker_Base_Model.php

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

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,

application/models/Tracker/Tracker_Admin_Model.php

Indentation +7 added lines, -7 removed lines

@@ -62,8 +62,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->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 
 						print " - ({$titleData['latest_chapter']})\n";
 					}
@@ -77,9 +77,9 @@ 
 
 	public function updateCustom() {
 		$query = $this->db->select('*')
-		                  ->from('tracker_sites')
-		                  ->where('status', 'enabled')
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('status', 'enabled')
+						  ->get();
 
 		$sites = $query->result_array();
 		foreach ($sites as $site) {
@@ -94,8 +94,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 {

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 Tracker_Admin_Model extends Tracker_Base_Model {
 	public function __construct() {
@@ -52,7 +52,7 @@ 
 			->get();
 
 		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(is_array($titleData) && !is_null($titleData['latest_chapter'])) {
@@ -82,9 +82,9 @@ 
 		                  ->get();
 
 		$sites = $query->result_array();
-		foreach ($sites as $site) {
+		foreach($sites as $site) {
 			if($titleDataList = $this->sites->{$site['site_class']}->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)) {

application/models/Tracker/Tracker_Favourites_Model.php

Indentation +7 added lines, -7 removed lines

@@ -72,23 +72,23 @@
 
 			//We need the series to be tracked
 			$idCQuery = $this->db->select('id')
-			                     ->where('user_id', $this->User->id)
-			                     ->where('title_id', $titleID)
-			                     ->get('tracker_chapters');
+								 ->where('user_id', $this->User->id)
+								 ->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 +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)))

application/models/Tracker/Tracker_Bug_Model.php

Indentation +3 added lines, -3 removed lines

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

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