Inspection of "Remove GroceryCrud Model" - East-Kent-Partnership/Intranet - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 63a7db...fb547d )

by William

created 2017-03-18 14:36 UTC

Status

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?php 
 
-	$column_width = (int)(80/count($columns));
+    $column_width = (int)(80/count($columns));
 	
-	if(!empty($list)){
+    if(!empty($list)){
 ?><div class="bDiv" >
     <table cellspacing="0" cellpadding="0" border="0" id="flex1" class="sortable">
 		<thead>
@@ -47,19 +47,19 @@  discard block
 block discarded – undo
 						<a href='<?php echo $row->read_url?>' title='<?php echo $this->l('list_view')?> <?php echo $subject?>' class="edit_button"><span class='read-icon'></span></a>
 					<?php }?>
 					<?php 
-					if(!empty($row->action_urls)){
-						foreach($row->action_urls as $action_unique_id => $action_url){ 
-							$action = $actions[$action_unique_id];
-					?>
+                    if(!empty($row->action_urls)){
+                        foreach($row->action_urls as $action_unique_id => $action_url){ 
+                            $action = $actions[$action_unique_id];
+                    ?>
 							<a href="<?php echo $action_url; ?>" class="<?php echo $action->css_class; ?> crud-action" title="<?php echo $action->label?>"><?php 
-								if(!empty($action->image_url))
-								{
-									?><img src="<?php echo $action->image_url; ?>" alt="<?php echo $action->label?>" /><?php 	
-								}
-							?></a>		
+                                if(!empty($action->image_url))
+                                {
+                                    ?><img src="<?php echo $action->image_url; ?>" alt="<?php echo $action->label?>" /><?php 	
+                                }
+                            ?></a>		
 					<?php }
-					}
-					?>					
+                    }
+                    ?>					
                     <div class='clear'></div>
 				</div>
 			</td>

Please login to merge, or discard this patch.

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -1,21 +1,21 @@  discard block
 block discarded – undo
 <?php 
 
-	$column_width = (int)(80/count($columns));
+	$column_width = (int) (80 / count($columns));
 	
-	if(!empty($list)){
+	if (!empty($list)) {
 ?><div class="bDiv" >
     <table cellspacing="0" cellpadding="0" border="0" id="flex1" class="sortable">
 		<thead>
 			<tr class='hDiv'>
-				<?php foreach($columns as $column){?>
+				<?php foreach ($columns as $column) {?>
 				<th width='<?php echo $column_width?>%'>
-					<div class="text-left field-sorting <?php if(isset($order_by[0]) &&  $column->field_name == $order_by[0]){?><?php echo $order_by[1]?><?php }?>" 
+					<div class="text-left field-sorting <?php if (isset($order_by[0]) && $column->field_name == $order_by[0]) {?><?php echo $order_by[1]?><?php }?>" 
 						rel='<?php echo $column->field_name?>'>
 						<?php echo $column->display_as?>
 					</div>
 				</th>
 				<?php }?>
-				<?php if(!$unset_delete || !$unset_edit || !$unset_read || !empty($actions)){?>
+				<?php if (!$unset_delete || !$unset_edit || !$unset_read || !empty($actions)) {?>
 				<th align="left" abbr="tools" axis="col1" class="" width='20%'>
 					<div class="text-right">
 						<?php echo $this->l('list_actions'); ?>
@@ -25,34 +25,34 @@  discard block
 block discarded – undo
 			</tr>
 		</thead>		
 		<tbody>
-<?php foreach($list as $num_row => $row){ ?>        
-		<tr  <?php if($num_row % 2 == 1){?>class="erow"<?php }?>>
-			<?php foreach($columns as $column){?>
-			<td width='<?php echo $column_width?>%' class='<?php if(isset($order_by[0]) &&  $column->field_name == $order_by[0]){?>sorted<?php }?>'>
-				<div class='text-left'><?php echo $row->{$column->field_name} != '' ? $row->{$column->field_name} : '&nbsp;' ; ?></div>
+<?php foreach ($list as $num_row => $row) { ?>        
+		<tr  <?php if ($num_row % 2 == 1) {?>class="erow"<?php }?>>
+			<?php foreach ($columns as $column) {?>
+			<td width='<?php echo $column_width?>%' class='<?php if (isset($order_by[0]) && $column->field_name == $order_by[0]) {?>sorted<?php }?>'>
+				<div class='text-left'><?php echo $row->{$column->field_name} != '' ? $row->{$column->field_name} : '&nbsp;'; ?></div>
 			</td>
 			<?php }?>
-			<?php if(!$unset_delete || !$unset_edit || !$unset_read || !empty($actions)){?>
+			<?php if (!$unset_delete || !$unset_edit || !$unset_read || !empty($actions)) {?>
 			<td align="left" width='20%'>
 				<div class='tools'>				
-					<?php if(!$unset_delete){?>
+					<?php if (!$unset_delete) {?>
                     	<a href='<?php echo $row->delete_url?>' title='<?php echo $this->l('list_delete')?> <?php echo $subject?>' class="delete-row" >
                     			<span class='delete-icon'></span>
                     	</a>
                     <?php }?>
-                    <?php if(!$unset_edit){?>
+                    <?php if (!$unset_edit) {?>
 						<a href='<?php echo $row->edit_url?>' title='<?php echo $this->l('list_edit')?> <?php echo $subject?>' class="edit_button"><span class='edit-icon'></span></a>
 					<?php }?>
-					<?php if(!$unset_read){?>
+					<?php if (!$unset_read) {?>
 						<a href='<?php echo $row->read_url?>' title='<?php echo $this->l('list_view')?> <?php echo $subject?>' class="edit_button"><span class='read-icon'></span></a>
 					<?php }?>
 					<?php 
-					if(!empty($row->action_urls)){
-						foreach($row->action_urls as $action_unique_id => $action_url){ 
+					if (!empty($row->action_urls)) {
+						foreach ($row->action_urls as $action_unique_id => $action_url) { 
 							$action = $actions[$action_unique_id];
 					?>
 							<a href="<?php echo $action_url; ?>" class="<?php echo $action->css_class; ?> crud-action" title="<?php echo $action->label?>"><?php 
-								if(!empty($action->image_url))
+								if (!empty($action->image_url))
 								{
 									?><img src="<?php echo $action->image_url; ?>" alt="<?php echo $action->label?>" /><?php 	
 								}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
 		</tbody>
 		</table>
 	</div>
-<?php }else{?>
+<?php } else {?>
 	<br/>
 	&nbsp;&nbsp;&nbsp;&nbsp; <?php echo $this->l('list_no_items'); ?>
 	<br/>

Please login to merge, or discard this patch.

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -69,7 +69,7 @@
 block discarded – undo
 		</tbody>
 		</table>
 	</div>
-<?php }else{?>
+<?php } else{?>
 	<br/>
 	&nbsp;&nbsp;&nbsp;&nbsp; <?php echo $this->l('list_no_items'); ?>
 	<br/>

Please login to merge, or discard this patch.

dashboard/assets/grocery_crud/themes/dashboard/views/list_template.php 2 patches

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -1,30 +1,30 @@  discard block
 block discarded – undo
 <?php
-	$this->set_css($this->default_theme_path.'/dashboard/css/style.css');
-	$this->set_js_lib($this->default_javascript_path.'/'.grocery_CRUD::JQUERY);
+    $this->set_css($this->default_theme_path.'/dashboard/css/style.css');
+    $this->set_js_lib($this->default_javascript_path.'/'.grocery_CRUD::JQUERY);
 
-	$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
-	$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
-	$this->set_js_lib($this->default_javascript_path.'/common/lazyload-min.js');
+    $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
+    $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
+    $this->set_js_lib($this->default_javascript_path.'/common/lazyload-min.js');
 
-	if (!$this->is_IE7()) {
-		$this->set_js_lib($this->default_javascript_path.'/common/list.js');
-	}
+    if (!$this->is_IE7()) {
+        $this->set_js_lib($this->default_javascript_path.'/common/list.js');
+    }
 
-	$this->set_js($this->default_theme_path.'/flexigrid/js/cookies.js');
-	$this->set_js($this->default_theme_path.'/flexigrid/js/flexigrid.js');
+    $this->set_js($this->default_theme_path.'/flexigrid/js/cookies.js');
+    $this->set_js($this->default_theme_path.'/flexigrid/js/flexigrid.js');
 
     $this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.form.min.js');
 
-	$this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.numeric.min.js');
-	$this->set_js($this->default_theme_path.'/flexigrid/js/jquery.printElement.min.js');
+    $this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.numeric.min.js');
+    $this->set_js($this->default_theme_path.'/flexigrid/js/jquery.printElement.min.js');
 
-	/** Fancybox */
-	$this->set_css($this->default_css_path.'/jquery_plugins/fancybox/jquery.fancybox.css');
-	$this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.fancybox-1.3.4.js');
-	$this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.easing-1.3.pack.js');
+    /** Fancybox */
+    $this->set_css($this->default_css_path.'/jquery_plugins/fancybox/jquery.fancybox.css');
+    $this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.fancybox-1.3.4.js');
+    $this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.easing-1.3.pack.js');
 
-	/** Jquery UI */
-	$this->load_js_jqueryui();
+    /** Jquery UI */
+    $this->load_js_jqueryui();
 
 ?>
 <script type='text/javascript'>
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
 					<?php $paging_ends_to = "<span id='page-ends-to' class='page-ends-to'>". ($total_results < $default_per_page ? $total_results : $default_per_page) ."</span>"; ?>
 					<?php $paging_total_results = "<span id='total_items' class='total_items'>$total_results</span>"?>
 					<?php echo str_replace( array('{start}','{end}','{results}'),
-											array($paging_starts_from, $paging_ends_to, $paging_total_results),
-											$this->l('list_displaying')
-										   ); ?>
+                                            array($paging_starts_from, $paging_ends_to, $paging_total_results),
+                                            $this->l('list_displaying')
+                                            ); ?>
 				</span>
 			</div>
                             <div class="pDiv">

Please login to merge, or discard this patch.

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -28,7 +28,7 @@  discard block
 block discarded – undo
 
 ?>
 <script type='text/javascript'>
-	var base_url = '<?php echo base_url();?>';
+	var base_url = '<?php echo base_url(); ?>';
 
 	var subject = '<?php echo addslashes($subject); ?>';
 	var ajax_list_info_url = '<?php echo $ajax_list_info_url; ?>';
@@ -38,20 +38,20 @@  discard block
 block discarded – undo
 
 </script>
 <div id='list-report-error' class='report-div error'></div>
-<div  <?php if($success_message !== null){?>class="alert alert-success" role="alert" style="display:block;"<?php }?>><?php
-if($success_message !== null){?>
+<div  <?php if ($success_message !== null) {?>class="alert alert-success" role="alert" style="display:block;"<?php }?>><?php
+if ($success_message !== null) {?>
     <p style=" margin-top: -0px;"><?php echo $success_message; ?></p>
 <?php }
 ?></div>
 <div class="flexigrid" style='width: 100%;' data-unique-hash="<?php echo $unique_hash; ?>">
     
-	<?php echo form_open( $ajax_list_url, 'method="post" id="filtering_form" class="filtering_form" autocomplete = "off" data-ajax-list-info-url="'.$ajax_list_info_url.'"'); ?>
+	<?php echo form_open($ajax_list_url, 'method="post" id="filtering_form" class="filtering_form" autocomplete = "off" data-ajax-list-info-url="'.$ajax_list_info_url.'"'); ?>
 	
 	<div id='main-table-box' class="main-table-box">
 
-	<?php if(!$unset_add || !$unset_export || !$unset_print){?>
+	<?php if (!$unset_add || !$unset_export || !$unset_print) {?>
 	<div class="tDiv">
-		<?php if(!$unset_add){?>
+		<?php if (!$unset_add) {?>
 		<div class="tDiv2">
                     <div class="displayadd">
                         <a href='<?php echo $add_url?>' title='<?php echo $this->l('list_add'); ?> <?php echo $subject?>' class='add-anchor add_button'>
@@ -64,11 +64,11 @@  discard block
 block discarded – undo
                 </div>
 		<?php }?>
 		<div class="tDiv3">
-			<?php if(!$unset_export) { ?>
+			<?php if (!$unset_export) { ?>
         	<a class="export-anchor" href="<?php echo $export_url; ?>" target="_blank">
 				<div class="fbutton">
 					<div>
-						<span class="export"><?php echo $this->l('list_export');?></span>
+						<span class="export"><?php echo $this->l('list_export'); ?></span>
 					</div>
 				</div>
             </a>
@@ -84,18 +84,18 @@  discard block
 block discarded – undo
 					<?php list($show_lang_string, $entries_lang_string) = explode('{paging}', $this->l('list_show_entries')); ?>
 					<?php echo $show_lang_string; ?>
 					<select name="per_page" id='per_page' class="per_page">
-						<?php foreach($paging_options as $option){?>
-							<option value="<?php echo $option; ?>" <?php if($option == $default_per_page){?>selected="selected"<?php }?>><?php echo $option; ?>&nbsp;&nbsp;</option>
+						<?php foreach ($paging_options as $option) {?>
+							<option value="<?php echo $option; ?>" <?php if ($option == $default_per_page) {?>selected="selected"<?php }?>><?php echo $option; ?>&nbsp;&nbsp;</option>
 						<?php }?>
 					</select>
 					<?php echo $entries_lang_string; ?>
-					<input type='hidden' name='order_by[0]' id='hidden-sorting' class='hidden-sorting' value='<?php if(!empty($order_by[0])){?><?php echo $order_by[0]?><?php }?>' />
-					<input type='hidden' name='order_by[1]' id='hidden-ordering' class='hidden-ordering'  value='<?php if(!empty($order_by[1])){?><?php echo $order_by[1]?><?php }?>'/>
+					<input type='hidden' name='order_by[0]' id='hidden-sorting' class='hidden-sorting' value='<?php if (!empty($order_by[0])) {?><?php echo $order_by[0]?><?php }?>' />
+					<input type='hidden' name='order_by[1]' id='hidden-ordering' class='hidden-ordering'  value='<?php if (!empty($order_by[1])) {?><?php echo $order_by[1]?><?php }?>'/>
 				</span>
 			</div>
             <div class="displaysearch">
-			<?php echo $this->l('list_search');?>: <input type="text" class="qsbsearch_fieldox search_text" name="search_text" size="30" id='search_text'>
-                    <input type="button" value="<?php echo $this->l('list_search');?>" class="btn btn-default">
+			<?php echo $this->l('list_search'); ?>: <input type="text" class="qsbsearch_fieldox search_text" name="search_text" size="30" id='search_text'>
+                    <input type="button" value="<?php echo $this->l('list_search'); ?>" class="btn btn-default">
 		</div>
 
 	<div id='ajax_list' class="ajax_list">
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
                         <div class="displayshowing" style="margin-top: 10px;">
 				<span class="pPageStat">
 					<?php $paging_starts_from = "<span id='page-starts-from' class='page-starts-from'>1</span>"; ?>
-					<?php $paging_ends_to = "<span id='page-ends-to' class='page-ends-to'>". ($total_results < $default_per_page ? $total_results : $default_per_page) ."</span>"; ?>
+					<?php $paging_ends_to = "<span id='page-ends-to' class='page-ends-to'>".($total_results < $default_per_page ? $total_results : $default_per_page)."</span>"; ?>
 					<?php $paging_total_results = "<span id='total_items' class='total_items'>$total_results</span>"?>
-					<?php echo str_replace( array('{start}','{end}','{results}'),
+					<?php echo str_replace(array('{start}', '{end}', '{results}'),
 											array($paging_starts_from, $paging_ends_to, $paging_total_results),
 											$this->l('list_displaying')
 										   ); ?>

Please login to merge, or discard this patch.

dashboard/application/controllers/marketing/Index.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@
 block discarded – undo
 class Index extends My_Force_Login {
     
     public function __construct() {
-	parent::__construct();
+    parent::__construct();
         
     }
     

Please login to merge, or discard this patch.

dashboard/application/controllers/computing-support/Index.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@
 block discarded – undo
 class Index extends My_Force_Login {
     
     public function __construct() {
-	parent::__construct();
+    parent::__construct();
         
     }
     

Please login to merge, or discard this patch.

dashboard/application/views/errors/cli/error_404.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -2,7 +2,7 @@
 block discarded – undo
 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

Please login to merge, or discard this patch.

dashboard/application/views/computing-support/room-move/history.php 2 patches

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -73,7 +73,7 @@  discard block
 block discarded – undo
                                         <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 @@  discard block
 block discarded – undo
                                             <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 } ?>

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -32,15 +32,15 @@  discard block
 block discarded – undo
                         <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 @@  discard block
 block discarded – undo
                           <?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'])) { ?>

Please login to merge, or discard this patch.

dashboard/application/views/computing-support/private-drive/view.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@
 block discarded – undo
 $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
     }
 }
 ?>

Please login to merge, or discard this patch.

dashboard/application/views/computing-support/ownership/view.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@
 block discarded – undo
     $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
         }
     }
 ?>

Please login to merge, or discard this patch.

dashboard/assets/grocery_crud/themes/dashboard/views/edit.php 2 patches

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -1,12 +1,12 @@  discard block
 block discarded – undo
 <?php
 
-	$this->set_css($this->default_theme_path.'/flexigrid/css/flexigrid.css');
+    $this->set_css($this->default_theme_path.'/flexigrid/css/flexigrid.css');
 
     $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.form.min.js');
-	$this->set_js_config($this->default_theme_path.'/flexigrid/js/flexigrid-edit.js');
+    $this->set_js_config($this->default_theme_path.'/flexigrid/js/flexigrid-edit.js');
 
-	$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
-	$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
+    $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
+    $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
 ?>
 <div class="flexigrid crud-form" style='width: 100%;' data-unique-hash="<?php echo $unique_hash; ?>">
 	<div class="mDiv">
@@ -24,12 +24,12 @@  discard block
 block discarded – undo
 	<?php echo form_open( $update_url, 'method="post" id="crudForm"  enctype="multipart/form-data"'); ?>
 	<div class='form-div'>
 		<?php
-		$counter = 0;
-			foreach($fields as $field)
-			{
-				$even_odd = $counter % 2 == 0 ? 'odd' : 'even';
-				$counter++;
-		?>
+        $counter = 0;
+            foreach($fields as $field)
+            {
+                $even_odd = $counter % 2 == 0 ? 'odd' : 'even';
+                $counter++;
+        ?>
 			<div class='form-field-box <?php echo $even_odd?>' id="<?php echo $field->field_name; ?>_field_box">
 				<div class='form-display-as-box' id="<?php echo $field->field_name; ?>_display_as_box">
 					<?php echo $input_fields[$field->field_name]->display_as?><?php echo ($input_fields[$field->field_name]->required)? "<span class='required'>*</span> " : ""?> :
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
 		<?php if(!empty($hidden_fields)){?>
 		<!-- Start of hidden inputs -->
 			<?php
-				foreach($hidden_fields as $hidden_field){
-					echo $hidden_field->input;
-				}
-			?>
+                foreach($hidden_fields as $hidden_field){
+                    echo $hidden_field->input;
+                }
+            ?>
 		<!-- End of hidden inputs -->
 		<?php }?>
 		<?php if ($is_ajax) { ?><input type="hidden" name="is_ajax" value="true" /><?php }?>

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -16,23 +16,23 @@  discard block
 block discarded – undo
 			</div>
 			<div class='clear'></div>
 		</div>
-		<div title="<?php echo $this->l('minimize_maximize');?>" class="ptogtitle">
+		<div title="<?php echo $this->l('minimize_maximize'); ?>" class="ptogtitle">
 			<span></span>
 		</div>
 	</div>
 <div id='main-table-box'>
-	<?php echo form_open( $update_url, 'method="post" id="crudForm"  enctype="multipart/form-data"'); ?>
+	<?php echo form_open($update_url, 'method="post" id="crudForm"  enctype="multipart/form-data"'); ?>
 	<div class='form-div'>
 		<?php
 		$counter = 0;
-			foreach($fields as $field)
+			foreach ($fields as $field)
 			{
 				$even_odd = $counter % 2 == 0 ? 'odd' : 'even';
 				$counter++;
 		?>
 			<div class='form-field-box <?php echo $even_odd?>' id="<?php echo $field->field_name; ?>_field_box">
 				<div class='form-display-as-box' id="<?php echo $field->field_name; ?>_display_as_box">
-					<?php echo $input_fields[$field->field_name]->display_as?><?php echo ($input_fields[$field->field_name]->required)? "<span class='required'>*</span> " : ""?> :
+					<?php echo $input_fields[$field->field_name]->display_as?><?php echo ($input_fields[$field->field_name]->required) ? "<span class='required'>*</span> " : ""?> :
 				</div>
 				<div class='form-input-box' id="<?php echo $field->field_name; ?>_input_box">
 					<?php echo $input_fields[$field->field_name]->input?>
@@ -40,10 +40,10 @@  discard block
 block discarded – undo
 				<div class='clear'></div>
 			</div>
 		<?php }?>
-		<?php if(!empty($hidden_fields)){?>
+		<?php if (!empty($hidden_fields)) {?>
 		<!-- Start of hidden inputs -->
 			<?php
-				foreach($hidden_fields as $hidden_field){
+				foreach ($hidden_fields as $hidden_field) {
 					echo $hidden_field->input;
 				}
 			?>
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 		<div class='form-button-box'>
 			<input  id="form-button-save" type='submit' value='<?php echo $this->l('form_update_changes'); ?>' class="btn btn-large"/>
 		</div>
-<?php 	if(!$this->unset_back_to_list) { ?>
+<?php 	if (!$this->unset_back_to_list) { ?>
 		<div class='form-button-box'>
 			<input type='button' value='<?php echo $this->l('form_update_and_go_back'); ?>' id="save-and-go-back-button" class="btn btn-large"/>
 		</div>

Please login to merge, or discard this patch.

		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	<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']); ?>';"/>
74	74	<input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/room-move/history?reid='.$room['id']); ?>';"/>
75	75	<?php break;
76		- default: ?>
	76	+ default: ?>
77	77	No action Required
78	78	<?php break; ?>
79	79	<?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 @@ discard block
		block discarded – undo
82	82	<input type="button" value="Overide Estates" name="overide_approve" class="btn btn-default" data-toggle="modal" data-target="#overide"/>
83	83	<input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/room-move/history?rcid='.$room['id']); ?>';"/>
84	84	<?php break;
85		- case 1: ?>
	85	+ case 1: ?>
86	86	<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']); ?>';"/>
87	87	<input type="button" value="Reject" name="reject" class="btn btn-default" onclick="location.href = '<?= base_url('computing-support/room-move/history?rcid='.$room['id']); ?>';"/>
88	88	<?php break;
89		- case 5: ?>
	89	+ case 5: ?>
90	90	<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']); ?>';"/>
91	91	<?php break;
92		- default: ?>
	92	+ default: ?>
93	93	No action Required
94	94	<?php break; }?>
95	95	<?php } ?>

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		- $column_width = (int)(80/count($columns));
	3	+ $column_width = (int)(80/count($columns));
4	4
5		- if(!empty($list)){
	5	+ if(!empty($list)){
6	6	?><div class="bDiv" >
7	7	<table cellspacing="0" cellpadding="0" border="0" id="flex1" class="sortable">
8	8	<thead>
		@@ -47,19 +47,19 @@ discard block
		block discarded – undo
47	47	<a href='<?php echo $row->read_url?>' title='<?php echo $this->l('list_view')?> <?php echo $subject?>' class="edit_button"><span class='read-icon'></span></a>
48	48	<?php }?>
49	49	<?php
50		- if(!empty($row->action_urls)){
51		- foreach($row->action_urls as $action_unique_id => $action_url){
52		- $action = $actions[$action_unique_id];
53		- ?>
	50	+ if(!empty($row->action_urls)){
	51	+ foreach($row->action_urls as $action_unique_id => $action_url){
	52	+ $action = $actions[$action_unique_id];
	53	+ ?>
54	54	<a href="<?php echo $action_url; ?>" class="<?php echo $action->css_class; ?> crud-action" title="<?php echo $action->label?>"><?php
55		- if(!empty($action->image_url))
56		- {
57		- ?><img src="<?php echo $action->image_url; ?>" alt="<?php echo $action->label?>" /><?php
58		- }
59		- ?></a>
	55	+ if(!empty($action->image_url))
	56	+ {
	57	+ ?><img src="<?php echo $action->image_url; ?>" alt="<?php echo $action->label?>" /><?php
	58	+ }
	59	+ ?></a>
60	60	<?php }
61		- }
62		- ?>
	61	+ }
	62	+ ?>
63	63	<div class='clear'></div>
64	64	</div>
65	65	</td>

		@@ -1,21 +1,21 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		- $column_width = (int)(80/count($columns));
	3	+ $column_width = (int) (80 / count($columns));
4	4
5		- if(!empty($list)){
	5	+ if (!empty($list)) {
6	6	?><div class="bDiv" >
7	7	<table cellspacing="0" cellpadding="0" border="0" id="flex1" class="sortable">
8	8	<thead>
9	9	<tr class='hDiv'>
10		- <?php foreach($columns as $column){?>
	10	+ <?php foreach ($columns as $column) {?>
11	11	<th width='<?php echo $column_width?>%'>
12		- <div class="text-left field-sorting <?php if(isset($order_by[0]) && $column->field_name == $order_by[0]){?><?php echo $order_by[1]?><?php }?>"
	12	+ <div class="text-left field-sorting <?php if (isset($order_by[0]) && $column->field_name == $order_by[0]) {?><?php echo $order_by[1]?><?php }?>"
13	13	rel='<?php echo $column->field_name?>'>
14	14	<?php echo $column->display_as?>
15	15	</div>
16	16	</th>
17	17	<?php }?>
18		- <?php if(!$unset_delete \|\| !$unset_edit \|\| !$unset_read \|\| !empty($actions)){?>
	18	+ <?php if (!$unset_delete \|\| !$unset_edit \|\| !$unset_read \|\| !empty($actions)) {?>
19	19	<th align="left" abbr="tools" axis="col1" class="" width='20%'>
20	20	<div class="text-right">
21	21	<?php echo $this->l('list_actions'); ?>
		@@ -25,34 +25,34 @@ discard block
		block discarded – undo
25	25	</tr>
26	26	</thead>
27	27	<tbody>
28		-<?php foreach($list as $num_row => $row){ ?>
29		- <tr <?php if($num_row % 2 == 1){?>class="erow"<?php }?>>
30		- <?php foreach($columns as $column){?>
31		- <td width='<?php echo $column_width?>%' class='<?php if(isset($order_by[0]) && $column->field_name == $order_by[0]){?>sorted<?php }?>'>
32		- <div class='text-left'><?php echo $row->{$column->field_name} != '' ? $row->{$column->field_name} : ' ' ; ?></div>
	28	+<?php foreach ($list as $num_row => $row) { ?>
	29	+ <tr <?php if ($num_row % 2 == 1) {?>class="erow"<?php }?>>
	30	+ <?php foreach ($columns as $column) {?>
	31	+ <td width='<?php echo $column_width?>%' class='<?php if (isset($order_by[0]) && $column->field_name == $order_by[0]) {?>sorted<?php }?>'>
	32	+ <div class='text-left'><?php echo $row->{$column->field_name} != '' ? $row->{$column->field_name} : ' '; ?></div>
33	33	</td>
34	34	<?php }?>
35		- <?php if(!$unset_delete \|\| !$unset_edit \|\| !$unset_read \|\| !empty($actions)){?>
	35	+ <?php if (!$unset_delete \|\| !$unset_edit \|\| !$unset_read \|\| !empty($actions)) {?>
36	36	<td align="left" width='20%'>
37	37	<div class='tools'>
38		- <?php if(!$unset_delete){?>
	38	+ <?php if (!$unset_delete) {?>
39	39	<a href='<?php echo $row->delete_url?>' title='<?php echo $this->l('list_delete')?> <?php echo $subject?>' class="delete-row" >
40	40	<span class='delete-icon'></span>
41	41	</a>
42	42	<?php }?>
43		- <?php if(!$unset_edit){?>
	43	+ <?php if (!$unset_edit) {?>
44	44	<a href='<?php echo $row->edit_url?>' title='<?php echo $this->l('list_edit')?> <?php echo $subject?>' class="edit_button"><span class='edit-icon'></span></a>
45	45	<?php }?>
46		- <?php if(!$unset_read){?>
	46	+ <?php if (!$unset_read) {?>
47	47	<a href='<?php echo $row->read_url?>' title='<?php echo $this->l('list_view')?> <?php echo $subject?>' class="edit_button"><span class='read-icon'></span></a>
48	48	<?php }?>
49	49	<?php
50		- if(!empty($row->action_urls)){
51		- foreach($row->action_urls as $action_unique_id => $action_url){
	50	+ if (!empty($row->action_urls)) {
	51	+ foreach ($row->action_urls as $action_unique_id => $action_url) {
52	52	$action = $actions[$action_unique_id];
53	53	?>
54	54	<a href="<?php echo $action_url; ?>" class="<?php echo $action->css_class; ?> crud-action" title="<?php echo $action->label?>"><?php
55		- if(!empty($action->image_url))
	55	+ if (!empty($action->image_url))
56	56	{
57	57	?><img src="<?php echo $action->image_url; ?>" alt="<?php echo $action->label?>" /><?php
58	58	}
		@@ -69,7 +69,7 @@ discard block
		block discarded – undo
69	69	</tbody>
70	70	</table>
71	71	</div>
72		-<?php }else{?>
	72	+<?php } else {?>
73	73	<br/>
74	74	<?php echo $this->l('list_no_items'); ?>
75	75	<br/>

		@@ -69,7 +69,7 @@
		block discarded – undo
69	69	</tbody>
70	70	</table>
71	71	</div>
72		-<?php }else{?>
	72	+<?php } else{?>
73	73	<br/>
74	74	<?php echo $this->l('list_no_items'); ?>
75	75	<br/>

		@@ -1,30 +1,30 @@ discard block
		block discarded – undo
1	1	<?php
2		- $this->set_css($this->default_theme_path.'/dashboard/css/style.css');
3		- $this->set_js_lib($this->default_javascript_path.'/'.grocery_CRUD::JQUERY);
	2	+ $this->set_css($this->default_theme_path.'/dashboard/css/style.css');
	3	+ $this->set_js_lib($this->default_javascript_path.'/'.grocery_CRUD::JQUERY);
4	4
5		- $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
6		- $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
7		- $this->set_js_lib($this->default_javascript_path.'/common/lazyload-min.js');
	5	+ $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
	6	+ $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
	7	+ $this->set_js_lib($this->default_javascript_path.'/common/lazyload-min.js');
8	8
9		- if (!$this->is_IE7()) {
10		- $this->set_js_lib($this->default_javascript_path.'/common/list.js');
11		- }
	9	+ if (!$this->is_IE7()) {
	10	+ $this->set_js_lib($this->default_javascript_path.'/common/list.js');
	11	+ }
12	12
13		- $this->set_js($this->default_theme_path.'/flexigrid/js/cookies.js');
14		- $this->set_js($this->default_theme_path.'/flexigrid/js/flexigrid.js');
	13	+ $this->set_js($this->default_theme_path.'/flexigrid/js/cookies.js');
	14	+ $this->set_js($this->default_theme_path.'/flexigrid/js/flexigrid.js');
15	15
16	16	$this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.form.min.js');
17	17
18		- $this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.numeric.min.js');
19		- $this->set_js($this->default_theme_path.'/flexigrid/js/jquery.printElement.min.js');
	18	+ $this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.numeric.min.js');
	19	+ $this->set_js($this->default_theme_path.'/flexigrid/js/jquery.printElement.min.js');
20	20
21		- /** Fancybox */
22		- $this->set_css($this->default_css_path.'/jquery_plugins/fancybox/jquery.fancybox.css');
23		- $this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.fancybox-1.3.4.js');
24		- $this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.easing-1.3.pack.js');
	21	+ /** Fancybox */
	22	+ $this->set_css($this->default_css_path.'/jquery_plugins/fancybox/jquery.fancybox.css');
	23	+ $this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.fancybox-1.3.4.js');
	24	+ $this->set_js($this->default_javascript_path.'/jquery_plugins/jquery.easing-1.3.pack.js');
25	25
26		- /** Jquery UI */
27		- $this->load_js_jqueryui();
	26	+ /** Jquery UI */
	27	+ $this->load_js_jqueryui();
28	28
29	29	?>
30	30	<script type='text/javascript'>
		@@ -108,9 +108,9 @@ discard block
		block discarded – undo
108	108	<?php $paging_ends_to = "<span id='page-ends-to' class='page-ends-to'>". ($total_results < $default_per_page ? $total_results : $default_per_page) ."</span>"; ?>
109	109	<?php $paging_total_results = "<span id='total_items' class='total_items'>$total_results</span>"?>
110	110	<?php echo str_replace( array('{start}','{end}','{results}'),
111		- array($paging_starts_from, $paging_ends_to, $paging_total_results),
112		- $this->l('list_displaying')
113		- ); ?>
	111	+ array($paging_starts_from, $paging_ends_to, $paging_total_results),
	112	+ $this->l('list_displaying')
	113	+ ); ?>
114	114	</span>
115	115	</div>
116	116	<div class="pDiv">

		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28
29	29	?>
30	30	<script type='text/javascript'>
31		- var base_url = '<?php echo base_url();?>';
	31	+ var base_url = '<?php echo base_url(); ?>';
32	32
33	33	var subject = '<?php echo addslashes($subject); ?>';
34	34	var ajax_list_info_url = '<?php echo $ajax_list_info_url; ?>';
		@@ -38,20 +38,20 @@ discard block
		block discarded – undo
38	38
39	39	</script>
40	40	<div id='list-report-error' class='report-div error'></div>
41		-<div <?php if($success_message !== null){?>class="alert alert-success" role="alert" style="display:block;"<?php }?>><?php
42		-if($success_message !== null){?>
	41	+<div <?php if ($success_message !== null) {?>class="alert alert-success" role="alert" style="display:block;"<?php }?>><?php
	42	+if ($success_message !== null) {?>
43	43	<p style=" margin-top: -0px;"><?php echo $success_message; ?></p>
44	44	<?php }
45	45	?></div>
46	46	<div class="flexigrid" style='width: 100%;' data-unique-hash="<?php echo $unique_hash; ?>">
47	47
48		- <?php echo form_open( $ajax_list_url, 'method="post" id="filtering_form" class="filtering_form" autocomplete = "off" data-ajax-list-info-url="'.$ajax_list_info_url.'"'); ?>
	48	+ <?php echo form_open($ajax_list_url, 'method="post" id="filtering_form" class="filtering_form" autocomplete = "off" data-ajax-list-info-url="'.$ajax_list_info_url.'"'); ?>
49	49
50	50	<div id='main-table-box' class="main-table-box">
51	51
52		- <?php if(!$unset_add \|\| !$unset_export \|\| !$unset_print){?>
	52	+ <?php if (!$unset_add \|\| !$unset_export \|\| !$unset_print) {?>
53	53	<div class="tDiv">
54		- <?php if(!$unset_add){?>
	54	+ <?php if (!$unset_add) {?>
55	55	<div class="tDiv2">
56	56	<div class="displayadd">
57	57	<a href='<?php echo $add_url?>' title='<?php echo $this->l('list_add'); ?> <?php echo $subject?>' class='add-anchor add_button'>
		@@ -64,11 +64,11 @@ discard block
		block discarded – undo
64	64	</div>
65	65	<?php }?>
66	66	<div class="tDiv3">
67		- <?php if(!$unset_export) { ?>
	67	+ <?php if (!$unset_export) { ?>
68	68	<a class="export-anchor" href="<?php echo $export_url; ?>" target="_blank">
69	69	<div class="fbutton">
70	70	<div>
71		- <span class="export"><?php echo $this->l('list_export');?></span>
	71	+ <span class="export"><?php echo $this->l('list_export'); ?></span>
72	72	</div>
73	73	</div>
74	74	</a>
		@@ -84,18 +84,18 @@ discard block
		block discarded – undo
84	84	<?php list($show_lang_string, $entries_lang_string) = explode('{paging}', $this->l('list_show_entries')); ?>
85	85	<?php echo $show_lang_string; ?>
86	86	<select name="per_page" id='per_page' class="per_page">
87		- <?php foreach($paging_options as $option){?>
88		- <option value="<?php echo $option; ?>" <?php if($option == $default_per_page){?>selected="selected"<?php }?>><?php echo $option; ?>  </option>
	87	+ <?php foreach ($paging_options as $option) {?>
	88	+ <option value="<?php echo $option; ?>" <?php if ($option == $default_per_page) {?>selected="selected"<?php }?>><?php echo $option; ?>  </option>
89	89	<?php }?>
90	90	</select>
91	91	<?php echo $entries_lang_string; ?>
92		- <input type='hidden' name='order_by[0]' id='hidden-sorting' class='hidden-sorting' value='<?php if(!empty($order_by[0])){?><?php echo $order_by[0]?><?php }?>' />
93		- <input type='hidden' name='order_by[1]' id='hidden-ordering' class='hidden-ordering' value='<?php if(!empty($order_by[1])){?><?php echo $order_by[1]?><?php }?>'/>
	92	+ <input type='hidden' name='order_by[0]' id='hidden-sorting' class='hidden-sorting' value='<?php if (!empty($order_by[0])) {?><?php echo $order_by[0]?><?php }?>' />
	93	+ <input type='hidden' name='order_by[1]' id='hidden-ordering' class='hidden-ordering' value='<?php if (!empty($order_by[1])) {?><?php echo $order_by[1]?><?php }?>'/>
94	94	</span>
95	95	</div>
96	96	<div class="displaysearch">
97		- <?php echo $this->l('list_search');?>: <input type="text" class="qsbsearch_fieldox search_text" name="search_text" size="30" id='search_text'>
98		- <input type="button" value="<?php echo $this->l('list_search');?>" class="btn btn-default">
	97	+ <?php echo $this->l('list_search'); ?>: <input type="text" class="qsbsearch_fieldox search_text" name="search_text" size="30" id='search_text'>
	98	+ <input type="button" value="<?php echo $this->l('list_search'); ?>" class="btn btn-default">
99	99	</div>
100	100
101	101	<div id='ajax_list' class="ajax_list">
		@@ -105,9 +105,9 @@ discard block
		block discarded – undo
105	105	<div class="displayshowing" style="margin-top: 10px;">
106	106	<span class="pPageStat">
107	107	<?php $paging_starts_from = "<span id='page-starts-from' class='page-starts-from'>1</span>"; ?>
108		- <?php $paging_ends_to = "<span id='page-ends-to' class='page-ends-to'>". ($total_results < $default_per_page ? $total_results : $default_per_page) ."</span>"; ?>
	108	+ <?php $paging_ends_to = "<span id='page-ends-to' class='page-ends-to'>".($total_results < $default_per_page ? $total_results : $default_per_page)."</span>"; ?>
109	109	<?php $paging_total_results = "<span id='total_items' class='total_items'>$total_results</span>"?>
110		- <?php echo str_replace( array('{start}','{end}','{results}'),
	110	+ <?php echo str_replace(array('{start}', '{end}', '{results}'),
111	111	array($paging_starts_from, $paging_ends_to, $paging_total_results),
112	112	$this->l('list_displaying')
113	113	); ?>

		@@ -3,7 +3,7 @@
		block discarded – undo
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

		@@ -2,7 +2,7 @@
		block discarded – undo
2	2	defined('BASEPATH') OR exit('No direct script access allowed');
3	3
4	4	echo "\nERROR: ",
5		- $heading,
6		- "\n\n",
7		- $message,
8		- "\n\n";
9	5	\ No newline at end of file
	6	+ $heading,
	7	+ "\n\n",
	8	+ $message,
	9	+ "\n\n";
10	10	\ No newline at end of file

		@@ -32,15 +32,15 @@ discard block
		block discarded – undo
32	32	<td><?= $room['furniture'] ?></td>
33	33	<td>
34	34	<?= $room['staff_involved'] ?>
35		- <?php if (isset($room['staff_involved2'])) { echo '<br>'. $room['staff_involved2']; } ?>
36		- <?php if (isset($room['staff_involved3'])) { echo '<br>'. $room['staff_involved3']; } ?>
37		- <?php if (isset($room['staff_involved4'])) { echo '<br>'. $room['staff_involved4']; } ?>
38		- <?php if (isset($room['staff_involved5'])) { echo '<br>'. $room['staff_involved5']; } ?>
39		- <?php if (isset($room['staff_involved6'])) { echo '<br>'. $room['staff_involved6']; } ?>
40		- <?php if (isset($room['staff_involved7'])) { echo '<br>'. $room['staff_involved7']; } ?>
41		- <?php if (isset($room['staff_involved8'])) { echo '<br>'. $room['staff_involved8']; } ?>
42		- <?php if (isset($room['staff_involved9'])) { echo '<br>'. $room['staff_involved9']; } ?>
43		- <?php if (isset($room['staff_involved10'])) { echo '<br>'. $room['staff_involved10']; } ?>
	35	+ <?php if (isset($room['staff_involved2'])) { echo '<br>'.$room['staff_involved2']; } ?>
	36	+ <?php if (isset($room['staff_involved3'])) { echo '<br>'.$room['staff_involved3']; } ?>
	37	+ <?php if (isset($room['staff_involved4'])) { echo '<br>'.$room['staff_involved4']; } ?>
	38	+ <?php if (isset($room['staff_involved5'])) { echo '<br>'.$room['staff_involved5']; } ?>
	39	+ <?php if (isset($room['staff_involved6'])) { echo '<br>'.$room['staff_involved6']; } ?>
	40	+ <?php if (isset($room['staff_involved7'])) { echo '<br>'.$room['staff_involved7']; } ?>
	41	+ <?php if (isset($room['staff_involved8'])) { echo '<br>'.$room['staff_involved8']; } ?>
	42	+ <?php if (isset($room['staff_involved9'])) { echo '<br>'.$room['staff_involved9']; } ?>
	43	+ <?php if (isset($room['staff_involved10'])) { echo '<br>'.$room['staff_involved10']; } ?>
44	44	</td>
45	45	<td width="20%"><?= $room['reason'] ?></td>
46	46	<?php switch ($room['status']) {
		@@ -64,7 +64,7 @@ discard block
		block discarded – undo
64	64	<?php break;
65	65	case 6: ?>
66	66	<td class='success'>Move Complete</td>
67		- <?php break;?>
	67	+ <?php break; ?>
68	68	<?php } ?>
69	69	<td>
70	70	<?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'])) { ?>

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

		@@ -1,12 +1,12 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		- $this->set_css($this->default_theme_path.'/flexigrid/css/flexigrid.css');
	3	+ $this->set_css($this->default_theme_path.'/flexigrid/css/flexigrid.css');
4	4
5	5	$this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.form.min.js');
6		- $this->set_js_config($this->default_theme_path.'/flexigrid/js/flexigrid-edit.js');
	6	+ $this->set_js_config($this->default_theme_path.'/flexigrid/js/flexigrid-edit.js');
7	7
8		- $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
9		- $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
	8	+ $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/jquery.noty.js');
	9	+ $this->set_js_lib($this->default_javascript_path.'/jquery_plugins/config/jquery.noty.config.js');
10	10	?>
11	11	<div class="flexigrid crud-form" style='width: 100%;' data-unique-hash="<?php echo $unique_hash; ?>">
12	12	<div class="mDiv">
		@@ -24,12 +24,12 @@ discard block
		block discarded – undo
24	24	<?php echo form_open( $update_url, 'method="post" id="crudForm" enctype="multipart/form-data"'); ?>
25	25	<div class='form-div'>
26	26	<?php
27		- $counter = 0;
28		- foreach($fields as $field)
29		- {
30		- $even_odd = $counter % 2 == 0 ? 'odd' : 'even';
31		- $counter++;
32		- ?>
	27	+ $counter = 0;
	28	+ foreach($fields as $field)
	29	+ {
	30	+ $even_odd = $counter % 2 == 0 ? 'odd' : 'even';
	31	+ $counter++;
	32	+ ?>
33	33	<div class='form-field-box <?php echo $even_odd?>' id="<?php echo $field->field_name; ?>_field_box">
34	34	<div class='form-display-as-box' id="<?php echo $field->field_name; ?>_display_as_box">
35	35	<?php echo $input_fields[$field->field_name]->display_as?><?php echo ($input_fields[$field->field_name]->required)? "<span class='required'>*</span> " : ""?> :
		@@ -43,10 +43,10 @@ discard block
		block discarded – undo
43	43	<?php if(!empty($hidden_fields)){?>
44	44	<!-- Start of hidden inputs -->
45	45	<?php
46		- foreach($hidden_fields as $hidden_field){
47		- echo $hidden_field->input;
48		- }
49		- ?>
	46	+ foreach($hidden_fields as $hidden_field){
	47	+ echo $hidden_field->input;
	48	+ }
	49	+ ?>
50	50	<!-- End of hidden inputs -->
51	51	<?php }?>
52	52	<?php if ($is_ajax) { ?><input type="hidden" name="is_ajax" value="true" /><?php }?>

		@@ -16,23 +16,23 @@ discard block
		block discarded – undo
16	16	</div>
17	17	<div class='clear'></div>
18	18	</div>
19		- <div title="<?php echo $this->l('minimize_maximize');?>" class="ptogtitle">
	19	+ <div title="<?php echo $this->l('minimize_maximize'); ?>" class="ptogtitle">
20	20	<span></span>
21	21	</div>
22	22	</div>
23	23	<div id='main-table-box'>
24		- <?php echo form_open( $update_url, 'method="post" id="crudForm" enctype="multipart/form-data"'); ?>
	24	+ <?php echo form_open($update_url, 'method="post" id="crudForm" enctype="multipart/form-data"'); ?>
25	25	<div class='form-div'>
26	26	<?php
27	27	$counter = 0;
28		- foreach($fields as $field)
	28	+ foreach ($fields as $field)
29	29	{
30	30	$even_odd = $counter % 2 == 0 ? 'odd' : 'even';
31	31	$counter++;
32	32	?>
33	33	<div class='form-field-box <?php echo $even_odd?>' id="<?php echo $field->field_name; ?>_field_box">
34	34	<div class='form-display-as-box' id="<?php echo $field->field_name; ?>_display_as_box">
35		- <?php echo $input_fields[$field->field_name]->display_as?><?php echo ($input_fields[$field->field_name]->required)? "<span class='required'>*</span> " : ""?> :
	35	+ <?php echo $input_fields[$field->field_name]->display_as?><?php echo ($input_fields[$field->field_name]->required) ? "<span class='required'>*</span> " : ""?> :
36	36	</div>
37	37	<div class='form-input-box' id="<?php echo $field->field_name; ?>_input_box">
38	38	<?php echo $input_fields[$field->field_name]->input?>
		@@ -40,10 +40,10 @@ discard block
		block discarded – undo
40	40	<div class='clear'></div>
41	41	</div>
42	42	<?php }?>
43		- <?php if(!empty($hidden_fields)){?>
	43	+ <?php if (!empty($hidden_fields)) {?>
44	44	<!-- Start of hidden inputs -->
45	45	<?php
46		- foreach($hidden_fields as $hidden_field){
	46	+ foreach ($hidden_fields as $hidden_field) {
47	47	echo $hidden_field->input;
48	48	}
49	49	?>
		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	<div class='form-button-box'>
58	58	<input id="form-button-save" type='submit' value='<?php echo $this->l('form_update_changes'); ?>' class="btn btn-large"/>
59	59	</div>
60		-<?php if(!$this->unset_back_to_list) { ?>
	60	+<?php if (!$this->unset_back_to_list) { ?>
61	61	<div class='form-button-box'>
62	62	<input type='button' value='<?php echo $this->l('form_update_and_go_back'); ?>' id="save-and-go-back-button" class="btn btn-large"/>
63	63	</div>

East-Kent-Partnership / Intranet

Push — master ( 63a7db...fb547d )

Status

Category

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch