East-Kent-Partnership / Intranet

dashboard/application/views/templates/table_assets.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
 
-<?php foreach($css_files as $file): ?>
+<?php foreach ($css_files as $file): ?>
     <link type="text/css" rel="stylesheet" href="<?= $file; ?>" />
 <?php endforeach; ?>
-<?php foreach($js_files as $file): ?>
+<?php foreach ($js_files as $file): ?>
     <script src="<?= $file; ?>"></script>
 <?php endforeach;
\ No newline at end of file

dashboard/application/core/MY_Controller.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
         if (isset($_COOKIE['CI-CONCRETE5']) === FALSE) {
 
             $this->session->set_userdata('last_url', current_url());
-            redirect('http://'.$_SERVER['HTTP_HOST'].'/authentication/dashboard?url=' . current_url());
+            redirect('http://'.$_SERVER['HTTP_HOST'].'/authentication/dashboard?url='.current_url());
         } else {
 
             $cookie = $_COOKIE['CI-CONCRETE5'];
@@ -79,7 +79,7 @@ 
                 //expire fake cookie
                 setcookie('CI-CONCRETE5', 'expired', time() - (1), "/");
                 $this->session->set_userdata('last_url', current_url());
-                redirect('http://'.$_SERVER['HTTP_HOST'].'/authentication/dashboard?url=' . current_url());
+                redirect('http://'.$_SERVER['HTTP_HOST'].'/authentication/dashboard?url='.current_url());
             } else {
 
                 $user_ldap = $this->user_model->user_ldap($username);

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

Spacing +15 added lines, -15 removed lines

@@ -17,7 +17,7 @@ 
         $data = array();
         $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');
@@ -47,10 +47,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();
@@ -123,7 +123,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']);
@@ -143,7 +143,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']);
@@ -164,7 +164,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 = array();
@@ -180,12 +180,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';
@@ -202,7 +202,7 @@ 
                     //$WIN = convertUnixtoWin($UNIX);
 
                     //Create Unicode password
-                    $passwordWithQuotes = '"' . $data['AD'][0]['password'] . '"';
+                    $passwordWithQuotes = '"'.$data['AD'][0]['password'].'"';
                     $ldaprecord = array();
                     $ldaprecord["unicodepwd"] = iconv('UTF-8', 'UTF-16LE', $passwordWithQuotes);
 
@@ -212,20 +212,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);