DakuTree / manga-tracker

application/models/User_Options_Model.php

Indentation +6 added lines, -6 removed lines

@@ -190,16 +190,16 @@
 		//FIXME: Query duplication.
 		if($this->User->id !== $userID) {
 			$query = $this->db->select("options->\"$.{$option}\" AS value", FALSE)
-			                  ->from('auth_users')
-			                  ->where('id', $userID)
-			                  ->limit(1);
+							  ->from('auth_users')
+							  ->where('id', $userID)
+							  ->limit(1);
 			$data = $query->get()->row_object();
 		} else {
 			//if(!($data = $this->session->tempdata("option_{$option}"))) {
 				$query = $this->db->select("options->\"$.{$option}\" AS value", FALSE)
-				                  ->from('auth_users')
-				                  ->where('id', $userID)
-				                  ->limit(1);
+								  ->from('auth_users')
+								  ->where('id', $userID)
+								  ->limit(1);
 				$data = $query->get()->row_object();
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
 			//}

Spacing +1 added lines, -1 removed lines

@@ -237,7 +237,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

@@ -154,7 +154,9 @@ 
 				//CI doesn't have any nice way of using the query builder with JSON columns.
 				$sql = 'UPDATE `auth_users` SET `options` = JSON_SET(COALESCE(`options`, \'{}\'), ?, ?) WHERE `id` = ?';
 				if($success = $this->db->query($sql, ["$.{$option}", $parsedValue, $this->User->id])) {
-					if($success) $this->session->unset_tempdata("option_{$option}");
+					if($success) {
+						$this->session->unset_tempdata("option_{$option}");
+					}
 				}
 			}
 		}
@@ -177,7 +179,9 @@ 
 			}
 
 			//Overall fallback method.
-			if(!isset($value)) $value = $this->options[$option]['default'];
+			if(!isset($value)) {
+				$value = $this->options[$option]['default'];
+			}
 		} else {
 			$value = FALSE;
 		}
@@ -224,7 +228,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;
 	}