East-Kent-Partnership / Intranet

application/blocks/page_list/templates/Post Feed/view.php

Braces +3 added lines, -1 removed lines

@@ -67,8 +67,10 @@
                                             $name = $ui->getAttribute('user_fullname');
                                             if ($name):
                                                 echo $name;
-                                            else :
+                                            else {
+                                                :
                                                 echo $ownerName;
+                                            }
                                             endif;
                                         ?>
                                     </div><br>

dashboard/application/libraries/Grocery_CRUD.php

Doc Comments +55 added lines, -20 removed lines

@@ -883,6 +883,9 @@ 
 		return $validation_result;
 	}
 
+	/**
+	 * @return boolean
+	 */
 	protected function db_insert($state_info)
 	{
 		$validation_result = $this->db_insert_validation();
@@ -1351,6 +1354,9 @@ 
 		return $this->basic_model->get_relation_n_n_unselected_array($field_info, $selected_values);
 	}
 
+	/**
+	 * @param string $table_name
+	 */
 	protected function set_basic_db_table($table_name = null)
 	{
 		$this->basic_model->set_basic_table($table_name);
@@ -1997,6 +2003,9 @@ 
 		$this->set_echo_and_die();
 	}
 
+	/**
+	 * @param boolean $upload_result
+	 */
 	protected function delete_file_layout($upload_result)
 	{
 		@ob_end_clean();
@@ -2012,6 +2021,9 @@ 
 		$this->set_echo_and_die();
 	}
 
+	/**
+	 * @param string $css_file
+	 */
 	public function set_css($css_file)
 	{
 		$this->css_files[sha1($css_file)] = base_url().$css_file;
@@ -2022,12 +2034,18 @@ 
 		$this->js_files[sha1($js_file)] = base_url().$js_file;
 	}
 
+	/**
+	 * @param string $js_file
+	 */
 	public function set_js_lib($js_file)
 	{
 		$this->js_lib_files[sha1($js_file)] = base_url().$js_file;
 		$this->js_files[sha1($js_file)] = base_url().$js_file;
 	}
 
+	/**
+	 * @param string $js_file
+	 */
 	public function set_js_config($js_file)
 	{
 		$this->js_config_files[sha1($js_file)] = base_url().$js_file;
@@ -2892,6 +2910,9 @@ 
 		return array_key_exists('is_ajax', $_POST) && $_POST['is_ajax'] == 'true' ? true: false;
 	}
 
+	/**
+	 * @param string $view
+	 */
 	protected function _theme_view($view, $vars = array(), $return = FALSE)
 	{
 		$vars = (is_object($vars)) ? get_object_vars($vars) : $vars;
@@ -3551,7 +3572,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	array
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function columns()
 	{
@@ -3576,7 +3597,7 @@ 
 	 * @access	public
 	 * @param	mixed
 	 * @param	string
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	function set_rules($field, $label = '', $rules = '')
 	{
@@ -3643,7 +3664,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	array
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_texteditor()
 	{
@@ -3665,7 +3686,7 @@ 
 	 * Unsets just the jquery library from the js. This function can be used if there is already a jquery included
 	 * in the main template. This will avoid all jquery conflicts.
 	 *
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_jquery()
 	{
@@ -3679,7 +3700,7 @@ 
 	 * when the jquery UI JavaScript and CSS are already included in the main template.
 	 * This will avoid all jquery UI conflicts.
 	 *
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_jquery_ui()
 	{
@@ -3692,7 +3713,7 @@ 
 	 * Unsets just the twitter bootstrap libraries from the js and css. This function can be used if there is already twitter bootstrap files included
 	 * in the main template. If you are already using a bootstrap template then it's not necessary to load the files again.
 	 *
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_bootstrap()
 	{
@@ -3704,7 +3725,7 @@ 
 	/**
 	 * Unsets the add operation from the list
 	 *
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_add()
 	{
@@ -3716,7 +3737,7 @@ 
 	/**
 	 * Unsets the edit operation from the list
 	 *
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_edit()
 	{
@@ -3728,7 +3749,7 @@ 
 	/**
 	 * Unsets the delete operation from the list
 	 *
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_delete()
 	{
@@ -3740,7 +3761,7 @@ 
 	/**
 	 * Unsets the read operation from the list
 	 *
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_read()
 	{
@@ -3762,7 +3783,7 @@ 
 	/**
 	 * Unsets the export button and functionality from the list
 	 *
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_export()
 	{
@@ -3775,7 +3796,7 @@ 
 	/**
 	 * Unsets the print button and functionality from the list
 	 *
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_print()
 	{
@@ -3787,7 +3808,7 @@ 
 	/**
 	 * Unsets all the operations from the list
 	 *
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_operations()
 	{
@@ -3889,7 +3910,7 @@ 
 	/**
 	 * Unsets everything that has to do with buttons or links with go back to list message
 	 * @access	public
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function unset_back_to_list()
 	{
@@ -3905,7 +3926,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	array
-	 * @return	void
+	 * @return	Grocery_CRUD
 	 */
 	public function fields()
 	{
@@ -3974,9 +3995,9 @@ 
 	/**
 	 *
 	 * Changes the displaying label of the field
-	 * @param $field_name
-	 * @param $display_as
-	 * @return void
+	 * @param string $field_name
+	 * @param string $display_as
+	 * @return Grocery_CRUD
 	 */
 	public function display_as($field_name, $display_as = null)
 	{
@@ -4048,7 +4069,7 @@ 
 	 *
 	 * Set a language string directly
 	 * @param string $handle
-	 * @param string $string
+	 * @param string $lang_string
 	 */
 	public function set_lang_string($handle, $lang_string){
 		$this->lang_strings[$handle] = $lang_string;
@@ -5157,7 +5178,6 @@ 
 	 * Transform a field to an upload field
 	 *
 	 * @param string $field_name
-	 * @param string $upload_path
      * @return Grocery_CRUD
 	 */
 	public function set_field_upload($field_name, $upload_dir = '', $allowed_file_types = '')
@@ -5273,6 +5293,9 @@ 
         		substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
     }
 
+    /**
+     * @param string $file_name
+     */
     private function get_file_object($file_name) {
         $file_path = $this->options['upload_dir'].$file_name;
         if (is_file($file_path) && $file_name[0] !== '.') {
@@ -5301,6 +5324,9 @@ 
         )));
     }
 
+    /**
+     * @param string $file_name
+     */
     private function create_scaled_image($file_name, $options) {
         $file_path = $this->options['upload_dir'].$file_name;
         $new_file_path = $options['upload_dir'].$file_name;
@@ -5354,6 +5380,9 @@ 
         return $success;
     }
 
+    /**
+     * @param stdClass $file
+     */
     private function has_error($uploaded_file, $file, $error) {
         if ($error) {
 			switch($error) {
@@ -5424,6 +5453,9 @@ 
         return $file_name;
     }
 
+    /**
+     * @param string $file_name
+     */
     private function _transliterate_characters($file_name)
 	{
 		include($this->default_config_path.'/translit_chars.php');
@@ -5438,6 +5470,9 @@ 
 		return preg_replace('/\-+/', '-', trim($file_name, '-'));
 	}
 
+    /**
+     * @param string $file_path
+     */
     private function orient_image($file_path) {
       	$exif = exif_read_data($file_path);
       	$orientation = intval(@$exif['Orientation']);

Braces +371 added lines, -371 removed lines

@@ -60,8 +60,7 @@ 
 
 				if (isset($this->relation[$field_info->name])) {
 					$field_info->crud_type = "relation_".$field_type->type;
-				}
-				elseif (isset($this->upload_fields[$field_info->name])) {
+				} elseif (isset($this->upload_fields[$field_info->name])) {
 					$field_info->crud_type = "upload_file_".$field_type->type;
 				} else {
 					$field_info->crud_type 	= $field_type->type;
@@ -69,18 +68,15 @@ 
 				}
 
 				$real_type				= $field_info->crud_type;
-			}
-			elseif(isset($this->relation[$field_info->name]))
+			} elseif(isset($this->relation[$field_info->name]))
 			{
 				$real_type				= 'relation';
 				$field_info->crud_type 	= 'relation';
-			}
-			elseif(isset($this->upload_fields[$field_info->name]))
+			} elseif(isset($this->upload_fields[$field_info->name]))
 			{
 				$real_type				= 'upload_file';
 				$field_info->crud_type 	= 'upload_file';
-			}
-			else
+			} else
 			{
 				$real_type = $this->get_type($field_info);
 				$field_info->crud_type = $real_type;
@@ -88,10 +84,11 @@ 
 
 			switch ($real_type) {
 				case 'text':
-					if(!empty($this->unset_texteditor) && in_array($field_info->name,$this->unset_texteditor))
-						$field_info->extras = false;
-					else
-						$field_info->extras = 'text_editor';
+					if(!empty($this->unset_texteditor) && in_array($field_info->name,$this->unset_texteditor)) {
+											$field_info->extras = false;
+					} else {
+											$field_info->extras = 'text_editor';
+					}
 				break;
 
 				case 'relation':
@@ -105,8 +102,9 @@ 
 				break;
 
 				default:
-					if(empty($field_info->extras))
-						$field_info->extras = false;
+					if(empty($field_info->extras)) {
+											$field_info->extras = false;
+					}
 				break;
 			}
 
@@ -135,14 +133,17 @@ 
 			}
 		}
 
-		if(!empty($this->add_fields))
-			foreach($this->add_fields as $field_object)
+		if(!empty($this->add_fields)) {
+					foreach($this->add_fields as $field_object)
 			{
 				$field_name = isset($field_object->field_name) ? $field_object->field_name : $field_object;
+		}
 
-				if(!isset($types[$field_name]))//Doesn't exist in the database? Create it for the CRUD
+				if(!isset($types[$field_name])) {
+				    //Doesn't exist in the database? Create it for the CRUD
 				{
 					$extras = false;
+				}
 					if($this->change_field_type !== null && isset($this->change_field_type[$field_name]))
 					{
 						$field_type = $this->change_field_type[$field_name];
@@ -165,14 +166,17 @@ 
 				}
 			}
 
-		if(!empty($this->edit_fields))
-			foreach($this->edit_fields as $field_object)
+		if(!empty($this->edit_fields)) {
+					foreach($this->edit_fields as $field_object)
 			{
 				$field_name = isset($field_object->field_name) ? $field_object->field_name : $field_object;
+		}
 
-				if(!isset($types[$field_name]))//Doesn't exist in the database? Create it for the CRUD
+				if(!isset($types[$field_name])) {
+				    //Doesn't exist in the database? Create it for the CRUD
 				{
 					$extras = false;
+				}
 					if($this->change_field_type !== null && isset($this->change_field_type[$field_name]))
 					{
 						$field_type = $this->change_field_type[$field_name];
@@ -244,8 +248,7 @@ 
 				 * $this->get_integer_input
 				 *  */
 				$field_info->input = $this->{"get_".$real_type."_input"}($field_info,$value);
-			}
-			else
+			} else
 			{
 				$field_info->input = $this->get_string_input($field_info,$value);
 			}
@@ -282,8 +285,7 @@ 
 					list($year,$month,$day) = explode("-",$value);
 
 					$value = date($this->php_date_format, mktime (0, 0, 0, (int)$month , (int)$day , (int)$year));
-				}
-				else
+				} else
 				{
 					$value = '';
 				}
@@ -295,8 +297,7 @@ 
 					list($hours,$minutes) = explode(":",substr($value,11));
 
 					$value = date($this->php_date_format." - H:i", mktime ((int)$hours , (int)$minutes , 0, (int)$month , (int)$day ,(int)$year));
-				}
-				else
+				} else
 				{
 					$value = '';
 				}
@@ -330,8 +331,7 @@ 
 				if(empty($value))
 				{
 					$value = "";
-				}
-				else
+				} else
 				{
 					$is_image = !empty($value) &&
 					( substr($value,-4) == '.jpg'
@@ -347,8 +347,7 @@ 
 					if($is_image)
 					{
 						$file_url_anchor .= ' class="image-thumbnail"><img src="'.$file_url.'" height="50px">';
-					}
-					else
+					} else
 					{
 						$file_url_anchor .= ' target="_blank">'.$this->character_limiter($value,$this->character_limiter,'...',true);
 					}
@@ -418,24 +417,27 @@ 
 				case 'tinyint':
 				case 'mediumint':
 				case 'longint':
-					if( $db_type->db_type == 'tinyint' && $db_type->db_max_length ==  1)
-						$type = 'true_false';
-					else
-						$type = 'integer';
+					if( $db_type->db_type == 'tinyint' && $db_type->db_max_length ==  1) {
+											$type = 'true_false';
+					} else {
+											$type = 'integer';
+					}
 				break;
 				case '254':
 				case 'string':
 				case 'enum':
-					if($db_type->db_type != 'enum')
-						$type = 'string';
-					else
-						$type = 'enum';
+					if($db_type->db_type != 'enum') {
+											$type = 'string';
+					} else {
+											$type = 'enum';
+					}
 				break;
 				case 'set':
-					if($db_type->db_type != 'set')
-						$type = 'string';
-					else
-						$type = 'set';
+					if($db_type->db_type != 'set') {
+											$type = 'string';
+					} else {
+											$type = 'set';
+					}
 				break;
 				case '252':
 				case 'blob':
@@ -488,33 +490,40 @@ 
 
 	protected function get_total_results()
 	{
-		if(!empty($this->where))
-			foreach($this->where as $where)
+		if(!empty($this->where)) {
+					foreach($this->where as $where)
 				$this->basic_model->where($where[0],$where[1],$where[2]);
+		}
 
-		if(!empty($this->or_where))
-			foreach($this->or_where as $or_where)
+		if(!empty($this->or_where)) {
+					foreach($this->or_where as $or_where)
 				$this->basic_model->or_where($or_where[0],$or_where[1],$or_where[2]);
+		}
 
-		if(!empty($this->like))
-			foreach($this->like as $like)
+		if(!empty($this->like)) {
+					foreach($this->like as $like)
 				$this->basic_model->like($like[0],$like[1],$like[2]);
+		}
 
-		if(!empty($this->or_like))
-			foreach($this->or_like as $or_like)
+		if(!empty($this->or_like)) {
+					foreach($this->or_like as $or_like)
 				$this->basic_model->or_like($or_like[0],$or_like[1],$or_like[2]);
+		}
 
-		if(!empty($this->having))
-			foreach($this->having as $having)
+		if(!empty($this->having)) {
+					foreach($this->having as $having)
 				$this->basic_model->having($having[0],$having[1],$having[2]);
+		}
 
-		if(!empty($this->or_having))
-			foreach($this->or_having as $or_having)
+		if(!empty($this->or_having)) {
+					foreach($this->or_having as $or_having)
 				$this->basic_model->or_having($or_having[0],$or_having[1],$or_having[2]);
+		}
 
-		if(!empty($this->relation))
-			foreach($this->relation as $relation)
+		if(!empty($this->relation)) {
+					foreach($this->relation as $relation)
 				$this->basic_model->join_relation($relation[0],$relation[1],$relation[2]);
+		}
 
 		if(!empty($this->relation_n_n))
 		{
@@ -555,9 +564,9 @@ 
 	{
 		if(!empty($state_info->per_page))
 		{
-			if(empty($state_info->page) || !is_numeric($state_info->page) )
-				$this->limit($state_info->per_page);
-			else
+			if(empty($state_info->page) || !is_numeric($state_info->page) ) {
+							$this->limit($state_info->per_page);
+			} else
 			{
 				$limit_page = ( ($state_info->page-1) * $state_info->per_page );
 				$this->limit($state_info->per_page, $limit_page);
@@ -614,16 +623,16 @@ 
 				} else {
 					$this->like($state_info->search->field , $state_info->search->text);
 				}
-			}
-			else
+			} else
 			{
 				$columns = $this->get_columns();
 
 				$search_text = $state_info->search->text;
 
-				if(!empty($this->where))
-					foreach($this->where as $where)
+				if(!empty($this->where)) {
+									foreach($this->where as $where)
 						$this->basic_model->having($where[0],$where[1],$where[2]);
+				}
 
 				foreach($columns as $column)
 				{
@@ -635,17 +644,14 @@ 
 							{
 								$this->or_like($search_field, $search_text);
 							}
-						}
-						else
+						} else
 						{
 							$this->or_like($temp_relation[$column->field_name], $search_text);
 						}
-					}
-					elseif(isset($this->relation_n_n[$column->field_name]))
+					} elseif(isset($this->relation_n_n[$column->field_name]))
 					{
 						//@todo have a where for the relation_n_n statement
-					}
-					else
+					} else
 					{
 						$this->or_like($column->field_name, $search_text);
 					}
@@ -656,8 +662,9 @@ 
 
 	protected function table_exists($table_name = null)
 	{
-		if($this->basic_model->db_table_exists($table_name))
-			return true;
+		if($this->basic_model->db_table_exists($table_name)) {
+					return true;
+		}
 		return false;
 	}
 
@@ -753,14 +760,12 @@ 
 			if($form_validation->run())
 			{
 				$validation_result->success = true;
-			}
-			else
+			} else
 			{
 				$validation_result->error_message = $form_validation->error_string();
 				$validation_result->error_fields = $form_validation->_error_array;
 			}
-		}
-		else
+		} else
 		{
 			$validation_result->success = true;
 		}
@@ -868,14 +873,12 @@ 
 			if($form_validation->run())
 			{
 				$validation_result->success = true;
-			}
-			else
+			} else
 			{
 				$validation_result->error_message = $form_validation->error_string();
 				$validation_result->error_fields = $form_validation->_error_array;
 			}
-		}
-		else
+		} else
 		{
 			$validation_result->success = true;
 		}
@@ -899,10 +902,11 @@ 
 				{
 					$callback_return = call_user_func($this->callback_before_insert, $post_data);
 
-					if(!empty($callback_return) && is_array($callback_return))
-						$post_data = $callback_return;
-					elseif($callback_return === false)
-						return false;
+					if(!empty($callback_return) && is_array($callback_return)) {
+											$post_data = $callback_return;
+					} elseif($callback_return === false) {
+											return false;
+					}
 				}
 
 				$insert_data = array();
@@ -920,28 +924,22 @@ 
 						if(isset($types[$field->field_name]->db_null) && $types[$field->field_name]->db_null && is_array($post_data[$field->field_name]) && empty($post_data[$field->field_name]))
 						{
 							$insert_data[$field->field_name] = null;
-						}
-						elseif(isset($types[$field->field_name]->db_null) && $types[$field->field_name]->db_null && $post_data[$field->field_name] === '')
+						} elseif(isset($types[$field->field_name]->db_null) && $types[$field->field_name]->db_null && $post_data[$field->field_name] === '')
 						{
 							$insert_data[$field->field_name] = null;
-						}
-						elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'date')
+						} elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'date')
 						{
 							$insert_data[$field->field_name] = $this->_convert_date_to_sql_date($post_data[$field->field_name]);
-						}
-						elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'readonly')
+						} elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'readonly')
 						{
 							//This empty if statement is to make sure that a readonly field will never inserted/updated
-						}
-						elseif(isset($types[$field->field_name]->crud_type) && ($types[$field->field_name]->crud_type == 'set' || $types[$field->field_name]->crud_type == 'multiselect'))
+						} elseif(isset($types[$field->field_name]->crud_type) && ($types[$field->field_name]->crud_type == 'set' || $types[$field->field_name]->crud_type == 'multiselect'))
 						{
 							$insert_data[$field->field_name] = !empty($post_data[$field->field_name]) ? implode(',',$post_data[$field->field_name]) : '';
-						}
-						elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'datetime'){
+						} elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'datetime'){
 							$insert_data[$field->field_name] = $this->_convert_date_to_sql_date(substr($post_data[$field->field_name],0,10)).
 																		substr($post_data[$field->field_name],10);
-						}
-						else
+						} else
 						{
 							$insert_data[$field->field_name] = $post_data[$field->field_name];
 						}
@@ -953,8 +951,7 @@ 
 				if($insert_result !== false)
 				{
 					$insert_primary_key = $insert_result;
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -978,7 +975,7 @@ 
 					}
 
 				}
-			}else
+			} else
 			{
 					$callback_return = call_user_func($this->callback_insert, $post_data);
 
@@ -988,10 +985,11 @@ 
 					}
 			}
 
-			if(isset($insert_primary_key))
-				return $insert_primary_key;
-			else
-				return true;
+			if(isset($insert_primary_key)) {
+							return $insert_primary_key;
+			} else {
+							return true;
+			}
 		}
 
 		return false;
@@ -1018,8 +1016,7 @@ 
 					if(!empty($callback_return) && is_array($callback_return))
 					{
 						$post_data = $callback_return;
-					}
-					elseif($callback_return === false)
+					} elseif($callback_return === false)
 					{
 						return false;
 					}
@@ -1041,28 +1038,22 @@ 
 						if(isset($types[$field->field_name]->db_null) && $types[$field->field_name]->db_null && is_array($post_data[$field->field_name]) && empty($post_data[$field->field_name]))
 						{
 							$update_data[$field->field_name] = null;
-						}
-						elseif(isset($types[$field->field_name]->db_null) && $types[$field->field_name]->db_null && $post_data[$field->field_name] === '')
+						} elseif(isset($types[$field->field_name]->db_null) && $types[$field->field_name]->db_null && $post_data[$field->field_name] === '')
 						{
 							$update_data[$field->field_name] = null;
-						}
-						elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'date')
+						} elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'date')
 						{
 							$update_data[$field->field_name] = $this->_convert_date_to_sql_date($post_data[$field->field_name]);
-						}
-						elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'readonly')
+						} elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'readonly')
 						{
 							//This empty if statement is to make sure that a readonly field will never inserted/updated
-						}
-						elseif(isset($types[$field->field_name]->crud_type) && ($types[$field->field_name]->crud_type == 'set' || $types[$field->field_name]->crud_type == 'multiselect'))
+						} elseif(isset($types[$field->field_name]->crud_type) && ($types[$field->field_name]->crud_type == 'set' || $types[$field->field_name]->crud_type == 'multiselect'))
 						{
 							$update_data[$field->field_name] = !empty($post_data[$field->field_name]) ? implode(',',$post_data[$field->field_name]) : '';
-						}
-						elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'datetime'){
+						} elseif(isset($types[$field->field_name]->crud_type) && $types[$field->field_name]->crud_type == 'datetime'){
 							$update_data[$field->field_name] = $this->_convert_date_to_sql_date(substr($post_data[$field->field_name],0,10)).
 																		substr($post_data[$field->field_name],10);
-						}
-						else
+						} else
 						{
 							$update_data[$field->field_name] = $post_data[$field->field_name];
 						}
@@ -1100,8 +1091,7 @@ 
 					}
 
 				}
-			}
-			else
+			} else
 			{
 				$callback_return = call_user_func($this->callback_update, $post_data, $primary_key);
 
@@ -1112,8 +1102,7 @@ 
 			}
 
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -1126,7 +1115,7 @@ 
 		{
 			//If it's already a sql-date don't convert it!
 			return $date;
-		}elseif(empty($date))
+		} elseif(empty($date))
 		{
 			return '';
 		}
@@ -1135,12 +1124,10 @@ 
 		if($this->php_date_format == 'd/m/Y')
 		{
 			$sql_date = date('Y-m-d',mktime(0,0,0,$date_array[1],$date_array[0],$date_array[2]));
-		}
-		elseif($this->php_date_format == 'm/d/Y')
+		} elseif($this->php_date_format == 'm/d/Y')
 		{
 			$sql_date = date('Y-m-d',mktime(0,0,0,$date_array[0],$date_array[1],$date_array[2]));
-		}
-		else
+		} else
 		{
 			$sql_date = $date;
 		}
@@ -1150,17 +1137,18 @@ 
 
 	protected function _get_field_names_to_search(array $relation_values)
 	{
-		if(!strstr($relation_values[2],'{'))
-			return $this->_unique_join_name($relation_values[0]).'.'.$relation_values[2];
-		else
+		if(!strstr($relation_values[2],'{')) {
+					return $this->_unique_join_name($relation_values[0]).'.'.$relation_values[2];
+		} else
 		{
 			$relation_values[2] = ' '.$relation_values[2].' ';
 			$temp1 = explode('{',$relation_values[2]);
 			unset($temp1[0]);
 
 			$field_names_array = array();
-			foreach($temp1 as $field)
-				list($field_names_array[]) = explode('}',$field);
+			foreach($temp1 as $field) {
+							list($field_names_array[]) = explode('}',$field);
+			}
 
 			return $field_names_array;
 		}
@@ -1230,8 +1218,7 @@ 
 				}
 
 			}
-		}
-		else
+		} else
 		{
 			$callback_return = call_user_func($this->callback_delete, $primary_key_value);
 
@@ -1256,36 +1243,44 @@ 
 
 	protected function get_list()
 	{
-		if(!empty($this->order_by))
-			$this->basic_model->order_by($this->order_by[0],$this->order_by[1]);
+		if(!empty($this->order_by)) {
+					$this->basic_model->order_by($this->order_by[0],$this->order_by[1]);
+		}
 
-		if(!empty($this->where))
-			foreach($this->where as $where)
+		if(!empty($this->where)) {
+					foreach($this->where as $where)
 				$this->basic_model->where($where[0],$where[1],$where[2]);
+		}
 
-		if(!empty($this->or_where))
-			foreach($this->or_where as $or_where)
+		if(!empty($this->or_where)) {
+					foreach($this->or_where as $or_where)
 				$this->basic_model->or_where($or_where[0],$or_where[1],$or_where[2]);
+		}
 
-		if(!empty($this->like))
-			foreach($this->like as $like)
+		if(!empty($this->like)) {
+					foreach($this->like as $like)
 				$this->basic_model->like($like[0],$like[1],$like[2]);
+		}
 
-		if(!empty($this->or_like))
-			foreach($this->or_like as $or_like)
+		if(!empty($this->or_like)) {
+					foreach($this->or_like as $or_like)
 				$this->basic_model->or_like($or_like[0],$or_like[1],$or_like[2]);
+		}
 
-		if(!empty($this->having))
-			foreach($this->having as $having)
+		if(!empty($this->having)) {
+					foreach($this->having as $having)
 				$this->basic_model->having($having[0],$having[1],$having[2]);
+		}
 
-		if(!empty($this->or_having))
-			foreach($this->or_having as $or_having)
+		if(!empty($this->or_having)) {
+					foreach($this->or_having as $or_having)
 				$this->basic_model->or_having($or_having[0],$or_having[1],$or_having[2]);
+		}
 
-		if(!empty($this->relation))
-			foreach($this->relation as $relation)
+		if(!empty($this->relation)) {
+					foreach($this->relation as $relation)
 				$this->basic_model->join_relation($relation[0],$relation[1],$relation[2]);
+		}
 
 		if(!empty($this->relation_n_n))
 		{
@@ -1309,13 +1304,11 @@ 
 				if(is_numeric($default_per_page) && $default_per_page >1)
 				{
 					$this->basic_model->limit($default_per_page);
-				}
-				else
+				} else
 				{
 					$this->basic_model->limit(10);
 				}
-			}
-			else
+			} else
 			{
 				$this->basic_model->limit($this->limit[0],$this->limit[1]);
 			}
@@ -1366,10 +1359,11 @@ 
 				{
 					$callback_before_upload_response = call_user_func($this->callback_before_upload, $_FILES,  $this->upload_fields[$state_info->field_name]);
 
-					if($callback_before_upload_response === false)
-						return false;
-					elseif(is_string($callback_before_upload_response))
-						return $callback_before_upload_response;
+					if($callback_before_upload_response === false) {
+											return false;
+					} elseif(is_string($callback_before_upload_response)) {
+											return $callback_before_upload_response;
+					}
 				}
 
 				$upload_info = $this->upload_fields[$state_info->field_name];
@@ -1387,7 +1381,7 @@ 
 		                $reg_exp = '';
 		                if(!empty($upload_info->allowed_file_types)){
 		                    $reg_exp = '/(\\.|\\/)('.$upload_info->allowed_file_types.')$/i';
-		                }else{
+		                } else{
 		                    $reg_exp = '/(\\.|\\/)('.$allowed_files.')$/i';
 		                }
 
@@ -1418,31 +1412,29 @@ 
 				{
 					$callback_after_upload_response = call_user_func($this->callback_after_upload, $uploader_response ,  $this->upload_fields[$state_info->field_name] , $_FILES );
 
-					if($callback_after_upload_response === false)
-						return false;
-					elseif(is_string($callback_after_upload_response))
-						return $callback_after_upload_response;
-					elseif(is_array($callback_after_upload_response))
-						$uploader_response = $callback_after_upload_response;
+					if($callback_after_upload_response === false) {
+											return false;
+					} elseif(is_string($callback_after_upload_response)) {
+											return $callback_after_upload_response;
+					} elseif(is_array($callback_after_upload_response)) {
+											$uploader_response = $callback_after_upload_response;
+					}
 				}
 
 				return $uploader_response;
-			}
-			else
+			} else
 			{
 				$upload_response = call_user_func($this->callback_upload, $_FILES, $this->upload_fields[$state_info->field_name] );
 
 				if($upload_response === false)
 				{
 					return false;
-				}
-				else
+				} else
 				{
 					return $upload_response;
 				}
 			}
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -1462,19 +1454,16 @@ 
 					$this->basic_model->db_file_delete($state_info->field_name, $state_info->file_name);
 
 					return true;
-				}
-				else
+				} else
 				{
 					return false;
 				}
-			}
-			else
+			} else
 			{
 				$this->basic_model->db_file_delete($state_info->field_name, $state_info->file_name);
 				return true;
 			}
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -1482,8 +1471,9 @@ 
 
 	protected function ajax_relation($state_info)
 	{
-		if(!isset($this->relation[$state_info->field_name]))
-			return false;
+		if(!isset($this->relation[$state_info->field_name])) {
+					return false;
+		}
 
 		list($field_name, $related_table, $related_field_title, $where_clause, $order_by)  = $this->relation[$state_info->field_name];
 
@@ -1604,8 +1594,7 @@ 
 
 			$data->list_view = $this->_theme_view('list.php',$data,true);
 			$this->_theme_view('list_template.php',$data);
-		}
-		else
+		} else
 		{
 			$this->set_echo_and_die();
 			$this->_theme_view('list.php',$data);
@@ -1726,8 +1715,9 @@ 
 		$value = str_replace(array("&nbsp;","&amp;","&gt;","&lt;"),array(" ","&",">","<"),$value);
 
 		//If the value has only spaces and nothing more then add the whitespace html character
-		if(str_replace(" ","",$value) == "")
-			$value = "&nbsp;";
+		if(str_replace(" ","",$value) == "") {
+					$value = "&nbsp;";
+		}
 
 		return strip_tags($value);
 	}
@@ -1754,8 +1744,9 @@ 
 
 	protected function change_list_add_actions($list)
 	{
-		if(empty($this->actions))
-			return $list;
+		if(empty($this->actions)) {
+					return $list;
+		}
 
 		$primary_key = $this->get_primary_key();
 
@@ -1767,8 +1758,7 @@ 
 				if(!empty($action->url_callback))
 				{
 					$actions_urls[$unique_id] = call_user_func($action->url_callback, $row->$primary_key, $row);
-				}
-				else
+				} else
 				{
 					$actions_urls[$unique_id] =
 						$action->url_has_http ?
@@ -1793,12 +1783,13 @@ 
 			{
 				$field_name 	= $column->field_name;
 				$field_value 	= isset( $row->{$column->field_name} ) ? $row->{$column->field_name} : null;
-				if( $has_callbacks && isset($this->callback_column[$field_name]) )
-					$list[$num_row]->$field_name = call_user_func($this->callback_column[$field_name], $field_value, $row);
-				elseif(isset($types[$field_name]))
-					$list[$num_row]->$field_name = $this->change_list_value($types[$field_name] , $field_value);
-				else
-					$list[$num_row]->$field_name = $field_value;
+				if( $has_callbacks && isset($this->callback_column[$field_name]) ) {
+									$list[$num_row]->$field_name = call_user_func($this->callback_column[$field_name], $field_value, $row);
+				} elseif(isset($types[$field_name])) {
+									$list[$num_row]->$field_name = $this->change_list_value($types[$field_name] , $field_value);
+				} else {
+									$list[$num_row]->$field_name = $field_value;
+				}
 			}
 		}
 
@@ -1899,8 +1890,7 @@ 
 			$error_message = '<p>'.$this->l('delete_error_message').'</p>';
 
 			echo json_encode(array('success' => $delete_result ,'error_message' => $error_message));
-		}
-		else
+		} else
 		{
 			$success_message = '<p>'.$this->l('delete_success_message').'</p>';
 
@@ -1916,13 +1906,11 @@ 
 			if(!empty($field_info->primary_key) && !$this->unset_edit)
 			{
 				return $this->l('insert_success_message')." <a class='go-to-edit-form' href='".$this->getEditUrl($field_info->primary_key)."'>".$this->l('form_edit')." {$this->subject}</a> ";
-			}
-			else
+			} else
 			{
 				return $this->l('insert_success_message');
 			}
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -1934,8 +1922,7 @@ 
 		if($insert_result === false)
 		{
 			echo json_encode(array('success' => false));
-		}
-		else
+		} else
 		{
 			$success_message = '<p>'.$this->l('insert_success_message');
 
@@ -1982,14 +1969,15 @@ 
 							'success' => true,
 							'files'	=> $upload_result
 					));
-		}
-		else
+		} else
 		{
 			$result = (object)array('success' => false);
-			if(is_string($upload_result))
-				$result->message = $upload_result;
-			if(!empty($upload_result[0]->error))
-				$result->message = $upload_result[0]->error;
+			if(is_string($upload_result)) {
+							$result->message = $upload_result;
+			}
+			if(!empty($upload_result[0]->error)) {
+							$result->message = $upload_result[0]->error;
+			}
 
 			echo json_encode($result);
 		}
@@ -2003,8 +1991,7 @@ 
 		if($upload_result !== false)
 		{
 			echo json_encode( (object)array( 'success' => true ) );
-		}
-		else
+		} else
 		{
 			echo json_encode((object)array('success' => false));
 		}
@@ -2146,8 +2133,7 @@ 
 					'css_files' => $css_files,
 					'output' => $this->views_as_string,
 			);
-		}
-		elseif($this->echo_and_die === true)
+		} elseif($this->echo_and_die === true)
 		{
 			echo $this->views_as_string;
 			die();
@@ -2160,8 +2146,7 @@ 
 		if($update_result === false)
 		{
 			echo json_encode(array('success' => $update_result));
-		}
-		else
+		} else
 		{
 			$success_message = '<p>'.$this->l('update_success_message');
 			if(!$this->unset_back_to_list && !$this->_is_ajax())
@@ -2185,8 +2170,9 @@ 
 		$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.numeric.min.js');
 		$this->set_js_config($this->default_javascript_path.'/jquery_plugins/config/jquery.numeric.config.js');
 		$extra_attributes = '';
-		if(!empty($field_info->db_max_length))
-			$extra_attributes .= "maxlength='{$field_info->db_max_length}'";
+		if(!empty($field_info->db_max_length)) {
+					$extra_attributes .= "maxlength='{$field_info->db_max_length}'";
+		}
 		$input = "<input id='field-{$field_info->name}' name='{$field_info->name}' type='text' value='$value' class='numeric form-control' $extra_attributes />";
 		return $input;
 	}
@@ -2268,8 +2254,7 @@ 
 			$class_name = $this->config->text_editor_type == 'minimal' ? 'mini-texteditor' : 'texteditor';
 
 			$input = "<textarea id='field-{$field_info->name}' name='{$field_info->name}' class='$class_name' >$value</textarea>";
-		}
-		else
+		} else
 		{
 			$input = "<textarea id='field-{$field_info->name}' name='{$field_info->name}'>$value</textarea>";
 		}
@@ -2309,8 +2294,7 @@ 
 			list($year,$month,$day) = explode('-',substr($value,0,10));
 			$date = date($this->php_date_format, mktime(0,0,0,$month,$day,$year));
 			$datetime = $date.substr($value,10);
-		}
-		else
+		} else
 		{
 			$datetime = '';
 		}
@@ -2322,8 +2306,9 @@ 
 
 	protected function get_hidden_input($field_info,$value)
 	{
-		if($field_info->extras !== null && $field_info->extras != false)
-			$value = $field_info->extras;
+		if($field_info->extras !== null && $field_info->extras != false) {
+					$value = $field_info->extras;
+		}
 		$input = "<input id='field-{$field_info->name}' type='hidden' name='{$field_info->name}' value='$value' />";
 		return $input;
 	}
@@ -2333,8 +2318,9 @@ 
 		$value = !is_string($value) ? '' : $value;
 
 		$extra_attributes = '';
-		if(!empty($field_info->db_max_length))
-			$extra_attributes .= "maxlength='{$field_info->db_max_length}'";
+		if(!empty($field_info->db_max_length)) {
+					$extra_attributes .= "maxlength='{$field_info->db_max_length}'";
+		}
 		$input = "<input id='field-{$field_info->name}' class='form-control' name='{$field_info->name}' type='password' value='$value' $extra_attributes />";
 		return $input;
 	}
@@ -2363,8 +2349,7 @@ 
 		{
 			list($year,$month,$day) = explode('-',substr($value,0,10));
 			$date = date($this->php_date_format, mktime(0,0,0,$month,$day,$year));
-		}
-		else
+		} else
 		{
 			$date = '';
 		}
@@ -2504,10 +2489,11 @@ 
 				$selected = !empty($value) && $value == $option_value ? "selected='selected'" : '';
 				$input .= "<option value='$option_value' $selected >$option</option>";
 			}
-		}
-		elseif(!empty($value) || (is_numeric($value) && $value == '0') ) //If it's ajax then we only need the selected items and not all the items
+		} elseif(!empty($value) || (is_numeric($value) && $value == '0') ) {
+		    //If it's ajax then we only need the selected items and not all the items
 		{
 			$selected_options_array = $this->get_relation_array($field_info->extras, $value);
+		}
 			foreach($selected_options_array as $option_value => $option)
 			{
 				$input .= "<option value='$option_value'selected='selected' >$option</option>";
@@ -2561,8 +2547,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			$this->set_css($this->default_css_path.'/jquery_plugins/chosen/chosen.css');
 			$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.chosen.min.js');
@@ -2577,8 +2562,7 @@ 
 		if(empty($unselected_values) && empty($selected_values))
 		{
 			$input = "Please add {$field_info_type->display_as} first";
-		}
-		else
+		} else
 		{
 			$css_class = $has_priority_field || $is_ie_7 ? 'multiselect': 'chosen-multiple-select';
 			$width_style = $has_priority_field || $is_ie_7 ? '' : 'width:510px;';
@@ -2586,16 +2570,18 @@ 
 			$select_title = str_replace('{field_display_as}',$field_info_type->display_as,$this->l('set_relation_title'));
 			$input = "<select id='field-{$field_info_type->name}' name='{$field_info_type->name}[]' multiple='multiple' size='8' class='$css_class' data-placeholder='$select_title' style='$width_style' >";
 
-			if(!empty($unselected_values))
-				foreach($unselected_values as $id => $name)
+			if(!empty($unselected_values)) {
+							foreach($unselected_values as $id => $name)
 				{
 					$input .= "<option value='$id'>$name</option>";
+			}
 				}
 
-			if(!empty($selected_values))
-				foreach($selected_values as $id => $name)
+			if(!empty($selected_values)) {
+							foreach($selected_values as $id => $name)
 				{
 					$input .= "<option value='$id' selected='selected'>$name</option>";
+			}
 				}
 
 			$input .= "</select>";
@@ -2607,14 +2593,15 @@ 
 	protected function _convert_bytes_ui_to_bytes($bytes_ui)
 	{
 		$bytes_ui = str_replace(' ','',$bytes_ui);
-		if(strstr($bytes_ui,'MB'))
-			$bytes = (int)(str_replace('MB','',$bytes_ui))*1024*1024;
-		elseif(strstr($bytes_ui,'KB'))
-			$bytes = (int)(str_replace('KB','',$bytes_ui))*1024;
-		elseif(strstr($bytes_ui,'B'))
-			$bytes = (int)(str_replace('B','',$bytes_ui));
-		else
-			$bytes = (int)($bytes_ui);
+		if(strstr($bytes_ui,'MB')) {
+					$bytes = (int)(str_replace('MB','',$bytes_ui))*1024*1024;
+		} elseif(strstr($bytes_ui,'KB')) {
+					$bytes = (int)(str_replace('KB','',$bytes_ui))*1024;
+		} elseif(strstr($bytes_ui,'B')) {
+					$bytes = (int)(str_replace('B','',$bytes_ui));
+		} else {
+					$bytes = (int)($bytes_ui);
+		}
 
 		return $bytes;
 	}
@@ -2721,8 +2708,7 @@ 
 			if(!isset($this->callback_add_field[$field->field_name]))
 			{
 				$field_input = $this->get_field_input($field_info, $field_value);
-			}
-			else
+			} else
 			{
 				$field_input = $field_info;
 				$field_input->input = call_user_func($this->callback_add_field[$field->field_name], $field_value, null, $field_info);
@@ -2763,8 +2749,7 @@ 
 			if(!isset($this->callback_edit_field[$field->field_name]))
 			{
 				$field_input = $this->get_field_input($field_info, $field_value);
-			}
-			else
+			} else
 			{
 				$primary_key = $this->getStateInfo()->primary_key;
 				$field_input = $field_info;
@@ -2821,8 +2806,7 @@ 
 			if(!isset($this->callback_read_field[$field->field_name]))
 			{
 				$field_input = $this->get_field_input($field_info, $field_value);
-			}
-			else
+			} else
 			{
 				$primary_key = $this->getStateInfo()->primary_key;
 				$field_input = $field_info;
@@ -2852,8 +2836,9 @@ 
 	protected function setThemeBasics()
 	{
 		$this->theme_path = $this->default_theme_path;
-		if(substr($this->theme_path,-1) != '/')
-			$this->theme_path = $this->theme_path.'/';
+		if(substr($this->theme_path,-1) != '/') {
+					$this->theme_path = $this->theme_path.'/';
+		}
 
 		include($this->theme_path.$this->theme.'/config.php');
 
@@ -2950,10 +2935,11 @@ 
 
 	protected function get_views_as_string()
 	{
-		if(!empty($this->views_as_string))
-			return $this->views_as_string;
-		else
-			return null;
+		if(!empty($this->views_as_string)) {
+					return $this->views_as_string;
+		} else {
+					return null;
+		}
 	}
 }
 
@@ -3068,8 +3054,7 @@ 
                 if(!empty($_POST))
                 {
                     $state_info = (object)array('unwrapped_data' => $_POST);
-                }
-                else
+                } else
                 {
                     throw new Exception('On the state "insert" you must have post data',8);
                     die();
@@ -3080,13 +3065,11 @@ 
                 if(!empty($_POST) && $first_parameter !== null)
                 {
                     $state_info = (object)array('primary_key' => $first_parameter,'unwrapped_data' => $_POST);
-                }
-                elseif(empty($_POST))
+                } elseif(empty($_POST))
                 {
                     throw new Exception('On the state "update" you must have post data',9);
                     die();
-                }
-                else
+                } else
                 {
                     throw new Exception('On the state "update" the Primary key cannot be null',10);
                     die();
@@ -3122,8 +3105,7 @@ 
                     {
                         $search_text = strip_tags($_POST['search_field']);
                         $state_info->search = (object)array('field' => null , 'text' => $_POST['search_text']);
-                    }
-                    else
+                    } else
                     {
                         if (is_array($_POST['search_field'])) {
                             $search_array = array();
@@ -3185,10 +3167,11 @@ 
 	{
 		$state_string = $this->get_state_info_from_url()->operation;
 
-		if( $state_string != 'unknown' && in_array( $state_string, $this->states ) )
-			$state_code =  array_search($state_string, $this->states);
-		else
-			$state_code = 0;
+		if( $state_string != 'unknown' && in_array( $state_string, $this->states ) ) {
+					$state_code =  array_search($state_string, $this->states);
+		} else {
+					$state_code = 0;
+		}
 
 		return $state_code;
 	}
@@ -3215,12 +3198,15 @@ 
 		      foreach($ci->uri->segments as $num => $value)
 		      {
 		        $state_url_array[$num] = $value;
-		        if($num == ($segment_position - 1))
-		          break;
+		        if($num == ($segment_position - 1)) {
+		        		          break;
+		        }
 		      }
 
-		      if( $method_name == 'index' && !in_array( 'index', $state_url_array ) ) //there is a scenario that you don't have the index to your url
+		      if( $method_name == 'index' && !in_array( 'index', $state_url_array ) ) {
+		          //there is a scenario that you don't have the index to your url
 		        $state_url_array[$num+1] = 'index';
+		      }
 		    }
 
 			$state_url =  site_url(implode('/',$state_url_array).'/'.$url);
@@ -3248,8 +3234,9 @@ 
 
 		$function_name = $this->get_method_name();
 
-		if($function_name == 'index' && !in_array('index',$ci->uri->segments))
-			$segment_position++;
+		if($function_name == 'index' && !in_array('index',$ci->uri->segments)) {
+					$segment_position++;
+		}
 
 		$first_parameter = isset($segements[$segment_position+1]) ? $segements[$segment_position+1] : null;
 		$second_parameter = isset($segements[$segment_position+2]) ? $segements[$segment_position+2] : null;
@@ -3328,26 +3315,29 @@ 
 
 	protected function getValidationUpdateUrl($primary_key = null)
 	{
-		if($primary_key === null)
-			return $this->state_url('update_validation');
-		else
-			return $this->state_url('update_validation/'.$primary_key);
+		if($primary_key === null) {
+					return $this->state_url('update_validation');
+		} else {
+					return $this->state_url('update_validation/'.$primary_key);
+		}
 	}
 
 	protected function getEditUrl($primary_key = null)
 	{
-		if($primary_key === null)
-			return $this->state_url('edit');
-		else
-			return $this->state_url('edit/'.$primary_key);
+		if($primary_key === null) {
+					return $this->state_url('edit');
+		} else {
+					return $this->state_url('edit/'.$primary_key);
+		}
 	}
 
 	protected function getReadUrl($primary_key = null)
 	{
-		if($primary_key === null)
-			return $this->state_url('read');
-		else
-			return $this->state_url('read/'.$primary_key);
+		if($primary_key === null) {
+					return $this->state_url('read');
+		} else {
+					return $this->state_url('read/'.$primary_key);
+		}
 	}
 
 	protected function getUpdateUrl($state_info)
@@ -3371,10 +3361,11 @@ 
 
 	protected function getListSuccessUrl($primary_key = null)
 	{
-		if(empty($primary_key))
-			return $this->state_url('success',true);
-		else
-			return $this->state_url('success/'.$primary_key,true);
+		if(empty($primary_key)) {
+					return $this->state_url('success',true);
+		} else {
+					return $this->state_url('success/'.$primary_key,true);
+		}
 	}
 
 	protected function getUploadUrl($field_name)
@@ -3583,7 +3574,7 @@ 
 		if(is_string($field))
 		{
 			$this->validation_rules[$field] = array('field' => $field, 'label' => $label, 'rules' => $rules);
-		}elseif(is_array($field))
+		} elseif(is_array($field))
 		{
 			foreach($field as $num_field => $field_array)
 			{
@@ -3986,8 +3977,7 @@ 
 			{
 				$this->display_as[$field] = $display_as;
 			}
-		}
-		elseif($display_as !== null)
+		} elseif($display_as !== null)
 		{
 			$this->display_as[$field_name] = $display_as;
 		}
@@ -4006,9 +3996,10 @@ 
 		}
 		include($this->default_language_path.'/'.$this->language.'.php');
 
-		foreach($lang as $handle => $lang_string)
-			if(!isset($this->lang_strings[$handle]))
+		foreach($lang as $handle => $lang_string) {
+					if(!isset($this->lang_strings[$handle]))
 				$this->lang_strings[$handle] = $lang_string;
+		}
 
 		$this->default_true_false_text = array( $this->l('form_inactive') , $this->l('form_active'));
 		$this->subject = $this->subject === null ? $this->l('list_record') : $this->subject;
@@ -4103,8 +4094,9 @@ 
 				$this->columns = array();
 				foreach($field_types as $field)
 				{
-					if( !isset($field->db_extra) || $field->db_extra != 'auto_increment' )
-						$this->columns[] = $field->name;
+					if( !isset($field->db_extra) || $field->db_extra != 'auto_increment' ) {
+											$this->columns[] = $field->name;
+					}
 				}
 			}
 
@@ -4122,16 +4114,14 @@ 
 						$display_as = $this->display_as[$column];
 						unset($this->display_as[$column]);
 						$this->display_as[$new_column] = $display_as;
-					}
-					else
+					} else
 					{
 						$this->display_as[$new_column] = ucfirst(str_replace('_',' ',$column));
 					}
 
 					$column = $new_column;
 					$this->columns[$col_num] = $new_column;
-				}
-				else
+				} else
 				{
 					if(!empty($this->relation))
 					{
@@ -4146,8 +4136,7 @@ 
 									$display_as = $this->display_as[$column];
 									unset($this->display_as[$column]);
 									$this->display_as[$new_column] = $display_as;
-								}
-								else
+								} else
 								{
 									$this->display_as[$new_column] = ucfirst(str_replace('_',' ',$column));
 								}
@@ -4160,13 +4149,14 @@ 
 
 				}
 
-				if(isset($this->display_as[$column]))
-					$this->columns[$col_num] = (object)array('field_name' => $column, 'display_as' => $this->display_as[$column]);
-				elseif(isset($field_types[$column]))
-					$this->columns[$col_num] = (object)array('field_name' => $column, 'display_as' => $field_types[$column]->display_as);
-				else
-					$this->columns[$col_num] = (object)array('field_name' => $column, 'display_as' =>
+				if(isset($this->display_as[$column])) {
+									$this->columns[$col_num] = (object)array('field_name' => $column, 'display_as' => $this->display_as[$column]);
+				} elseif(isset($field_types[$column])) {
+									$this->columns[$col_num] = (object)array('field_name' => $column, 'display_as' => $field_types[$column]->display_as);
+				} else {
+									$this->columns[$col_num] = (object)array('field_name' => $column, 'display_as' =>
 						ucfirst(str_replace('_',' ',$column)));
+				}
 
 				if(!empty($this->unset_columns) && in_array($column,$this->unset_columns))
 				{
@@ -4194,29 +4184,31 @@ 
 			{
 				foreach($this->add_fields as $field_num => $field)
 				{
-					if(isset($this->display_as[$field]))
-						$this->add_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $this->display_as[$field]);
-					elseif(isset($field_types[$field]->display_as))
-						$this->add_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $field_types[$field]->display_as);
-					else
-						$this->add_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => ucfirst(str_replace('_',' ',$field)));
+					if(isset($this->display_as[$field])) {
+											$this->add_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $this->display_as[$field]);
+					} elseif(isset($field_types[$field]->display_as)) {
+											$this->add_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $field_types[$field]->display_as);
+					} else {
+											$this->add_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => ucfirst(str_replace('_',' ',$field)));
+					}
 				}
-			}
-			else
+			} else
 			{
 				$this->add_fields = array();
 				foreach($field_types as $field)
 				{
 					//Check if an unset_add_field is initialize for this field name
-					if($this->unset_add_fields !== null && is_array($this->unset_add_fields) && in_array($field->name,$this->unset_add_fields))
-						continue;
+					if($this->unset_add_fields !== null && is_array($this->unset_add_fields) && in_array($field->name,$this->unset_add_fields)) {
+											continue;
+					}
 
 					if( (!isset($field->db_extra) || $field->db_extra != 'auto_increment') )
 					{
-						if(isset($this->display_as[$field->name]))
-							$this->add_fields[] = (object)array('field_name' => $field->name, 'display_as' => $this->display_as[$field->name]);
-						else
-							$this->add_fields[] = (object)array('field_name' => $field->name, 'display_as' => $field->display_as);
+						if(isset($this->display_as[$field->name])) {
+													$this->add_fields[] = (object)array('field_name' => $field->name, 'display_as' => $this->display_as[$field->name]);
+						} else {
+													$this->add_fields[] = (object)array('field_name' => $field->name, 'display_as' => $field->display_as);
+						}
 					}
 				}
 			}
@@ -4239,27 +4231,29 @@ 
 			{
 				foreach($this->edit_fields as $field_num => $field)
 				{
-					if(isset($this->display_as[$field]))
-						$this->edit_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $this->display_as[$field]);
-					else
-						$this->edit_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $field_types[$field]->display_as);
+					if(isset($this->display_as[$field])) {
+											$this->edit_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $this->display_as[$field]);
+					} else {
+											$this->edit_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $field_types[$field]->display_as);
+					}
 				}
-			}
-			else
+			} else
 			{
 				$this->edit_fields = array();
 				foreach($field_types as $field)
 				{
 					//Check if an unset_edit_field is initialize for this field name
-					if($this->unset_edit_fields !== null && is_array($this->unset_edit_fields) && in_array($field->name,$this->unset_edit_fields))
-						continue;
+					if($this->unset_edit_fields !== null && is_array($this->unset_edit_fields) && in_array($field->name,$this->unset_edit_fields)) {
+											continue;
+					}
 
 					if(!isset($field->db_extra) || $field->db_extra != 'auto_increment')
 					{
-						if(isset($this->display_as[$field->name]))
-							$this->edit_fields[] = (object)array('field_name' => $field->name, 'display_as' => $this->display_as[$field->name]);
-						else
-							$this->edit_fields[] = (object)array('field_name' => $field->name, 'display_as' => $field->display_as);
+						if(isset($this->display_as[$field->name])) {
+													$this->edit_fields[] = (object)array('field_name' => $field->name, 'display_as' => $this->display_as[$field->name]);
+						} else {
+													$this->edit_fields[] = (object)array('field_name' => $field->name, 'display_as' => $field->display_as);
+						}
 					}
 				}
 			}
@@ -4282,27 +4276,29 @@ 
 			{
 				foreach($this->read_fields as $field_num => $field)
 				{
-					if(isset($this->display_as[$field]))
-						$this->read_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $this->display_as[$field]);
-					else
-						$this->read_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $field_types[$field]->display_as);
+					if(isset($this->display_as[$field])) {
+											$this->read_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $this->display_as[$field]);
+					} else {
+											$this->read_fields[$field_num] = (object)array('field_name' => $field, 'display_as' => $field_types[$field]->display_as);
+					}
 				}
-			}
-			else
+			} else
 			{
 				$this->read_fields = array();
 				foreach($field_types as $field)
 				{
 					//Check if an unset_read_field is initialize for this field name
-					if($this->unset_read_fields !== null && is_array($this->unset_read_fields) && in_array($field->name,$this->unset_read_fields))
-						continue;
+					if($this->unset_read_fields !== null && is_array($this->unset_read_fields) && in_array($field->name,$this->unset_read_fields)) {
+											continue;
+					}
 
 					if(!isset($field->db_extra) || $field->db_extra != 'auto_increment')
 					{
-						if(isset($this->display_as[$field->name]))
-							$this->read_fields[] = (object)array('field_name' => $field->name, 'display_as' => $this->display_as[$field->name]);
-						else
-							$this->read_fields[] = (object)array('field_name' => $field->name, 'display_as' => $field->display_as);
+						if(isset($this->display_as[$field->name])) {
+													$this->read_fields[] = (object)array('field_name' => $field->name, 'display_as' => $this->display_as[$field->name]);
+						} else {
+													$this->read_fields[] = (object)array('field_name' => $field->name, 'display_as' => $field->display_as);
+						}
 					}
 				}
 			}
@@ -4437,8 +4433,9 @@ 
 		$this->_load_language();
 		$this->state_code = $this->getStateCode();
 
-		if($this->basic_model === null)
-			$this->set_default_Model();
+		if($this->basic_model === null) {
+					$this->set_default_Model();
+		}
 
 		$this->set_basic_db_table($this->get_table());
 
@@ -4461,8 +4458,7 @@ 
 		if( $this->state_code != 0 )
 		{
 			$this->state_info = $this->getStateInfo();
-		}
-		else
+		} else
 		{
 			throw new Exception('The state is unknown , I don\'t know what I will do with your data!', 4);
 			die();
@@ -4477,8 +4473,9 @@ 
 					die();
 				}
 
-				if($this->theme === null)
-					$this->set_theme($this->default_theme);
+				if($this->theme === null) {
+									$this->set_theme($this->default_theme);
+				}
 				$this->setThemeBasics();
 
 				$this->set_basic_Layout();
@@ -4496,8 +4493,9 @@ 
 					die();
 				}
 
-				if($this->theme === null)
-					$this->set_theme($this->default_theme);
+				if($this->theme === null) {
+									$this->set_theme($this->default_theme);
+				}
 				$this->setThemeBasics();
 
 				$this->set_basic_Layout();
@@ -4513,8 +4511,9 @@ 
 					die();
 				}
 
-				if($this->theme === null)
-					$this->set_theme($this->default_theme);
+				if($this->theme === null) {
+									$this->set_theme($this->default_theme);
+				}
 				$this->setThemeBasics();
 
 				$this->set_basic_Layout();
@@ -4572,8 +4571,9 @@ 
 					die();
 				}
 
-				if($this->theme === null)
-					$this->set_theme($this->default_theme);
+				if($this->theme === null) {
+									$this->set_theme($this->default_theme);
+				}
 				$this->setThemeBasics();
 
 				$this->set_basic_Layout();
@@ -4587,8 +4587,9 @@ 
 
 			case 8://ajax_list_info
 
-				if($this->theme === null)
-					$this->set_theme($this->default_theme);
+				if($this->theme === null) {
+									$this->set_theme($this->default_theme);
+				}
 				$this->setThemeBasics();
 
 				$this->set_basic_Layout();
@@ -4656,8 +4657,9 @@ 
 					die();
 				}
 
-				if($this->theme === null)
-					$this->set_theme($this->default_theme);
+				if($this->theme === null) {
+									$this->set_theme($this->default_theme);
+				}
 				$this->setThemeBasics();
 
 				$this->set_basic_Layout();
@@ -4677,8 +4679,9 @@ 
 					die();
 				}
 
-				if($this->theme === null)
-					$this->set_theme($this->default_theme);
+				if($this->theme === null) {
+									$this->set_theme($this->default_theme);
+				}
 				$this->setThemeBasics();
 
 				$this->set_basic_Layout();
@@ -4695,8 +4698,9 @@ 
 					die();
 				}
 
-				if($this->theme === null)
-					$this->set_theme($this->default_theme);
+				if($this->theme === null) {
+									$this->set_theme($this->default_theme);
+				}
 				$this->setThemeBasics();
 
 				$this->set_basic_Layout();
@@ -4943,8 +4947,7 @@ 
 		if($this->basic_db_table_checked)
 		{
 			return $this->basic_db_table;
-		}
-		elseif( $this->basic_db_table !== null )
+		} elseif( $this->basic_db_table !== null )
 		{
 			if(!$this->table_exists($this->basic_db_table))
 			{
@@ -4953,8 +4956,7 @@ 
 			}
 			$this->basic_db_table_checked = true;
 			return $this->basic_db_table;
-		}
-		else
+		} else
 		{
 			//Last try , try to find the table from your view / function name!!! Not suggested but it works .
 			$last_chance_table_name = $this->get_method_name();
@@ -5018,12 +5020,10 @@ 
 		if(!empty($table_name) && $this->basic_db_table === null)
 		{
 			$this->basic_db_table = $table_name;
-		}
-		elseif(!empty($table_name))
+		} elseif(!empty($table_name))
 		{
 			throw new Exception('You have already insert a table name once...', 1);
-		}
-		else
+		} else
 		{
 			throw new Exception('The table name cannot be empty.', 2);
 			die();

dashboard/assets/grocery_crud/texteditor/ckeditor/ckeditor_php4.php

Doc Comments +1 added lines

@@ -483,6 +483,7 @@
 	/**

 	 * Return path to ckeditor.js.

 	 * \private

+	 * @return string
 	 */

 	function ckeditorPath()

 	{

Braces +19 added lines, -24 removed lines

@@ -146,10 +146,11 @@ 
 		$_config = $this->configSettings($config, $events);

 

 		$js = $this->returnGlobalEvents();

-		if (!empty($_config))

-			$js .= "CKEDITOR.replace('".$name."', ".$this->jsEncode($_config).");";

-		else

-			$js .= "CKEDITOR.replace('".$name."');";

+		if (!empty($_config)) {
+					$js .= "CKEDITOR.replace('".$name."', ".$this->jsEncode($_config).");";
+		} else {
+					$js .= "CKEDITOR.replace('".$name."');";
+		}
 

 		$out .= $this->script($js);

 

@@ -186,8 +187,7 @@ 
 		$js = $this->returnGlobalEvents();

 		if (!empty($_config)) {

 			$js .= "CKEDITOR.replace('".$id."', ".$this->jsEncode($_config).");";

-		}

-		else {

+		} else {

 			$js .= "CKEDITOR.replace('".$id."');";

 		}

 		$out .= $this->script($js);

@@ -230,12 +230,10 @@ 
 		if (empty($_config)) {

 			if (empty($className)) {

 				$js .= "CKEDITOR.replaceAll();";

-			}

-			else {

+			} else {

 				$js .= "CKEDITOR.replaceAll('".$className."');";

 			}

-		}

-		else {

+		} else {

 			$classDetection = "";

 			$js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";

 			if (!empty($className)) {

@@ -293,8 +291,7 @@ 
 	{

 		if (!empty($event)) {

 			$this->_events[$event] = array();

-		}

-		else {

+		} else {

 			$this->_events = array();

 		}

 	}

@@ -333,8 +330,7 @@ 
 	{

 		if (!empty($event)) {

 			$this->_globalEvents[$event] = array();

-		}

-		else {

+		} else {

 			$this->_globalEvents = array();

 		}

 	}

@@ -387,11 +383,9 @@ 
 			foreach($_events as $eventName => $handlers) {

 				if (empty($handlers)) {

 					continue;

-				}

-				else if (count($handlers) == 1) {

+				} else if (count($handlers) == 1) {

 					$_config['on'][$eventName] = '@@'.$handlers[0];

-				}

-				else {

+				} else {

 					$_config['on'][$eventName] = '@@function (ev){';

 					foreach ($handlers as $handler => $code) {

 						$_config['on'][$eventName] .= '('.$code.')(ev);';

@@ -497,8 +491,7 @@ 
 		 */

 		if (isset($_SERVER['SCRIPT_FILENAME'])) {

 			$realPath = dirname($_SERVER['SCRIPT_FILENAME']);

-		}

-		else {

+		} else {

 			/**

 			 * realpath - Returns canonicalized absolute pathname

 			 */

@@ -556,10 +549,12 @@ 
 			return '{' . implode(',', $temp) . '}';

 		}

 		// String otherwise

-		if (strpos($val, '@@') === 0)

-			return substr($val, 2);

-		if (strtoupper(substr($val, 0, 9)) == 'CKEDITOR.')

-			return $val;

+		if (strpos($val, '@@') === 0) {
+					return substr($val, 2);
+		}
+		if (strtoupper(substr($val, 0, 9)) == 'CKEDITOR.') {
+					return $val;
+		}
 

 		return '"' . str_replace(array("\\", "/", "\n", "\t", "\r", "\x08", "\x0c", '"'), array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"'), $val) . '"';

 	}

dashboard/application/helpers/breadcrumb_helper.php

Braces +12 added lines, -10 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
 
 /**
  * Breadcrumb helper
@@ -241,9 +243,11 @@ 
                 $segment .= $uri_array_original[$i].'/';
 
                 // If replace value is an array
-                if (! in_array($i, $skip_key, TRUE) && is_array($value)) // Skip link if replace value is null
+                if (! in_array($i, $skip_key, TRUE) && is_array($value)) {
+                    // Skip link if replace value is null
                 {
                     $number_added_value_array = count($value);
+                }
 
                     foreach ($value as $pair_values)
                     {
@@ -253,8 +257,7 @@ 
                         if ($number_pv_array == 1)
                         {
                             $val_name = $pv_array[0];
-                        }
-                        else
+                        } else
                         {
                             $val_name = $pv_array[1];
                         }
@@ -292,12 +295,10 @@ 
                         if ($number_pv_array == 1 || $val_url == $uri_array_original[$i])
                         {
                             $new_segment_url = $segment;
-                        }
-                        else if ($val_url[0] == '/')
+                        } else if ($val_url[0] == '/')
                         {
                             $new_segment_url = base_url().substr($val_url, 1);
-                        }
-                        else
+                        } else
                         {
                             $new_segment_url = $segment.$val_url;
                         }
@@ -305,14 +306,15 @@ 
                         $str_link[] = $new_segment_url;
                         $str_name[] = ucwords($val_name);
                     }
-                }
-                else if (! in_array($i, $skip_key, TRUE)) // If value is NOT an array
+                } else if (! in_array($i, $skip_key, TRUE)) {
+                    // If value is NOT an array
                 {
                     // Add multilanguage
                     if ($CI->config->item('multilang'))
                     {
                         if ($CI->lang->line($value)) {
                             $value = ucwords($CI->lang->line($value));
+                }
                         }
                     }
 

dashboard/application/models/Grocery_crud_model.php

Braces +56 added lines, -53 removed lines

@@ -47,8 +47,9 @@ 
 
     function get_list()
     {
-    	if($this->table_name === null)
-    		return false;
+    	if($this->table_name === null) {
+    	    		return false;
+    	}
 
     	$select = "`{$this->table_name}`.*";
 
@@ -65,14 +66,14 @@ 
 				{
 					$related_field_title = str_replace(" "," ",$related_field_title);
     				$select .= ", CONCAT('".str_replace(array('{','}'),array("',COALESCE({$unique_join_name}.",", ''),'"),str_replace("'","\\'",$related_field_title))."') as $unique_field_name";
-				}
-    			else
+				} else
     			{
     				$select .= ", $unique_join_name.$related_field_title AS $unique_field_name";
     			}
 
-    			if($this->field_exists($related_field_title))
-    				$select .= ", `{$this->table_name}`.$related_field_title AS '{$this->table_name}.$related_field_title'";
+    			if($this->field_exists($related_field_title)) {
+    			    				$select .= ", `{$this->table_name}`.$related_field_title AS '{$this->table_name}.$related_field_title'";
+    			}
     		}
     	}
 
@@ -120,8 +121,7 @@ 
 	    	{
 	    		$title_field_selection_table = str_replace(" ", " ", $title_field_selection_table);
 	    		$field .= "CONCAT('".str_replace(array('{','}'),array("',COALESCE(",", ''),'"),str_replace("'","\\'",$title_field_selection_table))."')";
-	    	}
-	    	else
+	    	} else
 	    	{
 	    		$field .= "$selection_table.$title_field_selection_table";
 	    	}
@@ -191,8 +191,9 @@ 
 
     function set_basic_table($table_name = null)
     {
-    	if( !($this->db->table_exists($table_name)) )
-    		return false;
+    	if( !($this->db->table_exists($table_name)) ) {
+    	    		return false;
+    	}
 
     	$this->table_name = $table_name;
 
@@ -252,24 +253,27 @@ 
     	{
     		$related_field_title = str_replace(" ", " ", $related_field_title);
     		$select .= "CONCAT('".str_replace(array('{','}'),array("',COALESCE(",", ''),'"),str_replace("'","\\'",$related_field_title))."') as $field_name_hash";
-    	}
-    	else
+    	} else
     	{
 	    	$select .= "$related_table.$related_field_title as $field_name_hash";
     	}
 
     	$this->db->select($select,false);
-    	if($where_clause !== null)
-    		$this->db->where($where_clause);
+    	if($where_clause !== null) {
+    	    		$this->db->where($where_clause);
+    	}
 
-    	if($where_clause !== null)
-    		$this->db->where($where_clause);
+    	if($where_clause !== null) {
+    	    		$this->db->where($where_clause);
+    	}
 
-    	if($limit !== null)
-    		$this->db->limit($limit);
+    	if($limit !== null) {
+    	    		$this->db->limit($limit);
+    	}
 
-    	if($search_like !== null)
-    		$this->db->having("$field_name_hash LIKE '%".$this->db->escape_like_str($search_like)."%'");
+    	if($search_like !== null) {
+    	    		$this->db->having("$field_name_hash LIKE '%".$this->db->escape_like_str($search_like)."%'");
+    	}
 
     	$order_by !== null
     		? $this->db->order_by($order_by)
@@ -292,8 +296,9 @@ 
 
     function get_relation_total_rows($field_name , $related_table , $related_field_title, $where_clause)
     {
-    	if($where_clause !== null)
-    		$this->db->where($where_clause);
+    	if($where_clause !== null) {
+    	    		$this->db->where($where_clause);
+    	}
 
     	return $this->db->count_all_results($related_table);
     }
@@ -308,8 +313,7 @@ 
     	{
     		$related_field_title = str_replace(" ", " ", $related_field_title);
     		$select .= "CONCAT('".str_replace(array('{','}'),array("',COALESCE(",", ''),'"),str_replace("'","\\'",$related_field_title))."') as $field_name_hash";
-    	}
-    	else
+    	} else
     	{
     		$select .= "$related_field_title as $field_name_hash";
     	}
@@ -322,8 +326,7 @@ 
     		if(!$use_template){
     			$this->db->order_by("{$field_info->selection_table}.{$field_info->title_field_selection_table}");
     		}
-    	}
-    	else
+    	} else
     	{
     		$this->db->order_by("{$field_info->relation_table}.{$field_info->priority_field_relation_table}");
     	}
@@ -356,8 +359,7 @@ 
     	{
     		$related_field_title = str_replace(" ", " ", $related_field_title);
     		$select .= "CONCAT('".str_replace(array('{','}'),array("',COALESCE(",", ''),'"),str_replace("'","\\'",$related_field_title))."') as $field_name_hash";
-    	}
-    	else
+    	} else
     	{
     		$select .= "$related_field_title as $field_name_hash";
     	}
@@ -368,15 +370,17 @@ 
     	}
 
     	$selection_primary_key = $this->get_primary_key($field_info->selection_table);
-        if(!$use_template)
-        	$this->db->order_by("{$field_info->selection_table}.{$field_info->title_field_selection_table}");
+        if(!$use_template) {
+                	$this->db->order_by("{$field_info->selection_table}.{$field_info->title_field_selection_table}");
+        }
         $results = $this->db->get($field_info->selection_table)->result();
 
         $results_array = array();
         foreach($results as $row)
         {
-            if(!isset($selected_values[$row->$selection_primary_key]))
-                $results_array[$row->$selection_primary_key] = $row->{$field_name_hash};
+            if(!isset($selected_values[$row->$selection_primary_key])) {
+                            $results_array[$row->$selection_primary_key] = $row->{$field_name_hash};
+            }
         }
 
         return $results_array;
@@ -385,8 +389,9 @@ 
     function db_relation_n_n_update($field_info, $post_data ,$main_primary_key)
     {
     	$this->db->where($field_info->primary_key_alias_to_this_table, $main_primary_key);
-    	if(!empty($post_data))
-    		$this->db->where_not_in($field_info->primary_key_alias_to_selection_table , $post_data);
+    	if(!empty($post_data)) {
+    	    		$this->db->where_not_in($field_info->primary_key_alias_to_selection_table , $post_data);
+    	}
     	$this->db->delete($field_info->relation_table);
 
     	$counter = 0;
@@ -404,12 +409,13 @@ 
 
 				if($count == 0)
 				{
-					if(!empty($field_info->priority_field_relation_table))
-						$where_array[$field_info->priority_field_relation_table] = $counter;
+					if(!empty($field_info->priority_field_relation_table)) {
+											$where_array[$field_info->priority_field_relation_table] = $counter;
+					}
 
 					$this->db->insert($field_info->relation_table, $where_array);
 
-				}elseif($count >= 1 && !empty($field_info->priority_field_relation_table))
+				} elseif($count >= 1 && !empty($field_info->priority_field_relation_table))
 				{
 					$this->db->update( $field_info->relation_table, array($field_info->priority_field_relation_table => $counter) , $where_array);
 				}
@@ -438,14 +444,12 @@ 
     			if(substr($type[1],-1) == ')')
     			{
     				$length = substr($type[1],0,-1);
-    			}
-    			else
+    			} else
     			{
     				list($length) = explode(" ",$type[1]);
     				$length = substr($length,0,-1);
     			}
-    		}
-    		else
+    		} else
     		{
     			$length = '';
     		}
@@ -492,15 +496,17 @@ 
     {
     	$primary_key_field = $this->get_primary_key();
 
-    	if($primary_key_field === false)
-    		return false;
+    	if($primary_key_field === false) {
+    	    		return false;
+    	}
 
     	$this->db->limit(1);
     	$this->db->delete($this->table_name,array( $primary_key_field => $primary_key_value));
-    	if( $this->db->affected_rows() != 1)
-    		return false;
-    	else
-    		return true;
+    	if( $this->db->affected_rows() != 1) {
+    	    		return false;
+    	} else {
+    	    		return true;
+    	}
     }
 
     function db_file_delete($field_name, $filename)
@@ -508,8 +514,7 @@ 
     	if( $this->db->update($this->table_name,array($field_name => ''),array($field_name => $filename)) )
     	{
     		return true;
-    	}
-    	else
+    	} else
     	{
     		return false;
     	}
@@ -546,13 +551,11 @@ 
 		    	}
 
 		    	return false;
-	    	}
-	    	else
+	    	} else
 	    	{
 	    		return $this->primary_key;
 	    	}
-    	}
-    	else
+    	} else
     	{
     		if(isset($this->primary_keys[$table_name]))
     		{

dashboard/application/models/User_model.php

Braces +3 added lines, -2 removed lines

@@ -73,8 +73,9 @@
             ldap_sort($ldap, $result, "sn");
             $info = ldap_get_entries($ldap, $result);
             for ($i = 0; $i < $info["count"]; $i++) {
-                if ($info['count'] > 1)
-                    break;
+                if ($info['count'] > 1) {
+                                    break;
+                }
 
                 //clean
                 $groups = $info[$i]["memberof"];

dashboard/application/models/computing-support/New_account_model.php

Braces +3 added lines, -2 removed lines

@@ -16,8 +16,9 @@
         // specify the LDAP server to connect to
         $conn = ldap_connect($this->config->item('ldapserver')) or die("Oh no can't create LDAP connection");
         // bind to the LDAP server specified above
-        if (!ldap_bind($conn, $this->config->item('ldapbindun'),"@".$this->config->item('ldapdomain'), $this->config->item('ldapbindpass')))
-            echo "Invalid credentials.";
+        if (!ldap_bind($conn, $this->config->item('ldapbindun'),"@".$this->config->item('ldapdomain'), $this->config->item('ldapbindpass'))) {
+                    echo "Invalid credentials.";
+        }
         // Search for user in directory
         $cred = explode('\\', $username);
         list($domain, $user) = $cred;

dashboard/application/views/computing-support/status/view.php

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
                     </tr>

                 </thead>

                 <tbody>

-                    <?php foreach ($status as $status_item): if ($status_item['category'] == 'network') {}else {

+                    <?php foreach ($status as $status_item): if ($status_item['category'] == 'network') {} else {

                         $sid = $status_item['id'];?>

                         <tr>

                             <td> &nbsp; <i class="fa <?= $status_item['icon'];?>" aria-hidden="true"></i> &nbsp; <?= $status_item['name'];?></td>

dashboard/assets/grocery_crud/languages/afrikaans.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
 
 /* Original translation by @KaBaDaBrA, improved by Kobus Myburgh (@impero_consult) */