| @@ -72,7 +72,7 @@ | ||
| 72 | 72 | |
| 73 | 73 | /** | 
| 74 | 74 | * @param string $verificationCode | 
| 75 | - * @return mixed | |
| 75 | + * @return string | |
| 76 | 76 | */ | 
| 77 | 77 |  	public function verification_check(string $verificationCode) { | 
| 78 | 78 | //user is trying to validate their email for signup, check if verification code is still valid/exists | 
| @@ -77,9 +77,9 @@ | ||
| 77 | 77 |  	public function verification_check(string $verificationCode) { | 
| 78 | 78 | //user is trying to validate their email for signup, check if verification code is still valid/exists | 
| 79 | 79 |  		$query = $this->db->select('email, verification_code_time') | 
| 80 | -		                  ->from('auth_signup_verification') | |
| 81 | -		                  ->where(array('verification_code' => $verificationCode)) | |
| 82 | - ->get(); | |
| 80 | +						  ->from('auth_signup_verification') | |
| 81 | +						  ->where(array('verification_code' => $verificationCode)) | |
| 82 | + ->get(); | |
| 83 | 83 | |
| 84 | 84 | $return = FALSE; | 
| 85 | 85 |  		if($query->num_rows() > 0) { | 
| @@ -210,10 +210,10 @@ | ||
| 210 | 210 |  { | 
| 211 | 211 | // Ensure there's a trailing slash | 
| 212 | 212 | $system_path = strtr( | 
| 213 | - rtrim($system_path, '/\\'), | |
| 214 | - '/\\', | |
| 215 | - DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR | |
| 216 | - ).DIRECTORY_SEPARATOR; | |
| 213 | + rtrim($system_path, '/\\'), | |
| 214 | + '/\\', | |
| 215 | + DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR | |
| 216 | + ).DIRECTORY_SEPARATOR; | |
| 217 | 217 | } | 
| 218 | 218 | |
| 219 | 219 | // Is the system path correct? | 
| @@ -18,7 +18,7 @@ | ||
| 18 | 18 | */ | 
| 19 | 19 | class UnitTester extends \Codeception\Actor | 
| 20 | 20 |  { | 
| 21 | - use _generated\UnitTesterActions; | |
| 21 | + use _generated\UnitTesterActions; | |
| 22 | 22 | |
| 23 | 23 | /** | 
| 24 | 24 | * Define custom actions here | 
| @@ -18,7 +18,7 @@ | ||
| 18 | 18 | */ | 
| 19 | 19 | class AcceptanceTester extends \Codeception\Actor | 
| 20 | 20 |  { | 
| 21 | - use _generated\AcceptanceTesterActions; | |
| 21 | + use _generated\AcceptanceTesterActions; | |
| 22 | 22 | |
| 23 | 23 | /** | 
| 24 | 24 | * Define custom actions here | 
| @@ -18,7 +18,7 @@ | ||
| 18 | 18 | */ | 
| 19 | 19 | class FunctionalTester extends \Codeception\Actor | 
| 20 | 20 |  { | 
| 21 | - use _generated\FunctionalTesterActions; | |
| 21 | + use _generated\FunctionalTesterActions; | |
| 22 | 22 | |
| 23 | 23 | /** | 
| 24 | 24 | * Define custom actions here | 
| @@ -245,7 +245,7 @@ | ||
| 245 | 245 | } | 
| 246 | 246 | |
| 247 | 247 | /** | 
| 248 | - * @param $md5 | |
| 248 | + * @param string $md5 | |
| 249 | 249 | * | 
| 250 | 250 | * @return array | 
| 251 | 251 | */ | 
| @@ -9,9 +9,9 @@ | ||
| 9 | 9 | $success = FALSE; | 
| 10 | 10 |  		if(preg_match("/^[a-z0-9\\-_,:]{0,255}$/", $tag_string)) { | 
| 11 | 11 | $success = (bool) $this->db->set(['tags' => $tag_string, 'active' => 'Y', 'last_updated' => NULL]) | 
| 12 | -			                           ->where('user_id', $userID) | |
| 13 | -			                           ->where('id', $chapterID) | |
| 14 | -			                           ->update('tracker_chapters'); | |
| 12 | +									   ->where('user_id', $userID) | |
| 13 | +									   ->where('id', $chapterID) | |
| 14 | +									   ->update('tracker_chapters'); | |
| 15 | 15 | } | 
| 16 | 16 | |
| 17 | 17 |  		if($success) { | 
| @@ -7,9 +7,9 @@ discard block | ||
| 7 | 7 | |
| 8 | 8 |  	public function setByID(int $userID, int $chapterID, string $category) : bool { | 
| 9 | 9 | $success = $this->db->set(['category' => $category, 'active' => 'Y', 'last_updated' => NULL]) | 
| 10 | -		                    ->where('user_id', $userID) | |
| 11 | -		                    ->where('id', $chapterID) | |
| 12 | -		                    ->update('tracker_chapters'); | |
| 10 | +							->where('user_id', $userID) | |
| 11 | +							->where('id', $chapterID) | |
| 12 | +							->update('tracker_chapters'); | |
| 13 | 13 | |
| 14 | 14 | return (bool) $success; | 
| 15 | 15 | } | 
| @@ -40,11 +40,11 @@ discard block | ||
| 40 | 40 | |
| 41 | 41 |  	public function getUsed(int $userID) : array { | 
| 42 | 42 | $query = $this->db->distinct() | 
| 43 | -		                  ->select('category') | |
| 44 | -		                  ->from('tracker_chapters') | |
| 45 | -		                  ->where('tracker_chapters.active', 'Y') | |
| 46 | -		                  ->where('user_id', $userID) | |
| 47 | - ->get(); | |
| 43 | +						  ->select('category') | |
| 44 | +						  ->from('tracker_chapters') | |
| 45 | +						  ->where('tracker_chapters.active', 'Y') | |
| 46 | +						  ->where('user_id', $userID) | |
| 47 | + ->get(); | |
| 48 | 48 | |
| 49 | 49 | return array_column($query->result_array(), 'category'); | 
| 50 | 50 | } | 
| @@ -114,7 +114,7 @@ | ||
| 114 | 114 | * @param string $option | 
| 115 | 115 | * @param int|null $userID | 
| 116 | 116 | * | 
| 117 | - * @return mixed Returns option value as STRING, or FALSE if option does not exist. | |
| 117 | + * @return string Returns option value as STRING, or FALSE if option does not exist. | |
| 118 | 118 | */ | 
| 119 | 119 |  	public function get(string $option, ?int $userID = NULL) { | 
| 120 | 120 | $userID = (is_null($userID) ? (int) $this->User->id : $userID); | 
| @@ -188,18 +188,18 @@ | ||
| 188 | 188 | //FIXME: Query duplication. | 
| 189 | 189 |  		if($this->User->id !== $userID) { | 
| 190 | 190 |  			$query = $this->db->select('value_str, value_int') | 
| 191 | -			                  ->from('user_options') | |
| 192 | -			                  ->where('user_id', $userID) | |
| 193 | -			                  ->where('name',    $option) | |
| 194 | - ->limit(1); | |
| 191 | +							  ->from('user_options') | |
| 192 | +							  ->where('user_id', $userID) | |
| 193 | +							  ->where('name',    $option) | |
| 194 | + ->limit(1); | |
| 195 | 195 | $data = $query->get()->row_array(); | 
| 196 | 196 |  		} else { | 
| 197 | 197 |  			if(!($data = $this->session->tempdata("option_{$option}"))) { | 
| 198 | 198 |  				$query = $this->db->select('value_str, value_int') | 
| 199 | -				                  ->from('user_options') | |
| 200 | -				                  ->where('user_id', $userID) | |
| 201 | -				                  ->where('name',    $option) | |
| 202 | - ->limit(1); | |
| 199 | +								  ->from('user_options') | |
| 200 | +								  ->where('user_id', $userID) | |
| 201 | +								  ->where('name',    $option) | |
| 202 | + ->limit(1); | |
| 203 | 203 | $data = $query->get()->row_array(); | 
| 204 | 204 |  				$this->session->set_tempdata("option_{$option}", $data, 3600); | 
| 205 | 205 | } |