@@ -5,7 +5,7 @@ |
||
| 5 | 5 | // Each function is run using cron. |
| 6 | 6 | |
| 7 | 7 | public function __construct() { |
| 8 | - parent::__construct(); |
|
| 8 | + parent::__construct(); |
|
| 9 | 9 | $this->load->model('core/Jobs_model', 'jobs_model'); |
| 10 | 10 | } |
| 11 | 11 | |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | class Index extends My_Force_Login { |
| 4 | 4 | |
| 5 | 5 | public function __construct() { |
| 6 | - parent::__construct(); |
|
| 6 | + parent::__construct(); |
|
| 7 | 7 | |
| 8 | 8 | } |
| 9 | 9 | |
@@ -18,7 +18,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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(); |
@@ -4,7 +4,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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(); |
@@ -18,13 +18,13 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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'); |
@@ -3,7 +3,7 @@ |
||
| 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 | |
@@ -37,7 +37,7 @@ |
||
| 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'); |
@@ -74,7 +74,7 @@ |
||
| 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(); |
@@ -73,8 +73,8 @@ |
||
| 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(); |
@@ -133,7 +133,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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']); |
@@ -64,11 +64,11 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | |