DakuTree / manga-tracker

application/models/Tracker/Tracker_Favourites_Model.php

Spacing +4 added lines, -4 removed lines

@@ -14,8 +14,8 @@ 
 			          tf.chapter, tf.updated_at', FALSE)
 			->from('tracker_favourites AS tf')
 			->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left')
-			->join('tracker_titles AS tt',   'tc.title_id = tt.id',   'left')
-			->join('tracker_sites AS ts',    'tt.site_id = ts.id',    'left')
+			->join('tracker_titles AS tt', 'tc.title_id = tt.id', 'left')
+			->join('tracker_sites AS ts', 'tt.site_id = ts.id', 'left')
 			->where('tc.user_id', $this->User->id) //CHECK: Is this inefficient? Would it be better to have a user_id column in tracker_favourites?
 			->order_by('tf.id DESC')
 			->limit($rowsPerPage, ($rowsPerPage * ($page - 1)))
@@ -50,8 +50,8 @@ 
 			          tf.chapter, tf.updated_at', FALSE)
 			->from('tracker_favourites AS tf')
 			->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left')
-			->join('tracker_titles AS tt',   'tc.title_id = tt.id',   'left')
-			->join('tracker_sites AS ts',    'tt.site_id = ts.id',    'left')
+			->join('tracker_titles AS tt', 'tc.title_id = tt.id', 'left')
+			->join('tracker_sites AS ts', 'tt.site_id = ts.id', 'left')
 			->where('tc.user_id', $this->User->id) //CHECK: Is this inefficient? Would it be better to have a user_id column in tracker_favourites?
 			->order_by('tf.id DESC')
 			->get();

application/models/Tracker/Tracker_Portation_Model.php

Spacing +8 added lines, -8 removed lines

@@ -61,7 +61,7 @@ 
 
 		$arr = [];
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				$arr[$row->category][] = [
 					'site'            => $row->site,
 					'title_url'       => $row->title_url,
@@ -94,15 +94,15 @@ 
 		$enclosure_esc = preg_quote($enclosure, '/');
 
 		$output = array();
-		foreach ($fields as $field) {
-			if ($field === NULL && $nullToMysqlNull) {
+		foreach($fields as $field) {
+			if($field === NULL && $nullToMysqlNull) {
 				$output[] = 'NULL';
 				continue;
 			}
 
 			// Enclose fields containing $delimiter, $enclosure or whitespace
-			if ($encloseAll || preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field)) {
-				$output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure;
+			if($encloseAll || preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field)) {
+				$output[] = $enclosure.str_replace($enclosure, $enclosure.$enclosure, $field).$enclosure;
 			} else {
 				$output[] = $field;
 			}
@@ -116,10 +116,10 @@ 
 			$csvArr[] = $headers;
 		}
 
-		foreach ($fields as $field) {
-			$csvArr[] = $this->arrayToCSV($field, $delimiter, $enclosure,$encloseAll,$nullToMysqlNull);
+		foreach($fields as $field) {
+			$csvArr[] = $this->arrayToCSV($field, $delimiter, $enclosure, $encloseAll, $nullToMysqlNull);
 		}
 
-		return implode(PHP_EOL,$csvArr);
+		return implode(PHP_EOL, $csvArr);
 	}
 }

application/models/Tracker/Tracker_List_Model.php

Spacing +9 added lines, -9 removed lines

@@ -33,13 +33,13 @@ 
 			];
 		}
 		if($result->num_rows() > 0) {
-			foreach ($result->result() as $row) {
+			foreach($result->result() as $row) {
 				$is_unread = intval((is_null($row->latest_chapter)) || ($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 = [
 					'id' => $row->id,
 					'generated_current_data' => $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->current_chapter),
-					'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'] ,
+					'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'],
 					'generated_ignore_data'  => ($row->ignore_chapter ? $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->ignore_chapter) : NULL),
 
 					'full_title_url'        => $this->sites->{$row->site_class}->getFullTitleURL($row->title_url),
@@ -90,8 +90,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']}");
 
@@ -105,8 +105,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'];
 
@@ -127,7 +127,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']}");
@@ -142,7 +142,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']}");
@@ -157,7 +157,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']}");

application/models/Tracker/Tracker_Base_Model.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 			$this->enabledCategories['custom3'] = $this->User_Options->get('category_custom_3_text');
 		}
 
-		foreach (glob(APPPATH.'models/Tracker/Sites/*.php') as $filename) {
+		foreach(glob(APPPATH.'models/Tracker/Sites/*.php') as $filename) {
 			/** @noinspection PhpIncludeInspection */
 			include_once $filename;
 		}

application/models/User_Model.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 			if($query->num_rows() > 0) {
 				//username exists, grab email
 				$email = $query->row('email');
-			}else{
+			} else {
 				//username doesn't exist, return FALSE
 				$email = FALSE;
 			}
@@ -108,7 +108,7 @@ 
 	public function get_new_api_key() : string {
 		$api_key = NULL;
 		if($this->logged_in()) {
-			$api_key = substr("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", mt_rand(0, 51), 1) . substr(md5((string) time()), 1);
+			$api_key = substr("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", mt_rand(0, 51), 1).substr(md5((string) time()), 1);
 
 			$this->db->where('id', $this->id);
 			$this->db->update('auth_users', ['api_key' => $api_key]);

application/libraries/Cacher.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 	protected $CI;
 
 	public function __construct() {
-		$this->CI =& get_instance(); //grab an instance of CI
+		$this->CI = & get_instance(); //grab an instance of CI
 		$this->initiate_cache();
 	}
 

application/models/Auth_Model.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 			}
 
 			$success = TRUE;
-		} catch (Exception $e) {
+		} catch(Exception $e) {
 			//echo 'Caught exception: ',  $e->getMessage(), "\n";
 
 			//revert verification
@@ -92,7 +92,7 @@ 
 				         ->where(array('verification_code' => $verificationCode));
 			} else {
 				//not expired, verification is valid, return email
-				$return =  $result->email;
+				$return = $result->email;
 			}
 		}
 		return $return;
@@ -132,7 +132,7 @@ 
 			if($query->num_rows() > 0) {
 				//username exists, grab email
 				$email = $query->row('email');
-			}else{
+			} else {
 				//username doesn't exist, return FALSE
 				$email = NULL;
 			}

application/helpers/generic_helper.php

Spacing +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
  * @return bool
  */
 function view_exists(string $path) : bool {
-	return file_exists(APPPATH . "/views/{$path}.php");
+	return file_exists(APPPATH."/views/{$path}.php");
 }
 
 function get_time_class(string $time_string) : string {
@@ -32,19 +32,19 @@ 
 	return $time_string;
 }
 
-if (!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
-	function http_parse_headers (string $raw_headers) : array {
+if(!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
+	function http_parse_headers(string $raw_headers) : array {
 		$headers = array(); // $headers = [];
-		foreach (explode("\n", $raw_headers) as $i => $h) {
+		foreach(explode("\n", $raw_headers) as $i => $h) {
 			$h = explode(':', $h, 2);
-			if (isset($h[1])){
-				if(!isset($headers[$h[0]])){
+			if(isset($h[1])) {
+				if(!isset($headers[$h[0]])) {
 					$headers[$h[0]] = trim($h[1]);
-				}else if(is_array($headers[$h[0]])){
-					$tmp = array_merge($headers[$h[0]],array(trim($h[1])));
+				} else if(is_array($headers[$h[0]])) {
+					$tmp = array_merge($headers[$h[0]], array(trim($h[1])));
 					$headers[$h[0]] = $tmp;
-				}else{
-					$tmp = array_merge(array($headers[$h[0]]),array(trim($h[1])));
+				} else {
+					$tmp = array_merge(array($headers[$h[0]]), array(trim($h[1])));
 					$headers[$h[0]] = $tmp;
 				}
 			}
@@ -66,19 +66,19 @@ 
 	} elseif($notices = $CI->session->flashdata('errors')) {
 		$CI->session->unset_userdata('errors'); //Sometimes we call this flashdata without redirecting, so make sure we remove it
 		if(is_string($notices)) {
-			$notice_str = $CI->config->item('error_start_delimiter', 'ion_auth') . $notices . $CI->config->item('error_end_delimiter', 'ion_auth');
+			$notice_str = $CI->config->item('error_start_delimiter', 'ion_auth').$notices.$CI->config->item('error_end_delimiter', 'ion_auth');
 		} elseif(is_array($notices)) {
 			foreach($notices as $notice) {
-				$notice_str .= $CI->config->item('error_start_delimiter', 'ion_auth') . $notice . $CI->config->item('error_end_delimiter', 'ion_auth');
+				$notice_str .= $CI->config->item('error_start_delimiter', 'ion_auth').$notice.$CI->config->item('error_end_delimiter', 'ion_auth');
 			}
 		}
 	} elseif($notices = $CI->session->flashdata('notices')) {
 		$CI->session->unset_userdata('notices'); //Sometimes we call this flashdata without redirecting, so make sure we remove it
 		if(is_string($notices)) {
-			$notice_str = $CI->config->item('message_start_delimiter', 'ion_auth') . $notices . $CI->config->item('message_end_delimiter', 'ion_auth');
+			$notice_str = $CI->config->item('message_start_delimiter', 'ion_auth').$notices.$CI->config->item('message_end_delimiter', 'ion_auth');
 		} elseif(is_array($notices)) {
 			foreach($notices as $notice) {
-				$notice_str .= $CI->config->item('message_start_delimiter', 'ion_auth') . $notice . $CI->config->item('message_end_delimiter', 'ion_auth');
+				$notice_str .= $CI->config->item('message_start_delimiter', 'ion_auth').$notice.$CI->config->item('message_end_delimiter', 'ion_auth');
 			}
 		}
 	}

application/controllers/User/Auth/Signup.php

Spacing +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 			'is_unique_email' => 'Email already exists.'
 		));
 
-		if ($isValid = ($this->form_validation->run() === TRUE)) {
+		if($isValid = ($this->form_validation->run() === TRUE)) {
 			$email = $this->Auth->parseEmail($this->input->post('email'));
 
 			$this->body_data['email'] = $email;
@@ -54,7 +54,7 @@ 
 		}
 
 		//login wasn't valid, failed, or this is a fresh login attempt
-		if(!$isValid){
+		if(!$isValid) {
 			//display the email validation form
 			$this->body_data['form_email'] = array(
 					'name'        => 'email',
@@ -89,14 +89,14 @@ 
 		if(!($email = $this->Auth->verificationCheck($verificationCode))) redirect('user/signup');
 
 		//validation is valid, proceed as normal
-		$this->form_validation->set_rules('username',         'Username',           'required|min_length[4]|max_length[15]|valid_username|is_unique_username');
-		$this->form_validation->set_rules('password',         'Password',           'required|valid_password');
-		$this->form_validation->set_rules('password_confirm', 'Confirm Password',   'required|matches[password]');
-		$this->form_validation->set_rules('terms',            'Terms & Conditions', 'required');
+		$this->form_validation->set_rules('username', 'Username', 'required|min_length[4]|max_length[15]|valid_username|is_unique_username');
+		$this->form_validation->set_rules('password', 'Password', 'required|valid_password');
+		$this->form_validation->set_rules('password_confirm', 'Confirm Password', 'required|matches[password]');
+		$this->form_validation->set_rules('terms', 'Terms & Conditions', 'required');
 		//TODO: timezone
 		//TODO: receive email
 
-		if ($isValid = ($this->form_validation->run() === TRUE)) {
+		if($isValid = ($this->form_validation->run() === TRUE)) {
 			$username = $this->input->post('username');
 			$password = $this->input->post('password');
 
@@ -117,7 +117,7 @@ 
 		}
 
 		//signup wasn't valid, failed, or this is a fresh signup attempt
-		if(!$isValid){
+		if(!$isValid) {
 			//display the create user form
 			$this->body_data['verificationCode'] = $verificationCode;