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/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/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;

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

Indentation +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
         
         $this->db->select('faculty');
         $this->db->where('cat_id', $faculty);
-	$this->db->from('faculty');
+    $this->db->from('faculty');
         return $this->db->get()->result_array();
     }
     
@@ -63,7 +63,7 @@ 
         
         $this->db->select('subfaculty');
         $this->db->where('cat_key', $department);
-	$this->db->from('facultysub');
+    $this->db->from('facultysub');
         return $this->db->get()->result_array();
     }
 }

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

Indentation +5 added lines, -5 removed lines

@@ -70,7 +70,7 @@ 
     public function cancel($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('private_drive');
+    $this->db->from('private_drive');
         $data = array(
             'status' => '5',
             'canceled_by' => $_SESSION['ldap']['full_name'],
@@ -82,7 +82,7 @@ 
     public function fh_reject($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('private_drive');
+    $this->db->from('private_drive');
         $data = array(
             'status' => '3',
             'approved_at' => date("Y-m-d H:i:s", time()),
@@ -93,7 +93,7 @@ 
     public function fh_approve($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('private_drive');
+    $this->db->from('private_drive');
         $data = array(
             'status' => '1',
             'approved_at' => date("Y-m-d H:i:s", time()),
@@ -105,7 +105,7 @@ 
     public function cs_reject($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('private_drive');
+    $this->db->from('private_drive');
         $data = array(
             'status' => '4',
             'actioned_at' => date("Y-m-d H:i:s", time()),
@@ -117,7 +117,7 @@ 
     public function cs_approve($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('private_drive');
+    $this->db->from('private_drive');
         $data = array(
             'status' => '2',
             'actioned_at' => date("Y-m-d H:i:s", time()),