DakuTree / manga-tracker

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)

Braces +12 added lines, -4 removed lines

@@ -72,8 +72,12 @@ 
 
 				$arr['series'][$row->category]['manga'][] = $data;
 
-				if(!$arr['has_inactive']) $arr['has_inactive'] = !$data['title_data']['active'];
-				if($arr['has_inactive'])  $arr['inactive_titles'][$data['full_title_url']] = $data['title_data']['title'];
+				if(!$arr['has_inactive']) {
+					$arr['has_inactive'] = !$data['title_data']['active'];
+				}
+				if($arr['has_inactive']) {
+					$arr['inactive_titles'][$data['full_title_url']] = $data['title_data']['title'];
+				}
 			}
 
 			//FIXME: This is not good for speed, but we're kind of required to do this for UX purposes.
@@ -107,11 +111,15 @@ 
 
 							if($sortOrder == 'asc') {
 								$unreadSort = ($a_text <=> $b_text);
-								if($unreadSort) return $unreadSort;
+								if($unreadSort) {
+									return $unreadSort;
+								}
 								return $a_text2 <=> $b_text2;
 							} else {
 								$unreadSort = ($a_text <=> $b_text);
-								if($unreadSort) return $unreadSort;
+								if($unreadSort) {
+									return $unreadSort;
+								}
 								return $b_text2 <=> $a_text2;
 							}
 						});