DakuTree / manga-tracker

application/models/Tracker/Sites/MangaFox.php

Spacing +6 added lines, -6 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 MangaFox extends Base_Site_Model {
 	public $titleFormat   = '/^[a-z0-9_]+$/';
@@ -15,7 +15,7 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$fullURL = $this->getFullTitleURL($title_url);
@@ -34,8 +34,8 @@ 
 
 			$link = preg_replace('/^(.*\/)(?:[0-9]+\.html)?$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 			$chapterURLSegments = explode('/', $link);
-			$titleData['latest_chapter'] = $chapterURLSegments[5] . (isset($chapterURLSegments[6]) && !empty($chapterURLSegments[6]) ? "/{$chapterURLSegments[6]}" : "");
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
+			$titleData['latest_chapter'] = $chapterURLSegments[5].(isset($chapterURLSegments[6]) && !empty($chapterURLSegments[6]) ? "/{$chapterURLSegments[6]}" : "");
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
 
 			if($firstGet) {
 				$titleData = array_merge($titleData, $this->doCustomFollow($content['body']));
@@ -114,9 +114,9 @@ 
 
 							$link = preg_replace('/^(.*\/)(?:[0-9]+\.html)?$/', '$1', (string) $nodes_chapter->item(0)->getAttribute('href'));
 							$chapterURLSegments = explode('/', $link);
-							$titleData['latest_chapter'] = $chapterURLSegments[5] . (isset($chapterURLSegments[6]) && !empty($chapterURLSegments[6]) ? "/{$chapterURLSegments[6]}" : "");
+							$titleData['latest_chapter'] = $chapterURLSegments[5].(isset($chapterURLSegments[6]) && !empty($chapterURLSegments[6]) ? "/{$chapterURLSegments[6]}" : "");
 
-							$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $nodes_latest->item(0)->nodeValue));
+							$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $nodes_latest->item(0)->nodeValue));
 
 							$title_url = explode('/', $title->getAttribute('href'))[4];
 							$titleDataList[$title_url] = $titleData;

application/models/Tracker/Sites/WebToons.php

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 WebToons extends Base_Site_Model {
 	/* Webtoons.com has a very weird and pointless URL format.
@@ -34,7 +34,7 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		//FIXME: We don't use parseTitleDOM here due to using rss. Should probably have an alternate method for XML parsing.
@@ -51,8 +51,8 @@ 
 				$titleData['title'] = trim((string) $xml->{'channel'}->title);
 
 				$chapterURLSegments = explode('/', ((string) $xml->{'channel'}->item[0]->link));
-				$titleData['latest_chapter'] = preg_replace('/^.*?([0-9]+)$/', '$1', $chapterURLSegments[7]) . ':--:' . $chapterURLSegments[6];
-				$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $xml->{'channel'}->item[0]->pubDate));
+				$titleData['latest_chapter'] = preg_replace('/^.*?([0-9]+)$/', '$1', $chapterURLSegments[7]).':--:'.$chapterURLSegments[6];
+				$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $xml->{'channel'}->item[0]->pubDate));
 
 				if($firstGet) {
 					$titleData = array_merge($titleData, $this->doCustomFollow($content['body'], ['id' => $title_parts[0]]));

application/models/Tracker/Sites/MangaCow.php

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 MangaCow extends Base_Site_Model {
 	public $titleFormat   = '/^[a-zA-Z0-9_-]+$/';
@@ -15,7 +15,7 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$fullURL = $this->getFullTitleURL($title_url);
@@ -36,7 +36,7 @@ 
 
 			$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9\.]+)\/$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) substr($data['nodes_latest']->getAttribute('title'), 13)));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) substr($data['nodes_latest']->getAttribute('title'), 13)));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);

application/models/Tracker/Sites/ReadMangaToday.php

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 ReadMangaToday extends Base_Site_Model {
 	public $titleFormat   = '/^[a-zA-Z0-9_-]+$/';
@@ -16,7 +16,7 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$fullURL = $this->getFullTitleURL($title_url);
@@ -38,7 +38,7 @@ 
 			$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9\.]+)$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
 			$dateString = $data['nodes_latest']->nodeValue;
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime(preg_replace('/ (-|\[A\]).*$/', '', $dateString)));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime(preg_replace('/ (-|\[A\]).*$/', '', $dateString)));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);

application/models/History_Model.php

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 History_Model extends CI_Model {
 	public function __construct() {
@@ -49,7 +49,7 @@ 
 			foreach($result as $row) {
 				$arrRow = [];
 
-				$arrRow['updated_at']  = $row->updated_at;
+				$arrRow['updated_at'] = $row->updated_at;
 
 				$newChapterData = $this->Tracker->sites->{$row->site_class}->getChapterData($row->title_url, $row->new_chapter);
 				$arrRow['new_chapter']      = "<a href=\"{$newChapterData['url']}\">{$newChapterData['number']}</a>";
@@ -171,7 +171,7 @@ 
 
 		return $success;
 	}
-	public function userSetMalID(int $chapterID, ?int $malID) : bool {
+	public function userSetMalID(int $chapterID, ? int $malID) : bool {
 		$success = $this->db->insert('tracker_user_history', [
 			'chapter_id'  => $chapterID,
 

_scripts/generate_spritesheet.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 if(!extension_loaded('gd')) die('GD ext is required to run this!');
 
@@ -23,11 +23,11 @@ 
 		imagealphablending($sheetImage, FALSE);
 		imagesavealpha($sheetImage, TRUE);
 
-		imagefill($sheetImage,0,0,0x7fff0000);
+		imagefill($sheetImage, 0, 0, 0x7fff0000);
 
 		$x = 0;
-		foreach ($this->fileList as $filename) {
-			$siteImage = imagecreatefrompng(ICON_FOLDER. "/{$filename}");
+		foreach($this->fileList as $filename) {
+			$siteImage = imagecreatefrompng(ICON_FOLDER."/{$filename}");
 			imagealphablending($siteImage, TRUE);
 
 			$dst_x = ((16 + 2) * $x);
@@ -57,7 +57,7 @@ 
 		if(preg_match('/\.sprite-site.*\@cache-version: ([0-9]+);/s', $oldLESS, $cvMatches)) {
 			$cacheVersion = ((int) $cvMatches[1]) + 1;
 
-			$newLESS = preg_replace('/\.sprite-site.*/s', '',$oldLESS);
+			$newLESS = preg_replace('/\.sprite-site.*/s', '', $oldLESS);
 			$newLESS .= ''.
 				".sprite-site {\n".
 				"	.sprite();\n".

application/models/Tracker/Sites/FallenAngelsScans.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');
 
 class FallenAngelsScans extends Base_Site_Model {
 	public $titleFormat   = '/^[a-zA-Z0-9_-]+$/';
@@ -15,7 +15,7 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$fullURL = $this->getFullTitleURL($title_url);

application/models/Tracker/Tracker_List_Model.php

Spacing +13 added lines, -13 removed lines

@@ -1,11 +1,11 @@ 
-<?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_List_Model extends Tracker_Base_Model {
 	public function __construct() {
 		parent::__construct();
 	}
 
-	public function get(?int $userID = NULL) {
+	public function get(? int $userID = NULL) {
 		$userID = (is_null($userID) ? (int) $this->User->id : $userID);
 
 		$query = $this->db
@@ -29,7 +29,7 @@ 
 			];
 		}
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				$is_unread = intval(($row->latest_chapter == $row->ignore_chapter) || ($row->latest_chapter == $row->current_chapter) ? '1' : '0');
 				$arr['series'][$row->category]['unread_count'] = (($arr['series'][$row->category]['unread_count'] ?? 0) + !$is_unread);
 				$data = [
@@ -82,8 +82,8 @@ 
 			$sortOrder = $this->User_Options->get('list_sort_order', $userID);
 			switch($this->User_Options->get('list_sort_type', $userID)) {
 				case 'unread':
-					foreach (array_keys($arr['series']) as $category) {
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
+					foreach(array_keys($arr['series']) as $category) {
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['new_chapter_exists']} - {$a['title_data']['title']}");
 							$b_text = strtolower("{$b['new_chapter_exists']} - {$b['title_data']['title']}");
 
@@ -97,8 +97,8 @@ 
 					break;
 
 				case 'unread_latest':
-					foreach (array_keys($arr['series']) as $category) {
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
+					foreach(array_keys($arr['series']) as $category) {
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = $a['new_chapter_exists'];
 							$b_text = $b['new_chapter_exists'];
 
@@ -119,7 +119,7 @@ 
 					break;
 
 				case 'alphabetical':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['title_data']['title']}");
 							$b_text = strtolower("{$b['title_data']['title']}");
@@ -134,7 +134,7 @@ 
 					break;
 
 				case 'my_status':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['generated_current_data']['number']}");
 							$b_text = strtolower("{$b['generated_current_data']['number']}");
@@ -149,7 +149,7 @@ 
 					break;
 
 				case 'latest':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = new DateTime("{$a['title_data']['last_updated']}");
 							$b_text = new DateTime("{$b['title_data']['last_updated']}");
@@ -281,7 +281,7 @@ 
 		return $status;
 	}
 
-	public function getMalID(int $userID, int $titleID) : ?array{
+	public function getMalID(int $userID, int $titleID) : ? array{
 		$malIDArr = NULL;
 
 		//NEW METHOD
@@ -319,7 +319,7 @@ 
 			                  ->get('tracker_chapters');
 
 			if($queryC2->num_rows() > 0 && ($tag_string = $queryC2->row()->tags) && !is_null($tag_string)) {
-				$arr   = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
+				$arr = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
 				if(!empty($arr)) {
 					$malIDArr = [
 						'id'   => explode(':', $arr[0])[1],
@@ -331,7 +331,7 @@ 
 
 		return $malIDArr;
 	}
-	public function setMalID(int $userID, int $chapterID, ?int $malID) : bool {
+	public function setMalID(int $userID, int $chapterID, ? int $malID) : bool {
 		//TODO: Handle NULL?
 		$success = (bool) $this->db->set(['mal_id' => $malID, 'active' => 'Y', 'last_updated' => NULL])
 		                           ->where('user_id', $userID)

application/models/Tracker/Sites/LHTranslation.php

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 LHTranslation extends Base_Site_Model {
 	public $titleFormat   = '/^[a-zA-Z0-9_\-.]+$/';
@@ -15,7 +15,7 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$fullURL = $this->getFullTitleURL($title_url);
@@ -36,7 +36,7 @@ 
 
 			$titleData['latest_chapter'] = preg_replace('/^read-(?:.*?)chapter-(.*?)\.html$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->textContent));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->textContent));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);