Completed
Pull Request — master (#382)
by
unknown
02:37
created
application/models/User_Options_Model.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 			$query = $this->db->select('value_str, value_int')
201 201
 			                  ->from('user_options')
202 202
 			                  ->where('user_id', $userID)
203
-			                  ->where('name',    $option)
203
+			                  ->where('name', $option)
204 204
 			                  ->limit(1);
205 205
 			$data = $query->get()->row_array();
206 206
 		} else {
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 				$query = $this->db->select('value_str, value_int')
209 209
 				                  ->from('user_options')
210 210
 				                  ->where('user_id', $userID)
211
-				                  ->where('name',    $option)
211
+				                  ->where('name', $option)
212 212
 				                  ->limit(1);
213 213
 				$data = $query->get()->row_array();
214 214
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 			);
262 262
 			//FIXME: Get a better solution than str_replace for removing special characters
263 263
 			$elements = array();
264
-			foreach (array_values($this->options[$option]['valid_options']) as $valid_option) {
264
+			foreach(array_values($this->options[$option]['valid_options']) as $valid_option) {
265 265
 				$elements[$option.'_'.str_replace(',', '_', $valid_option)] = array_merge($base_attributes, array(
266 266
 					'value' => $valid_option
267 267
 				));
Please login to merge, or discard this patch.
application/models/History_Model.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 			foreach($result as $row) {
58 58
 				$arrRow = [];
59 59
 
60
-				$arrRow['updated_at']  = $row->updated_at;
60
+				$arrRow['updated_at'] = $row->updated_at;
61 61
 
62 62
 				$newChapterData = $this->Tracker->sites->{$row->site_class}->getChapterData($row->title_url, $row->new_chapter);
63 63
 				$arrRow['new_chapter']      = "<a href=\"{$newChapterData['url']}\">{$newChapterData['number']}</a>";
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_Stats_Model.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 				], FALSE)
29 29
 				->from('tracker_chapters')
30 30
 				->join('tracker_titles', 'tracker_titles.id = tracker_chapters.title_id', 'left')
31
-				->join('tracker_sites','tracker_titles.site_id = tracker_sites.id', 'left')
31
+				->join('tracker_sites', 'tracker_titles.site_id = tracker_sites.id', 'left')
32 32
 				->where('tracker_sites.status', 'enabled')
33 33
 				->group_by('tracker_chapters.title_id')
34 34
 				->having('count > 1')
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_Portation_Model.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
 		$arr = [];
63 63
 		if($query->num_rows() > 0) {
64
-			foreach ($query->result() as $row) {
64
+			foreach($query->result() as $row) {
65 65
 				$arr[$row->category][] = [
66 66
 					'site'            => $row->site,
67 67
 					'title_url'       => $row->title_url,
@@ -94,15 +94,15 @@  discard block
 block discarded – undo
94 94
 		$enclosure_esc = preg_quote($enclosure, '/');
95 95
 
96 96
 		$output = array();
97
-		foreach ($fields as $field) {
98
-			if ($field === NULL && $nullToMysqlNull) {
97
+		foreach($fields as $field) {
98
+			if($field === NULL && $nullToMysqlNull) {
99 99
 				$output[] = 'NULL';
100 100
 				continue;
101 101
 			}
102 102
 
103 103
 			// Enclose fields containing $delimiter, $enclosure or whitespace
104
-			if ($encloseAll || preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field)) {
105
-				$output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure;
104
+			if($encloseAll || preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field)) {
105
+				$output[] = $enclosure.str_replace($enclosure, $enclosure.$enclosure, $field).$enclosure;
106 106
 			} else {
107 107
 				$output[] = $field;
108 108
 			}
@@ -116,10 +116,10 @@  discard block
 block discarded – undo
116 116
 			$csvArr[] = $headers;
117 117
 		}
118 118
 
119
-		foreach ($fields as $field) {
120
-			$csvArr[] = $this->arrayToCSV($field, $delimiter, $enclosure,$encloseAll,$nullToMysqlNull);
119
+		foreach($fields as $field) {
120
+			$csvArr[] = $this->arrayToCSV($field, $delimiter, $enclosure, $encloseAll, $nullToMysqlNull);
121 121
 		}
122 122
 
123
-		return implode(PHP_EOL,$csvArr);
123
+		return implode(PHP_EOL, $csvArr);
124 124
 	}
125 125
 }
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_List_Model.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -33,13 +33,13 @@  discard block
 block discarded – undo
33 33
 			];
34 34
 		}
35 35
 		if($result->num_rows() > 0) {
36
-			foreach ($result->result() as $row) {
36
+			foreach($result->result() as $row) {
37 37
 				$is_unread = intval((is_null($row->latest_chapter)) || ($row->latest_chapter == $row->ignore_chapter) || ($row->latest_chapter == $row->current_chapter) ? '1' : '0');
38 38
 				$arr['series'][$row->category]['unread_count'] = (($arr['series'][$row->category]['unread_count'] ?? 0) + !$is_unread);
39 39
 				$data = [
40 40
 					'id' => $row->id,
41 41
 					'generated_current_data' => $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->current_chapter),
42
-					'generated_latest_data'  => !is_null($row->latest_chapter) ? $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->latest_chapter) : ['url' => '#', 'number' => 'No chapters found'] ,
42
+					'generated_latest_data'  => !is_null($row->latest_chapter) ? $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->latest_chapter) : ['url' => '#', 'number' => 'No chapters found'],
43 43
 					'generated_ignore_data'  => ($row->ignore_chapter ? $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->ignore_chapter) : NULL),
44 44
 
45 45
 					'full_title_url'        => $this->sites->{$row->site_class}->getFullTitleURL($row->title_url),
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
 			$sortOrder = $this->User_Options->get('list_sort_order', $userID);
91 91
 			switch($this->User_Options->get('list_sort_type', $userID)) {
92 92
 				case 'unread':
93
-					foreach (array_keys($arr['series']) as $category) {
94
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
93
+					foreach(array_keys($arr['series']) as $category) {
94
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
95 95
 							$a_text = strtolower("{$a['new_chapter_exists']} - {$a['title_data']['title']}");
96 96
 							$b_text = strtolower("{$b['new_chapter_exists']} - {$b['title_data']['title']}");
97 97
 
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
 					break;
106 106
 
107 107
 				case 'unread_latest':
108
-					foreach (array_keys($arr['series']) as $category) {
109
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
108
+					foreach(array_keys($arr['series']) as $category) {
109
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
110 110
 							$a_text = $a['new_chapter_exists'];
111 111
 							$b_text = $b['new_chapter_exists'];
112 112
 
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 					break;
128 128
 
129 129
 				case 'alphabetical':
130
-					foreach (array_keys($arr['series']) as $category) {
130
+					foreach(array_keys($arr['series']) as $category) {
131 131
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
132 132
 							$a_text = strtolower("{$a['title_data']['title']}");
133 133
 							$b_text = strtolower("{$b['title_data']['title']}");
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 					break;
143 143
 
144 144
 				case 'my_status':
145
-					foreach (array_keys($arr['series']) as $category) {
145
+					foreach(array_keys($arr['series']) as $category) {
146 146
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
147 147
 							$a_text = strtolower("{$a['generated_current_data']['number']}");
148 148
 							$b_text = strtolower("{$b['generated_current_data']['number']}");
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 					break;
158 158
 
159 159
 				case 'latest':
160
-					foreach (array_keys($arr['series']) as $category) {
160
+					foreach(array_keys($arr['series']) as $category) {
161 161
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
162 162
 							$a_text = new DateTime("{$a['title_data']['last_updated']}");
163 163
 							$b_text = new DateTime("{$b['title_data']['last_updated']}");
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_Base_Model.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 			$this->enabledCategories['custom3'] = $this->User_Options->get('category_custom_3_text');
27 27
 		}
28 28
 
29
-		foreach (glob(APPPATH.'models/Tracker/Sites/*.php') as $filename) {
29
+		foreach(glob(APPPATH.'models/Tracker/Sites/*.php') as $filename) {
30 30
 			/** @noinspection PhpIncludeInspection */
31 31
 			include_once $filename;
32 32
 		}
Please login to merge, or discard this patch.
application/models/User_Model.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 			if($query->num_rows() > 0) {
77 77
 				//username exists, grab email
78 78
 				$email = $query->row('email');
79
-			}else{
79
+			} else {
80 80
 				//username doesn't exist, return FALSE
81 81
 				$email = FALSE;
82 82
 			}
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	public function get_new_api_key() : string {
109 109
 		$api_key = NULL;
110 110
 		if($this->logged_in()) {
111
-			$api_key = substr("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", mt_rand(0, 51), 1) . substr(md5((string) time()), 1);
111
+			$api_key = substr("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", mt_rand(0, 51), 1).substr(md5((string) time()), 1);
112 112
 
113 113
 			$this->db->where('id', $this->id);
114 114
 			$this->db->update('auth_users', ['api_key' => $api_key]);
Please login to merge, or discard this patch.
application/libraries/Cacher.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 	protected $CI;
6 6
 
7 7
 	public function __construct() {
8
-		$this->CI =& get_instance(); //grab an instance of CI
8
+		$this->CI = & get_instance(); //grab an instance of CI
9 9
 		$this->initiate_cache();
10 10
 	}
11 11
 
Please login to merge, or discard this patch.
application/models/Auth_Model.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 			}
60 60
 
61 61
 			$success = TRUE;
62
-		} catch (Exception $e) {
62
+		} catch(Exception $e) {
63 63
 			//echo 'Caught exception: ',  $e->getMessage(), "\n";
64 64
 
65 65
 			//revert verification
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 				         ->where(array('verification_code' => $verificationCode));
93 93
 			} else {
94 94
 				//not expired, verification is valid, return email
95
-				$return =  $result->email;
95
+				$return = $result->email;
96 96
 			}
97 97
 		}
98 98
 		return $return;
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 			if($query->num_rows() > 0) {
133 133
 				//username exists, grab email
134 134
 				$email = $query->row('email');
135
-			}else{
135
+			} else {
136 136
 				//username doesn't exist, return FALSE
137 137
 				$email = NULL;
138 138
 			}
Please login to merge, or discard this patch.