East-Kent-Partnership / Intranet

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

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

Indentation +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
     public function approve($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('ownership');
+    $this->db->from('ownership');
         $data = array(
             'status' => '3',
             'transfer' => date("Y-m-d H:i:s", time()),
@@ -67,7 +67,7 @@ 
     public function reject($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('ownership');
+    $this->db->from('ownership');
         $data = array(
             'status' => '2',
             'transfer' => date("Y-m-d H:i:s", time()),
@@ -80,7 +80,7 @@ 
     public function cancel($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('ownership');
+    $this->db->from('ownership');
         $data = array(
             'status' => '4',
         );
@@ -91,7 +91,7 @@ 
     public function terms($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('ownership');
+    $this->db->from('ownership');
         $data = array(
             'status' => '1',
             'policy_accepted' => date("Y-m-d H:i:s", time()),

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

Indentation +4 added lines, -4 removed lines

@@ -146,7 +146,7 @@ 
     public function cancel($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('temporary_account');
+    $this->db->from('temporary_account');
         $data = array(
             'status' => '3',
         );
@@ -156,7 +156,7 @@ 
     public function reject($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('temporary_account');
+    $this->db->from('temporary_account');
         $data = array(
             'status' => '2',
             'status_at' => date("Y-m-d H:i:s", time()),
@@ -168,7 +168,7 @@ 
     public function approve($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('temporary_account');
+    $this->db->from('temporary_account');
         $data = array(
             'status' => '1',
             'status_at' => date("Y-m-d H:i:s", time()),
@@ -181,7 +181,7 @@ 
     public function created_account($id) {
             
         $this->db->where('id', $id);
-	$this->db->from('temporary_account');
+    $this->db->from('temporary_account');
         $data = array(
             'created' => '1',
         );

Spacing +5 added lines, -5 removed lines

@@ -10,14 +10,14 @@ 
     public function create($logged, $faculty, $department, $requester, $first_name, $last_name, $email, $username, $expiry) {
         
         $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);
@@ -28,7 +28,7 @@ 
         $info = ldap_count_entries($conn, $result);
 
         if ($info != 0) {
-            $builtUsername = $builtUsername . "2";
+            $builtUsername = $builtUsername."2";
         }
 
         function randomPassword() {
@@ -49,7 +49,7 @@ 
 
         //Format hh:mm:ss
         $timeFromForm = "00:00:00";
-        $dateWithTime = $dateFromForm . " " . $timeFromForm;
+        $dateWithTime = $dateFromForm." ".$timeFromForm;
 
         function convertDateToUnix($input) {
             $format = 'd-m-Y H:i:s';

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

Indentation +14 added lines, -14 removed lines

@@ -3,7 +3,7 @@ 
 class Status_model extends CI_Model {

     

     public function __construct() {

-	parent::__construct();		

+    parent::__construct();		

     }

     

     public function view() {

@@ -18,7 +18,7 @@ 
         

         $data = array(

             'id', 'name', 'status', 'url', 'auto_status'

-	);

+    );

             

         $query = $this->db->get('status');

         return $query->result_array();

@@ -59,9 +59,9 @@ 
         $data = array(

             'sid' => $service_id,

             'auto_status' => $service_status

-	);	

+    );	

         

-	return $this->db->insert('status_logs', $data);

+    return $this->db->insert('status_logs', $data);

     }

     

     public function percentage($sid) {

@@ -70,7 +70,7 @@ 
         $this->db->where('sid', $sid);

         $this->db->order_by('id', 'DESC');

         $this->db->limit('5000');

-	$this->db->from('status_logs');

+    $this->db->from('status_logs');

         $total = $this->db->get()->num_rows();

         

         $this->db->select('sid');

@@ -78,7 +78,7 @@ 
         $this->db->where('auto_status', 1);

         $this->db->order_by('id', 'DESC');

         $this->db->limit('5000');

-	$this->db->from('status_logs');

+    $this->db->from('status_logs');

         $up = $this->db->get()->num_rows();

         

         if (empty($total)) { 

@@ -99,7 +99,7 @@ 
             

         $this->db->select('sid');

         $this->db->where('sid', $sid);

-	$this->db->from('status_logs');

+    $this->db->from('status_logs');

         $this->db->delete();

         

     }

@@ -108,7 +108,7 @@ 
         

         $this->db->select();

         $this->db->where('id', $sid);

-	$this->db->from('status');

+    $this->db->from('status');

         $query = $this->db->get();

         return $query->result_array();

     }

@@ -129,10 +129,10 @@ 
             'auto_status'   => $status,

             'last_update'   => date("Y-m-d H:i:s", time()),

             'by'   => $username,

-	);

+    );

         

         $this->db->where('id', $id);

-	return $this->db->update('status', $data);

+    return $this->db->update('status', $data);

     }

 

     public function create($name, $icon, $url, $category, $status) {

@@ -146,21 +146,21 @@ 
             'auto_status'   => $status,

             'last_update'   => date("Y-m-d H:i:s", time()),

             'by'   => $username,

-	);

+    );

         

-	return $this->db->insert('status', $data);

+    return $this->db->insert('status', $data);

     }

     

     public function delete($sid) {

             

         $this->db->select('sid');

         $this->db->where('sid', $sid);

-	$this->db->from('status_logs');

+    $this->db->from('status_logs');

         $this->db->delete();

         

         $this->db->select('id');

         $this->db->where('id', $sid);

-	$this->db->from('status');

+    $this->db->from('status');

         $this->db->delete();

         

     }

dashboard/application/views/errors/cli/error_general.php

Indentation +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 echo "\nERROR: ",
-	$heading,
-	"\n\n",
-	$message,
-	"\n\n";
\ No newline at end of file
+    $heading,
+    "\n\n",
+    $message,
+    "\n\n";
\ No newline at end of file

dashboard/application/views/errors/cli/error_db.php

Indentation +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 echo "\nDatabase error: ",
-	$heading,
-	"\n\n",
-	$message,
-	"\n\n";
\ No newline at end of file
+    $heading,
+    "\n\n",
+    $message,
+    "\n\n";
\ No newline at end of file

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