@@ -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 @@ 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 | /** |
4 | 4 | * Class Tracker_Sites_Model |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | |
165 | 165 | $ch = curl_init(); |
166 | 166 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
167 | - curl_setopt($ch, CURLOPT_ENCODING , "gzip"); |
|
167 | + curl_setopt($ch, CURLOPT_ENCODING, "gzip"); |
|
168 | 168 | //curl_setopt($ch, CURLOPT_VERBOSE, 1); |
169 | 169 | curl_setopt($ch, CURLOPT_HEADER, 1); |
170 | 170 | |
@@ -186,8 +186,8 @@ discard block |
||
186 | 186 | curl_setopt($ch, CURLOPT_URL, $url); |
187 | 187 | |
188 | 188 | if($isPost) { |
189 | - curl_setopt($ch,CURLOPT_POST, count($postFields)); |
|
190 | - curl_setopt($ch,CURLOPT_POSTFIELDS, http_build_query($postFields)); |
|
189 | + curl_setopt($ch, CURLOPT_POST, count($postFields)); |
|
190 | + curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($postFields)); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | $response = curl_exec($ch); |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | $result = shell_exec('python '.APPPATH.'../_scripts/get_cloudflare_cookie.py '.escapeshellarg(json_encode($urlData))); |
235 | 235 | $cookieData = json_decode($result, TRUE); |
236 | 236 | |
237 | - $this->cache->save("cloudflare_{$this->site}", $cookieData['cookies'], 31536000 /* 1 year, or until we renew it */); |
|
237 | + $this->cache->save("cloudflare_{$this->site}", $cookieData['cookies'], 31536000 /* 1 year, or until we renew it */); |
|
238 | 238 | log_message('debug', "Saving CloudFlare Cookies for {$this->site}"); |
239 | 239 | |
240 | 240 | $refresh = TRUE; |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | |
287 | 287 | $dom = new DOMDocument(); |
288 | 288 | libxml_use_internal_errors(TRUE); |
289 | - $dom->loadHTML('<?xml encoding="utf-8" ?>' . $data); |
|
289 | + $dom->loadHTML('<?xml encoding="utf-8" ?>'.$data); |
|
290 | 290 | libxml_use_internal_errors(FALSE); |
291 | 291 | |
292 | 292 | $xpath = new DOMXPath($dom); |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | if($nodes_title->length === 1) { |
296 | 296 | if($nodes_row->length === 1) { |
297 | 297 | $firstRow = $nodes_row->item(0); |
298 | - $nodes_latest = $xpath->query($node_latest_string, $firstRow); |
|
298 | + $nodes_latest = $xpath->query($node_latest_string, $firstRow); |
|
299 | 299 | |
300 | 300 | if($node_chapter_string !== '') { |
301 | 301 | $nodes_chapter = $xpath->query($node_chapter_string, $firstRow); |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | $chapter_parts = explode('/', $chapter); //returns #LANG#/#VOLUME#/#CHAPTER#/#CHAPTER_EXTRA#(/#PAGE#/) |
502 | 502 | return [ |
503 | 503 | 'url' => $this->getChapterURL($title_url, $chapter), |
504 | - 'number' => ($chapter_parts[1] !== '0' ? "v{$chapter_parts[1]}/" : '') . "c{$chapter_parts[2]}" . (isset($chapter_parts[3]) ? ".{$chapter_parts[3]}" : '')/*)*/ |
|
504 | + 'number' => ($chapter_parts[1] !== '0' ? "v{$chapter_parts[1]}/" : '')."c{$chapter_parts[2]}".(isset($chapter_parts[3]) ? ".{$chapter_parts[3]}" : '')/*)*/ |
|
505 | 505 | ]; |
506 | 506 | } |
507 | 507 | public function getChapterURL(string $title_url, string $chapter) : string { |
@@ -683,9 +683,9 @@ discard block |
||
683 | 683 | |
684 | 684 | $dateString = str_replace('/', '-', trim($nodes_latest->item(0)->nodeValue)); //NOTE: We replace slashes here as it stops strtotime interpreting the date as US date format. |
685 | 685 | if($dateString == 'T') { |
686 | - $dateString = date("Y-m-d",now()); |
|
686 | + $dateString = date("Y-m-d", now()); |
|
687 | 687 | } |
688 | - $titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString . ' 00:00')); |
|
688 | + $titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString.' 00:00')); |
|
689 | 689 | |
690 | 690 | $titleDataList[$title_url] = $titleData; |
691 | 691 | } |
@@ -740,7 +740,7 @@ discard block |
||
740 | 740 | //For whatever reason, DOMDocument breaks the <link> element we need to grab the chapter, so we have to grab it elsewhere. |
741 | 741 | $titleData['latest_chapter'] = preg_replace('/^.*? - ([0-9\.]+) - .*?$/', '$1', trim($data['nodes_chapter']->textContent)); |
742 | 742 | |
743 | - $titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->textContent)); |
|
743 | + $titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->textContent)); |
|
744 | 744 | } |
745 | 745 | |
746 | 746 | return (!empty($titleData) ? $titleData : NULL); |
@@ -842,11 +842,11 @@ discard block |
||
842 | 842 | "" |
843 | 843 | ); |
844 | 844 | if($data) { |
845 | - $titleData['title'] = trim(preg_replace('/ Added on .*$/','', $data['nodes_title']->textContent)); |
|
845 | + $titleData['title'] = trim(preg_replace('/ Added on .*$/', '', $data['nodes_title']->textContent)); |
|
846 | 846 | $titleData['latest_chapter'] = preg_replace('/^.*\/([0-9\.]+)$/', '$1', (string) $data['nodes_chapter']->getAttribute('href')); |
847 | 847 | |
848 | - $dateString = preg_replace('/^Added (?:on )?/', '',$data['nodes_latest']->textContent); |
|
849 | - $titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString)); |
|
848 | + $dateString = preg_replace('/^Added (?:on )?/', '', $data['nodes_latest']->textContent); |
|
849 | + $titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString)); |
|
850 | 850 | } |
851 | 851 | return (!empty($titleData) ? $titleData : NULL); |
852 | 852 | } |