East-Kent-Partnership / Intranet

dashboard/application/views/computing-support/status/edit.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
             <div class="form-group">
                 <label for="category">Category *</label>
                 <?php if (isset($get_current[0]['category'])) { $category_value = $get_current[0]['category']; } else { $category_value = NULL; } ?>
-                <?php $options = array('web' => 'Web', 'communication' => 'Communication', 'file' => 'File', 'remote' => 'Remote','network' => 'Network', 'wireless' => 'Wireless');
+                <?php $options = array('web' => 'Web', 'communication' => 'Communication', 'file' => 'File', 'remote' => 'Remote', 'network' => 'Network', 'wireless' => 'Wireless');
                 echo form_dropdown('category', $options, $category_value, 'class="form-control"'); ?>
             </div>
             <div class="form-group">

dashboard/application/views/computing-support/status/display.php

Spacing +3 added lines, -3 removed lines

@@ -37,9 +37,9 @@ 
                 </thead>

                 <tbody>

                     <?php foreach ($status as $status_item): if ($status_item['category'] == 'network') {} else {

-                        $sid = $status_item['id'];?>

+                        $sid = $status_item['id']; ?>

                         <tr>

-                            <td> &nbsp; <i class="fa <?= $status_item['icon'];?>" aria-hidden="true"></i> &nbsp; <?= $status_item['name'];?></td>

+                            <td> &nbsp; <i class="fa <?= $status_item['icon']; ?>" aria-hidden="true"></i> &nbsp; <?= $status_item['name']; ?></td>

                             <td class="col-md-1" style="text-transform: capitalize;"> <?= $status_item['category'] ?></td>

 

                             <?php

@@ -87,7 +87,7 @@ 
                     <?php foreach ($status as $status_item): if ($status_item['category'] == 'network') {?>

                         <?php $sid = $status_item['id']; ?>

                         <tr>

-                            <td> &nbsp; <i class="fa <?= $status_item['icon'];?>" aria-hidden="true"></i> &nbsp; <?= $status_item['name'];?></td>

+                            <td> &nbsp; <i class="fa <?= $status_item['icon']; ?>" aria-hidden="true"></i> &nbsp; <?= $status_item['name']; ?></td>

                             <td class="col-md-1" style="text-transform: capitalize;"> <?= $status_item['category'] ?></td>

 

                             <?php

dashboard/application/views/computing-support/status/auto.php

Spacing +4 added lines, -4 removed lines

@@ -6,13 +6,13 @@ 
             $service_id = $status_item["id"];
             $service_status = 0;
             $this->status_model->log($service_id, $service_status);
-            echo 'Down - ID=' . $status_item['id'] . ' NAME=' . $status_item['name'] . ' TIME=' . date('h:i') . ' DATE=' . date('Y-m-d') . '<br>';
+            echo 'Down - ID='.$status_item['id'].' NAME='.$status_item['name'].' TIME='.date('h:i').' DATE='.date('Y-m-d').'<br>';
             break;
         case 1:
             $service_id = $status_item["id"];
             $service_status = 1;
             $this->status_model->log($service_id, $service_status);
-            echo 'Up - ID=' . $status_item['id'] . ' NAME=' . $status_item['name'] . ' TIME=' . date('h:i') . ' DATE=' . date('Y-m-d') . '<br>';
+            echo 'Up - ID='.$status_item['id'].' NAME='.$status_item['name'].' TIME='.date('h:i').' DATE='.date('Y-m-d').'<br>';
             break;
         case 2:
             $file = $status_item['url'];
@@ -31,7 +31,7 @@ 
                 $service_status = 1;
                 $this->status_model->auto_update_ok($service_id, $service_status);
                 $this->status_model->log($service_id, $service_status);
-                echo 'Up - ID=' . $status_item['id'] . ' NAME=' . $status_item['name'] . ' TIME=' . date('h:i') . ' DATE=' . date('Y-m-d') . '<br>';
+                echo 'Up - ID='.$status_item['id'].' NAME='.$status_item['name'].' TIME='.date('h:i').' DATE='.date('Y-m-d').'<br>';
             } else {
                 if ($status_item['auto_status'] === '1') {
                     //$this->email->from('noreply@intranet.cant-col.ac.uk', 'IT Service Status');
@@ -46,7 +46,7 @@ 
                 $service_status = 0;
                 $this->status_model->auto_update_bad($service_id, $service_status);
                 $this->status_model->log($service_id, $service_status);
-                echo 'Down - ID=' . $status_item['id'] . ' NAME=' . $status_item['name'] . ' TIME=' . date('h:i') . ' DATE=' . date('Y-m-d') . '<br>';
+                echo 'Down - ID='.$status_item['id'].' NAME='.$status_item['name'].' TIME='.date('h:i').' DATE='.date('Y-m-d').'<br>';
             }
             break;
     }

dashboard/application/views/computing-support/room-move/pending.php

Indentation +4 added lines, -4 removed lines

@@ -73,7 +73,7 @@ 
                                         <input type="button" value="Approve" name="approve" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/room-move/eh-approve?id='.$room['id']); ?>';"/>
                                         <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/room-move/history?reid='.$room['id']); ?>';"/>
                                 <?php break;
-                                      default: ?>
+                                        default: ?>
                                           No action Required
                                 <?php break; ?>
                             <?php } } elseif (in_array('CN=Dashboard_CS_NS,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?> 
@@ -82,14 +82,14 @@ 
                                             <input type="button" value="Overide Estates" name="overide_approve" class="btn btn-default" data-toggle="modal" data-target="#overide"/>
                                             <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/room-move/history?rcid='.$room['id']); ?>';"/>
                                     <?php break; 
-                                          case 1: ?>
+                                            case 1: ?>
                                               <input type="button" value="Approve" name="approve" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/room-move/cs-approve?id='.$room['id']); ?>';"/>
                                               <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/room-move/history?rcid='.$room['id']); ?>';"/>
                                     <?php break;
-                                          case 5: ?>
+                                            case 5: ?>
                                               <input type="button" value="Move Complete" name="complete" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/room-move/cs-complete?id='.$room['id']); ?>';"/>
                                     <?php break;
-                                          default: ?>
+                                            default: ?>
                                               No action Required
                                     <?php break; }?>
                             <?php } ?>

Spacing +10 added lines, -10 removed lines

@@ -32,15 +32,15 @@ 
                         <td><?= $room['furniture'] ?></td>
                         <td>
                             <?= $room['staff_involved'] ?>
-                            <?php if (isset($room['staff_involved2'])) { echo '<br>'. $room['staff_involved2']; } ?>
-                            <?php if (isset($room['staff_involved3'])) { echo '<br>'. $room['staff_involved3']; } ?>
-                            <?php if (isset($room['staff_involved4'])) { echo '<br>'. $room['staff_involved4']; } ?>
-                            <?php if (isset($room['staff_involved5'])) { echo '<br>'. $room['staff_involved5']; } ?>
-                            <?php if (isset($room['staff_involved6'])) { echo '<br>'. $room['staff_involved6']; } ?>
-                            <?php if (isset($room['staff_involved7'])) { echo '<br>'. $room['staff_involved7']; } ?>
-                            <?php if (isset($room['staff_involved8'])) { echo '<br>'. $room['staff_involved8']; } ?>
-                            <?php if (isset($room['staff_involved9'])) { echo '<br>'. $room['staff_involved9']; } ?>
-                            <?php if (isset($room['staff_involved10'])) { echo '<br>'. $room['staff_involved10']; } ?>
+                            <?php if (isset($room['staff_involved2'])) { echo '<br>'.$room['staff_involved2']; } ?>
+                            <?php if (isset($room['staff_involved3'])) { echo '<br>'.$room['staff_involved3']; } ?>
+                            <?php if (isset($room['staff_involved4'])) { echo '<br>'.$room['staff_involved4']; } ?>
+                            <?php if (isset($room['staff_involved5'])) { echo '<br>'.$room['staff_involved5']; } ?>
+                            <?php if (isset($room['staff_involved6'])) { echo '<br>'.$room['staff_involved6']; } ?>
+                            <?php if (isset($room['staff_involved7'])) { echo '<br>'.$room['staff_involved7']; } ?>
+                            <?php if (isset($room['staff_involved8'])) { echo '<br>'.$room['staff_involved8']; } ?>
+                            <?php if (isset($room['staff_involved9'])) { echo '<br>'.$room['staff_involved9']; } ?>
+                            <?php if (isset($room['staff_involved10'])) { echo '<br>'.$room['staff_involved10']; } ?>
                         </td>
                         <td width="20%"><?= $room['reason'] ?></td>
                             <?php switch ($room['status']) {
@@ -64,7 +64,7 @@ 
                           <?php break;
                                 case 6: ?>
                                     <td class='success'>Move Complete</td>
-                          <?php break;?>
+                          <?php break; ?>
                             <?php } ?>
                         <td>
                             <?php if (in_array('CN=Dashboard_Estates_Room_Move,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>

dashboard/application/views/computing-support/room-move/view.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 $query = $this->db->get('users_ad');
 if ($query->num_rows() > 0) {
     foreach ($query->result_array() as $row) {
-        $row_set[] = htmlentities(stripslashes($row['first_name'] . ' ' . $row['last_name'] . ' (' . $row['username'] . ')')); //build an array
+        $row_set[] = htmlentities(stripslashes($row['first_name'].' '.$row['last_name'].' ('.$row['username'].')')); //build an array
     }
 }
 ?>

dashboard/application/views/computing-support/room-move/check.php

Spacing +10 added lines, -10 removed lines

@@ -31,15 +31,15 @@ 
                         <td><?= $room['furniture'] ?></td>
                         <td>
                             <?= $room['staff_involved'] ?>
-                            <?php if (isset($room['staff_involved2'])) { echo '<br>'. $room['staff_involved2']; } ?>
-                            <?php if (isset($room['staff_involved3'])) { echo '<br>'. $room['staff_involved3']; } ?>
-                            <?php if (isset($room['staff_involved4'])) { echo '<br>'. $room['staff_involved4']; } ?>
-                            <?php if (isset($room['staff_involved5'])) { echo '<br>'. $room['staff_involved5']; } ?>
-                            <?php if (isset($room['staff_involved6'])) { echo '<br>'. $room['staff_involved6']; } ?>
-                            <?php if (isset($room['staff_involved7'])) { echo '<br>'. $room['staff_involved7']; } ?>
-                            <?php if (isset($room['staff_involved8'])) { echo '<br>'. $room['staff_involved8']; } ?>
-                            <?php if (isset($room['staff_involved9'])) { echo '<br>'. $room['staff_involved9']; } ?>
-                            <?php if (isset($room['staff_involved10'])) { echo '<br>'. $room['staff_involved10']; } ?>
+                            <?php if (isset($room['staff_involved2'])) { echo '<br>'.$room['staff_involved2']; } ?>
+                            <?php if (isset($room['staff_involved3'])) { echo '<br>'.$room['staff_involved3']; } ?>
+                            <?php if (isset($room['staff_involved4'])) { echo '<br>'.$room['staff_involved4']; } ?>
+                            <?php if (isset($room['staff_involved5'])) { echo '<br>'.$room['staff_involved5']; } ?>
+                            <?php if (isset($room['staff_involved6'])) { echo '<br>'.$room['staff_involved6']; } ?>
+                            <?php if (isset($room['staff_involved7'])) { echo '<br>'.$room['staff_involved7']; } ?>
+                            <?php if (isset($room['staff_involved8'])) { echo '<br>'.$room['staff_involved8']; } ?>
+                            <?php if (isset($room['staff_involved9'])) { echo '<br>'.$room['staff_involved9']; } ?>
+                            <?php if (isset($room['staff_involved10'])) { echo '<br>'.$room['staff_involved10']; } ?>
                         </td>
                             <?php switch ($room['status']) {
                                 case 0: ?>
@@ -62,7 +62,7 @@ 
                           <?php break;
                                 case 6: ?>
                                     <td class='success'>Move Complete</td>
-                          <?php break;?>
+                          <?php break; ?>
                             <?php } ?>
                         <td>
                             <?php switch ($room['status']) {

dashboard/application/views/computing-support/view.php

Spacing +17 added lines, -17 removed lines

@@ -23,7 +23,7 @@ 
                         <td></td><td></td><td></td>
                     </tr>
                     <tr>
-                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/status');?>">Service Status</a></td>
+                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/status'); ?>">Service Status</a></td>
                         <td></td><td></td><td></td>
                     </tr>
                     <tr>
@@ -74,11 +74,11 @@ 
                               in_array('CN=DG06,OU=Distribution Groups,OU=Email Groups,OU=Accounts,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups']) ||
                               in_array('CN=Intranet_Edit_HR,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
                         <tr>
-                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/new-account');?>">New Staff Account</a>
-                                - <a href="<?= base_url('/computing-support/new-account/pending');?>">Pending</a>
-                                - <a href="<?= base_url('/computing-support/new-account/history');?>">History</a>
+                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/new-account'); ?>">New Staff Account</a>
+                                - <a href="<?= base_url('/computing-support/new-account/pending'); ?>">Pending</a>
+                                - <a href="<?= base_url('/computing-support/new-account/history'); ?>">History</a>
                                 <?php if (in_array('CN=DG06,OU=Distribution Groups,OU=Email Groups,OU=Accounts,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
-                                    - <a href="<?= base_url('/computing-support/new-account/export');?>">Export New Staff</a>
+                                    - <a href="<?= base_url('/computing-support/new-account/export'); ?>">Export New Staff</a>
                                 <?php } ?>
                             </td>
                             <td></td><td></td><td></td>
@@ -88,39 +88,39 @@ 
                               in_array('CN=DG06,OU=Distribution Groups,OU=Email Groups,OU=Accounts,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups']) ||
                               in_array('CN=Intranet_Edit_HR,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
                         <tr>
-                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/new-account/disable-account');?>">Disable Staff Account</a>
-                                - <a href="<?= base_url('/computing-support/new-account/disable-account/pending');?>">Pending</a>
-                                - <a href="<?= base_url('/computing-support/new-account/disable-account/history');?>">History</a>
+                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/new-account/disable-account'); ?>">Disable Staff Account</a>
+                                - <a href="<?= base_url('/computing-support/new-account/disable-account/pending'); ?>">Pending</a>
+                                - <a href="<?= base_url('/computing-support/new-account/disable-account/history'); ?>">History</a>
                             </td>
                             <td></td><td></td><td></td>
                         </tr>
                     <?php } ?>
                     <tr>
-                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/address-book');?>">Address Book Update</a>
+                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/address-book'); ?>">Address Book Update</a>
                             <?php if (in_array('CN=DG06,OU=Distribution Groups,OU=Email Groups,OU=Accounts,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
-                                - <a href="<?= base_url('computing-support/address-book/history');?>">History</a>
+                                - <a href="<?= base_url('computing-support/address-book/history'); ?>">History</a>
                             <?php } ?>
                         </td>
                         <td></td><td></td><td></td>
                     </tr>
                     <tr>
-                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/mobile-policy');?>">Mobile Phone Policy</a>
+                        <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/mobile-policy'); ?>">Mobile Phone Policy</a>
                             <?php if (in_array('CN=Dashboard_Admin,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups']) || 
                                       in_array('CN=Dashboard_CS_NS,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
-                                - <a href="<?= base_url('computing-support/mobile-policy/accepted');?>">Accepted</a>
+                                - <a href="<?= base_url('computing-support/mobile-policy/accepted'); ?>">Accepted</a>
                             <?php } ?>
                         </td>
                         <td></td><td></td><td></td>
                     </tr>
                     <tr>
                         <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/room-move')?>">Room Move Request</a>
-                            - <a href="<?= base_url('computing-support/room-move/check');?>">Check</a>
+                            - <a href="<?= base_url('computing-support/room-move/check'); ?>">Check</a>
                             <?php if (in_array('CN=Dashboard_CS_NS,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups']) ||
                                       in_array('CN=Dashboard_Estates_Room_Move,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
-                                - <a href="<?= base_url('computing-support/room-move/pending');?>">Pending</a>
+                                - <a href="<?= base_url('computing-support/room-move/pending'); ?>">Pending</a>
                             <?php } if (in_array('CN=DG06,OU=Distribution Groups,OU=Email Groups,OU=Accounts,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups']) ||
                                       in_array('CN=Dashboard_Estates_Room_Move,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
-                                    - <a href="<?= base_url('computing-support/room-move/history');?>">History</a>
+                                    - <a href="<?= base_url('computing-support/room-move/history'); ?>">History</a>
                             <?php } ?>
                         </td>
                         <td></td><td></td><td></td>
@@ -147,8 +147,8 @@ 
                     </thead>
                     <tbody>
                         <tr>
-                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/equipment-loan');?>">Equipment Loan</a>
-                                - <a href="<?= base_url('computing-support/equipment-loan/history');?>">History</a></td>
+                            <td><i class="fa fa-paperclip" aria-hidden="true"></i> <a href="<?= base_url('computing-support/equipment-loan'); ?>">Equipment Loan</a>
+                                - <a href="<?= base_url('computing-support/equipment-loan/history'); ?>">History</a></td>
                             <td></td><td></td><td></td>
                         </tr>
                         <tr>

dashboard/application/views/computing-support/ownership/history.php

Spacing +5 added lines, -5 removed lines

@@ -45,13 +45,13 @@
                                 <?php if (in_array('CN=Dashboard_Admin,OU=Dashboard_Group,OU=Intranet_Group,OU=Groups,DC=cant-col,DC=ac,DC=uk', $_SESSION['ldap']['groups'])) { ?>
                                 <td>
                                     <?php if ($ownership_item['status'] == 0) { ?>
-                                        <input type="button" value="Overide Approve" name="overide_approve" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/approve?id=' . $ownership_item['id']); ?>';"/>
-                                        <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/reject?id=' . $ownership_item['id']); ?>';"/>
+                                        <input type="button" value="Overide Approve" name="overide_approve" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/approve?id='.$ownership_item['id']); ?>';"/>
+                                        <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/reject?id='.$ownership_item['id']); ?>';"/>
                                     <?php } elseif ($ownership_item['status'] == 1) { ?>
-                                        <input type="button" value="Approve" name="approve" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/approve?id=' . $ownership_item['id']); ?>';"/>
-                                        <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/reject?id=' . $ownership_item['id']); ?>';"/>
+                                        <input type="button" value="Approve" name="approve" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/approve?id='.$ownership_item['id']); ?>';"/>
+                                        <input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/ownership/reject?id='.$ownership_item['id']); ?>';"/>
                                     <?php } elseif ($ownership_item['status'] == 2) { ?>
-                                        <input type = "button" value = "Approve" name = "approve" class = "btn btn-default" onclick = "location.href = '<?= base_url('computing-support/ownership/approve?id=' . $ownership_item['id']); ?>';"/>
+                                        <input type = "button" value = "Approve" name = "approve" class = "btn btn-default" onclick = "location.href = '<?= base_url('computing-support/ownership/approve?id='.$ownership_item['id']); ?>';"/>
                                     <?php } else { ?>
                                         No action required
                                 <?php } ?>

dashboard/application/views/computing-support/temporary-account/view.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 $query = $this->db->get('users_ad');
 if ($query->num_rows() > 0) {
     foreach ($query->result_array() as $row) {
-        $row_set[] = htmlentities(stripslashes($row['first_name'] . ' ' . $row['last_name'])); //build an array
+        $row_set[] = htmlentities(stripslashes($row['first_name'].' '.$row['last_name'])); //build an array
     }
 }
 ?>