patrickpr / trapdirector

library/Trapdirector/Tables/TrapDirectorTable.php

Braces +47 added lines, -28 removed lines

@@ -88,17 +88,21 @@ 
     {
         $actionURL = $this->getCurrentURL() . '?' ;
         $QSList=array();
-        if ($caller != 'filter' && $this->curFilterQuery() != '')
-            array_push($QSList , $this->curFilterQuery());
+        if ($caller != 'filter' && $this->curFilterQuery() != '') {
+                    array_push($QSList , $this->curFilterQuery());
+        }
         
-        if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '')
-            array_push($QSList , $this->curPagingQuery());
+        if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '') {
+                    array_push($QSList , $this->curPagingQuery());
+        }
  
-        if ($caller != 'order' && $this->curOrderQuery() != '')
-            array_push($QSList , $this->curOrderQuery());
+        if ($caller != 'order' && $this->curOrderQuery() != '') {
+                    array_push($QSList , $this->curOrderQuery());
+        }
         
-        if (count($QSList) != 0)
-            $actionURL .=  implode('&', $QSList) . '&';
+        if (count($QSList) != 0) {
+                    $actionURL .=  implode('&', $QSList) . '&';
+        }
         
         return $actionURL;
     }
@@ -142,7 +146,9 @@ 
         $filter='';
         foreach ($this->filterColumn as $column)
         {
-            if ($filter != "") $filter.=' OR ';
+            if ($filter != "") {
+            	$filter.=' OR ';
+            }
             //$filter .= "'" . $column . "' LIKE '%" . $this->filterString. "%'";
             $filter .= $column  . " LIKE '%" . $this->filterString. "%'";
         }
@@ -185,7 +191,9 @@ 
     
     protected function curFilterQuery()
     {
-        if ($this->filterQuery == '') return '';
+        if ($this->filterQuery == '') {
+        	return '';
+        }
         return 'f='.$this->filterQuery;
     }
     
@@ -200,7 +208,9 @@ 
         $orderSQL='';
         foreach ($this->order as $column => $direction)
         {
-            if ($orderSQL != "") $orderSQL.=',';
+            if ($orderSQL != "") {
+            	$orderSQL.=',';
+            }
             
             $orderSQL .= $column . ' ' . $direction;
         }
@@ -217,7 +227,9 @@ 
 
     public function isOrderSet()
     {
-        if (count($this->order) == 0) return FALSE;
+        if (count($this->order) == 0) {
+        	return FALSE;
+        }
         return TRUE;
     }
     
@@ -238,7 +250,9 @@ 
     
     protected function curOrderQuery()
     {
-        if ($this->orderQuery == '') return '';
+        if ($this->orderQuery == '') {
+        	return '';
+        }
         return 'o='.$this->orderQuery;
     }
     
@@ -276,7 +290,9 @@ 
 
     protected function curPagingQuery()
     {
-        if ($this->currentPage == '') return '';
+        if ($this->currentPage == '') {
+        	return '';
+        }
         return 'page='.$this->currentPage;
     }
     
@@ -288,10 +304,14 @@ 
             return  'count : ' . $this->count() . '<br>';
         }
         
-        if ($this->currentPage == 0) $this->currentPage = 1;
+        if ($this->currentPage == 0) {
+        	$this->currentPage = 1;
+        }
         
         $numPages = intdiv($count , $this->maxPerPage);
-        if ($count % $this->maxPerPage != 0 ) $numPages++;
+        if ($count % $this->maxPerPage != 0 ) {
+        	$numPages++;
+        }
         
         $html = '<div class="pagination-control" role="navigation">';
         $html .= '<ul class="nav tab-nav">';
@@ -305,8 +325,7 @@ 
                      </span>
                 </li>
                ';
-        }
-        else 
+        } else 
         {
             $html .= '
                 <li class="nav-item">
@@ -322,7 +341,9 @@ 
             $active = ($this->currentPage == $i) ? 'active' : '';
             $first = ($i-1)*$this->maxPerPage+1;
             $last = $i * $this->maxPerPage;
-            if ($last > $count) $last = $count;
+            if ($last > $count) {
+            	$last = $count;
+            }
             $display = 'Show rows '. $first . ' to '. $last .' of '. $count;
             $html .= '<li class="' . $active . ' nav-item">
                     <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. $i .'" title="' . $display . '" aria-label="' . $display . '">
@@ -341,8 +362,7 @@ 
                      </span>
                 </li>
                ';
-        }
-        else
+        } else
         {
             $html .= '
                 <li class="nav-item">
@@ -386,7 +406,9 @@ 
     
     public function groupingNextLine( $values)
     {
-        if ($this->grouppingActive === FALSE) return '';
+        if ($this->grouppingActive === FALSE) {
+        	return '';
+        }
         
         $dbcol = $this->groupingColumn;
         if ($this->groupingVal == '' || $this->groupingVal != $values->$dbcol )
@@ -419,20 +441,17 @@ 
                     if ($this->order[$titleOrder] == 'ASC')
                     {
                         $titleOrder.='DESC';
-                    }
-                    else
+                    } else
                     {
                         $titleOrder.='ASC';
                     }
-                }
-                else 
+                } else 
                 {
                     $titleOrder.='ASC';
                 }
                 $actionURL = $this->getCurrentURLAndQS('order').'o='.$titleOrder;
                 $html .= '<th><a href="'.$actionURL.'">' . $values . '</a></th>';
-            }
-            else 
+            } else 
             {
                 $html .= '<th>' . $values . '</th>';
             }