Passed
Push — master ( fb547d...d3b3ea )
by William
02:49
created
dashboard/application/controllers/admin/Jobs_logs.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
     
19 19
     public function intranet() {
20 20
         
21
-        $this->db = $this->load->database('intranet',true);
21
+        $this->db = $this->load->database('intranet', true);
22 22
         
23 23
         $crud = new grocery_CRUD();
24 24
         $crud->set_table('Logs');
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
         $crud->unset_edit();
30 30
         $output = $crud->render();
31 31
         
32
-        $this->db = $this->load->database('default',true);
32
+        $this->db = $this->load->database('default', true);
33 33
         
34 34
         $this->load->view('templates/header.php');
35 35
         $this->load->view('admin/jobs-logs/intranet', $output);
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
         $crud->set_table('users_log');
45 45
         $crud->set_subject('Dashboard Logs', 'Dashboard Logs');
46 46
         $crud->unset_columns('id');
47
-        $crud->display_as('ip','IP')->display_as('url','URL');
47
+        $crud->display_as('ip', 'IP')->display_as('url', 'URL');
48 48
         $crud->unset_edit();
49 49
         $crud->unset_delete();
50 50
         $crud->unset_add();
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
         $crud->set_table('passkey_log');
64 64
         $crud->set_subject('Passkey', 'Passkey');
65 65
         $crud->unset_columns('id');
66
-        $crud->display_as('ip','IP')->display_as('passid','PassID');
66
+        $crud->display_as('ip', 'IP')->display_as('passid', 'PassID');
67 67
         $crud->unset_edit();
68 68
         $crud->unset_delete();
69 69
         $crud->unset_add();
Please login to merge, or discard this patch.
dashboard/application/controllers/admin/User.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 
5 5
     public function __construct() {
6 6
         
7
-	parent::__construct();
7
+    parent::__construct();
8 8
             $this->load->library('encrypt');
9 9
             $this->load->library('grocery_CRUD');
10 10
             $this->load->model('user_model');
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
         $crud->set_subject('User', 'Users');
26 26
         $crud->columns('uID','uName', 'uEmail', 'uDateAdded','uLastLogin','uNumLogins');
27 27
         $crud->display_as('uID','Intranet UID')->display_as('uName', 'Username')->display_as('uEmail', 'Email Address')
28
-              ->display_as('uDateAdded', 'First Login')->display_as('uLastLogin', 'Last Login')->display_as('uNumLogins', 'Logins');
28
+                ->display_as('uDateAdded', 'First Login')->display_as('uLastLogin', 'Last Login')->display_as('uNumLogins', 'Logins');
29 29
         $crud->unset_delete();
30 30
         $crud->unset_read();
31 31
         $crud->unset_add();
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
         $crud->set_table('users');
48 48
         $crud->set_subject('users', 'Dashboard Users');
49 49
         $crud->display_as('uid','Intranet UID')->display_as('ip_last', 'Last IP')->display_as('ip_internal', 'Last internal IP')->display_as('ip_external', 'Last external IP')
50
-              ->display_as('os', 'OS')->display_as('last_external', 'Last active external');
50
+                ->display_as('os', 'OS')->display_as('last_external', 'Last active external');
51 51
         $crud->unset_read();
52 52
         $crud->unset_edit();
53 53
         $crud->unset_delete();
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -18,13 +18,13 @@  discard block
 block discarded – undo
18 18
     
19 19
     public function intranet() {
20 20
         
21
-        $this->db = $this->load->database('intranet',true);
21
+        $this->db = $this->load->database('intranet', true);
22 22
         
23 23
         $crud = new grocery_CRUD();
24 24
         $crud->set_table('Users');
25 25
         $crud->set_subject('User', 'Users');
26
-        $crud->columns('uID','uName', 'uEmail', 'uDateAdded','uLastLogin','uNumLogins');
27
-        $crud->display_as('uID','Intranet UID')->display_as('uName', 'Username')->display_as('uEmail', 'Email Address')
26
+        $crud->columns('uID', 'uName', 'uEmail', 'uDateAdded', 'uLastLogin', 'uNumLogins');
27
+        $crud->display_as('uID', 'Intranet UID')->display_as('uName', 'Username')->display_as('uEmail', 'Email Address')
28 28
               ->display_as('uDateAdded', 'First Login')->display_as('uLastLogin', 'Last Login')->display_as('uNumLogins', 'Logins');
29 29
         $crud->unset_delete();
30 30
         $crud->unset_read();
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
         $crud->unset_edit();
33 33
         $output = $crud->render();
34 34
         
35
-        $this->db = $this->load->database('default',true);
35
+        $this->db = $this->load->database('default', true);
36 36
         
37 37
         $this->load->view('templates/header.php');
38 38
         $this->load->view('admin/user/view.php', $output);
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         $crud = new grocery_CRUD();
47 47
         $crud->set_table('users');
48 48
         $crud->set_subject('users', 'Dashboard Users');
49
-        $crud->display_as('uid','Intranet UID')->display_as('ip_last', 'Last IP')->display_as('ip_internal', 'Last internal IP')->display_as('ip_external', 'Last external IP')
49
+        $crud->display_as('uid', 'Intranet UID')->display_as('ip_last', 'Last IP')->display_as('ip_internal', 'Last internal IP')->display_as('ip_external', 'Last external IP')
50 50
               ->display_as('os', 'OS')->display_as('last_external', 'Last active external');
51 51
         $crud->unset_read();
52 52
         $crud->unset_edit();
@@ -66,15 +66,15 @@  discard block
 block discarded – undo
66 66
         $crud = new grocery_CRUD();
67 67
         $crud->set_table('passkey');
68 68
         $crud->set_subject('passkey', 'Passkey');
69
-        $crud->display_as('passid','PassID')->display_as('passkey', 'Passkey')->display_as('url', 'URL');
69
+        $crud->display_as('passid', 'PassID')->display_as('passkey', 'Passkey')->display_as('url', 'URL');
70 70
         $crud->unset_columns('id'); 
71 71
         $crud->unset_edit_fields('id'); 
72 72
         $crud->unset_read();
73 73
         $crud->unset_print();
74 74
         $crud->unset_export();
75
-        $crud->callback_before_insert(array($this,'encrypt_password_callback'));
76
-        $crud->callback_before_update(array($this,'encrypt_password_callback'));
77
-        $crud->callback_edit_field('passkey',array($this,'decrypt_password_callback'));
75
+        $crud->callback_before_insert(array($this, 'encrypt_password_callback'));
76
+        $crud->callback_before_update(array($this, 'encrypt_password_callback'));
77
+        $crud->callback_edit_field('passkey', array($this, 'decrypt_password_callback'));
78 78
         $output = $crud->render();
79 79
         
80 80
         $this->load->view('templates/header.php');
Please login to merge, or discard this patch.
dashboard/application/controllers/admin/Index.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 class Index extends My_Force_Admin {
4 4
     
5 5
     public function __construct() {
6
-	parent::__construct();
6
+    parent::__construct();
7 7
             
8 8
     }
9 9
     
Please login to merge, or discard this patch.
dashboard/application/controllers/marketing/Visitor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
                 $last_name = $this->input->post('last_name');
38 38
                 $email = $this->input->post('email');
39 39
                 $postcode = $this->input->post('postcode');
40
-                $dob = $this->input->post('dob_d') . '/' . $this->input->post('dob_m') . '/' . $this->input->post('dob_y');
40
+                $dob = $this->input->post('dob_d').'/'.$this->input->post('dob_m').'/'.$this->input->post('dob_y');
41 41
                 $current = $this->input->post('current');
42 42
                 $current_other = $this->input->post('current_other');
43 43
                 $subject = $this->input->post('subject');
Please login to merge, or discard this patch.
dashboard/application/controllers/computing-support/Equipment_loan.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
             $crud->set_subject('Equipment Loan', 'Equipment Loan');
75 75
             $crud->unset_columns('id'); 
76 76
             $crud->display_as('ern','ER no.')
77
-                 ->display_as('sn','Serial Number');
77
+                    ->display_as('sn','Serial Number');
78 78
             $crud->unset_edit_fields('logged', 'date'); 
79 79
             $crud->unset_add();
80 80
             $crud->unset_read();
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,8 +73,8 @@
 block discarded – undo
73 73
             $crud->set_table('equipment_loan');
74 74
             $crud->set_subject('Equipment Loan', 'Equipment Loan');
75 75
             $crud->unset_columns('id'); 
76
-            $crud->display_as('ern','ER no.')
77
-                 ->display_as('sn','Serial Number');
76
+            $crud->display_as('ern', 'ER no.')
77
+                 ->display_as('sn', 'Serial Number');
78 78
             $crud->unset_edit_fields('logged', 'date'); 
79 79
             $crud->unset_add();
80 80
             $crud->unset_read();
Please login to merge, or discard this patch.
dashboard/application/controllers/computing-support/Ownership.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
                         . 'Check the progress of other requests and the history of your transfers.');
134 134
                 $this->email->send();
135 135
 
136
-                $function = 'ownership_APPROVE_' . $id;
136
+                $function = 'ownership_APPROVE_'.$id;
137 137
                 $this->user_model->function_log($function);
138 138
 
139 139
                 redirect($_SERVER['HTTP_REFERER']);
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
                         . 'https://intranet.cant-col.ac.uk/dashboard/computing-support/ownership/check');
168 168
                 $this->email->send();
169 169
 
170
-                $function = 'ownership_REJECT_' . $id;
170
+                $function = 'ownership_REJECT_'.$id;
171 171
                 $this->user_model->function_log($function);
172 172
 
173 173
                 redirect($_SERVER['HTTP_REFERER']);
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
                 $id = $_GET['id'];
191 191
                 $this->ownership_model->cancel($id);
192 192
 
193
-                $function = 'ownership_CANCEL_' . $id;
193
+                $function = 'ownership_CANCEL_'.$id;
194 194
                 $this->user_model->function_log($function);
195 195
 
196 196
                 redirect($_SERVER['HTTP_REFERER']);
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
                         . 'https://intranet.cant-col.ac.uk/dashboard/computing-support/ownership/review');
224 224
                 $this->email->send();
225 225
 
226
-                $function = 'ownership_TERMS_' . $id;
226
+                $function = 'ownership_TERMS_'.$id;
227 227
                 $this->user_model->function_log($function);
228 228
 
229 229
                 redirect($_SERVER['HTTP_REFERER']);
Please login to merge, or discard this patch.
dashboard/application/controllers/computing-support/New_account.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -64,11 +64,11 @@  discard block
 block discarded – undo
64 64
                     $this->email->bcc('[email protected]');
65 65
                     $this->email->subject('New Staff Account');
66 66
                     $this->email->message('A new staff account has been requested by '.$_SESSION['username'].'
67
-                       Name: ' . $this->input->post('first_name') . ' ' . $this->input->post('last_name') . '
68
-                       Position: ' . $this->input->post('position') . '
69
-                       Department: ' . $this->input->post('department') . '
67
+                       Name: ' . $this->input->post('first_name').' '.$this->input->post('last_name').'
68
+                       Position: ' . $this->input->post('position').'
69
+                       Department: ' . $this->input->post('department').'
70 70
                            
71
-                       By: ' . $_SESSION['ldap']['full_name'] . '
71
+                       By: ' . $_SESSION['ldap']['full_name'].'
72 72
 
73 73
 
74 74
                        The script will automaticly download user details and mark as created.
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
                     $this->email->to($_SESSION['ldap']['email']);
80 80
                     $this->email->subject('New Staff Account');
81 81
                     $this->email->message('You have submitted a new staff account request for
82
-                       Name: ' . $this->input->post('first_name') . ' ' . $this->input->post('last_name') . '
83
-                       Position: ' . $this->input->post('position') . '
82
+                       Name: ' . $this->input->post('first_name').' '.$this->input->post('last_name').'
83
+                       Position: ' . $this->input->post('position').'
84 84
                            
85 85
                        There password is: '.$password.'
86 86
                        Check their username here: https://intranet.cant-col.ac.uk/dashboard/computing-support/new-account/pending
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
             $crud = new grocery_CRUD();
123 123
             $crud->set_table('new_account');
124 124
             $crud->set_subject('new_account', 'New Account');
125
-            $crud->display_as('ern','ER no.')->display_as('ext','Phone Number')->display_as('con_start','Contract Start')->display_as('con_end','Contract End');
125
+            $crud->display_as('ern', 'ER no.')->display_as('ext', 'Phone Number')->display_as('con_start', 'Contract Start')->display_as('con_end', 'Contract End');
126 126
             $crud->edit_fields('complete');
127 127
             $crud->unset_add();
128 128
             $crud->unset_read();
@@ -304,8 +304,8 @@  discard block
 block discarded – undo
304 304
                     $this->email->to('[email protected]');
305 305
                     $this->email->subject('Disable Staff Account');
306 306
                     $this->email->message('A staff account needs to be disabled and has been requested by '.$_SESSION['username'].'
307
-                       Name: ' . $this->input->post('full_name') . '
308
-                       Last Day: ' . $this->input->post('last') . '
307
+                       Name: ' . $this->input->post('full_name').'
308
+                       Last Day: ' . $this->input->post('last').'
309 309
                            
310 310
                        By: ' . $_SESSION['ldap']['full_name'].'
311 311
                            
Please login to merge, or discard this patch.
dashboard/application/controllers/computing-support/Private_drive.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -48,15 +48,15 @@  discard block
 block discarded – undo
48 48
                     $this->email->to($user_email);
49 49
                     $this->email->cc($_SESSION['ldap']['email']);
50 50
                     $this->email->subject('Private Drive Access Request');
51
-                    $this->email->message('Access to a private drive has been requested for ' . $user . ' by ' . $requester . '. 
52
-                    This request is currently waiting for approval by ' . $approver . '. 
51
+                    $this->email->message('Access to a private drive has been requested for '.$user.' by '.$requester.'. 
52
+                    This request is currently waiting for approval by ' . $approver.'. 
53 53
                             
54 54
                     You can check the status of the request at the following link:
55 55
                     https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/check
56 56
                             
57 57
                     If this request was made by mistake; you can cancel the request using the same link.
58 58
                             
59
-                    Folder path: ' . $path . '
59
+                    Folder path: ' . $path.'
60 60
                     Access level: ' . $access);
61 61
                     $this->email->send();
62 62
 
@@ -66,13 +66,13 @@  discard block
 block discarded – undo
66 66
                     $this->email->from('[email protected]', 'Private Drive Access');
67 67
                     $this->email->to($faculty_email);
68 68
                     $this->email->subject('Private Drive Access Request');
69
-                    $this->email->message('Access to a private drive has been requested for ' . $user . ' by ' . $requester . '.
69
+                    $this->email->message('Access to a private drive has been requested for '.$user.' by '.$requester.'.
70 70
                     You have been marked as the approver for this request.
71 71
                             
72 72
                     Please approve or reject this request using the following link:
73 73
                     https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/check
74 74
                             
75
-                    Folder path: ' . $path . '
75
+                    Folder path: ' . $path.'
76 76
                     Access level: ' . $access);
77 77
                     $this->email->send();
78 78
 
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
                 $id = $_GET['id'];
144 144
                 $this->private_drive_model->cancel($id);
145 145
 
146
-                $function = 'private_drive_CANCEL_' . $id;
146
+                $function = 'private_drive_CANCEL_'.$id;
147 147
                 $this->user_model->function_log($function);
148 148
 
149 149
                 redirect($_SERVER['HTTP_REFERER']);
@@ -175,16 +175,16 @@  discard block
 block discarded – undo
175 175
                 $this->email->to($requester_email);
176 176
                 $this->email->cc($user_email);
177 177
                 $this->email->subject('Private Drive Access Request Rejected');
178
-                $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'] . '.
178
+                $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'].'.
179 179
                             
180 180
                 You can view the status of this request and others like it using the below link:
181 181
                 https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/check
182 182
                             
183
-                Folder path: ' . $get_request[0]['path'] . '
183
+                Folder path: ' . $get_request[0]['path'].'
184 184
                 Access level: ' . $get_request[0]['access']);
185 185
                 $this->email->send();
186 186
 
187
-                $function = 'private_drive_FH_REJECT_' . $id;
187
+                $function = 'private_drive_FH_REJECT_'.$id;
188 188
                 $this->user_model->function_log($function);
189 189
 
190 190
                 redirect($_SERVER['HTTP_REFERER']);
@@ -211,18 +211,18 @@  discard block
 block discarded – undo
211 211
                 $this->email->to('[email protected]');
212 212
                 $this->email->cc('[email protected]');
213 213
                 $this->email->subject('Private Drive Access Request Approved');
214
-                $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'] . '.
214
+                $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'].'.
215 215
                             
216 216
                 This request needs to be actioned
217 217
                             
218 218
                 View the details of the request at the following link:
219 219
                 https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/pending
220 220
                             
221
-                Folder path: ' . $get_request[0]['path'] . '
221
+                Folder path: ' . $get_request[0]['path'].'
222 222
                 Access level: ' . $get_request[0]['access']);
223 223
                 $this->email->send();
224 224
 
225
-                $function = 'private_drive_FH_APPROVED_' . $id;
225
+                $function = 'private_drive_FH_APPROVED_'.$id;
226 226
                 $this->user_model->function_log($function);
227 227
 
228 228
                 redirect($_SERVER['HTTP_REFERER']);
@@ -254,16 +254,16 @@  discard block
 block discarded – undo
254 254
                 $this->email->to($requester_email);
255 255
                 $this->email->cc($user_email);
256 256
                 $this->email->subject('Private Drive Access Request Rejected');
257
-                $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.
257
+                $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.
258 258
                             
259 259
                 You can view the status of this request and others like it using the below link:
260 260
                 https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/check
261 261
                             
262
-                Folder path: ' . $get_request[0]['path'] . '
262
+                Folder path: ' . $get_request[0]['path'].'
263 263
                 Access level: ' . $get_request[0]['access']);
264 264
                 $this->email->send();
265 265
 
266
-                $function = 'private_drive_CS_REJECT_' . $id;
266
+                $function = 'private_drive_CS_REJECT_'.$id;
267 267
                 $this->user_model->function_log($function);
268 268
 
269 269
                 redirect($_SERVER['HTTP_REFERER']);
@@ -296,18 +296,18 @@  discard block
 block discarded – undo
296 296
                 $this->email->to($requester_email);
297 297
                 $this->email->cc($user_email);
298 298
                 $this->email->subject('Private Drive Access Request Actioned');
299
-                $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.
299
+                $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.
300 300
                             
301 301
                 For the permissions to be applied, you must log out and on again.
302 302
                 
303 303
                 You can view your other requests at the following link.
304 304
                 https://intranet.cant-col.ac.uk/dashboard/computing-support/private-drive/check
305 305
                             
306
-                Folder path: ' . $get_request[0]['path'] . '
306
+                Folder path: ' . $get_request[0]['path'].'
307 307
                 Access level: ' . $get_request[0]['access']);
308 308
                 $this->email->send();
309 309
 
310
-                $function = 'private_drive_CS_APPROVED_' . $id;
310
+                $function = 'private_drive_CS_APPROVED_'.$id;
311 311
                 $this->user_model->function_log($function);
312 312
 
313 313
                 redirect($_SERVER['HTTP_REFERER']);
Please login to merge, or discard this patch.
dashboard/application/controllers/computing-support/Room_move.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
                 $this->load->view('computing-support/room-move/complete');
53 53
                 $this->load->view('templates/footer');
54 54
                 
55
-                if ($furniture == "No Furniture"){
55
+                if ($furniture == "No Furniture") {
56 56
 
57 57
                     $to_add = array('[email protected]', '[email protected]', '[email protected]');
58 58
                     
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
                 $staff_involved_un6 = $user_un6;
166 166
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
167 167
                 
168
-                $staff_involved_un7= $user_un7;
168
+                $staff_involved_un7 = $user_un7;
169 169
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
170 170
                 
171 171
                 $staff_involved_un8 = $user_un8;
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
                 $id = $_GET['id'];
257 257
                 $this->room_move_model->cancel($id);
258 258
 
259
-                $function = 'room_move_CANCEL_' . $id;
259
+                $function = 'room_move_CANCEL_'.$id;
260 260
                 $this->user_model->function_log($function);
261 261
                 
262 262
                 $get_request = $this->room_move_model->get_request($id);
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
                 $staff_involved_un6 = $get_request[0]['staff_involved_un6'];
283 283
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
284 284
                 
285
-                $staff_involved_un7= $get_request[0]['staff_involved_un7'];
285
+                $staff_involved_un7 = $get_request[0]['staff_involved_un7'];
286 286
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
287 287
                 
288 288
                 $staff_involved_un8 = $get_request[0]['staff_involved_un8'];
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
                 $id = $_GET['id'];
329 329
                 $this->room_move_model->eh_reject($id);
330 330
 
331
-                $function = 'room_move_EH_REJECT_' . $id;
331
+                $function = 'room_move_EH_REJECT_'.$id;
332 332
                 $this->user_model->function_log($function);
333 333
                 
334 334
                 $get_request = $this->room_move_model->get_request($id);
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
                 $staff_involved_un6 = $get_request[0]['staff_involved_un6'];
355 355
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
356 356
                 
357
-                $staff_involved_un7= $get_request[0]['staff_involved_un7'];
357
+                $staff_involved_un7 = $get_request[0]['staff_involved_un7'];
358 358
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
359 359
                 
360 360
                 $staff_involved_un8 = $get_request[0]['staff_involved_un8'];
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
                 $id = $_GET['id'];
403 403
                 $this->room_move_model->eh_approve($id);
404 404
 
405
-                $function = 'room_move_EH_APPROVED_' . $id;
405
+                $function = 'room_move_EH_APPROVED_'.$id;
406 406
                 $this->user_model->function_log($function);
407 407
                 
408 408
                 $get_request = $this->room_move_model->get_request($id);
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
                 $reason = $_GET['reason'];
445 445
                 $this->room_move_model->cs_reject($id);
446 446
 
447
-                $function = 'room_move_CS_REJECT_' . $id;
447
+                $function = 'room_move_CS_REJECT_'.$id;
448 448
                 $this->user_model->function_log($function);
449 449
                 
450 450
                 $get_request = $this->room_move_model->get_request($id);
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
                 $staff_involved_un6 = $get_request[0]['staff_involved_un6'];
471 471
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
472 472
                 
473
-                $staff_involved_un7= $get_request[0]['staff_involved_un7'];
473
+                $staff_involved_un7 = $get_request[0]['staff_involved_un7'];
474 474
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
475 475
                 
476 476
                 $staff_involved_un8 = $get_request[0]['staff_involved_un8'];
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
                 $id = $_GET['id'];
519 519
                 $this->room_move_model->cs_approve($id);
520 520
 
521
-                $function = 'room_move_CS_APPROVED_' . $id;
521
+                $function = 'room_move_CS_APPROVED_'.$id;
522 522
                 $this->user_model->function_log($function);
523 523
                 
524 524
                 $get_request = $this->room_move_model->get_request($id);
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
                 $staff_involved_un6 = $get_request[0]['staff_involved_un6'];
545 545
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
546 546
                 
547
-                $staff_involved_un7= $get_request[0]['staff_involved_un7'];
547
+                $staff_involved_un7 = $get_request[0]['staff_involved_un7'];
548 548
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
549 549
                 
550 550
                 $staff_involved_un8 = $get_request[0]['staff_involved_un8'];
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
                 $id = $_GET['id'];
592 592
                 $this->room_move_model->cs_complete($id);
593 593
 
594
-                $function = 'room_move_CS_COMPLETE_' . $id;
594
+                $function = 'room_move_CS_COMPLETE_'.$id;
595 595
                 $this->user_model->function_log($function);
596 596
                 
597 597
                 $get_request = $this->room_move_model->get_request($id);
@@ -617,7 +617,7 @@  discard block
 block discarded – undo
617 617
                 $staff_involved_un6 = $get_request[0]['staff_involved_un6'];
618 618
                 $staff_involved_email6 = $this->room_move_model->get_email_username($staff_involved_un6);
619 619
                 
620
-                $staff_involved_un7= $get_request[0]['staff_involved_un7'];
620
+                $staff_involved_un7 = $get_request[0]['staff_involved_un7'];
621 621
                 $staff_involved_email7 = $this->room_move_model->get_email_username($staff_involved_un7);
622 622
                 
623 623
                 $staff_involved_un8 = $get_request[0]['staff_involved_un8'];
Please login to merge, or discard this patch.