DakuTree / manga-tracker

application/models/Auth_Model.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
 	/**
 	 * @param string $verificationCode
-	 * @return mixed
+	 * @return string
 	 */
 	public function verification_check(string $verificationCode) {
 		//user is trying to validate their email for signup, check if verification code is still valid/exists

Indentation +3 added lines, -3 removed lines

@@ -77,9 +77,9 @@
 	public function verification_check(string $verificationCode) {
 		//user is trying to validate their email for signup, check if verification code is still valid/exists
 		$query = $this->db->select('email, verification_code_time')
-		                  ->from('auth_signup_verification')
-		                  ->where(array('verification_code' => $verificationCode))
-		                  ->get();
+						  ->from('auth_signup_verification')
+						  ->where(array('verification_code' => $verificationCode))
+						  ->get();
 
 		$return = FALSE;
 		if($query->num_rows() > 0) {

application/models/Tracker_Model.php

Doc Comments +3 added lines

@@ -88,6 +88,9 @@
 		return $arr;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('id, site_class')
 		                  ->from('tracker_sites')

Indentation +93 added lines, -93 removed lines

@@ -91,9 +91,9 @@ 
 
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('id, site_class')
-		                  ->from('tracker_sites')
-		                  ->where('site', $site_url)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('site', $site_url)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$siteData = $query->row();
@@ -104,11 +104,11 @@ 
 
 	public function getTitleID(string $titleURL, int $siteID) {
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title, tracker_titles.title_url, tracker_titles.complete, 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');
@@ -121,8 +121,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");
@@ -160,14 +160,14 @@ 
 			}
 
 			$idQuery = $this->db->select('id')
-			                    ->where('user_id', $userID)
-			                    ->where('title_id', $titleID)
-			                    ->get('tracker_chapters');
+								->where('user_id', $userID)
+								->where('title_id', $titleID)
+								->get('tracker_chapters');
 			if($idQuery->num_rows() > 0) {
 				$success = (bool) $this->db->set(['current_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL])
-				                    ->where('user_id', $userID)
-				                    ->where('title_id', $titleID)
-				                    ->update('tracker_chapters');
+									->where('user_id', $userID)
+									->where('title_id', $titleID)
+									->update('tracker_chapters');
 
 				if($success) {
 					$idQueryRow = $idQuery->row();
@@ -192,9 +192,9 @@ 
 
 	public function updateTrackerByID(int $userID, int $chapterID, string $chapter) : bool {
 		$success = (bool) $this->db->set(['current_chapter' => $chapter, '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) {
 			$this->History->userUpdateTitle($chapterID, $chapter);
@@ -207,23 +207,23 @@ 
 		//This is to allow user history to function properly.
 
 		$success = $this->db->set(['active' => 'N', 'last_updated' => NULL])
-		                    ->where('user_id', $userID)
-		                    ->where('id', $chapterID)
-		                    ->update('tracker_chapters');
+							->where('user_id', $userID)
+							->where('id', $chapterID)
+							->update('tracker_chapters');
 
 		return (bool) $success;
 	}
 	private function updateTitleById(int $id, string $latestChapter) {
 		//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', $id)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->where('id', $id)
+						  ->get();
 		$row = $query->row();
 
 		$success = $this->db->set(['latest_chapter' => $latestChapter]) //last_updated gets updated via a trigger if something changes
-		                    ->where('id', $id)
-		                    ->update('tracker_titles');
+							->where('id', $id)
+							->update('tracker_titles');
 
 		//Update History
 		//NOTE: To avoid doing another query to grab the last_updated time, we just use time() which <should> get the same thing.
@@ -234,16 +234,16 @@ 
 	}
 	private function updateTitleDataById(int $id, array $titleData) {
 		$success = $this->db->set($titleData)
-		                    ->where('id', $id)
-		                    ->update('tracker_titles');
+							->where('id', $id)
+							->update('tracker_titles');
 
 		return (bool) $success;
 	}
 	private function addTitle(string $titleURL, int $siteID) {
 		$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);
 		$this->db->insert('tracker_titles', array_merge($titleData, ['title_url' => $titleURL, 'site_id' => $siteID]));
@@ -294,8 +294,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', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 
 						print " - ({$titleData['latest_chapter']})\n";
 					}
@@ -412,9 +412,9 @@ 
 	}
 	public function setCategoryTrackerByID(int $userID, int $chapterID, string $category) : bool {
 		$success = $this->db->set(['category' => $category, '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');
 
 		return (bool) $success;
 	}
@@ -424,9 +424,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) {
@@ -464,23 +464,23 @@ 
 
 			//We need the series to be tracked
 			$idCQuery = $this->db->select('id')
-			                    ->where('user_id', $userID)
-			                    ->where('title_id', $titleID)
-			                    ->get('tracker_chapters');
+								->where('user_id', $userID)
+								->where('title_id', $titleID)
+								->get('tracker_chapters');
 			if($idCQuery->num_rows() > 0) {
 				$idCQueryRow = $idCQuery->row();
 
 				//Check if it is already favourited
 				$idFQuery = $this->db->select('id')
-				                    ->where('chapter_id', $idCQueryRow->id)
-				                    ->where('chapter', $chapter)
-				                    ->get('tracker_favourites');
+									->where('chapter_id', $idCQueryRow->id)
+									->where('chapter', $chapter)
+									->get('tracker_favourites');
 				if($idFQuery->num_rows() > 0) {
 					//Chapter is already favourited, so remove it from DB
 					$idFQueryRow = $idFQuery->row();
 
 					$isSuccess = (bool) $this->db->where('id', $idFQueryRow->id)
-					                           ->delete('tracker_favourites');
+											   ->delete('tracker_favourites');
 
 					if($isSuccess) {
 						$success = array(
@@ -553,10 +553,10 @@ 
 		$usedCategories = [];
 
 		$query = $this->db->distinct()
-		                  ->select('category')
-		                  ->from('tracker_chapters')
-		                  ->where('tracker_chapters.active', 'Y')
-		                  ->get();
+						  ->select('category')
+						  ->from('tracker_chapters')
+						  ->where('tracker_chapters.active', 'Y')
+						  ->get();
 
 		return array_column($query->result_array(), 'category');
 	}
@@ -568,51 +568,51 @@ 
 
 		//$this->db->cache_on();
 		$queryUsers = $this->db->select([
-		                      'COUNT(*) AS total_users',
-		                      'SUM(CASE WHEN api_key IS NOT NULL THEN 1 ELSE 0 END) AS validated_users',
-		                      'SUM(CASE WHEN (api_key IS NOT NULL AND from_unixtime(last_login) > DATE_SUB(NOW(), INTERVAL 7 DAY)) THEN 1 ELSE 0 END) AS active_users'
-		                  ], FALSE)
-		                  ->from('auth_users')
-		                  ->get();
+							  'COUNT(*) AS total_users',
+							  'SUM(CASE WHEN api_key IS NOT NULL THEN 1 ELSE 0 END) AS validated_users',
+							  'SUM(CASE WHEN (api_key IS NOT NULL AND from_unixtime(last_login) > DATE_SUB(NOW(), INTERVAL 7 DAY)) THEN 1 ELSE 0 END) AS active_users'
+						  ], FALSE)
+						  ->from('auth_users')
+						  ->get();
 		$stats = array_merge($stats, $queryUsers->result_array()[0]);
 
 		$queryCounts = $this->db->select([
-		                      'tracker_titles.title',
-		                      'COUNT(tracker_chapters.title_id) AS count'
-		                  ], FALSE)
-		                  ->from('tracker_chapters')
-		                  ->join('tracker_titles', 'tracker_titles.id = tracker_chapters.title_id', 'left')
-		                  ->group_by('tracker_chapters.title_id')
-		                  ->having('count > 1')
-		                  ->order_by('count DESC')
-		                  ->get();
+							  'tracker_titles.title',
+							  'COUNT(tracker_chapters.title_id) AS count'
+						  ], FALSE)
+						  ->from('tracker_chapters')
+						  ->join('tracker_titles', 'tracker_titles.id = tracker_chapters.title_id', 'left')
+						  ->group_by('tracker_chapters.title_id')
+						  ->having('count > 1')
+						  ->order_by('count DESC')
+						  ->get();
 		$stats['titles_tracked_more'] = count($queryCounts->result_array());
 		$stats['top_title_name']  = $queryCounts->result_array()[0]['title'] ?? 'N/A';
 		$stats['top_title_count'] = $queryCounts->result_array()[0]['count'] ?? 'N/A';
 
 		$queryTitles = $this->db->select([
-		                      'COUNT(DISTINCT tracker_titles.id) AS total_titles',
-		                      'COUNT(DISTINCT tracker_titles.site_id) AS total_sites',
-		                      'SUM(CASE WHEN from_unixtime(auth_users.last_login) > DATE_SUB(NOW(), INTERVAL 120 HOUR) IS NOT NULL THEN 0 ELSE 1 END) AS inactive_titles',
-		                      'SUM(CASE WHEN (tracker_titles.last_updated > DATE_SUB(NOW(), INTERVAL 24 HOUR)) THEN 1 ELSE 0 END) AS updated_titles'
-		                  ], FALSE)
-		                  ->from('tracker_titles')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->join('tracker_chapters', 'tracker_titles.id = tracker_chapters.title_id', 'left')
-		                  ->join('auth_users', 'tracker_chapters.user_id = auth_users.id', 'left')
-		                  ->get();
+							  'COUNT(DISTINCT tracker_titles.id) AS total_titles',
+							  'COUNT(DISTINCT tracker_titles.site_id) AS total_sites',
+							  'SUM(CASE WHEN from_unixtime(auth_users.last_login) > DATE_SUB(NOW(), INTERVAL 120 HOUR) IS NOT NULL THEN 0 ELSE 1 END) AS inactive_titles',
+							  'SUM(CASE WHEN (tracker_titles.last_updated > DATE_SUB(NOW(), INTERVAL 24 HOUR)) THEN 1 ELSE 0 END) AS updated_titles'
+						  ], FALSE)
+						  ->from('tracker_titles')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->join('tracker_chapters', 'tracker_titles.id = tracker_chapters.title_id', 'left')
+						  ->join('auth_users', 'tracker_chapters.user_id = auth_users.id', 'left')
+						  ->get();
 		$stats = array_merge($stats, $queryTitles->result_array()[0]);
 
 		$querySites = $this->db->select([
-		                      'tracker_sites.site',
-		                      'COUNT(*) AS count'
-		                  ], FALSE)
-		                  ->from('tracker_titles')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->group_by('tracker_titles.site_id')
-		                  ->order_by('count DESC')
-		                  ->limit(3)
-		                  ->get();
+							  'tracker_sites.site',
+							  'COUNT(*) AS count'
+						  ], FALSE)
+						  ->from('tracker_titles')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->group_by('tracker_titles.site_id')
+						  ->order_by('count DESC')
+						  ->limit(3)
+						  ->get();
 		$querySitesResult = $querySites->result_array();
 		$stats['rank1_site']       = $querySitesResult[0]['site'];
 		$stats['rank1_site_count'] = $querySitesResult[0]['count'];
@@ -622,17 +622,17 @@ 
 		$stats['rank3_site_count'] = $querySitesResult[2]['count'];
 
 		$queryTitlesU = $this->db->select([
-		                      'COUNT(*) AS title_updated_count'
-		                  ], FALSE)
-		                  ->from('tracker_titles_history')
-		                  ->get();
+							  'COUNT(*) AS title_updated_count'
+						  ], FALSE)
+						  ->from('tracker_titles_history')
+						  ->get();
 		$stats = array_merge($stats, $queryTitlesU->result_array()[0]);
 
 		$queryUsersU = $this->db->select([
-		                      'COUNT(*) AS user_updated_count'
-		                  ], FALSE)
-		                  ->from('tracker_user_history')
-		                  ->get();
+							  'COUNT(*) AS user_updated_count'
+						  ], FALSE)
+						  ->from('tracker_user_history')
+						  ->get();
 		$stats = array_merge($stats, $queryUsersU->result_array()[0]);
 
 		$stats['live_time'] = timespan(/*2016-09-10T03:17:19*/ 1473477439, time(), 2);

application/tests/libraries/MY_Form_validation_test.php

Doc Comments +4 added lines

@@ -144,6 +144,10 @@
 	}
 
 	//utility functions
+
+	/**
+	 * @param string $field
+	 */
 	function get_error_message(/*str*/$field, /*obj*/ $customObj = FALSE) {
 		$obj = $customObj ?: $this->form_validation;
 		$error_messages = ReflectionHelper::getPrivateProperty(

public/index.php

Indentation +4 added lines, -4 removed lines

@@ -210,10 +210,10 @@
 {
 	// Ensure there's a trailing slash
 	$system_path = strtr(
-		               rtrim($system_path, '/\\'),
-		               '/\\',
-		               DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-	               ).DIRECTORY_SEPARATOR;
+					   rtrim($system_path, '/\\'),
+					   '/\\',
+					   DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
+				   ).DIRECTORY_SEPARATOR;
 }
 
 // Is the system path correct?

application/tests/TestCase.php

Indentation +13 added lines, -13 removed lines

@@ -29,27 +29,27 @@ 
 
 	public function getMock_ion_auth_logged_in() {
 		$ion_auth = $this->getMockBuilder('Ion_auth')
-		                 ->disableOriginalConstructor()
-		                 ->getMock();
+						 ->disableOriginalConstructor()
+						 ->getMock();
 
 		$ion_auth->expects($this->at(0))
-		         ->method('logged_in')
-		         ->willReturn(TRUE);
+				 ->method('logged_in')
+				 ->willReturn(TRUE);
 		$ion_auth->expects($this->at(1))
-		         ->method('logged_in')
-		         ->willReturn(TRUE);
+				 ->method('logged_in')
+				 ->willReturn(TRUE);
 
 		$ion_auth->expects($this->any())
-		         ->method($this->anything())
-		         ->will($this->returnSelf());
+				 ->method($this->anything())
+				 ->will($this->returnSelf());
 		
 		return $ion_auth;
 	}
 
 	public function getMock_CI_DB_result(array $methods) {
 		$db_result = $this->getMockBuilder('CI_DB_result')
-		                  ->disableOriginalConstructor()
-		                  ->getMock();
+						  ->disableOriginalConstructor()
+						  ->getMock();
 
 		foreach ($methods as $method => $return) {
 			$db_result->method($method)->willReturn($return);
@@ -59,9 +59,9 @@ 
 
 	public function getMock_CI_DB($return) {
 		$db = $this->getMockBuilder('CI_DB')
-		           ->disableOriginalConstructor()
-		           ->setMethods(array('select', 'from', 'where', 'get'))
-		           ->getMock();
+				   ->disableOriginalConstructor()
+				   ->setMethods(array('select', 'from', 'where', 'get'))
+				   ->getMock();
 
 		$db->expects($this->at(3))
 		   ->method('get')

application/tests/models/User_Model_test.php

Indentation +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
 		$User_Model = $this->User_Model;
 
 		$ion_auth = $this->getMockBuilder('ion_auth')
-		                 ->disableOriginalConstructor()
-		                 ->getMock();
+						 ->disableOriginalConstructor()
+						 ->getMock();
 		$ion_auth->method('logged_in')->willReturn(FALSE);
 
 		$User_Model->ion_auth = $ion_auth;

application/models/User_Options_Model.php

Indentation +4 added lines, -4 removed lines

@@ -138,10 +138,10 @@
 	private function get_db(string $option, int $userID) {
 		//This function assumes we've already done some basic validation.
 		$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);
 		return $query->get()->row_array();
 	}
 	private function set_db(string $option, $value) : bool {}

Doc Comments +8 added lines, -1 removed lines

@@ -73,11 +73,15 @@ 
 	/**
 	 * Get user option, or default option if it does not exist.
 	 * @param string $option
-	 * @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) {
 		return $this->get_by_userid($option, (int) $this->User->id);
 	}
+
+	/**
+	 * @return string
+	 */
 	public function get_by_userid(string $option, int $userID) {
 		//Check if option is valid
 		if(array_key_exists($option, $this->options)) {
@@ -135,6 +139,9 @@ 
 		return $success;
 	}
 
+	/**
+	 * @return string
+	 */
 	private function get_db(string $option, int $userID) {
 		//This function assumes we've already done some basic validation.
 		$query = $this->db->select('value_str, value_int')

application/models/Site_Model.php

Indentation +2 added lines, -2 removed lines

@@ -228,8 +228,8 @@
 		//Bato.to is annoying and locks stuff behind auth. See: https://github.com/DakuTree/manga-tracker/issues/14#issuecomment-233830855
 		$cookies = [
 			"lang_option={$title_lang}",
-		    "member_id=" . $this->config->item('batoto_cookie_member_id'),
-		    "pass_hash=" . $this->config->item('batoto_cookie_pass_hash')
+			"member_id=" . $this->config->item('batoto_cookie_member_id'),
+			"pass_hash=" . $this->config->item('batoto_cookie_pass_hash')
 		];
 		$data = $this->get_content($title_url, implode("; ", $cookies));
 		if(!$data) {

application/models/User_Model.php

Indentation +12 added lines, -12 removed lines

@@ -40,9 +40,9 @@ 
 		$this->load->database();
 
 		$query = $this->db->select('*')
-		                  ->from('auth_users')
-		                  ->where('username', $username)
-		                  ->get();
+						  ->from('auth_users')
+						  ->where('username', $username)
+						  ->get();
 
 		return (bool) $query->num_rows();
 	}
@@ -64,9 +64,9 @@ 
 			$this->load->database();
 
 			$query = $this->db->select('email')
-			                  ->from('auth_users')
-			                  ->where('username', $identity)
-			                  ->get();
+							  ->from('auth_users')
+							  ->where('username', $identity)
+							  ->get();
 
 			if($query->num_rows() > 0) {
 				//username exists, grab email
@@ -84,9 +84,9 @@ 
 		$user = NULL;
 
 		$query = $this->db->select('*')
-		                  ->from('auth_users')
-		                  ->where('username', $username)
-		                  ->get();
+						  ->from('auth_users')
+						  ->where('username', $username)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$user = $query->row();
@@ -114,9 +114,9 @@ 
 	
 	public function get_id_from_api_key(string $api_key) {
 		$query = $this->db->select('id')
-		                  ->from('auth_users')
-		                  ->where('api_key', $api_key)
-		                  ->get();
+						  ->from('auth_users')
+						  ->where('api_key', $api_key)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$userID = $query->row('id');