East-Kent-Partnership / Intranet

dashboard/application/controllers/computing-support/Mobile_policy.php

Indentation +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
                 $this->email->to($_SESSION['ldap']['email']);
                 $this->email->subject('Mobile Phone Policy');
                 $this->email->message(
-                       'Name: ' . $_SESSION['ldap']['fll_name']. '
+                        'Name: ' . $_SESSION['ldap']['fll_name']. '
                            
                        Has accepted the Canterbury College mobile phone policy.
 
@@ -66,7 +66,7 @@ 
                 $this->email->to('ns@canterburycollege.ac.uk');
                 $this->email->subject('Mobile Phone Policy Accepted');
                 $this->email->message(
-                       'Name: ' . $_SESSION['ldap']['full_name'] . '
+                        'Name: ' . $_SESSION['ldap']['full_name'] . '
                            
                        Has accepted the Canterbury College mobile phone policy.
                        

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
                 $this->email->to($_SESSION['ldap']['email']);
                 $this->email->subject('Mobile Phone Policy');
                 $this->email->message(
-                       'Name: ' . $_SESSION['ldap']['fll_name']. '
+                       'Name: '.$_SESSION['ldap']['fll_name'].'
                            
                        Has accepted the Canterbury College mobile phone policy.
 
@@ -66,11 +66,11 @@ 
                 $this->email->to('ns@canterburycollege.ac.uk');
                 $this->email->subject('Mobile Phone Policy Accepted');
                 $this->email->message(
-                       'Name: ' . $_SESSION['ldap']['full_name'] . '
+                       'Name: '.$_SESSION['ldap']['full_name'].'
                            
                        Has accepted the Canterbury College mobile phone policy.
                        
-                       ' . date("d/m/Y") . ' ' . date("h:i"));
+                       ' . date("d/m/Y").' '.date("h:i"));
                 $this->email->send();
                 
                 $function = 'mobile_policy_accepted';

dashboard/application/controllers/computing-support/Temporary_account.php

Spacing +15 added lines, -15 removed lines

@@ -16,7 +16,7 @@ 
 
         $data['faculty'] = $this->temporary_account_model->get_faculty();
         $data['department'] = $this->temporary_account_model->get_department();
-        $data['tempid'] = "tempuser" . $this->temporary_account_model->get_next_temp();
+        $data['tempid'] = "tempuser".$this->temporary_account_model->get_next_temp();
 
         //validation
         $this->form_validation->set_rules('faculty', 'Faculty', 'trim|required');
@@ -46,10 +46,10 @@ 
                 $this->email->from('noreply@intranet.cant-col.ac.uk', 'Temporary Logon Account Request');
                 $this->email->to('w.bargent@canterburycollege.ac.uk');
                 $this->email->subject('Temporary Logon Account Request');
-                $this->email->message('A temporary network account has been requested by ' . $_SESSION['ldap']['full_name']
-                        . ' for ' . $this->input->post('requester')
+                $this->email->message('A temporary network account has been requested by '.$_SESSION['ldap']['full_name']
+                        . ' for '.$this->input->post('requester')
                         . ''
-                        . 'the user will be: ' . $this->input->post('first_name') . ' ' . $this->input->post('last_name')
+                        . 'the user will be: '.$this->input->post('first_name').' '.$this->input->post('last_name')
                         . ''
                         . 'Approve https://intranet.cant-col.ac.uk/dashboard/computing-support/temporary-account/approve');
                 $this->email->send();
@@ -118,7 +118,7 @@ 
                 $id = $_GET['id'];
                 $this->temporary_account_model->cancel($id);
 
-                $function = 'temp_account_CANCEL_' . $id;
+                $function = 'temp_account_CANCEL_'.$id;
                 $this->user_model->function_log($function);
 
                 redirect($_SERVER['HTTP_REFERER']);
@@ -138,7 +138,7 @@ 
                 $id = $_GET['id'];
                 $this->temporary_account_model->reject($id);
 
-                $function = 'temp_account_REJECT_' . $id;
+                $function = 'temp_account_REJECT_'.$id;
                 $this->user_model->function_log($function);
 
                 redirect($_SERVER['HTTP_REFERER']);
@@ -159,7 +159,7 @@ 
                 $id = $_GET['id'];
                 //$this->temporary_account_model->approve($id);
 
-                $function = 'temp_account_APPROVED_' . $id;
+                $function = 'temp_account_APPROVED_'.$id;
                 $this->user_model->function_log($function);
         
                     $data['AD'] = $this->temporary_account_model->get_account($id);
@@ -174,12 +174,12 @@ 
 
                     //Format dd-mm-yyyy
                     //Expiry is beginning of day (thats why +1 day
-                    $dateFromForm = date('d-m-Y', strtotime($data['AD'][0]['expiry']. ' +1 day'));
+                    $dateFromForm = date('d-m-Y', strtotime($data['AD'][0]['expiry'].' +1 day'));
 
                     //Format hh:mm:ss
                     $timeFromForm = "00:00:00";
 
-                    $dateWithTime = $dateFromForm . " " . $timeFromForm;
+                    $dateWithTime = $dateFromForm." ".$timeFromForm;
 
                     function convertDateToUnix($input) {
                         $format = 'd-m-Y H:i:s';
@@ -196,7 +196,7 @@ 
                     //$WIN = convertUnixtoWin($UNIX);
 
                     //Create Unicode password
-                    $passwordWithQuotes = '"' . $data['AD'][0]['password'] . '"';
+                    $passwordWithQuotes = '"'.$data['AD'][0]['password'].'"';
                     $ldaprecord["unicodepwd"] = iconv('UTF-8', 'UTF-16LE', $passwordWithQuotes);
 
                     //Build Active Directory record     
@@ -205,20 +205,20 @@ 
                     $ldaprecord["sn"] = $data['AD'][0]['last_name'];
                     $ldaprecord["mail"] = $data['AD'][0]['email'];
                     $ldaprecord["sAMAccountName"] = $data['AD'][0]['username'];
-                    $ldaprecord["displayName"] = $data['AD'][0]['first_name'] . " " . $data['AD'][0]['last_name'];
+                    $ldaprecord["displayName"] = $data['AD'][0]['first_name']." ".$data['AD'][0]['last_name'];
                     $ldaprecord["l"] = "Canterbury";
-                    $ldaprecord["description"] = "Temp account created by dashboard for " . $ldaprecord["displayName"];
+                    $ldaprecord["description"] = "Temp account created by dashboard for ".$ldaprecord["displayName"];
                     //$ldaprecord["accountExpires"] = $WIN;
                     $ldaprecord["UserAccountControl"] = "512"; //512 - Enabled Account
-                    $ldaprecord['userPrincipalName'] = $data['AD'][0]['username'] . '@cant-col.ac.uk';
+                    $ldaprecord['userPrincipalName'] = $data['AD'][0]['username'].'@cant-col.ac.uk';
                     $ldaprecord['objectclass'][0] = "top";
                     $ldaprecord['objectclass'][1] = "person";
                     $ldaprecord['objectclass'][2] = "organizationalPerson";
                     $ldaprecord['objectclass'][3] = "user";
-                    $dn = 'CN=' . $ldaprecord["cn"] . ',OU=Temp Accounts,OU=Students,OU=Accounts,DC=cant-col,DC=ac,DC=uk';
+                    $dn = 'CN='.$ldaprecord["cn"].',OU=Temp Accounts,OU=Students,OU=Accounts,DC=cant-col,DC=ac,DC=uk';
 
                     // Connect to Active Directory
-                    $ds = ldap_connect('ldaps://' . $AD_server);
+                    $ds = ldap_connect('ldaps://'.$AD_server);
 
                     if ($ds) {
                         ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);

dashboard/application/controllers/computing-support/Address_book.php

Spacing +5 added lines, -5 removed lines

@@ -44,11 +44,11 @@
                 $this->email->from('noreply@intranet.cant-col.ac.uk', 'Address Book Update');
                 $this->email->to('helpdesk@canterburycollege.ac.uk');
                 $this->email->subject('Address Book Update');
-                $this->email->message('A global address book update request been made by ' . $_SESSION['ldap']['full_name'] . '
-                       Change name to: ' . $name . '
-                       Change Faculty to: ' . $faculty[0]['faculty'] . '  
-                       Change Department to: ' . $department[0]['subfaculty'] . '  
-                       Change Room to : ' . $room . '
+                $this->email->message('A global address book update request been made by '.$_SESSION['ldap']['full_name'].'
+                       Change name to: ' . $name.'
+                       Change Faculty to: ' . $faculty[0]['faculty'].'  
+                       Change Department to: ' . $department[0]['subfaculty'].'  
+                       Change Room to : ' . $room.'
                        Change Telephone to : ' . $phone.'
                        Change Position to : ' . $position);
 

dashboard/application/models/core/Jobs_model.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
                             !empty($entries[$x]['samaccountname'][0]) &&
                             !empty($entries[$x]['sn'][0]) &&
                             !empty($entries[$x]['mail'][0])) {  
-                        $ad_users[] = array('first_name' => trim($entries[$x]['givenname'][0]), 'last_name' => trim($entries[$x]['sn'][0]), 'full_name' => trim($entries[$x]['givenname'][0]).' '. trim($entries[$x]['sn'][0]), 'username' => trim($entries[$x]['samaccountname'][0]), 'email' => trim($entries[$x]['mail'][0]));
+                        $ad_users[] = array('first_name' => trim($entries[$x]['givenname'][0]), 'last_name' => trim($entries[$x]['sn'][0]), 'full_name' => trim($entries[$x]['givenname'][0]).' '.trim($entries[$x]['sn'][0]), 'username' => trim($entries[$x]['samaccountname'][0]), 'email' => trim($entries[$x]['mail'][0]));
                     }
                 }
             }
@@ -49,7 +49,7 @@ 
                             !empty($entries[$x]['samaccountname'][0]) &&
                             !empty($entries[$x]['sn'][0]) &&
                             !empty($entries[$x]['mail'][0])) {
-                        $ad_users[] = array('first_name' => trim($entries[$x]['givenname'][0]), 'last_name' => trim($entries[$x]['sn'][0]), 'full_name' => trim($entries[$x]['givenname'][0]).' '. trim($entries[$x]['sn'][0]), 'username' => trim($entries[$x]['samaccountname'][0]), 'email' => trim($entries[$x]['mail'][0]));
+                        $ad_users[] = array('first_name' => trim($entries[$x]['givenname'][0]), 'last_name' => trim($entries[$x]['sn'][0]), 'full_name' => trim($entries[$x]['givenname'][0]).' '.trim($entries[$x]['sn'][0]), 'username' => trim($entries[$x]['samaccountname'][0]), 'email' => trim($entries[$x]['mail'][0]));
                     }
                 }
             }
@@ -61,7 +61,7 @@ 
                             !empty($entries[$x]['samaccountname'][0]) &&
                             !empty($entries[$x]['sn'][0]) &&
                             !empty($entries[$x]['mail'][0])) {
-                        $ad_users[] = array('first_name' => trim($entries[$x]['givenname'][0]), 'last_name' => trim($entries[$x]['sn'][0]), 'full_name' => trim($entries[$x]['givenname'][0]).' '. trim($entries[$x]['sn'][0]), 'username' => trim($entries[$x]['samaccountname'][0]), 'email' => trim($entries[$x]['mail'][0]));
+                        $ad_users[] = array('first_name' => trim($entries[$x]['givenname'][0]), 'last_name' => trim($entries[$x]['sn'][0]), 'full_name' => trim($entries[$x]['givenname'][0]).' '.trim($entries[$x]['sn'][0]), 'username' => trim($entries[$x]['samaccountname'][0]), 'email' => trim($entries[$x]['mail'][0]));
                     }
                 }
             }
@@ -73,7 +73,7 @@ 
                             !empty($entries[$x]['samaccountname'][0]) &&
                             !empty($entries[$x]['sn'][0]) &&
                             !empty($entries[$x]['mail'][0])) {
-                        $ad_users[] = array('first_name' => trim($entries[$x]['givenname'][0]), 'last_name' => trim($entries[$x]['sn'][0]), 'full_name' => trim($entries[$x]['givenname'][0]).' '. trim($entries[$x]['sn'][0]), 'username' => trim($entries[$x]['samaccountname'][0]), 'email' => trim($entries[$x]['mail'][0]));
+                        $ad_users[] = array('first_name' => trim($entries[$x]['givenname'][0]), 'last_name' => trim($entries[$x]['sn'][0]), 'full_name' => trim($entries[$x]['givenname'][0]).' '.trim($entries[$x]['sn'][0]), 'username' => trim($entries[$x]['samaccountname'][0]), 'email' => trim($entries[$x]['mail'][0]));
                     }
                 }
             }
@@ -85,7 +85,7 @@ 
                             !empty($entries[$x]['samaccountname'][0]) &&
                             !empty($entries[$x]['sn'][0]) &&
                             !empty($entries[$x]['mail'][0])) {
-                        $ad_users[] = array('first_name' => trim($entries[$x]['givenname'][0]), 'last_name' => trim($entries[$x]['sn'][0]), 'full_name' => trim($entries[$x]['givenname'][0]).' '. trim($entries[$x]['sn'][0]), 'username' => trim($entries[$x]['samaccountname'][0]), 'email' => trim($entries[$x]['mail'][0]));
+                        $ad_users[] = array('first_name' => trim($entries[$x]['givenname'][0]), 'last_name' => trim($entries[$x]['sn'][0]), 'full_name' => trim($entries[$x]['givenname'][0]).' '.trim($entries[$x]['sn'][0]), 'username' => trim($entries[$x]['samaccountname'][0]), 'email' => trim($entries[$x]['mail'][0]));
                     }
                 }
             }

dashboard/application/models/Grocery_crud_model.php

Indentation +356 added lines, -356 removed lines

@@ -29,347 +29,347 @@ 
  */
 class Grocery_crud_model  extends CI_Model  {
 
-	protected $primary_key = null;
-	protected $table_name = null;
-	protected $relation = array();
-	protected $relation_n_n = array();
-	protected $primary_keys = array();
+    protected $primary_key = null;
+    protected $table_name = null;
+    protected $relation = array();
+    protected $relation_n_n = array();
+    protected $primary_keys = array();
 
-	function __construct()
+    function __construct()
     {
         parent::__construct();
     }
 
     function db_table_exists($table_name = null)
     {
-    	return $this->db->table_exists($table_name);
+        return $this->db->table_exists($table_name);
     }
 
     function get_list()
     {
-    	if($this->table_name === null)
-    		return false;
+        if($this->table_name === null)
+            return false;
 
-    	$select = "`{$this->table_name}`.*";
+        $select = "`{$this->table_name}`.*";
 
-    	//set_relation special queries
-    	if(!empty($this->relation))
-    	{
-    		foreach($this->relation as $relation)
-    		{
-    			list($field_name , $related_table , $related_field_title) = $relation;
-    			$unique_join_name = $this->_unique_join_name($field_name);
-    			$unique_field_name = $this->_unique_field_name($field_name);
-
-				if(strstr($related_field_title,'{'))
-				{
-					$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
-    			{
-    				$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'";
-    		}
-    	}
+        //set_relation special queries
+        if(!empty($this->relation))
+        {
+            foreach($this->relation as $relation)
+            {
+                list($field_name , $related_table , $related_field_title) = $relation;
+                $unique_join_name = $this->_unique_join_name($field_name);
+                $unique_field_name = $this->_unique_field_name($field_name);
+
+                if(strstr($related_field_title,'{'))
+                {
+                    $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
+                {
+                    $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'";
+            }
+        }
 
-    	//set_relation_n_n special queries. We prefer sub queries from a simple join for the relation_n_n as it is faster and more stable on big tables.
-    	if(!empty($this->relation_n_n))
-    	{
-			$select = $this->relation_n_n_queries($select);
-    	}
+        //set_relation_n_n special queries. We prefer sub queries from a simple join for the relation_n_n as it is faster and more stable on big tables.
+        if(!empty($this->relation_n_n))
+        {
+            $select = $this->relation_n_n_queries($select);
+        }
 
-    	$this->db->select($select, false);
+        $this->db->select($select, false);
 
-    	$results = $this->db->get($this->table_name)->result();
+        $results = $this->db->get($this->table_name)->result();
 
-    	return $results;
+        return $results;
     }
 
     public function get_row($table_name = null)
     {
-    	$table_name = $table_name === null ? $this->table_name : $table_name;
+        $table_name = $table_name === null ? $this->table_name : $table_name;
 
-    	return $this->db->get($table_name)->row();
+        return $this->db->get($table_name)->row();
     }
 
     public function set_primary_key($field_name, $table_name = null)
     {
-    	$table_name = $table_name === null ? $this->table_name : $table_name;
+        $table_name = $table_name === null ? $this->table_name : $table_name;
 
-    	$this->primary_keys[$table_name] = $field_name;
+        $this->primary_keys[$table_name] = $field_name;
     }
 
     protected function relation_n_n_queries($select)
     {
-    	$this_table_primary_key = $this->get_primary_key();
-    	foreach($this->relation_n_n as $relation_n_n)
-    	{
-    		list($field_name, $relation_table, $selection_table, $primary_key_alias_to_this_table,
-    					$primary_key_alias_to_selection_table, $title_field_selection_table, $priority_field_relation_table) = array_values((array)$relation_n_n);
-
-    		$primary_key_selection_table = $this->get_primary_key($selection_table);
-
-	    	$field = "";
-	    	$use_template = strpos($title_field_selection_table,'{') !== false;
-	    	$field_name_hash = $this->_unique_field_name($title_field_selection_table);
-	    	if($use_template)
-	    	{
-	    		$title_field_selection_table = str_replace(" ", " ", $title_field_selection_table);
-	    		$field .= "CONCAT('".str_replace(array('{','}'),array("',COALESCE(",", ''),'"),str_replace("'","\\'",$title_field_selection_table))."')";
-	    	}
-	    	else
-	    	{
-	    		$field .= "$selection_table.$title_field_selection_table";
-	    	}
-
-    		//Sorry Codeigniter but you cannot help me with the subquery!
-    		$select .= ", (SELECT GROUP_CONCAT(DISTINCT $field) FROM $selection_table "
-    			."LEFT JOIN $relation_table ON $relation_table.$primary_key_alias_to_selection_table = $selection_table.$primary_key_selection_table "
-    			."WHERE $relation_table.$primary_key_alias_to_this_table = `{$this->table_name}`.$this_table_primary_key GROUP BY $relation_table.$primary_key_alias_to_this_table) AS $field_name";
-    	}
+        $this_table_primary_key = $this->get_primary_key();
+        foreach($this->relation_n_n as $relation_n_n)
+        {
+            list($field_name, $relation_table, $selection_table, $primary_key_alias_to_this_table,
+                        $primary_key_alias_to_selection_table, $title_field_selection_table, $priority_field_relation_table) = array_values((array)$relation_n_n);
+
+            $primary_key_selection_table = $this->get_primary_key($selection_table);
+
+            $field = "";
+            $use_template = strpos($title_field_selection_table,'{') !== false;
+            $field_name_hash = $this->_unique_field_name($title_field_selection_table);
+            if($use_template)
+            {
+                $title_field_selection_table = str_replace(" ", " ", $title_field_selection_table);
+                $field .= "CONCAT('".str_replace(array('{','}'),array("',COALESCE(",", ''),'"),str_replace("'","\\'",$title_field_selection_table))."')";
+            }
+            else
+            {
+                $field .= "$selection_table.$title_field_selection_table";
+            }
+
+            //Sorry Codeigniter but you cannot help me with the subquery!
+            $select .= ", (SELECT GROUP_CONCAT(DISTINCT $field) FROM $selection_table "
+                ."LEFT JOIN $relation_table ON $relation_table.$primary_key_alias_to_selection_table = $selection_table.$primary_key_selection_table "
+                ."WHERE $relation_table.$primary_key_alias_to_this_table = `{$this->table_name}`.$this_table_primary_key GROUP BY $relation_table.$primary_key_alias_to_this_table) AS $field_name";
+        }
 
-    	return $select;
+        return $select;
     }
 
     function order_by($order_by , $direction)
     {
-    	$this->db->order_by( $order_by , $direction );
+        $this->db->order_by( $order_by , $direction );
     }
 
     function where($key, $value = NULL, $escape = TRUE)
     {
-    	$this->db->where( $key, $value, $escape);
+        $this->db->where( $key, $value, $escape);
     }
 
     function or_where($key, $value = NULL, $escape = TRUE)
     {
-    	$this->db->or_where( $key, $value, $escape);
+        $this->db->or_where( $key, $value, $escape);
     }
 
     function having($key, $value = NULL, $escape = TRUE)
     {
-    	$this->db->having( $key, $value, $escape);
+        $this->db->having( $key, $value, $escape);
     }
 
     function or_having($key, $value = NULL, $escape = TRUE)
     {
-    	$this->db->or_having( $key, $value, $escape);
+        $this->db->or_having( $key, $value, $escape);
     }
 
     function like($field, $match = '', $side = 'both')
     {
-    	$this->db->like($field, $match, $side);
+        $this->db->like($field, $match, $side);
     }
 
     function or_like($field, $match = '', $side = 'both')
     {
-    	$this->db->or_like($field, $match, $side);
+        $this->db->or_like($field, $match, $side);
     }
 
     function limit($value, $offset = '')
     {
-    	$this->db->limit( $value , $offset );
+        $this->db->limit( $value , $offset );
     }
 
     function get_total_results()
     {
-    	//set_relation_n_n special queries. We prefer sub queries from a simple join for the relation_n_n as it is faster and more stable on big tables.
-    	if(!empty($this->relation_n_n))
-    	{
-    		$select = "{$this->table_name}.*";
-    		$select = $this->relation_n_n_queries($select);
+        //set_relation_n_n special queries. We prefer sub queries from a simple join for the relation_n_n as it is faster and more stable on big tables.
+        if(!empty($this->relation_n_n))
+        {
+            $select = "{$this->table_name}.*";
+            $select = $this->relation_n_n_queries($select);
 
-    		$this->db->select($select,false);
-    	}
+            $this->db->select($select,false);
+        }
 
-		return $this->db->get($this->table_name)->num_rows();
+        return $this->db->get($this->table_name)->num_rows();
     }
 
     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;
+        $this->table_name = $table_name;
 
-    	return true;
+        return true;
     }
 
     function get_edit_values($primary_key_value)
     {
-    	$primary_key_field = $this->get_primary_key();
-    	$this->db->where($primary_key_field,$primary_key_value);
-    	$result = $this->db->get($this->table_name)->row();
-    	return $result;
+        $primary_key_field = $this->get_primary_key();
+        $this->db->where($primary_key_field,$primary_key_value);
+        $result = $this->db->get($this->table_name)->row();
+        return $result;
     }
 
     function join_relation($field_name , $related_table , $related_field_title)
     {
-		$related_primary_key = $this->get_primary_key($related_table);
+        $related_primary_key = $this->get_primary_key($related_table);
 
-		if($related_primary_key !== false)
-		{
-			$unique_name = $this->_unique_join_name($field_name);
-			$this->db->join( $related_table.' as '.$unique_name , "$unique_name.$related_primary_key = {$this->table_name}.$field_name",'left');
+        if($related_primary_key !== false)
+        {
+            $unique_name = $this->_unique_join_name($field_name);
+            $this->db->join( $related_table.' as '.$unique_name , "$unique_name.$related_primary_key = {$this->table_name}.$field_name",'left');
 
-			$this->relation[$field_name] = array($field_name , $related_table , $related_field_title);
+            $this->relation[$field_name] = array($field_name , $related_table , $related_field_title);
 
-			return true;
-		}
+            return true;
+        }
 
-    	return false;
+        return false;
     }
 
     function set_relation_n_n_field($field_info)
     {
-		$this->relation_n_n[$field_info->field_name] = $field_info;
+        $this->relation_n_n[$field_info->field_name] = $field_info;
     }
 
     protected function _unique_join_name($field_name)
     {
-    	return 'j'.substr(md5($field_name),0,8); //This j is because is better for a string to begin with a letter and not with a number
+        return 'j'.substr(md5($field_name),0,8); //This j is because is better for a string to begin with a letter and not with a number
     }
 
     protected function _unique_field_name($field_name)
     {
-    	return 's'.substr(md5($field_name),0,8); //This s is because is better for a string to begin with a letter and not with a number
+        return 's'.substr(md5($field_name),0,8); //This s is because is better for a string to begin with a letter and not with a number
     }
 
     function get_relation_array($field_name , $related_table , $related_field_title, $where_clause, $order_by, $limit = null, $search_like = null)
     {
-    	$relation_array = array();
-    	$field_name_hash = $this->_unique_field_name($field_name);
+        $relation_array = array();
+        $field_name_hash = $this->_unique_field_name($field_name);
 
-    	$related_primary_key = $this->get_primary_key($related_table);
+        $related_primary_key = $this->get_primary_key($related_table);
 
-    	$select = "$related_table.$related_primary_key, ";
+        $select = "$related_table.$related_primary_key, ";
 
-    	if(strstr($related_field_title,'{'))
-    	{
-    		$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
-    	{
-	    	$select .= "$related_table.$related_field_title as $field_name_hash";
-    	}
+        if(strstr($related_field_title,'{'))
+        {
+            $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
+        {
+            $select .= "$related_table.$related_field_title as $field_name_hash";
+        }
 
-    	$this->db->select($select,false);
-    	if($where_clause !== null)
-    		$this->db->where($where_clause);
+        $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($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)
-    		: $this->db->order_by($field_name_hash);
+        $order_by !== null
+            ? $this->db->order_by($order_by)
+            : $this->db->order_by($field_name_hash);
 
-    	$results = $this->db->get($related_table)->result();
+        $results = $this->db->get($related_table)->result();
 
-    	foreach($results as $row)
-    	{
-    		$relation_array[$row->$related_primary_key] = $row->$field_name_hash;
-    	}
+        foreach($results as $row)
+        {
+            $relation_array[$row->$related_primary_key] = $row->$field_name_hash;
+        }
 
-    	return $relation_array;
+        return $relation_array;
     }
 
     function get_ajax_relation_array($search, $field_name , $related_table , $related_field_title, $where_clause, $order_by)
     {
-    	return $this->get_relation_array($field_name , $related_table , $related_field_title, $where_clause, $order_by, 10 , $search);
+        return $this->get_relation_array($field_name , $related_table , $related_field_title, $where_clause, $order_by, 10 , $search);
     }
 
     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);
+        return $this->db->count_all_results($related_table);
     }
 
     function get_relation_n_n_selection_array($primary_key_value, $field_info)
     {
-    	$select = "";
-    	$related_field_title = $field_info->title_field_selection_table;
-    	$use_template = strpos($related_field_title,'{') !== false;;
-    	$field_name_hash = $this->_unique_field_name($related_field_title);
-    	if($use_template)
-    	{
-    		$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
-    	{
-    		$select .= "$related_field_title as $field_name_hash";
-    	}
-    	$this->db->select('*, '.$select,false);
-
-    	$selection_primary_key = $this->get_primary_key($field_info->selection_table);
-
-    	if(empty($field_info->priority_field_relation_table))
-    	{
-    		if(!$use_template){
-    			$this->db->order_by("{$field_info->selection_table}.{$field_info->title_field_selection_table}");
-    		}
-    	}
-    	else
-    	{
-    		$this->db->order_by("{$field_info->relation_table}.{$field_info->priority_field_relation_table}");
-    	}
-    	$this->db->where($field_info->primary_key_alias_to_this_table, $primary_key_value);
-    	$this->db->join(
-    			$field_info->selection_table,
-    			"{$field_info->relation_table}.{$field_info->primary_key_alias_to_selection_table} = {$field_info->selection_table}.{$selection_primary_key}"
-    		);
-    	$results = $this->db->get($field_info->relation_table)->result();
-
-    	$results_array = array();
-    	foreach($results as $row)
-    	{
-    		$results_array[$row->{$field_info->primary_key_alias_to_selection_table}] = $row->{$field_name_hash};
-    	}
-
-    	return $results_array;
+        $select = "";
+        $related_field_title = $field_info->title_field_selection_table;
+        $use_template = strpos($related_field_title,'{') !== false;;
+        $field_name_hash = $this->_unique_field_name($related_field_title);
+        if($use_template)
+        {
+            $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
+        {
+            $select .= "$related_field_title as $field_name_hash";
+        }
+        $this->db->select('*, '.$select,false);
+
+        $selection_primary_key = $this->get_primary_key($field_info->selection_table);
+
+        if(empty($field_info->priority_field_relation_table))
+        {
+            if(!$use_template){
+                $this->db->order_by("{$field_info->selection_table}.{$field_info->title_field_selection_table}");
+            }
+        }
+        else
+        {
+            $this->db->order_by("{$field_info->relation_table}.{$field_info->priority_field_relation_table}");
+        }
+        $this->db->where($field_info->primary_key_alias_to_this_table, $primary_key_value);
+        $this->db->join(
+                $field_info->selection_table,
+                "{$field_info->relation_table}.{$field_info->primary_key_alias_to_selection_table} = {$field_info->selection_table}.{$selection_primary_key}"
+            );
+        $results = $this->db->get($field_info->relation_table)->result();
+
+        $results_array = array();
+        foreach($results as $row)
+        {
+            $results_array[$row->{$field_info->primary_key_alias_to_selection_table}] = $row->{$field_name_hash};
+        }
+
+        return $results_array;
     }
 
     function get_relation_n_n_unselected_array($field_info, $selected_values)
     {
-    	$use_where_clause = !empty($field_info->where_clause);
-
-    	$select = "";
-    	$related_field_title = $field_info->title_field_selection_table;
-    	$use_template = strpos($related_field_title,'{') !== false;
-    	$field_name_hash = $this->_unique_field_name($related_field_title);
-
-    	if($use_template)
-    	{
-    		$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
-    	{
-    		$select .= "$related_field_title as $field_name_hash";
-    	}
-    	$this->db->select('*, '.$select,false);
-
-    	if($use_where_clause){
-    		$this->db->where($field_info->where_clause);
-    	}
-
-    	$selection_primary_key = $this->get_primary_key($field_info->selection_table);
+        $use_where_clause = !empty($field_info->where_clause);
+
+        $select = "";
+        $related_field_title = $field_info->title_field_selection_table;
+        $use_template = strpos($related_field_title,'{') !== false;
+        $field_name_hash = $this->_unique_field_name($related_field_title);
+
+        if($use_template)
+        {
+            $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
+        {
+            $select .= "$related_field_title as $field_name_hash";
+        }
+        $this->db->select('*, '.$select,false);
+
+        if($use_where_clause){
+            $this->db->where($field_info->where_clause);
+        }
+
+        $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}");
+            $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();
@@ -384,199 +384,199 @@ 
 
     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);
-    	$this->db->delete($field_info->relation_table);
-
-    	$counter = 0;
-    	if(!empty($post_data))
-    	{
-    		foreach($post_data as $primary_key_value)
-	    	{
-				$where_array = array(
-	    			$field_info->primary_key_alias_to_this_table => $main_primary_key,
-	    			$field_info->primary_key_alias_to_selection_table => $primary_key_value,
-	    		);
-
-	    		$this->db->where($where_array);
-				$count = $this->db->from($field_info->relation_table)->count_all_results();
-
-				if($count == 0)
-				{
-					if(!empty($field_info->priority_field_relation_table))
-						$where_array[$field_info->priority_field_relation_table] = $counter;
+        $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);
+        $this->db->delete($field_info->relation_table);
 
-					$this->db->insert($field_info->relation_table, $where_array);
-
-				}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);
-				}
-
-				$counter++;
-	    	}
-    	}
+        $counter = 0;
+        if(!empty($post_data))
+        {
+            foreach($post_data as $primary_key_value)
+            {
+                $where_array = array(
+                    $field_info->primary_key_alias_to_this_table => $main_primary_key,
+                    $field_info->primary_key_alias_to_selection_table => $primary_key_value,
+                );
+
+                $this->db->where($where_array);
+                $count = $this->db->from($field_info->relation_table)->count_all_results();
+
+                if($count == 0)
+                {
+                    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))
+                {
+                    $this->db->update( $field_info->relation_table, array($field_info->priority_field_relation_table => $counter) , $where_array);
+                }
+
+                $counter++;
+            }
+        }
     }
 
     function db_relation_n_n_delete($field_info, $main_primary_key)
     {
-    	$this->db->where($field_info->primary_key_alias_to_this_table, $main_primary_key);
-    	$this->db->delete($field_info->relation_table);
+        $this->db->where($field_info->primary_key_alias_to_this_table, $main_primary_key);
+        $this->db->delete($field_info->relation_table);
     }
 
     function get_field_types_basic_table()
     {
-    	$db_field_types = array();
-    	foreach($this->db->query("SHOW COLUMNS FROM `{$this->table_name}`")->result() as $db_field_type)
-    	{
-    		$type = explode("(",$db_field_type->Type);
-    		$db_type = $type[0];
-
-    		if(isset($type[1]))
-    		{
-    			if(substr($type[1],-1) == ')')
-    			{
-    				$length = substr($type[1],0,-1);
-    			}
-    			else
-    			{
-    				list($length) = explode(" ",$type[1]);
-    				$length = substr($length,0,-1);
-    			}
-    		}
-    		else
-    		{
-    			$length = '';
-    		}
-    		$db_field_types[$db_field_type->Field]['db_max_length'] = $length;
-    		$db_field_types[$db_field_type->Field]['db_type'] = $db_type;
-    		$db_field_types[$db_field_type->Field]['db_null'] = $db_field_type->Null == 'YES' ? true : false;
-    		$db_field_types[$db_field_type->Field]['db_extra'] = $db_field_type->Extra;
-    	}
-
-    	$results = $this->db->field_data($this->table_name);
-    	foreach($results as $num => $row)
-    	{
-    		$row = (array)$row;
-    		$results[$num] = (object)( array_merge($row, $db_field_types[$row['name']])  );
-    	}
-
-    	return $results;
+        $db_field_types = array();
+        foreach($this->db->query("SHOW COLUMNS FROM `{$this->table_name}`")->result() as $db_field_type)
+        {
+            $type = explode("(",$db_field_type->Type);
+            $db_type = $type[0];
+
+            if(isset($type[1]))
+            {
+                if(substr($type[1],-1) == ')')
+                {
+                    $length = substr($type[1],0,-1);
+                }
+                else
+                {
+                    list($length) = explode(" ",$type[1]);
+                    $length = substr($length,0,-1);
+                }
+            }
+            else
+            {
+                $length = '';
+            }
+            $db_field_types[$db_field_type->Field]['db_max_length'] = $length;
+            $db_field_types[$db_field_type->Field]['db_type'] = $db_type;
+            $db_field_types[$db_field_type->Field]['db_null'] = $db_field_type->Null == 'YES' ? true : false;
+            $db_field_types[$db_field_type->Field]['db_extra'] = $db_field_type->Extra;
+        }
+
+        $results = $this->db->field_data($this->table_name);
+        foreach($results as $num => $row)
+        {
+            $row = (array)$row;
+            $results[$num] = (object)( array_merge($row, $db_field_types[$row['name']])  );
+        }
+
+        return $results;
     }
 
     function get_field_types($table_name)
     {
-    	$results = $this->db->field_data($table_name);
+        $results = $this->db->field_data($table_name);
 
-    	return $results;
+        return $results;
     }
 
     function db_update($post_array, $primary_key_value)
     {
-    	$primary_key_field = $this->get_primary_key();
-    	return $this->db->update($this->table_name,$post_array, array( $primary_key_field => $primary_key_value));
+        $primary_key_field = $this->get_primary_key();
+        return $this->db->update($this->table_name,$post_array, array( $primary_key_field => $primary_key_value));
     }
 
     function db_insert($post_array)
     {
-    	$insert = $this->db->insert($this->table_name,$post_array);
-    	if($insert)
-    	{
-    		return $this->db->insert_id();
-    	}
-    	return false;
+        $insert = $this->db->insert($this->table_name,$post_array);
+        if($insert)
+        {
+            return $this->db->insert_id();
+        }
+        return false;
     }
 
     function db_delete($primary_key_value)
     {
-    	$primary_key_field = $this->get_primary_key();
+        $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;
+        $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;
     }
 
     function db_file_delete($field_name, $filename)
     {
-    	if( $this->db->update($this->table_name,array($field_name => ''),array($field_name => $filename)) )
-    	{
-    		return true;
-    	}
-    	else
-    	{
-    		return false;
-    	}
+        if( $this->db->update($this->table_name,array($field_name => ''),array($field_name => $filename)) )
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
     }
 
     function field_exists($field,$table_name = null)
     {
-    	if(empty($table_name))
-    	{
-    		$table_name = $this->table_name;
-    	}
-    	return $this->db->field_exists($field,$table_name);
+        if(empty($table_name))
+        {
+            $table_name = $this->table_name;
+        }
+        return $this->db->field_exists($field,$table_name);
     }
 
     function get_primary_key($table_name = null)
     {
-    	if($table_name == null)
-    	{
-    		if(isset($this->primary_keys[$this->table_name]))
-    		{
-    			return $this->primary_keys[$this->table_name];
-    		}
-
-	    	if(empty($this->primary_key))
-	    	{
-		    	$fields = $this->get_field_types_basic_table();
-
-		    	foreach($fields as $field)
-		    	{
-		    		if($field->primary_key == 1)
-		    		{
-		    			return $field->name;
-		    		}
-		    	}
-
-		    	return false;
-	    	}
-	    	else
-	    	{
-	    		return $this->primary_key;
-	    	}
-    	}
-    	else
-    	{
-    		if(isset($this->primary_keys[$table_name]))
-    		{
-    			return $this->primary_keys[$table_name];
-    		}
-
-	    	$fields = $this->get_field_types($table_name);
-
-	    	foreach($fields as $field)
-	    	{
-	    		if($field->primary_key == 1)
-	    		{
-	    			return $field->name;
-	    		}
-	    	}
-
-	    	return false;
-    	}
+        if($table_name == null)
+        {
+            if(isset($this->primary_keys[$this->table_name]))
+            {
+                return $this->primary_keys[$this->table_name];
+            }
+
+            if(empty($this->primary_key))
+            {
+                $fields = $this->get_field_types_basic_table();
+
+                foreach($fields as $field)
+                {
+                    if($field->primary_key == 1)
+                    {
+                        return $field->name;
+                    }
+                }
+
+                return false;
+            }
+            else
+            {
+                return $this->primary_key;
+            }
+        }
+        else
+        {
+            if(isset($this->primary_keys[$table_name]))
+            {
+                return $this->primary_keys[$table_name];
+            }
+
+            $fields = $this->get_field_types($table_name);
+
+            foreach($fields as $field)
+            {
+                if($field->primary_key == 1)
+                {
+                    return $field->name;
+                }
+            }
+
+            return false;
+        }
 
     }
 
     function escape_str($value)
     {
-    	return $this->db->escape_str($value);
+        return $this->db->escape_str($value);
     }
 
 }

Spacing +97 added lines, -97 removed lines

@@ -27,7 +27,7 @@ 
  * @version    	1.5.6
  * @link		http://www.grocerycrud.com/documentation
  */
-class Grocery_crud_model  extends CI_Model  {
+class Grocery_crud_model  extends CI_Model {
 
 	protected $primary_key = null;
 	protected $table_name = null;
@@ -47,37 +47,37 @@ 
 
     function get_list()
     {
-    	if($this->table_name === null)
+    	if ($this->table_name === null)
     		return false;
 
     	$select = "`{$this->table_name}`.*";
 
     	//set_relation special queries
-    	if(!empty($this->relation))
+    	if (!empty($this->relation))
     	{
-    		foreach($this->relation as $relation)
+    		foreach ($this->relation as $relation)
     		{
-    			list($field_name , $related_table , $related_field_title) = $relation;
+    			list($field_name, $related_table, $related_field_title) = $relation;
     			$unique_join_name = $this->_unique_join_name($field_name);
     			$unique_field_name = $this->_unique_field_name($field_name);
 
-				if(strstr($related_field_title,'{'))
+				if (strstr($related_field_title, '{'))
 				{
-					$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";
+					$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
     			{
     				$select .= ", $unique_join_name.$related_field_title AS $unique_field_name";
     			}
 
-    			if($this->field_exists($related_field_title))
+    			if ($this->field_exists($related_field_title))
     				$select .= ", `{$this->table_name}`.$related_field_title AS '{$this->table_name}.$related_field_title'";
     		}
     	}
 
     	//set_relation_n_n special queries. We prefer sub queries from a simple join for the relation_n_n as it is faster and more stable on big tables.
-    	if(!empty($this->relation_n_n))
+    	if (!empty($this->relation_n_n))
     	{
 			$select = $this->relation_n_n_queries($select);
     	}
@@ -106,20 +106,20 @@ 
     protected function relation_n_n_queries($select)
     {
     	$this_table_primary_key = $this->get_primary_key();
-    	foreach($this->relation_n_n as $relation_n_n)
+    	foreach ($this->relation_n_n as $relation_n_n)
     	{
     		list($field_name, $relation_table, $selection_table, $primary_key_alias_to_this_table,
-    					$primary_key_alias_to_selection_table, $title_field_selection_table, $priority_field_relation_table) = array_values((array)$relation_n_n);
+    					$primary_key_alias_to_selection_table, $title_field_selection_table, $priority_field_relation_table) = array_values((array) $relation_n_n);
 
     		$primary_key_selection_table = $this->get_primary_key($selection_table);
 
 	    	$field = "";
-	    	$use_template = strpos($title_field_selection_table,'{') !== false;
+	    	$use_template = strpos($title_field_selection_table, '{') !== false;
 	    	$field_name_hash = $this->_unique_field_name($title_field_selection_table);
-	    	if($use_template)
+	    	if ($use_template)
 	    	{
 	    		$title_field_selection_table = str_replace(" ", " ", $title_field_selection_table);
-	    		$field .= "CONCAT('".str_replace(array('{','}'),array("',COALESCE(",", ''),'"),str_replace("'","\\'",$title_field_selection_table))."')";
+	    		$field .= "CONCAT('".str_replace(array('{', '}'), array("',COALESCE(", ", ''),'"), str_replace("'", "\\'", $title_field_selection_table))."')";
 	    	}
 	    	else
 	    	{
@@ -135,29 +135,29 @@ 
     	return $select;
     }
 
-    function order_by($order_by , $direction)
+    function order_by($order_by, $direction)
     {
-    	$this->db->order_by( $order_by , $direction );
+    	$this->db->order_by($order_by, $direction);
     }
 
     function where($key, $value = NULL, $escape = TRUE)
     {
-    	$this->db->where( $key, $value, $escape);
+    	$this->db->where($key, $value, $escape);
     }
 
     function or_where($key, $value = NULL, $escape = TRUE)
     {
-    	$this->db->or_where( $key, $value, $escape);
+    	$this->db->or_where($key, $value, $escape);
     }
 
     function having($key, $value = NULL, $escape = TRUE)
     {
-    	$this->db->having( $key, $value, $escape);
+    	$this->db->having($key, $value, $escape);
     }
 
     function or_having($key, $value = NULL, $escape = TRUE)
     {
-    	$this->db->or_having( $key, $value, $escape);
+    	$this->db->or_having($key, $value, $escape);
     }
 
     function like($field, $match = '', $side = 'both')
@@ -172,18 +172,18 @@ 
 
     function limit($value, $offset = '')
     {
-    	$this->db->limit( $value , $offset );
+    	$this->db->limit($value, $offset);
     }
 
     function get_total_results()
     {
     	//set_relation_n_n special queries. We prefer sub queries from a simple join for the relation_n_n as it is faster and more stable on big tables.
-    	if(!empty($this->relation_n_n))
+    	if (!empty($this->relation_n_n))
     	{
     		$select = "{$this->table_name}.*";
     		$select = $this->relation_n_n_queries($select);
 
-    		$this->db->select($select,false);
+    		$this->db->select($select, false);
     	}
 
 		return $this->db->get($this->table_name)->num_rows();
@@ -191,7 +191,7 @@ 
 
     function set_basic_table($table_name = null)
     {
-    	if( !($this->db->table_exists($table_name)) )
+    	if (!($this->db->table_exists($table_name)))
     		return false;
 
     	$this->table_name = $table_name;
@@ -202,21 +202,21 @@ 
     function get_edit_values($primary_key_value)
     {
     	$primary_key_field = $this->get_primary_key();
-    	$this->db->where($primary_key_field,$primary_key_value);
+    	$this->db->where($primary_key_field, $primary_key_value);
     	$result = $this->db->get($this->table_name)->row();
     	return $result;
     }
 
-    function join_relation($field_name , $related_table , $related_field_title)
+    function join_relation($field_name, $related_table, $related_field_title)
     {
 		$related_primary_key = $this->get_primary_key($related_table);
 
-		if($related_primary_key !== false)
+		if ($related_primary_key !== false)
 		{
 			$unique_name = $this->_unique_join_name($field_name);
-			$this->db->join( $related_table.' as '.$unique_name , "$unique_name.$related_primary_key = {$this->table_name}.$field_name",'left');
+			$this->db->join($related_table.' as '.$unique_name, "$unique_name.$related_primary_key = {$this->table_name}.$field_name", 'left');
 
-			$this->relation[$field_name] = array($field_name , $related_table , $related_field_title);
+			$this->relation[$field_name] = array($field_name, $related_table, $related_field_title);
 
 			return true;
 		}
@@ -231,15 +231,15 @@ 
 
     protected function _unique_join_name($field_name)
     {
-    	return 'j'.substr(md5($field_name),0,8); //This j is because is better for a string to begin with a letter and not with a number
+    	return 'j'.substr(md5($field_name), 0, 8); //This j is because is better for a string to begin with a letter and not with a number
     }
 
     protected function _unique_field_name($field_name)
     {
-    	return 's'.substr(md5($field_name),0,8); //This s is because is better for a string to begin with a letter and not with a number
+    	return 's'.substr(md5($field_name), 0, 8); //This s is because is better for a string to begin with a letter and not with a number
     }
 
-    function get_relation_array($field_name , $related_table , $related_field_title, $where_clause, $order_by, $limit = null, $search_like = null)
+    function get_relation_array($field_name, $related_table, $related_field_title, $where_clause, $order_by, $limit = null, $search_like = null)
     {
     	$relation_array = array();
     	$field_name_hash = $this->_unique_field_name($field_name);
@@ -248,27 +248,27 @@ 
 
     	$select = "$related_table.$related_primary_key, ";
 
-    	if(strstr($related_field_title,'{'))
+    	if (strstr($related_field_title, '{'))
     	{
     		$related_field_title = str_replace(" ", " ", $related_field_title);
-    		$select .= "CONCAT('".str_replace(array('{','}'),array("',COALESCE(",", ''),'"),str_replace("'","\\'",$related_field_title))."') as $field_name_hash";
+    		$select .= "CONCAT('".str_replace(array('{', '}'), array("',COALESCE(", ", ''),'"), str_replace("'", "\\'", $related_field_title))."') as $field_name_hash";
     	}
     	else
     	{
 	    	$select .= "$related_table.$related_field_title as $field_name_hash";
     	}
 
-    	$this->db->select($select,false);
-    	if($where_clause !== null)
+    	$this->db->select($select, false);
+    	if ($where_clause !== null)
     		$this->db->where($where_clause);
 
-    	if($where_clause !== null)
+    	if ($where_clause !== null)
     		$this->db->where($where_clause);
 
-    	if($limit !== null)
+    	if ($limit !== null)
     		$this->db->limit($limit);
 
-    	if($search_like !== null)
+    	if ($search_like !== null)
     		$this->db->having("$field_name_hash LIKE '%".$this->db->escape_like_str($search_like)."%'");
 
     	$order_by !== null
@@ -277,7 +277,7 @@ 
 
     	$results = $this->db->get($related_table)->result();
 
-    	foreach($results as $row)
+    	foreach ($results as $row)
     	{
     		$relation_array[$row->$related_primary_key] = $row->$field_name_hash;
     	}
@@ -285,14 +285,14 @@ 
     	return $relation_array;
     }
 
-    function get_ajax_relation_array($search, $field_name , $related_table , $related_field_title, $where_clause, $order_by)
+    function get_ajax_relation_array($search, $field_name, $related_table, $related_field_title, $where_clause, $order_by)
     {
-    	return $this->get_relation_array($field_name , $related_table , $related_field_title, $where_clause, $order_by, 10 , $search);
+    	return $this->get_relation_array($field_name, $related_table, $related_field_title, $where_clause, $order_by, 10, $search);
     }
 
-    function get_relation_total_rows($field_name , $related_table , $related_field_title, $where_clause)
+    function get_relation_total_rows($field_name, $related_table, $related_field_title, $where_clause)
     {
-    	if($where_clause !== null)
+    	if ($where_clause !== null)
     		$this->db->where($where_clause);
 
     	return $this->db->count_all_results($related_table);
@@ -302,24 +302,24 @@ 
     {
     	$select = "";
     	$related_field_title = $field_info->title_field_selection_table;
-    	$use_template = strpos($related_field_title,'{') !== false;;
+    	$use_template = strpos($related_field_title, '{') !== false; ;
     	$field_name_hash = $this->_unique_field_name($related_field_title);
-    	if($use_template)
+    	if ($use_template)
     	{
     		$related_field_title = str_replace(" ", " ", $related_field_title);
-    		$select .= "CONCAT('".str_replace(array('{','}'),array("',COALESCE(",", ''),'"),str_replace("'","\\'",$related_field_title))."') as $field_name_hash";
+    		$select .= "CONCAT('".str_replace(array('{', '}'), array("',COALESCE(", ", ''),'"), str_replace("'", "\\'", $related_field_title))."') as $field_name_hash";
     	}
     	else
     	{
     		$select .= "$related_field_title as $field_name_hash";
     	}
-    	$this->db->select('*, '.$select,false);
+    	$this->db->select('*, '.$select, false);
 
     	$selection_primary_key = $this->get_primary_key($field_info->selection_table);
 
-    	if(empty($field_info->priority_field_relation_table))
+    	if (empty($field_info->priority_field_relation_table))
     	{
-    		if(!$use_template){
+    		if (!$use_template) {
     			$this->db->order_by("{$field_info->selection_table}.{$field_info->title_field_selection_table}");
     		}
     	}
@@ -335,7 +335,7 @@ 
     	$results = $this->db->get($field_info->relation_table)->result();
 
     	$results_array = array();
-    	foreach($results as $row)
+    	foreach ($results as $row)
     	{
     		$results_array[$row->{$field_info->primary_key_alias_to_selection_table}] = $row->{$field_name_hash};
     	}
@@ -349,50 +349,50 @@ 
 
     	$select = "";
     	$related_field_title = $field_info->title_field_selection_table;
-    	$use_template = strpos($related_field_title,'{') !== false;
+    	$use_template = strpos($related_field_title, '{') !== false;
     	$field_name_hash = $this->_unique_field_name($related_field_title);
 
-    	if($use_template)
+    	if ($use_template)
     	{
     		$related_field_title = str_replace(" ", " ", $related_field_title);
-    		$select .= "CONCAT('".str_replace(array('{','}'),array("',COALESCE(",", ''),'"),str_replace("'","\\'",$related_field_title))."') as $field_name_hash";
+    		$select .= "CONCAT('".str_replace(array('{', '}'), array("',COALESCE(", ", ''),'"), str_replace("'", "\\'", $related_field_title))."') as $field_name_hash";
     	}
     	else
     	{
     		$select .= "$related_field_title as $field_name_hash";
     	}
-    	$this->db->select('*, '.$select,false);
+    	$this->db->select('*, '.$select, false);
 
-    	if($use_where_clause){
+    	if ($use_where_clause) {
     		$this->db->where($field_info->where_clause);
     	}
 
     	$selection_primary_key = $this->get_primary_key($field_info->selection_table);
-        if(!$use_template)
+        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)
+        foreach ($results as $row)
         {
-            if(!isset($selected_values[$row->$selection_primary_key]))
+            if (!isset($selected_values[$row->$selection_primary_key]))
                 $results_array[$row->$selection_primary_key] = $row->{$field_name_hash};
         }
 
         return $results_array;
     }
 
-    function db_relation_n_n_update($field_info, $post_data ,$main_primary_key)
+    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;
-    	if(!empty($post_data))
+    	if (!empty($post_data))
     	{
-    		foreach($post_data as $primary_key_value)
+    		foreach ($post_data as $primary_key_value)
 	    	{
 				$where_array = array(
 	    			$field_info->primary_key_alias_to_this_table => $main_primary_key,
@@ -402,16 +402,16 @@ 
 	    		$this->db->where($where_array);
 				$count = $this->db->from($field_info->relation_table)->count_all_results();
 
-				if($count == 0)
+				if ($count == 0)
 				{
-					if(!empty($field_info->priority_field_relation_table))
+					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);
+					$this->db->update($field_info->relation_table, array($field_info->priority_field_relation_table => $counter), $where_array);
 				}
 
 				$counter++;
@@ -428,21 +428,21 @@ 
     function get_field_types_basic_table()
     {
     	$db_field_types = array();
-    	foreach($this->db->query("SHOW COLUMNS FROM `{$this->table_name}`")->result() as $db_field_type)
+    	foreach ($this->db->query("SHOW COLUMNS FROM `{$this->table_name}`")->result() as $db_field_type)
     	{
-    		$type = explode("(",$db_field_type->Type);
+    		$type = explode("(", $db_field_type->Type);
     		$db_type = $type[0];
 
-    		if(isset($type[1]))
+    		if (isset($type[1]))
     		{
-    			if(substr($type[1],-1) == ')')
+    			if (substr($type[1], -1) == ')')
     			{
-    				$length = substr($type[1],0,-1);
+    				$length = substr($type[1], 0, -1);
     			}
     			else
     			{
-    				list($length) = explode(" ",$type[1]);
-    				$length = substr($length,0,-1);
+    				list($length) = explode(" ", $type[1]);
+    				$length = substr($length, 0, -1);
     			}
     		}
     		else
@@ -456,10 +456,10 @@ 
     	}
 
     	$results = $this->db->field_data($this->table_name);
-    	foreach($results as $num => $row)
+    	foreach ($results as $num => $row)
     	{
-    		$row = (array)$row;
-    		$results[$num] = (object)( array_merge($row, $db_field_types[$row['name']])  );
+    		$row = (array) $row;
+    		$results[$num] = (object) (array_merge($row, $db_field_types[$row['name']]));
     	}
 
     	return $results;
@@ -475,13 +475,13 @@ 
     function db_update($post_array, $primary_key_value)
     {
     	$primary_key_field = $this->get_primary_key();
-    	return $this->db->update($this->table_name,$post_array, array( $primary_key_field => $primary_key_value));
+    	return $this->db->update($this->table_name, $post_array, array($primary_key_field => $primary_key_value));
     }
 
     function db_insert($post_array)
     {
-    	$insert = $this->db->insert($this->table_name,$post_array);
-    	if($insert)
+    	$insert = $this->db->insert($this->table_name, $post_array);
+    	if ($insert)
     	{
     		return $this->db->insert_id();
     	}
@@ -492,12 +492,12 @@ 
     {
     	$primary_key_field = $this->get_primary_key();
 
-    	if($primary_key_field === 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)
+    	$this->db->delete($this->table_name, array($primary_key_field => $primary_key_value));
+    	if ($this->db->affected_rows() != 1)
     		return false;
     	else
     		return true;
@@ -505,7 +505,7 @@ 
 
     function db_file_delete($field_name, $filename)
     {
-    	if( $this->db->update($this->table_name,array($field_name => ''),array($field_name => $filename)) )
+    	if ($this->db->update($this->table_name, array($field_name => ''), array($field_name => $filename)))
     	{
     		return true;
     	}
@@ -515,31 +515,31 @@ 
     	}
     }
 
-    function field_exists($field,$table_name = null)
+    function field_exists($field, $table_name = null)
     {
-    	if(empty($table_name))
+    	if (empty($table_name))
     	{
     		$table_name = $this->table_name;
     	}
-    	return $this->db->field_exists($field,$table_name);
+    	return $this->db->field_exists($field, $table_name);
     }
 
     function get_primary_key($table_name = null)
     {
-    	if($table_name == null)
+    	if ($table_name == null)
     	{
-    		if(isset($this->primary_keys[$this->table_name]))
+    		if (isset($this->primary_keys[$this->table_name]))
     		{
     			return $this->primary_keys[$this->table_name];
     		}
 
-	    	if(empty($this->primary_key))
+	    	if (empty($this->primary_key))
 	    	{
 		    	$fields = $this->get_field_types_basic_table();
 
-		    	foreach($fields as $field)
+		    	foreach ($fields as $field)
 		    	{
-		    		if($field->primary_key == 1)
+		    		if ($field->primary_key == 1)
 		    		{
 		    			return $field->name;
 		    		}
@@ -554,16 +554,16 @@ 
     	}
     	else
     	{
-    		if(isset($this->primary_keys[$table_name]))
+    		if (isset($this->primary_keys[$table_name]))
     		{
     			return $this->primary_keys[$table_name];
     		}
 
 	    	$fields = $this->get_field_types($table_name);
 
-	    	foreach($fields as $field)
+	    	foreach ($fields as $field)
 	    	{
-	    		if($field->primary_key == 1)
+	    		if ($field->primary_key == 1)
 	    		{
 	    			return $field->name;
 	    		}

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]))
     		{

Doc Comments +3 added lines

@@ -239,6 +239,9 @@
     	return 's'.substr(md5($field_name),0,8); //This s is because is better for a string to begin with a letter and not with a number
     }
 
+    /**
+     * @param integer $limit
+     */
     function get_relation_array($field_name , $related_table , $related_field_title, $where_clause, $order_by, $limit = null, $search_like = null)
     {
     	$relation_array = array();

dashboard/application/models/User_model.php

Indentation +13 added lines, -13 removed lines

@@ -242,20 +242,20 @@
     }
 
     function ip_is_private($ip) {
-       $safe_ip = array(
-           $this->config->item('safeipone'),
-           $this->config->item('safeiptwo'),
-           $this->config->item('safeipthree'),
-           $this->config->item('safeipfour'),
-           $this->config->item('safeipfive'),
-           $this->config->item('safeipsix'),
-           $this->config->item('safeipseven'),
-           $this->config->item('safeipeight'),
-           $this->config->item('safeipnine'),
-           $this->config->item('safeipten'),
-       );      
+        $safe_ip = array(
+            $this->config->item('safeipone'),
+            $this->config->item('safeiptwo'),
+            $this->config->item('safeipthree'),
+            $this->config->item('safeipfour'),
+            $this->config->item('safeipfive'),
+            $this->config->item('safeipsix'),
+            $this->config->item('safeipseven'),
+            $this->config->item('safeipeight'),
+            $this->config->item('safeipnine'),
+            $this->config->item('safeipten'),
+        );      
       
-      if (in_array($_SERVER['REMOTE_ADDR'], $safe_ip)) {
+        if (in_array($_SERVER['REMOTE_ADDR'], $safe_ip)) {
             return true;
         } else {
             return false;

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 
         $ldap = ldap_connect($this->config->item('ldapserver'));
 
-        $ldaprdn = $this->config->item('ldapshortdomain') . $username;
+        $ldaprdn = $this->config->item('ldapshortdomain').$username;
 
         ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
         ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
@@ -135,7 +135,7 @@ 
         $two_hour_login = strtotime("-2 hours");
         $current_timestamp = date("Y-m-d H:i:s", time());
         $login_count = 1;
-        $browser = $this->agent->browser() . ' ' . $this->agent->version();
+        $browser = $this->agent->browser().' '.$this->agent->version();
 
         if ($query->num_rows() > 0) {
 
@@ -235,8 +235,8 @@ 
 
         $iv = mcrypt_create_iv(IV_SIZE, MCRYPT_DEV_URANDOM);
         $crypt = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $encrypt_item, MCRYPT_MODE_CBC, $iv);
-        $combo = $iv . $crypt;
-        $output = base64_encode($iv . $crypt);
+        $combo = $iv.$crypt;
+        $output = base64_encode($iv.$crypt);
 
         return $output;
     }

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/marketing/Visitor_model.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
             'last_name' => $this->input->post('last_name'),
             'email' => $this->input->post('email'),
             'postcode' => $this->input->post('postcode'),
-            'date_birth' => $this->input->post('dob_d') .'/'. $this->input->post('dob_m') .'/'. $this->input->post('dob_y'),
+            'date_birth' => $this->input->post('dob_d').'/'.$this->input->post('dob_m').'/'.$this->input->post('dob_y'),
             'current_school' => $this->input->post('current'),
             'current_other' => $this->input->post('current_other'),
             'subject_interest' => implode(', ', $this->input->post('subject')),

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

Indentation +16 added lines, -16 removed lines

@@ -93,16 +93,16 @@ 
     
     public function check_status() {
         $this->db->where('requester_un', $_SESSION['username'])
-                 ->or_where('staff_involved_un', $_SESSION['username'])
-                 ->or_where('staff_involved_un2', $_SESSION['ldap']['full_name'])
-                 ->or_where('staff_involved_un3', $_SESSION['ldap']['full_name'])
-                 ->or_where('staff_involved_un4', $_SESSION['ldap']['full_name'])
-                 ->or_where('staff_involved_un5', $_SESSION['ldap']['full_name'])
-                 ->or_where('staff_involved_un6', $_SESSION['ldap']['full_name'])
-                 ->or_where('staff_involved_un7', $_SESSION['ldap']['full_name'])
-                 ->or_where('staff_involved_un8', $_SESSION['ldap']['full_name'])
-                 ->or_where('staff_involved_un9', $_SESSION['ldap']['full_name'])
-                 ->or_where('staff_involved_un10', $_SESSION['ldap']['full_name']);
+                    ->or_where('staff_involved_un', $_SESSION['username'])
+                    ->or_where('staff_involved_un2', $_SESSION['ldap']['full_name'])
+                    ->or_where('staff_involved_un3', $_SESSION['ldap']['full_name'])
+                    ->or_where('staff_involved_un4', $_SESSION['ldap']['full_name'])
+                    ->or_where('staff_involved_un5', $_SESSION['ldap']['full_name'])
+                    ->or_where('staff_involved_un6', $_SESSION['ldap']['full_name'])
+                    ->or_where('staff_involved_un7', $_SESSION['ldap']['full_name'])
+                    ->or_where('staff_involved_un8', $_SESSION['ldap']['full_name'])
+                    ->or_where('staff_involved_un9', $_SESSION['ldap']['full_name'])
+                    ->or_where('staff_involved_un10', $_SESSION['ldap']['full_name']);
         $query = $this->db->get('room_move');
         return $query->result_array();
     }
@@ -130,7 +130,7 @@ 
     public function cancel($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('room_move');
+    $this->db->from('room_move');
         $data = array(
             'status' => '4',
             'canceled_by' => $_SESSION['ldap']['full_name'],
@@ -142,7 +142,7 @@ 
     public function eh_reject($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('room_move');
+    $this->db->from('room_move');
         $data = array(
             'status' => '2',
             'estates_at' => date("Y-m-d H:i:s", time()),
@@ -154,7 +154,7 @@ 
     public function eh_approve($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('room_move');
+    $this->db->from('room_move');
         $data = array(
             'status' => '1',
             'estates_at' => date("Y-m-d H:i:s", time()),
@@ -167,7 +167,7 @@ 
     public function cs_reject($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('room_move');
+    $this->db->from('room_move');
         $data = array(
             'status' => '3',
             'cs_at' => date("Y-m-d H:i:s", time()),
@@ -179,7 +179,7 @@ 
     public function cs_approve($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('room_move');
+    $this->db->from('room_move');
         $data = array(
             'status' => '5',
             'cs_at' => date("Y-m-d H:i:s", time()),
@@ -192,7 +192,7 @@ 
     public function cs_complete($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('room_move');
+    $this->db->from('room_move');
         $data = array(
             'status' => '6',
             'completed_at' => date("Y-m-d H:i:s", time()),

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
                     $user_un10 = $user_un10[1];
                 } else { $user_un10 = NULL; }
                 
-        if ($furniture == "No Furniture"){
+        if ($furniture == "No Furniture") {
             $status = "1";
         } else {
             $status = "0";

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

Spacing +14 added lines, -14 removed lines

@@ -9,14 +9,14 @@ 
     public function create($first_name, $last_name, $ern, $position, $faculty, $department, $room, $ext, $con_start, $con_end, $password, $site) {
 
         $firstchar = substr($this->input->post('first_name'), 0, 1);
-        $builtUsername = strtolower($firstchar) . strtolower($this->input->post('last_name'));
+        $builtUsername = strtolower($firstchar).strtolower($this->input->post('last_name'));
         //check user name is new
 
-        $username = $this->config->item('ldapshortdomain') . $builtUsername;
+        $username = $this->config->item('ldapshortdomain').$builtUsername;
         // 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')))
+        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);
@@ -27,7 +27,7 @@ 
         $info = ldap_count_entries($conn, $result);
 
         if ($info != 0) {
-            $builtUsername = $builtUsername . "2";
+            $builtUsername = $builtUsername."2";
         }
 
 
@@ -38,17 +38,17 @@ 
         $this->email->message('A new staff account has been requested by yourself
                       
         Account Details:
-        Name: ' . $this->input->post('first_name') . ' ' . $this->input->post('last_name') . '
-        Position: ' . $this->input->post('position') . '
-        ERN: ' . $this->input->post('ern') . '
-        Faculty: ' . $this->input->post('faculty') . '
-        Department: ' . $this->input->post('department') . '
-        Room: ' . $this->input->post('room') . '
-        Phone: ' . $this->input->post('ext') . '
-        Site: ' . $this->input->post('site') . '
+        Name: ' . $this->input->post('first_name').' '.$this->input->post('last_name').'
+        Position: ' . $this->input->post('position').'
+        ERN: ' . $this->input->post('ern').'
+        Faculty: ' . $this->input->post('faculty').'
+        Department: ' . $this->input->post('department').'
+        Room: ' . $this->input->post('room').'
+        Phone: ' . $this->input->post('ext').'
+        Site: ' . $this->input->post('site').'
                            
-        Username: ' . $builtUsername . '
-        Password: ' . $this->input->post('password') . '
+        Username: ' . $builtUsername.'
+        Password: ' . $this->input->post('password').'
 
 
         If this account was made by mistake please contact Computing Support.

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;