DakuTree / manga-tracker

application/models/User_Options_Model.php

Doc Comments +5 added lines, -1 removed lines

@@ -102,11 +102,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)) {

Indentation +4 added lines, -4 removed lines

@@ -170,10 +170,10 @@
 		//This function assumes we've already done some basic validation.
 		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 +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 User_Options_Model extends CI_Model {
 	public $options = array(
@@ -172,7 +172,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);
@@ -214,7 +214,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
 				));

Braces +10 added lines, -3 removed lines

@@ -123,7 +123,9 @@ 
 			}
 
 			//Overall fallback method.
-			if(!isset($value)) $value = $this->options[$option]['default'];
+			if(!isset($value)) {
+				$value = $this->options[$option]['default'];
+			}
 		} else {
 			$value = FALSE;
 		}
@@ -159,7 +161,9 @@ 
 				$success = $this->db->update('user_options', $dataValues);
 			}
 
-			if($success) $this->session->unset_tempdata("option_{$option}");
+			if($success) {
+				$this->session->unset_tempdata("option_{$option}");
+			}
 		} else {
 			$success = FALSE;
 		}
@@ -200,7 +204,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;
 	}