@@ -1,4 +1,4 @@ |
||
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 | class TitleHistory extends Auth_Controller { |
4 | 4 | public function __construct() { |
@@ -23,7 +23,9 @@ |
||
23 | 23 | $this->body_data['totalPages'] = $historyData['totalPages']; |
24 | 24 | $this->body_data['titleID'] = (int) $titleID; |
25 | 25 | |
26 | - if($page > $this->body_data['totalPages'] && $page > 1) redirect("/history/{$titleID}/1"); |
|
26 | + if($page > $this->body_data['totalPages'] && $page > 1) { |
|
27 | + redirect("/history/{$titleID}/1"); |
|
28 | + } |
|
27 | 29 | |
28 | 30 | $this->_render_page("TitleHistory"); |
29 | 31 |
@@ -1,4 +1,4 @@ |
||
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 History_Model extends CI_Model { |
4 | 4 | public function __construct() { |
@@ -1,4 +1,4 @@ discard block |
||
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 History_Model extends CI_Model { |
4 | 4 | public function __construct() { |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | foreach($result as $row) { |
50 | 50 | $arrRow = []; |
51 | 51 | |
52 | - $arrRow['updated_at'] = $row->updated_at; |
|
52 | + $arrRow['updated_at'] = $row->updated_at; |
|
53 | 53 | |
54 | 54 | $newChapterData = $this->Tracker->sites->{$row->site_class}->getChapterData($row->title_url, $row->new_chapter); |
55 | 55 | $arrRow['new_chapter'] = "<a href=\"{$newChapterData['url']}\">{$newChapterData['number']}</a>"; |
@@ -1,4 +1,4 @@ |
||
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_Stats_Model extends Tracker_Base_Model { |
4 | 4 | public function __construct() { |
@@ -1,4 +1,4 @@ discard block |
||
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_Stats_Model extends Tracker_Base_Model { |
4 | 4 | public function __construct() { |
@@ -28,7 +28,7 @@ discard block |
||
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') |
@@ -1,4 +1,4 @@ |
||
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 | //http://english.stackexchange.com/a/141735 |
4 | 4 | class Tracker_Portation_Model extends Tracker_Base_Model { |
@@ -1,4 +1,4 @@ discard block |
||
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 | //http://english.stackexchange.com/a/141735 |
4 | 4 | class Tracker_Portation_Model extends Tracker_Base_Model { |
@@ -61,7 +61,7 @@ discard block |
||
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 |
||
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 |
||
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 | } |
@@ -1,4 +1,4 @@ |
||
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_Favourites_Model extends Tracker_Base_Model { |
4 | 4 | public function __construct() { |
@@ -71,32 +71,32 @@ |
||
71 | 71 | |
72 | 72 | ////We need the series to be tracked |
73 | 73 | $idCQuery = $this->db->select('id') |
74 | - ->where('user_id', $userID) |
|
75 | - ->where('title_id', $titleID) |
|
76 | - ->get('tracker_chapters'); |
|
74 | + ->where('user_id', $userID) |
|
75 | + ->where('title_id', $titleID) |
|
76 | + ->get('tracker_chapters'); |
|
77 | 77 | if(!($idCQuery->num_rows() > 0)) { |
78 | 78 | //NOTE: This pretty much repeats a lot of what we already did above. Is there a better way to do this? |
79 | 79 | $this->Tracker->list->update($userID, $site, $title, $chapter, FALSE); |
80 | 80 | |
81 | 81 | $idCQuery = $this->db->select('id') |
82 | - ->where('user_id', $userID) |
|
83 | - ->where('title_id', $titleID) |
|
84 | - ->get('tracker_chapters'); |
|
82 | + ->where('user_id', $userID) |
|
83 | + ->where('title_id', $titleID) |
|
84 | + ->get('tracker_chapters'); |
|
85 | 85 | } |
86 | 86 | if($idCQuery->num_rows() > 0) { |
87 | 87 | $idCQueryRow = $idCQuery->row(); |
88 | 88 | |
89 | 89 | //Check if it is already favourited |
90 | 90 | $idFQuery = $this->db->select('id') |
91 | - ->where('chapter_id', $idCQueryRow->id) |
|
92 | - ->where('chapter', $chapter) |
|
93 | - ->get('tracker_favourites'); |
|
91 | + ->where('chapter_id', $idCQueryRow->id) |
|
92 | + ->where('chapter', $chapter) |
|
93 | + ->get('tracker_favourites'); |
|
94 | 94 | if($idFQuery->num_rows() > 0) { |
95 | 95 | //Chapter is already favourited, so remove it from DB |
96 | 96 | $idFQueryRow = $idFQuery->row(); |
97 | 97 | |
98 | 98 | $isSuccess = (bool) $this->db->where('id', $idFQueryRow->id) |
99 | - ->delete('tracker_favourites'); |
|
99 | + ->delete('tracker_favourites'); |
|
100 | 100 | |
101 | 101 | if($isSuccess) { |
102 | 102 | $success = array( |
@@ -1,4 +1,4 @@ discard block |
||
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_Favourites_Model extends Tracker_Base_Model { |
4 | 4 | public function __construct() { |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | tf.chapter, tf.updated_at', FALSE) |
15 | 15 | ->from('tracker_favourites AS tf') |
16 | 16 | ->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left') |
17 | - ->join('tracker_titles AS tt', 'tc.title_id = tt.id', 'left') |
|
18 | - ->join('tracker_sites AS ts', 'tt.site_id = ts.id', 'left') |
|
17 | + ->join('tracker_titles AS tt', 'tc.title_id = tt.id', 'left') |
|
18 | + ->join('tracker_sites AS ts', 'tt.site_id = ts.id', 'left') |
|
19 | 19 | ->where('tc.user_id', $this->User->id) //CHECK: Is this inefficient? Would it be better to have a user_id column in tracker_favourites? |
20 | 20 | ->order_by('tf.id DESC') |
21 | 21 | ->limit($rowsPerPage, ($rowsPerPage * ($page - 1))) |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | tf.chapter, tf.updated_at', FALSE) |
51 | 51 | ->from('tracker_favourites AS tf') |
52 | 52 | ->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left') |
53 | - ->join('tracker_titles AS tt', 'tc.title_id = tt.id', 'left') |
|
54 | - ->join('tracker_sites AS ts', 'tt.site_id = ts.id', 'left') |
|
53 | + ->join('tracker_titles AS tt', 'tc.title_id = tt.id', 'left') |
|
54 | + ->join('tracker_sites AS ts', 'tt.site_id = ts.id', 'left') |
|
55 | 55 | ->where('tc.user_id', $this->User->id) //CHECK: Is this inefficient? Would it be better to have a user_id column in tracker_favourites? |
56 | 56 | ->order_by('tf.id DESC') |
57 | 57 | ->get(); |
@@ -1,4 +1,4 @@ |
||
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_Base_Model extends CI_Model { |
4 | 4 | public $sites; |
@@ -1,4 +1,4 @@ discard block |
||
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_Base_Model extends CI_Model { |
4 | 4 | public $sites; |
@@ -26,7 +26,7 @@ discard block |
||
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 | } |
@@ -1,4 +1,4 @@ |
||
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_Admin_Model extends Tracker_Base_Model { |
4 | 4 | public function __construct() { |
@@ -1,4 +1,4 @@ discard block |
||
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_Admin_Model extends Tracker_Base_Model { |
4 | 4 | public function __construct() { |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $query = $query->get(); |
77 | 77 | |
78 | 78 | if($query->num_rows() > 0) { |
79 | - foreach ($query->result() as $row) { |
|
79 | + foreach($query->result() as $row) { |
|
80 | 80 | $this->handleUpdate($row); |
81 | 81 | } |
82 | 82 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $query = $query->get(); |
134 | 134 | |
135 | 135 | if($query->num_rows() > 0) { |
136 | - foreach ($query->result() as $row) { |
|
136 | + foreach($query->result() as $row) { |
|
137 | 137 | $this->handleUpdate($row); |
138 | 138 | } |
139 | 139 | } |
@@ -197,10 +197,10 @@ discard block |
||
197 | 197 | ->get(); |
198 | 198 | |
199 | 199 | $sites = $query->result_array(); |
200 | - foreach ($sites as $site) { |
|
200 | + foreach($sites as $site) { |
|
201 | 201 | $siteClass = $this->sites->{$site['site_class']}; |
202 | 202 | if($titleDataList = $siteClass->doCustomUpdate()) { |
203 | - foreach ($titleDataList as $titleURL => $titleData) { |
|
203 | + foreach($titleDataList as $titleURL => $titleData) { |
|
204 | 204 | $titleURL = (string) $titleURL; //Number only keys get converted to int for some reason, so we need to fix that. |
205 | 205 | print "> {$titleData['title']} <{$site['site_class']}>"; //Print this prior to doing anything so we can more easily find out if something went wrong |
206 | 206 | if(is_array($titleData) && !is_null($titleData['latest_chapter'])) { |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | $query = $this->db->select('tracker_titles.id, tracker_titles.title_url, tracker_sites.site_class') |
244 | 244 | ->from('tracker_titles') |
245 | 245 | ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left') |
246 | - ->where('tracker_titles.followed','N') |
|
246 | + ->where('tracker_titles.followed', 'N') |
|
247 | 247 | ->where('tracker_titles !=', '255') |
248 | 248 | ->where('tracker_sites.status', 'enabled') |
249 | 249 | ->where('tracker_sites.use_custom', 'Y') |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | // @formatter:on |
302 | 302 | |
303 | 303 | if($query->num_rows() > 0) { |
304 | - foreach ($query->result() as $row) { |
|
304 | + foreach($query->result() as $row) { |
|
305 | 305 | print "> {$row->title} <{$row->site_class}>"; //Print this prior to doing anything so we can more easily find out if something went wrong |
306 | 306 | $titleData = $this->sites->{$row->site_class}->getTitleData($row->title_url); |
307 | 307 | if($titleData['title'] && is_array($titleData) && !is_null($titleData['latest_chapter'])) { |
@@ -152,8 +152,8 @@ discard block |
||
152 | 152 | //Make sure last_checked is always updated on successful run. |
153 | 153 | //CHECK: Is there a reason we aren't just doing this in updateByID? |
154 | 154 | $this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE) |
155 | - ->where('id', $row->title_id) |
|
156 | - ->update('tracker_titles'); |
|
155 | + ->where('id', $row->title_id) |
|
156 | + ->update('tracker_titles'); |
|
157 | 157 | |
158 | 158 | print " - ({$titleData['latest_chapter']})\n"; |
159 | 159 | } else { |
@@ -167,8 +167,8 @@ discard block |
||
167 | 167 | //Make sure last_checked is always updated on successful run. |
168 | 168 | //CHECK: Is there a reason we aren't just doing this in updateByID? |
169 | 169 | $this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE) |
170 | - ->where('id', $row->title_id) |
|
171 | - ->update('tracker_titles'); |
|
170 | + ->where('id', $row->title_id) |
|
171 | + ->update('tracker_titles'); |
|
172 | 172 | |
173 | 173 | print " - (No chapters found?)\n"; |
174 | 174 | } else { |
@@ -191,10 +191,10 @@ discard block |
||
191 | 191 | */ |
192 | 192 | public function updateCustom() { |
193 | 193 | $query = $this->db->select('*') |
194 | - ->from('tracker_sites') |
|
195 | - ->where('tracker_sites.status', 'enabled') |
|
196 | - ->where('tracker_sites.use_custom', 'Y') |
|
197 | - ->get(); |
|
194 | + ->from('tracker_sites') |
|
195 | + ->where('tracker_sites.status', 'enabled') |
|
196 | + ->where('tracker_sites.use_custom', 'Y') |
|
197 | + ->get(); |
|
198 | 198 | |
199 | 199 | $sites = $query->result_array(); |
200 | 200 | foreach ($sites as $site) { |
@@ -211,8 +211,8 @@ discard block |
||
211 | 211 | //Make sure last_checked is always updated on successful run. |
212 | 212 | //CHECK: Is there a reason we aren't just doing this in updateByID? |
213 | 213 | $this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE) |
214 | - ->where('id', $titleID) |
|
215 | - ->update('tracker_titles'); |
|
214 | + ->where('id', $titleID) |
|
215 | + ->update('tracker_titles'); |
|
216 | 216 | |
217 | 217 | print " - ({$titleData['latest_chapter']})\n"; |
218 | 218 | } else { |
@@ -241,13 +241,13 @@ discard block |
||
241 | 241 | |
242 | 242 | public function refollowCustom() { |
243 | 243 | $query = $this->db->select('tracker_titles.id, tracker_titles.title_url, tracker_sites.site_class') |
244 | - ->from('tracker_titles') |
|
245 | - ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left') |
|
246 | - ->where('tracker_titles.followed','N') |
|
247 | - ->where('tracker_titles !=', '255') |
|
248 | - ->where('tracker_sites.status', 'enabled') |
|
249 | - ->where('tracker_sites.use_custom', 'Y') |
|
250 | - ->get(); |
|
244 | + ->from('tracker_titles') |
|
245 | + ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left') |
|
246 | + ->where('tracker_titles.followed','N') |
|
247 | + ->where('tracker_titles !=', '255') |
|
248 | + ->where('tracker_sites.status', 'enabled') |
|
249 | + ->where('tracker_sites.use_custom', 'Y') |
|
250 | + ->get(); |
|
251 | 251 | |
252 | 252 | if($query->num_rows() > 0) { |
253 | 253 | foreach($query->result() as $row) { |
@@ -258,8 +258,8 @@ discard block |
||
258 | 258 | |
259 | 259 | if(!empty($titleData)) { |
260 | 260 | $this->db->set($titleData) |
261 | - ->where('id', $row->id) |
|
262 | - ->update('tracker_titles'); |
|
261 | + ->where('id', $row->id) |
|
262 | + ->update('tracker_titles'); |
|
263 | 263 | |
264 | 264 | print "> {$row->site_class}:{$row->id}:{$row->title_url} FOLLOWED\n"; |
265 | 265 | } else { |
@@ -307,8 +307,8 @@ discard block |
||
307 | 307 | if($titleData['title'] && is_array($titleData) && !is_null($titleData['latest_chapter'])) { |
308 | 308 | if($titleData['title'] !== $row->title) { |
309 | 309 | $this->db->set('title', $titleData['title']) |
310 | - ->where('id', $row->id) |
|
311 | - ->update('tracker_titles'); |
|
310 | + ->where('id', $row->id) |
|
311 | + ->update('tracker_titles'); |
|
312 | 312 | //TODO: Add to history somehow? |
313 | 313 | print " - NEW TITLE ({$titleData['title']})\n"; |
314 | 314 | } else { |
@@ -318,8 +318,8 @@ discard block |
||
318 | 318 | //We might as well try to update as well. |
319 | 319 | if($this->Tracker->title->updateByID((int) $row->id, $titleData['latest_chapter'])) { |
320 | 320 | $this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE) |
321 | - ->where('id', $row->id) |
|
322 | - ->update('tracker_titles'); |
|
321 | + ->where('id', $row->id) |
|
322 | + ->update('tracker_titles'); |
|
323 | 323 | } |
324 | 324 | } else { |
325 | 325 | log_message('error', "{$row->title} failed to update title successfully"); |
@@ -335,14 +335,14 @@ discard block |
||
335 | 335 | $date = $temp_now->format('Y-m-d'); |
336 | 336 | |
337 | 337 | $query = $this->db->select('1') |
338 | - ->from('site_stats') |
|
339 | - ->where('date', $date) |
|
340 | - ->get(); |
|
338 | + ->from('site_stats') |
|
339 | + ->where('date', $date) |
|
340 | + ->get(); |
|
341 | 341 | |
342 | 342 | if($query->num_rows() > 0) { |
343 | 343 | $this->db->set('total_requests', 'total_requests+1', FALSE) |
344 | - ->where('date', $date) |
|
345 | - ->update('site_stats'); |
|
344 | + ->where('date', $date) |
|
345 | + ->update('site_stats'); |
|
346 | 346 | } else { |
347 | 347 | $this->db->insert('site_stats', [ |
348 | 348 | 'date' => $date, |
@@ -1,4 +1,4 @@ |
||
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_List_Model extends Tracker_Base_Model { |
4 | 4 | public function __construct() { |
@@ -114,11 +114,15 @@ |
||
114 | 114 | |
115 | 115 | if($sortOrder == 'asc') { |
116 | 116 | $unreadSort = ($a_text <=> $b_text); |
117 | - if($unreadSort) return $unreadSort; |
|
117 | + if($unreadSort) { |
|
118 | + return $unreadSort; |
|
119 | + } |
|
118 | 120 | return $a_text2 <=> $b_text2; |
119 | 121 | } else { |
120 | 122 | $unreadSort = ($a_text <=> $b_text); |
121 | - if($unreadSort) return $unreadSort; |
|
123 | + if($unreadSort) { |
|
124 | + return $unreadSort; |
|
125 | + } |
|
122 | 126 | return $b_text2 <=> $a_text2; |
123 | 127 | } |
124 | 128 | }); |
@@ -203,14 +203,14 @@ discard block |
||
203 | 203 | } |
204 | 204 | |
205 | 205 | $idQuery = $this->db->select('id') |
206 | - ->where('user_id', $userID) |
|
207 | - ->where('title_id', $titleID) |
|
208 | - ->get('tracker_chapters'); |
|
206 | + ->where('user_id', $userID) |
|
207 | + ->where('title_id', $titleID) |
|
208 | + ->get('tracker_chapters'); |
|
209 | 209 | if($idQuery->num_rows() > 0) { |
210 | 210 | $success = (bool) $this->db->set(['current_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL, 'ignore_chapter' => NULL]) |
211 | - ->where('user_id', $userID) |
|
212 | - ->where('title_id', $titleID) |
|
213 | - ->update('tracker_chapters'); |
|
211 | + ->where('user_id', $userID) |
|
212 | + ->where('title_id', $titleID) |
|
213 | + ->update('tracker_chapters'); |
|
214 | 214 | |
215 | 215 | if($success) { |
216 | 216 | $idQueryRow = $idQuery->row(); |
@@ -236,9 +236,9 @@ discard block |
||
236 | 236 | } |
237 | 237 | public function updateByID(int $userID, int $chapterID, string $chapter) : bool { |
238 | 238 | $success = (bool) $this->db->set(['current_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL]) |
239 | - ->where('user_id', $userID) |
|
240 | - ->where('id', $chapterID) |
|
241 | - ->update('tracker_chapters'); |
|
239 | + ->where('user_id', $userID) |
|
240 | + ->where('id', $chapterID) |
|
241 | + ->update('tracker_chapters'); |
|
242 | 242 | |
243 | 243 | if($success) { |
244 | 244 | $this->History->userUpdateTitle($chapterID, $chapter); |
@@ -248,9 +248,9 @@ discard block |
||
248 | 248 | |
249 | 249 | public function ignoreByID(int $userID, int $chapterID, string $chapter) : bool { |
250 | 250 | $success = (bool) $this->db->set(['ignore_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL]) |
251 | - ->where('user_id', $userID) |
|
252 | - ->where('id', $chapterID) |
|
253 | - ->update('tracker_chapters'); |
|
251 | + ->where('user_id', $userID) |
|
252 | + ->where('id', $chapterID) |
|
253 | + ->update('tracker_chapters'); |
|
254 | 254 | |
255 | 255 | if($success) { |
256 | 256 | $this->History->userIgnoreTitle($chapterID, $chapter); |
@@ -263,9 +263,9 @@ discard block |
||
263 | 263 | //This is to allow user history to function properly. |
264 | 264 | |
265 | 265 | $success = $this->db->set(['active' => 'N', 'last_updated' => NULL]) |
266 | - ->where('user_id', $userID) |
|
267 | - ->where('id', $chapterID) |
|
268 | - ->update('tracker_chapters'); |
|
266 | + ->where('user_id', $userID) |
|
267 | + ->where('id', $chapterID) |
|
268 | + ->update('tracker_chapters'); |
|
269 | 269 | |
270 | 270 | return (bool) $success; |
271 | 271 | } |
@@ -295,10 +295,10 @@ discard block |
||
295 | 295 | //TODO: OPTION, USE BACKEND MAL ID DB WHERE POSSIBLE (DEFAULT TRUE) |
296 | 296 | |
297 | 297 | $queryC = $this->db->select('mal_id') |
298 | - ->where('user_id', $userID) |
|
299 | - ->where('title_id', $titleID) |
|
300 | - ->where('mal_id IS NOT NULL', NULL, FALSE) |
|
301 | - ->get('tracker_chapters'); |
|
298 | + ->where('user_id', $userID) |
|
299 | + ->where('title_id', $titleID) |
|
300 | + ->where('mal_id IS NOT NULL', NULL, FALSE) |
|
301 | + ->get('tracker_chapters'); |
|
302 | 302 | |
303 | 303 | if($queryC->num_rows() > 0 && ($rowC = $queryC->row())) { |
304 | 304 | $malIDArr = [ |
@@ -307,8 +307,8 @@ discard block |
||
307 | 307 | ]; |
308 | 308 | } else { |
309 | 309 | $queryT = $this->db->select('mal_id') |
310 | - ->where('id', $titleID) |
|
311 | - ->get('tracker_titles'); |
|
310 | + ->where('id', $titleID) |
|
311 | + ->get('tracker_titles'); |
|
312 | 312 | |
313 | 313 | if($queryT->num_rows() > 0 && ($rowT = $queryT->row())) { |
314 | 314 | $malIDArr = [ |
@@ -341,9 +341,9 @@ discard block |
||
341 | 341 | public function setMalID(int $userID, int $chapterID, ?int $malID) : bool { |
342 | 342 | //TODO: Handle NULL? |
343 | 343 | $success = (bool) $this->db->set(['mal_id' => $malID, 'active' => 'Y', 'last_updated' => NULL]) |
344 | - ->where('user_id', $userID) |
|
345 | - ->where('id', $chapterID) |
|
346 | - ->update('tracker_chapters'); |
|
344 | + ->where('user_id', $userID) |
|
345 | + ->where('id', $chapterID) |
|
346 | + ->update('tracker_chapters'); |
|
347 | 347 | |
348 | 348 | if($success) { |
349 | 349 | //MAL id update was successful, update history |
@@ -1,4 +1,4 @@ discard block |
||
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_List_Model extends Tracker_Base_Model { |
4 | 4 | public function __construct() { |
@@ -33,13 +33,13 @@ discard block |
||
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), |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | $sortOrder = $this->User_Options->get('list_sort_order', $userID); |
90 | 90 | switch($this->User_Options->get('list_sort_type', $userID)) { |
91 | 91 | case 'unread': |
92 | - foreach (array_keys($arr['series']) as $category) { |
|
93 | - usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) { |
|
92 | + foreach(array_keys($arr['series']) as $category) { |
|
93 | + usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) { |
|
94 | 94 | $a_text = strtolower("{$a['new_chapter_exists']} - {$a['title_data']['title']}"); |
95 | 95 | $b_text = strtolower("{$b['new_chapter_exists']} - {$b['title_data']['title']}"); |
96 | 96 | |
@@ -104,8 +104,8 @@ discard block |
||
104 | 104 | break; |
105 | 105 | |
106 | 106 | case 'unread_latest': |
107 | - foreach (array_keys($arr['series']) as $category) { |
|
108 | - usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) { |
|
107 | + foreach(array_keys($arr['series']) as $category) { |
|
108 | + usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) { |
|
109 | 109 | $a_text = $a['new_chapter_exists']; |
110 | 110 | $b_text = $b['new_chapter_exists']; |
111 | 111 | |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | break; |
127 | 127 | |
128 | 128 | case 'alphabetical': |
129 | - foreach (array_keys($arr['series']) as $category) { |
|
129 | + foreach(array_keys($arr['series']) as $category) { |
|
130 | 130 | usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) { |
131 | 131 | $a_text = strtolower("{$a['title_data']['title']}"); |
132 | 132 | $b_text = strtolower("{$b['title_data']['title']}"); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | break; |
142 | 142 | |
143 | 143 | case 'my_status': |
144 | - foreach (array_keys($arr['series']) as $category) { |
|
144 | + foreach(array_keys($arr['series']) as $category) { |
|
145 | 145 | usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) { |
146 | 146 | $a_text = strtolower("{$a['generated_current_data']['number']}"); |
147 | 147 | $b_text = strtolower("{$b['generated_current_data']['number']}"); |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | break; |
157 | 157 | |
158 | 158 | case 'latest': |
159 | - foreach (array_keys($arr['series']) as $category) { |
|
159 | + foreach(array_keys($arr['series']) as $category) { |
|
160 | 160 | usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) { |
161 | 161 | $a_text = new DateTime("{$a['title_data']['last_updated']}"); |
162 | 162 | $b_text = new DateTime("{$b['title_data']['last_updated']}"); |
@@ -1,4 +1,4 @@ |
||
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; |