DakuTree / manga-tracker

application/tests_codeception/_support/FunctionalTester.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 */
 class FunctionalTester extends \Codeception\Actor
 {
-    use _generated\FunctionalTesterActions;
+	use _generated\FunctionalTesterActions;
 
    /**
     * Define custom actions here

Braces +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
  *
  * @SuppressWarnings(PHPMD)
 */
-class FunctionalTester extends \Codeception\Actor
-{
+class FunctionalTester extends \Codeception\Actor {
     use _generated\FunctionalTesterActions;
 
    /**

application/libraries/MY_Form_validation.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 MY_Form_validation extends CI_Form_validation {
 	private $user_tables;
@@ -7,7 +7,7 @@ 
 		parent::__construct();
 		log_message('debug', "MY_Form_validation Class Initialized");
 
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		$this->CI->config->load('ion_auth', TRUE);
 		$this->user_tables = $this->CI->config->item('tables', 'ion_auth');
 	}
@@ -91,7 +91,7 @@ 
 	 */
 	public function isRuleValid(string $ruleName) : bool {
 		$isValid = FALSE;
-		if(is_string($ruleName) && $this->has_rule($ruleName)){
+		if(is_string($ruleName) && $this->has_rule($ruleName)) {
 			$isValid = !in_array($ruleName, array_keys($this->error_array()), TRUE);
 		}
 		return $isValid;

Braces +2 added lines, -3 removed lines

@@ -30,8 +30,7 @@ 
 	public function valid_password(string $password) : bool {
 		if(!($isValid = $this->min_length($password, $this->CI->config->item('min_password_length', 'ion_auth')))) {
 			$this->set_message('valid_password', 'The password is too short!');
-		}
-		elseif(!($isValid = $this->max_length($password, $this->CI->config->item('max_password_length', 'ion_auth')))) {
+		} elseif(!($isValid = $this->max_length($password, $this->CI->config->item('max_password_length', 'ion_auth')))) {
 			$this->set_message('valid_password', 'The password is too long!');
 		}
 		return $isValid;
@@ -91,7 +90,7 @@ 
 	 */
 	public function isRuleValid(string $ruleName) : bool {
 		$isValid = FALSE;
-		if(is_string($ruleName) && $this->has_rule($ruleName)){
+		if(is_string($ruleName) && $this->has_rule($ruleName)) {
 			$isValid = !in_array($ruleName, array_keys($this->error_array()), TRUE);
 		}
 		return $isValid;

application/libraries/MY_DB_cache.php

Doc Comments +1 added lines, -1 removed lines

@@ -245,7 +245,7 @@
 	}
 
 	/**
-	 * @param $md5
+	 * @param string $md5
 	 *
 	 * @return array
 	 */

Spacing +17 added lines, -17 removed lines

@@ -74,8 +74,8 @@ 
 	 */
 	public function __construct(&$db) {
 		// Assign the main CI object to $this->CI and load the file helper since we use it a lot
-		$this->CI =& get_instance();
-		$this->db =& $db;
+		$this->CI = & get_instance();
+		$this->db = & $db;
 		$this->CI->load->helper('file');
 
 		$this->check_path();
@@ -102,18 +102,18 @@ 
 
 		// Add a trailing slash to the path if needed
 		$path = realpath($path)
-			? rtrim(realpath($path), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR
-			: rtrim($path, '/') . '/';
+			? rtrim(realpath($path), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR
+			: rtrim($path, '/').'/';
 
 		if(!is_dir($path)) {
-			log_message('debug', 'DB cache path error: ' . $path);
+			log_message('debug', 'DB cache path error: '.$path);
 
 			// If the path is wrong we'll turn off caching
 			return $this->db->cache_off();
 		}
 
 		if(!is_really_writable($path)) {
-			log_message('debug', 'DB cache dir not writable: ' . $path);
+			log_message('debug', 'DB cache dir not writable: '.$path);
 
 			// If the path is not really writable we'll turn off caching
 			return $this->db->cache_off();
@@ -144,11 +144,11 @@ 
 		// BEGIN --- modification for supporting multi-level cache folders
 
 		if(is_array($this->CI->config->item('multi_level_cache_folders'))) {
-			$uri_md5  = md5($segment_one . '+' . $segment_two);
+			$uri_md5  = md5($segment_one.'+'.$segment_two);
 			$layer    = $this->get_folder_layers($uri_md5);
-			$filepath = $this->db->cachedir . $segment_one.'/'.$segment_two . '/' . implode('/', $layer) . '/' . $uri_md5;
+			$filepath = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.implode('/', $layer).'/'.$uri_md5;
 		} else {
-			$filepath = $this->db->cachedir . $segment_one.'/'. $segment_two . '/' . md5($sql);
+			$filepath = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.md5($sql);
 		}
 
 		// END --- modification for supporting multi-level cache folders
@@ -178,9 +178,9 @@ 
 		// BEGIN --- modification for supporting multi-level cache folders
 
 		if(is_array($this->CI->config->item('multi_level_cache_folders'))) {
-			$uri_md5  = md5($segment_one . '+' . $segment_two);
+			$uri_md5  = md5($segment_one.'+'.$segment_two);
 			$layer    = $this->get_folder_layers($uri_md5);
-			$dir_path = $this->db->cachedir . $segment_one.'/'.$segment_two . '/' . implode('/', $layer) . '/';
+			$dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.implode('/', $layer).'/';
 
 			if(!is_dir($dir_path)) {
 				$old = umask(0);
@@ -188,18 +188,18 @@ 
 				umask($old);
 			}
 		} else {
-			$dir_path = $this->db->cachedir . $segment_one.'/'. $segment_two . '/';
+			$dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/';
 		}
 
 		$filename = md5($sql);
 
 		// END --- modification for supporting multi-level cache folders
 
-		if(write_file($dir_path . $filename, serialize($object)) === FALSE) {
+		if(write_file($dir_path.$filename, serialize($object)) === FALSE) {
 			return FALSE;
 		}
 
-		chmod($dir_path . $filename, 0640);
+		chmod($dir_path.$filename, 0640);
 
 		return TRUE;
 	}
@@ -224,11 +224,11 @@ 
 		}
 
 		if(is_array($this->CI->config->item('multi_level_cache_folders'))) {
-			$uri_md5  = md5($segment_one . '+' . $segment_two);
+			$uri_md5  = md5($segment_one.'+'.$segment_two);
 			$layer    = $this->get_folder_layers($uri_md5);
-			$dir_path = $this->db->cachedir . $segment_one.'/'.$segment_two . '/' . implode('/', $layer) . '/';
+			$dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.implode('/', $layer).'/';
 		} else {
-			$dir_path = $this->db->cachedir . $segment_one.'/'. $segment_two . '/';
+			$dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/';
 		}
 		delete_files($dir_path, TRUE);
 	}

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
  * @since        Version 1.0.0
  * @filesource
  */
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /**
  * Database Cache Class
@@ -254,7 +254,7 @@ 
 		$last_key   = 0;
 		$last_value = 0;
 
-		foreach($this->CI->config->item('multi_level_cache_folders') AS $key => $value) {
+		foreach($this->CI->config->item('multi_level_cache_folders') as $key => $value) {
 			if($key != 0) {
 				$key = $last_key + $last_value;
 			}

application/core/MY_Loader.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 		// if this class is already loaded before instantiating it. Loading it now
 		// makes sure our version is used when a controller enables query caching
 		if(!class_exists('CI_DB_Cache')) {
-			@include(APPPATH . 'libraries/MY_DB_cache.php');
+			@include(APPPATH.'libraries/MY_DB_cache.php');
 		}
 
 		// call the parent method to retain the CI functionality

application/config/gravatar.php

Spacing +2 added lines, -2 removed lines

@@ -11,14 +11,14 @@
 
 $config['gravatar_base_url']        = 'http://www.gravatar.com/';
 $config['gravatar_secure_base_url'] = 'https://secure.gravatar.com/';
-$config['gravatar_image_extension'] = '.png';   // '', '.png' or '.jpg'.
+$config['gravatar_image_extension'] = '.png'; // '', '.png' or '.jpg'.
 $config['gravatar_image_size']      = 44;
 
 $config['gravatar_default_image'] = 'identicon'; // '', '404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank'.
 //$config['gravatar_default_image'] = BASE_URL.'assets/img/lib/default-person.png'; // Another possible option: a custon image.
 
 $config['gravatar_force_default_image'] = false;
-$config['gravatar_rating']              = '';  // '', 'g' (default), 'pg', 'r', 'x'.
+$config['gravatar_rating']              = ''; // '', 'g' (default), 'pg', 'r', 'x'.
 
 // Useragent string for server-made requests.
 // It is for not getting 403 forbidden response.

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /**
  * Gravatar Library for CodeIgniter - Configuration
@@ -17,7 +17,7 @@ 
 $config['gravatar_default_image'] = 'identicon'; // '', '404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank'.
 //$config['gravatar_default_image'] = BASE_URL.'assets/img/lib/default-person.png'; // Another possible option: a custon image.
 
-$config['gravatar_force_default_image'] = false;
+$config['gravatar_force_default_image'] = FALSE;
 $config['gravatar_rating']              = '';  // '', 'g' (default), 'pg', 'r', 'x'.
 
 // Useragent string for server-made requests.

application/models/User_Options_Model.php

Braces +10 added lines, -3 removed lines

@@ -137,7 +137,9 @@ 
 				}
 
 				$success = $this->set_db($idData, $valueData);
-				if($success) $this->session->unset_tempdata("option_{$option}");
+				if($success) {
+					$this->session->unset_tempdata("option_{$option}");
+				}
 			} else {
 				$success = FALSE;
 			}
@@ -164,7 +166,9 @@ 
 			}
 
 			//Overall fallback method.
-			if(!isset($value)) $value = $this->options[$option]['default'];
+			if(!isset($value)) {
+				$value = $this->options[$option]['default'];
+			}
 		} else {
 			$value = FALSE;
 		}
@@ -215,7 +219,10 @@ 
 				//This should never happen.
 				break;
 		}
-		if(!isset($value)) $value = FALSE; //FIXME: This won't play nice with BOOL type false?
+		if(!isset($value)) {
+			$value = FALSE;
+		}
+		//FIXME: This won't play nice with BOOL type false?
 
 		return $value;
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 	 * @param string   $option
 	 * @param int|null $userID
 	 *
-	 * @return mixed Returns option value as STRING, or FALSE if option does not exist.
+	 * @return string Returns option value as STRING, or FALSE if option does not exist.
 	 */
 	public function get(string $option, ?int $userID = NULL) {
 		$userID = (is_null($userID) ? (int) $this->User->id : $userID);

Indentation +8 added lines, -8 removed lines

@@ -188,18 +188,18 @@
 		//FIXME: Query duplication.
 		if($this->User->id !== $userID) {
 			$query = $this->db->select('value_str, value_int')
-			                  ->from('user_options')
-			                  ->where('user_id', $userID)
-			                  ->where('name',    $option)
-			                  ->limit(1);
+							  ->from('user_options')
+							  ->where('user_id', $userID)
+							  ->where('name',    $option)
+							  ->limit(1);
 			$data = $query->get()->row_array();
 		} else {
 			if(!($data = $this->session->tempdata("option_{$option}"))) {
 				$query = $this->db->select('value_str, value_int')
-				                  ->from('user_options')
-				                  ->where('user_id', $userID)
-				                  ->where('name',    $option)
-				                  ->limit(1);
+								  ->from('user_options')
+								  ->where('user_id', $userID)
+								  ->where('name',    $option)
+								  ->limit(1);
 				$data = $query->get()->row_array();
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
 			}

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 User_Options_Model extends CI_Model {
 	public $options = array(
@@ -200,7 +200,7 @@ 
 			$query = $this->db->select('value_str, value_int')
 			                  ->from('user_options')
 			                  ->where('user_id', $userID)
-			                  ->where('name',    $option)
+			                  ->where('name', $option)
 			                  ->limit(1);
 			$data = $query->get()->row_array();
 		} else {
@@ -208,7 +208,7 @@ 
 				$query = $this->db->select('value_str, value_int')
 				                  ->from('user_options')
 				                  ->where('user_id', $userID)
-				                  ->where('name',    $option)
+				                  ->where('name', $option)
 				                  ->limit(1);
 				$data = $query->get()->row_array();
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
@@ -261,7 +261,7 @@ 
 			);
 			//FIXME: Get a better solution than str_replace for removing special characters
 			$elements = array();
-			foreach (array_values($this->options[$option]['valid_options']) as $valid_option) {
+			foreach(array_values($this->options[$option]['valid_options']) as $valid_option) {
 				$elements[$option.'_'.str_replace(',', '_', $valid_option)] = array_merge($base_attributes, array(
 					'value' => $valid_option
 				));

application/models/Tracker_Model.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
-<?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');
 
 include_once APPPATH.'models/Tracker/Tracker_Base_Model.php';
-foreach (glob(APPPATH.'models/Tracker/*.php') as $filename) {
+foreach(glob(APPPATH.'models/Tracker/*.php') as $filename) {
 	/** @noinspection PhpIncludeInspection */
 	include_once $filename;
 }

Upper-Lower-Casing +1 added lines, -1 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');
 
 include_once APPPATH.'models/Tracker/Tracker_Base_Model.php';
 foreach (glob(APPPATH.'models/Tracker/*.php') as $filename) {

application/models/Tracker/Tracker_Tag_Model.php

Indentation +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
 		$success = FALSE;
 		if(preg_match("/^[a-z0-9\\-_,:]{0,255}$/", $tag_string)) {
 			$success = (bool) $this->db->set(['tags' => $tag_string, 'active' => 'Y', 'last_updated' => NULL])
-			                           ->where('user_id', $userID)
-			                           ->where('id', $chapterID)
-			                           ->update('tracker_chapters');
+									   ->where('user_id', $userID)
+									   ->where('id', $chapterID)
+									   ->update('tracker_chapters');
 		}
 
 		if($success) {

Spacing +1 added lines, -1 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 Tracker_Tag_Model extends Tracker_Base_Model {
 	public function __construct() {

Upper-Lower-Casing +1 added lines, -1 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 Tracker_Tag_Model extends Tracker_Base_Model {
 	public function __construct() {

application/models/Tracker/Tracker_Title_Model.php

Braces +6 added lines, -2 removed lines

@@ -35,9 +35,13 @@
 			$titleID = $id;
 		} else {
 			//TODO: Check if title is valid URL!
-			if($create) $titleID = $this->addTitle($titleURL, $siteID);
+			if($create) {
+				$titleID = $this->addTitle($titleURL, $siteID);
+			}
+		}
+		if(!isset($titleID) || !$titleID) {
+			$titleID = 0;
 		}
-		if(!isset($titleID) || !$titleID) $titleID = 0;
 
 		return ($returnData && $titleID !== 0 ? $query->row_array() : $titleID);
 	}

Spacing +1 added lines, -1 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 Tracker_Title_Model extends Tracker_Base_Model {
 	public function __construct() {

Upper-Lower-Casing +1 added lines, -1 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 Tracker_Title_Model extends Tracker_Base_Model {
 	public function __construct() {

Doc Comments +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 	/**
 	 * @param string $site_url
 	 *
-	 * @return stdClass|object|null
+	 * @return string
 	 */
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('*')

Indentation +22 added lines, -22 removed lines

@@ -15,11 +15,11 @@ 
 	 */
 	public function getID(string $titleURL, int $siteID, bool $create = TRUE, bool $returnData = FALSE) {
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title, tracker_titles.title_url, tracker_titles.latest_chapter, tracker_titles.status, tracker_sites.site_class, (tracker_titles.last_checked > DATE_SUB(NOW(), INTERVAL 3 DAY)) AS active', FALSE)
-		                  ->from('tracker_titles')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->where('tracker_titles.title_url', $titleURL)
-		                  ->where('tracker_titles.site_id', $siteID)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->where('tracker_titles.title_url', $titleURL)
+						  ->where('tracker_titles.site_id', $siteID)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$id = (int) $query->row('id');
@@ -32,8 +32,8 @@ 
 						//Make sure last_checked is always updated on successful run.
 						//CHECK: Is there a reason we aren't just doing this in updateTitleById?
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $id)
-						         ->update('tracker_titles');
+								 ->where('id', $id)
+								 ->update('tracker_titles');
 					}
 				} else {
 					log_message('error', "{$query->row('title')} failed to update successfully");
@@ -73,9 +73,9 @@ 
 	 */
 	private function addTitle(string $titleURL, int $siteID) : int {
 		$query = $this->db->select('site, site_class')
-		                  ->from('tracker_sites')
-		                  ->where('id', $siteID)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('id', $siteID)
+						  ->get();
 
 		$titleData = $this->sites->{$query->row()->site_class}->getTitleData($titleURL, TRUE);
 
@@ -101,20 +101,20 @@ 
 	public function updateByID(int $titleID, string $latestChapter) : bool {
 		//FIXME: Really not too happy with how we're doing history stuff here, it just feels messy.
 		$query = $this->db->select('latest_chapter AS current_chapter')
-		                  ->from('tracker_titles')
-		                  ->where('id', $titleID)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->where('id', $titleID)
+						  ->get();
 		$row = $query->row();
 
 		$success = $this->db->set(['latest_chapter' => $latestChapter, 'failed_checks' => 0]) //last_updated gets updated via a trigger if something changes
-		                    ->where('id', $titleID)
-		                    ->update('tracker_titles');
+							->where('id', $titleID)
+							->update('tracker_titles');
 
 		if($this->db->affected_rows() > 0) {
 			//Clear hidden latest chapter
 			$this->db->set(['ignore_chapter' => 'NULL', 'last_updated' => 'last_updated'], NULL, FALSE)
-			         ->where('title_id', $titleID)
-			         ->update('tracker_chapters');
+					 ->where('title_id', $titleID)
+					 ->update('tracker_chapters');
 		}
 
 		//Update History
@@ -127,8 +127,8 @@ 
 
 	public function updateFailedChecksByID(int $titleID) : bool {
 		$success = $this->db->set('failed_checks', 'failed_checks + 1', FALSE)
-		                    ->where('id', $titleID)
-		                    ->update('tracker_titles');
+							->where('id', $titleID)
+							->update('tracker_titles');
 
 		return $success;
 	}
@@ -140,9 +140,9 @@ 
 	 */
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('*')
-		                  ->from('tracker_sites')
-		                  ->where('site', $site_url)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('site', $site_url)
+						  ->get();
 
 		return $query->row();
 	}