East-Kent-Partnership / Intranet

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

Spacing +18 added lines, -18 removed lines

@@ -48,15 +48,15 @@ 
                     $this->email->to($user_email);
                     $this->email->cc($_SESSION['ldap']['email']);
                     $this->email->subject('Private Drive Access Request');
-                    $this->email->message('Access to a private drive has been requested for ' . $user . ' by ' . $requester . '. 
-                    This request is currently waiting for approval by ' . $approver . '. 
+                    $this->email->message('Access to a private drive has been requested for '.$user.' by '.$requester.'. 
+                    This request is currently waiting for approval by ' . $approver.'. 
                             
                     You can check the status of the request at the following link:
                     https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/check
                             
                     If this request was made by mistake; you can cancel the request using the same link.
                             
-                    Folder path: ' . $path . '
+                    Folder path: ' . $path.'
                     Access level: ' . $access);
                     $this->email->send();
 
@@ -66,13 +66,13 @@ 
                     $this->email->from('noreply@intranet.cant-col.ac.uk', 'Private Drive Access');
                     $this->email->to($faculty_email);
                     $this->email->subject('Private Drive Access Request');
-                    $this->email->message('Access to a private drive has been requested for ' . $user . ' by ' . $requester . '.
+                    $this->email->message('Access to a private drive has been requested for '.$user.' by '.$requester.'.
                     You have been marked as the approver for this request.
                             
                     Please approve or reject this request using the following link:
                     https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/check
                             
-                    Folder path: ' . $path . '
+                    Folder path: ' . $path.'
                     Access level: ' . $access);
                     $this->email->send();
 
@@ -143,7 +143,7 @@ 
                 $id = $_GET['id'];
                 $this->private_drive_model->cancel($id);
 
-                $function = 'private_drive_CANCEL_' . $id;
+                $function = 'private_drive_CANCEL_'.$id;
                 $this->user_model->function_log($function);
 
                 redirect($_SERVER['HTTP_REFERER']);
@@ -175,16 +175,16 @@ 
                 $this->email->to($requester_email);
                 $this->email->cc($user_email);
                 $this->email->subject('Private Drive Access Request Rejected');
-                $this->email->message('Access to a private drive has been requested for ' . $get_request[0]['user'] . ' by ' . $get_request[0]['requester'] . ' has been rejected by ' . $get_request[0]['approver'] . '.
+                $this->email->message('Access to a private drive has been requested for '.$get_request[0]['user'].' by '.$get_request[0]['requester'].' has been rejected by '.$get_request[0]['approver'].'.
                             
                 You can view the status of this request and others like it using the below link:
                 https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/check
                             
-                Folder path: ' . $get_request[0]['path'] . '
+                Folder path: ' . $get_request[0]['path'].'
                 Access level: ' . $get_request[0]['access']);
                 $this->email->send();
 
-                $function = 'private_drive_FH_REJECT_' . $id;
+                $function = 'private_drive_FH_REJECT_'.$id;
                 $this->user_model->function_log($function);
 
                 redirect($_SERVER['HTTP_REFERER']);
@@ -211,18 +211,18 @@ 
                 $this->email->to('ns@canterburycollege.ac.uk');
                 $this->email->cc('d.mitchell@canterburycollege.ac.uk');
                 $this->email->subject('Private Drive Access Request Approved');
-                $this->email->message('Access to a private drive has been requested for ' . $get_request[0]['user'] . ' by ' . $get_request[0]['requester'] . ' has been approved by ' . $get_request[0]['approver'] . '.
+                $this->email->message('Access to a private drive has been requested for '.$get_request[0]['user'].' by '.$get_request[0]['requester'].' has been approved by '.$get_request[0]['approver'].'.
                             
                 This request needs to be actioned
                             
                 View the details of the request at the following link:
                 https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/pending
                             
-                Folder path: ' . $get_request[0]['path'] . '
+                Folder path: ' . $get_request[0]['path'].'
                 Access level: ' . $get_request[0]['access']);
                 $this->email->send();
 
-                $function = 'private_drive_FH_APPROVED_' . $id;
+                $function = 'private_drive_FH_APPROVED_'.$id;
                 $this->user_model->function_log($function);
 
                 redirect($_SERVER['HTTP_REFERER']);
@@ -254,16 +254,16 @@ 
                 $this->email->to($requester_email);
                 $this->email->cc($user_email);
                 $this->email->subject('Private Drive Access Request Rejected');
-                $this->email->message('Access to a private drive has been requested for ' . $get_request[0]['user'] . ' by ' . $get_request[0]['requester'] . ' and approved by ' . $get_request[0]['approver'] . ' has been rejected by Computing Support.
+                $this->email->message('Access to a private drive has been requested for '.$get_request[0]['user'].' by '.$get_request[0]['requester'].' and approved by '.$get_request[0]['approver'].' has been rejected by Computing Support.
                             
                 You can view the status of this request and others like it using the below link:
                 https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/check
                             
-                Folder path: ' . $get_request[0]['path'] . '
+                Folder path: ' . $get_request[0]['path'].'
                 Access level: ' . $get_request[0]['access']);
                 $this->email->send();
 
-                $function = 'private_drive_CS_REJECT_' . $id;
+                $function = 'private_drive_CS_REJECT_'.$id;
                 $this->user_model->function_log($function);
 
                 redirect($_SERVER['HTTP_REFERER']);
@@ -296,18 +296,18 @@ 
                 $this->email->to($requester_email);
                 $this->email->cc($user_email);
                 $this->email->subject('Private Drive Access Request Actioned');
-                $this->email->message('Access to a private drive has been requested for ' . $get_request[0]['user'] . ' by ' . $get_request[0]['requester'] . ' and approved by ' . $get_request[0]['approver'] . ' has been actioned by Computing Support.
+                $this->email->message('Access to a private drive has been requested for '.$get_request[0]['user'].' by '.$get_request[0]['requester'].' and approved by '.$get_request[0]['approver'].' has been actioned by Computing Support.
                             
                 For the permissions to be applied, you must log out and on again.
                 
                 You can view your other requests at the following link.
                 https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/check
                             
-                Folder path: ' . $get_request[0]['path'] . '
+                Folder path: ' . $get_request[0]['path'].'
                 Access level: ' . $get_request[0]['access']);
                 $this->email->send();
 
-                $function = 'private_drive_CS_APPROVED_' . $id;
+                $function = 'private_drive_CS_APPROVED_'.$id;
                 $this->user_model->function_log($function);
 
                 redirect($_SERVER['HTTP_REFERER']);

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

Spacing +13 added lines, -13 removed lines

@@ -52,7 +52,7 @@ 
                 $this->load->view('computing-support/room-move/complete');
                 $this->load->view('templates/footer');
                 
-                if ($furniture == "No Furniture"){
+                if ($furniture == "No Furniture") {
 
                     $to_add = array('r.hayes@canterburycollege.ac.uk', 'ns@canterburycollege.ac.uk', 'a.pezelet@canterburycollege.ac.uk');
                     
@@ -165,7 +165,7 @@ 
                 $staff_involved_un6 = $user_un6;
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
                 
-                $staff_involved_un7= $user_un7;
+                $staff_involved_un7 = $user_un7;
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
                 
                 $staff_involved_un8 = $user_un8;
@@ -256,7 +256,7 @@ 
                 $id = $_GET['id'];
                 $this->room_move_model->cancel($id);
 
-                $function = 'room_move_CANCEL_' . $id;
+                $function = 'room_move_CANCEL_'.$id;
                 $this->user_model->function_log($function);
                 
                 $get_request = $this->room_move_model->get_request($id);
@@ -282,7 +282,7 @@ 
                 $staff_involved_un6 = $get_request[0]['staff_involved_un6'];
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
                 
-                $staff_involved_un7= $get_request[0]['staff_involved_un7'];
+                $staff_involved_un7 = $get_request[0]['staff_involved_un7'];
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
                 
                 $staff_involved_un8 = $get_request[0]['staff_involved_un8'];
@@ -328,7 +328,7 @@ 
                 $id = $_GET['id'];
                 $this->room_move_model->eh_reject($id);
 
-                $function = 'room_move_EH_REJECT_' . $id;
+                $function = 'room_move_EH_REJECT_'.$id;
                 $this->user_model->function_log($function);
                 
                 $get_request = $this->room_move_model->get_request($id);
@@ -354,7 +354,7 @@ 
                 $staff_involved_un6 = $get_request[0]['staff_involved_un6'];
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
                 
-                $staff_involved_un7= $get_request[0]['staff_involved_un7'];
+                $staff_involved_un7 = $get_request[0]['staff_involved_un7'];
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
                 
                 $staff_involved_un8 = $get_request[0]['staff_involved_un8'];
@@ -402,7 +402,7 @@ 
                 $id = $_GET['id'];
                 $this->room_move_model->eh_approve($id);
 
-                $function = 'room_move_EH_APPROVED_' . $id;
+                $function = 'room_move_EH_APPROVED_'.$id;
                 $this->user_model->function_log($function);
                 
                 $get_request = $this->room_move_model->get_request($id);
@@ -444,7 +444,7 @@ 
                 $reason = $_GET['reason'];
                 $this->room_move_model->cs_reject($id);
 
-                $function = 'room_move_CS_REJECT_' . $id;
+                $function = 'room_move_CS_REJECT_'.$id;
                 $this->user_model->function_log($function);
                 
                 $get_request = $this->room_move_model->get_request($id);
@@ -470,7 +470,7 @@ 
                 $staff_involved_un6 = $get_request[0]['staff_involved_un6'];
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
                 
-                $staff_involved_un7= $get_request[0]['staff_involved_un7'];
+                $staff_involved_un7 = $get_request[0]['staff_involved_un7'];
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
                 
                 $staff_involved_un8 = $get_request[0]['staff_involved_un8'];
@@ -518,7 +518,7 @@ 
                 $id = $_GET['id'];
                 $this->room_move_model->cs_approve($id);
 
-                $function = 'room_move_CS_APPROVED_' . $id;
+                $function = 'room_move_CS_APPROVED_'.$id;
                 $this->user_model->function_log($function);
                 
                 $get_request = $this->room_move_model->get_request($id);
@@ -544,7 +544,7 @@ 
                 $staff_involved_un6 = $get_request[0]['staff_involved_un6'];
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
                 
-                $staff_involved_un7= $get_request[0]['staff_involved_un7'];
+                $staff_involved_un7 = $get_request[0]['staff_involved_un7'];
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
                 
                 $staff_involved_un8 = $get_request[0]['staff_involved_un8'];
@@ -591,7 +591,7 @@ 
                 $id = $_GET['id'];
                 $this->room_move_model->cs_complete($id);
 
-                $function = 'room_move_CS_COMPLETE_' . $id;
+                $function = 'room_move_CS_COMPLETE_'.$id;
                 $this->user_model->function_log($function);
                 
                 $get_request = $this->room_move_model->get_request($id);
@@ -617,7 +617,7 @@ 
                 $staff_involved_un6 = $get_request[0]['staff_involved_un6'];
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
                 
-                $staff_involved_un7= $get_request[0]['staff_involved_un7'];
+                $staff_involved_un7 = $get_request[0]['staff_involved_un7'];
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
                 
                 $staff_involved_un8 = $get_request[0]['staff_involved_un8'];

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

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
             $crud = new grocery_CRUD();
             $crud->set_table('disposals');
             $crud->set_subject('disposals', 'Disposals');
-            $crud->display_as('sn','Serial Number');
+            $crud->display_as('sn', 'Serial Number');
             $crud->unset_columns('id'); 
             $crud->unset_add();
             $crud->unset_read();
@@ -98,7 +98,7 @@ 
             $crud->set_table('disposals_current');
             $crud->set_subject('disposals', 'Disposals');
             $crud->set_primary_key('id');
-            $crud->display_as('sn','Serial Number');
+            $crud->display_as('sn', 'Serial Number');
             $crud->unset_columns('id'); 
             $crud->unset_add();
             $crud->unset_read();

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

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/User_model.php

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

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')),