Completed
Push — master ( 3ee909...1f6bf8 )
by Angus
03:33
created
application/models/Tracker/Tracker_Tag_Model.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@
 block discarded – undo
9 9
 		$success = FALSE;
10 10
 		if(preg_match("/^[a-z0-9\\-_,:]{0,255}$/", $tag_string)) {
11 11
 			$success = (bool) $this->db->set(['tags' => $tag_string, 'active' => 'Y', 'last_updated' => NULL])
12
-			                           ->where('user_id', $userID)
13
-			                           ->where('id', $chapterID)
14
-			                           ->update('tracker_chapters');
12
+									   ->where('user_id', $userID)
13
+									   ->where('id', $chapterID)
14
+									   ->update('tracker_chapters');
15 15
 		}
16 16
 
17 17
 		if($success) {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 class Tracker_Tag_Model extends Tracker_Base_Model {
4 4
 	public function __construct() {
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_Title_Model.php 4 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,9 +35,13 @@
 block discarded – undo
35 35
 			$titleID = $id;
36 36
 		} else {
37 37
 			//TODO: Check if title is valid URL!
38
-			if($create) $titleID = $this->addTitle($titleURL, $siteID);
38
+			if($create) {
39
+				$titleID = $this->addTitle($titleURL, $siteID);
40
+			}
41
+		}
42
+		if(!isset($titleID) || !$titleID) {
43
+			$titleID = 0;
39 44
 		}
40
-		if(!isset($titleID) || !$titleID) $titleID = 0;
41 45
 
42 46
 		return ($returnData && $titleID !== 0 ? $query->row_array() : $titleID);
43 47
 	}
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 class Tracker_Title_Model extends Tracker_Base_Model {
4 4
 	public function __construct() {
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
 	/**
123 123
 	 * @param string $site_url
124 124
 	 *
125
-	 * @return stdClass|object|null
125
+	 * @return string
126 126
 	 */
127 127
 	public function getSiteDataFromURL(string $site_url) {
128 128
 		$query = $this->db->select('*')
Please login to merge, or discard this patch.
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -15,11 +15,11 @@  discard block
 block discarded – undo
15 15
 	 */
16 16
 	public function getID(string $titleURL, int $siteID, bool $create = TRUE, bool $returnData = FALSE) {
17 17
 		$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)
18
-		                  ->from('tracker_titles')
19
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
20
-		                  ->where('tracker_titles.title_url', $titleURL)
21
-		                  ->where('tracker_titles.site_id', $siteID)
22
-		                  ->get();
18
+						  ->from('tracker_titles')
19
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
20
+						  ->where('tracker_titles.title_url', $titleURL)
21
+						  ->where('tracker_titles.site_id', $siteID)
22
+						  ->get();
23 23
 
24 24
 		if($query->num_rows() > 0) {
25 25
 			$id = (int) $query->row('id');
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
 						//Make sure last_checked is always updated on successful run.
34 34
 						//CHECK: Is there a reason we aren't just doing this in updateTitleById?
35 35
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
36
-						         ->where('id', $id)
37
-						         ->update('tracker_titles');
36
+								 ->where('id', $id)
37
+								 ->update('tracker_titles');
38 38
 					}
39 39
 				} else {
40 40
 					log_message('error', "{$siteClass} | {$query->row('title')} ({$query->row('title_url')}) | Failed to update.");
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
 	 */
75 75
 	private function addTitle(string $titleURL, int $siteID) : int {
76 76
 		$query = $this->db->select('site, site_class')
77
-		                  ->from('tracker_sites')
78
-		                  ->where('id', $siteID)
79
-		                  ->get();
77
+						  ->from('tracker_sites')
78
+						  ->where('id', $siteID)
79
+						  ->get();
80 80
 
81 81
 		$titleData = $this->sites->{$query->row()->site_class}->getTitleData($titleURL, TRUE);
82 82
 
@@ -102,21 +102,21 @@  discard block
 block discarded – undo
102 102
 	public function updateByID(int $titleID, ?string $latestChapter) : bool {
103 103
 		//FIXME: Really not too happy with how we're doing history stuff here, it just feels messy.
104 104
 		$query = $this->db->select('latest_chapter AS current_chapter')
105
-		                  ->from('tracker_titles')
106
-		                  ->where('id', $titleID)
107
-		                  ->get();
105
+						  ->from('tracker_titles')
106
+						  ->where('id', $titleID)
107
+						  ->get();
108 108
 		$row = $query->row();
109 109
 
110 110
 		//TODO (CHECK): If failed_checks changes won't that trigger affected_rows?
111 111
 		$success = $this->db->set(['latest_chapter' => $latestChapter, 'failed_checks' => 0]) //last_updated gets updated via a trigger if something changes
112
-		                    ->where('id', $titleID)
113
-		                    ->update('tracker_titles');
112
+							->where('id', $titleID)
113
+							->update('tracker_titles');
114 114
 
115 115
 		if($this->db->affected_rows() > 0) {
116 116
 			//Clear hidden latest chapter
117 117
 			$this->db->set(['ignore_chapter' => 'NULL', 'last_updated' => 'last_updated'], NULL, FALSE)
118
-			         ->where('title_id', $titleID)
119
-			         ->update('tracker_chapters');
118
+					 ->where('title_id', $titleID)
119
+					 ->update('tracker_chapters');
120 120
 		}
121 121
 
122 122
 		//Update History
@@ -129,8 +129,8 @@  discard block
 block discarded – undo
129 129
 
130 130
 	public function updateFailedChecksByID(int $titleID) : bool {
131 131
 		$success = $this->db->set('failed_checks', 'failed_checks + 1', FALSE)
132
-		                    ->where('id', $titleID)
133
-		                    ->update('tracker_titles');
132
+							->where('id', $titleID)
133
+							->update('tracker_titles');
134 134
 
135 135
 		return $success;
136 136
 	}
@@ -142,9 +142,9 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	public function getSiteDataFromURL(string $site_url) {
144 144
 		$query = $this->db->select('*')
145
-		                  ->from('tracker_sites')
146
-		                  ->where('site', $site_url)
147
-		                  ->get();
145
+						  ->from('tracker_sites')
146
+						  ->where('site', $site_url)
147
+						  ->get();
148 148
 
149 149
 		return $query->row();
150 150
 	}
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_Category_Model.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 block discarded – undo
7 7
 
8 8
 	public function setByID(int $userID, int $chapterID, string $category) : bool {
9 9
 		$success = $this->db->set(['category' => $category, 'active' => 'Y', 'last_updated' => NULL])
10
-		                    ->where('user_id', $userID)
11
-		                    ->where('id', $chapterID)
12
-		                    ->update('tracker_chapters');
10
+							->where('user_id', $userID)
11
+							->where('id', $chapterID)
12
+							->update('tracker_chapters');
13 13
 
14 14
 		return (bool) $success;
15 15
 	}
@@ -40,11 +40,11 @@  discard block
 block discarded – undo
40 40
 
41 41
 	public function getUsed(int $userID) : array {
42 42
 		$query = $this->db->distinct()
43
-		                  ->select('category')
44
-		                  ->from('tracker_chapters')
45
-		                  ->where('tracker_chapters.active', 'Y')
46
-		                  ->where('user_id', $userID)
47
-		                  ->get();
43
+						  ->select('category')
44
+						  ->from('tracker_chapters')
45
+						  ->where('tracker_chapters.active', 'Y')
46
+						  ->where('user_id', $userID)
47
+						  ->get();
48 48
 
49 49
 		return array_column($query->result_array(), 'category');
50 50
 	}
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 class Tracker_Category_Model extends Tracker_Base_Model {
4 4
 	public function __construct() {
Please login to merge, or discard this patch.
application/views/errors/cli/error_general.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 
4 4
 echo "\nERROR: ",
5 5
 	$heading,
Please login to merge, or discard this patch.
application/views/errors/html/error_db.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 ?><!DOCTYPE html>
4 4
 <html lang="en">
5 5
 <head>
Please login to merge, or discard this patch.
application/views/errors/html/error_general.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 ?><!DOCTYPE html>
4 4
 <html lang="en">
5 5
 <head>
Please login to merge, or discard this patch.
application/views/User/Reset_Password.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
 
20 20
 			<div class="row">
21 21
 				<div class="col-xs-12 col-md-12">
22
-					<?=form_submit($form_submit);?>
22
+					<?=form_submit($form_submit); ?>
23 23
 				</div>
24 24
 			</div>
25 25
 		</form>
Please login to merge, or discard this patch.
application/views/User/Signup_Continued.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
 
20 20
 			<div class="row">
21 21
 				<div class="col-xs-12 col-md-12">
22
-					<?=form_submit($form_submit);?>
22
+					<?=form_submit($form_submit); ?>
23 23
 				</div>
24 24
 			</div>
25 25
 		</form>
Please login to merge, or discard this patch.
application/config/production/database.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 $active_group = 'default';
4 4
 $query_builder = TRUE;
Please login to merge, or discard this patch.