webdivane / table

trait_tfoot_paging.php

Spacing +8 added lines, -10 removed lines

@@ -14,13 +14,12 @@ 
 
             $limit = 10;
 
-            $v['start'] = $v['page'] > ($limit / 2) ?
-                    ($v['page'] - $limit / 2) :
-                    1;
+            $v['start'] = $v['page'] > ($limit/2) ?
+                    ($v['page'] - $limit/2) : 1;
 
-            if ($v['page'] > ($v['pages'] - ($limit / 2))) {
+            if ($v['page'] > ($v['pages'] - ($limit/2))) {
                 $v['final'] = $v['pages'];
-            } else if ($v['page'] > ($limit / 2)) {
+            } else if ($v['page'] > ($limit/2)) {
                 $v['final'] = $v['start'] + $limit;
             } else {
                 $v['final'] = $limit;
@@ -44,12 +43,11 @@ 
         $add = '<li class="jump"><a>' . self::jumps($m, $direction) . '</a></li>';
 
         $jump_exists = $direction === '-' ?
-                        (self::$t['page'] - $m) > 0 :
-                        (self::$t['page'] + $m) <= self::$t['pages'];
+                        (self::$t['page'] - $m) > 0 : (self::$t['page'] + $m) <= self::$t['pages'];
 
         if ($jump_exists) {
             $html = $direction === '-' ? $add . $html : $html . $add;
-            return self::pagingJumps($html, ($m * 10));
+            return self::pagingJumps($html, ($m*10));
         }
 
         return $html;
@@ -58,9 +56,9 @@ 
     private static function jumps($m, $direction)
     {
         if ($m >= 1000000) {
-            return ($direction . ($m / 1000000) . "M");
+            return ($direction . ($m/1000000) . "M");
         } else if ($m >= 1000) {
-            return ($direction . ($m / 1000) . "K");
+            return ($direction . ($m/1000) . "K");
         } else {
             return ($direction . $m);
         }

tbody.php

Spacing +4 added lines, -7 removed lines

@@ -48,16 +48,14 @@ 
         $rows = [$header];
 
         $data = self::$exportDataAsDisplayed ?
-                self::$data :
-                self::select(self::$t['q']);
+                self::$data : self::select(self::$t['q']);
 
         if (count($data) > 0) {
             foreach ($data as $row) {
                 $cells = [];
-                foreach($columns as $column){
+                foreach ($columns as $column) {
                     $cells[] = is_array($row[$column]) ? 
-                                $row[$column][0] :
-                                $row[$column];
+                                $row[$column][0] : $row[$column];
                 }
                 $rows[] = $cells;
             }
@@ -95,8 +93,7 @@ 
                 if (($output = fopen('php://output', 'w'))) {
                     foreach ($eData as $v) {
                         self::$export === 'CSV' ?
-                                        fputcsv($output, $v) :
-                                        fputs($output, implode("\t", array_map($escape, $v)) . "\r\n");
+                                        fputcsv($output, $v) : fputs($output, implode("\t", array_map($escape, $v)) . "\r\n");
                     }
                     fclose($output);
                 }

tfoot.php

Spacing +6 added lines, -8 removed lines

@@ -38,12 +38,11 @@ 
             $q = 'SELECT COUNT(*) FROM (' . self::$t['qAll'] . ') AS dt';
             self::$t['rows'] = self::select($q);
         }
-        self::$t['pages'] = ceil(self::$t['rows'] / self::$t['paging']);
+        self::$t['pages'] = ceil(self::$t['rows']/self::$t['paging']);
 
-        $v['from'] = ($pageNo - 1) * self::$t['paging'] + 1;
-        $v['upto'] = ($pageNo * self::$t['paging'] < self::$t['rows']) ?
-                $pageNo * self::$t['paging'] :
-                self::$t['rows'];
+        $v['from'] = ($pageNo - 1)*self::$t['paging'] + 1;
+        $v['upto'] = ($pageNo*self::$t['paging'] < self::$t['rows']) ?
+                $pageNo*self::$t['paging'] : self::$t['rows'];
 
         $v["total"] = self::$t['rows'];
         $v["items"] = self::$t['items'];
@@ -69,9 +68,8 @@ 
             $select = static::$select;
             $res = $select($expression, $bindings);
             //if result is single cell value ($res[0]->value), return the value
-            return (count($res) === 1 && count((array) $res[0]) === 1) ?
-                    reset($res[0]) :
-                    $res;
+            return (count($res) === 1 && count((array)$res[0]) === 1) ?
+                    reset($res[0]) : $res;
         } else {
             throw new Exception('ERROR: table::$select is not a closure. ');
         }

thead.php

Spacing +4 added lines, -7 removed lines

@@ -46,8 +46,7 @@ 
     private static function tagAttributes($tag, $items)
     {
         $attr = $tag === 'div' ?
-                ['id' => $items . '-list', 'class' => 'table'] :
-                ['id' => $items . '-table', 'data-table' => 'js', 
+                ['id' => $items . '-list', 'class' => 'table'] : ['id' => $items . '-table', 'data-table' => 'js', 
                 'data-sort-a' => self::config('UTF8_ASC_SYMBOL'),
                 'data-sort-d' => self::config('UTF8_DESC_SYMBOL')];
         if (array_key_exists($tag, self::$attributes)) {
@@ -84,8 +83,7 @@ 
         if (isset($arg['width'])) { // Width attribute -> style
             $width = 'width:' . $arg['width'] . ';';
             $arg['style'] = isset($arg['style']) ?
-                    $width . $arg['style'] :
-                    $width;
+                    $width . $arg['style'] : $width;
         }
 
         if (($del = isset($arg['type']) && $arg['type'] == 'delete')) {
@@ -94,7 +92,7 @@ 
             $sort = isset($arg['sort']) ? $arg['sort'] : $col;
         }
 
-        return array_diff_key((array) $arg, ['sort', 'type', 'width']);
+        return array_diff_key((array)$arg, ['sort', 'type', 'width']);
     }
 
     private static function th($i, $attr, $sort, $del, $lbl)
@@ -106,8 +104,7 @@ 
         if (!$del) {
             if ($sort == self::$t['order']['col']) {
                 $span = self::$t['order']['dir'] === 'desc' ?
-                        self::config('UTF8_DESC_SYMBOL') :
-                        self::config('UTF8_ASC_SYMBOL');
+                        self::config('UTF8_DESC_SYMBOL') : self::config('UTF8_ASC_SYMBOL');
             } else {
                 $span = "";
             }

table.php

Spacing +2 added lines, -3 removed lines

@@ -25,8 +25,7 @@ 
     public static function prepare($setOrCheck = false)
     {
         //@see  http://php.net/manual/es/function.filter-input.php#77307
-        $uri = filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL) ?:
-                filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_URL);
+        $uri = filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL) ?: filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_URL);
 
         $extension = pathinfo(strtok($uri, '?'), PATHINFO_EXTENSION);
 
@@ -80,7 +79,7 @@ 
 
         $filter = self::$t['filter']; //self::requestFilter();
         $order = [self::$t['order']['col'] => self::$t['order']['dir']];
-        $offset = (self::$t['page'] - 1) * self::$t['paging'];
+        $offset = (self::$t['page'] - 1)*self::$t['paging'];
         $limit = [$offset, self::$t['paging']];
         self::$t['q'] = self::q($q, $filter, $order, $limit, true);
 

trait_table_request.php

Spacing +3 added lines, -6 removed lines

@@ -77,16 +77,14 @@ 
             $reset = filter_has_var(INPUT_GET, 'col') ? 'asc' : null;
             return
                     in_array(filter_input(INPUT_GET, 'ord'), ['asc', 'desc']) ?
-                    filter_input(INPUT_GET, 'ord') :
-                    ($reset ?: self::$t['order']['dir']);
+                    filter_input(INPUT_GET, 'ord') : ($reset ?: self::$t['order']['dir']);
         };
         $order_col = function()
         {
             $col = filter_input(INPUT_GET, 'col', FILTER_VALIDATE_INT);
             if ($col) {
                 return isset(self::$cols[$col][2]['sort']) ?
-                        self::$cols[$col][2]['sort'] :
-                        self::$cols[$col][1];
+                        self::$cols[$col][2]['sort'] : self::$cols[$col][1];
             }
             return self::$t['order']['col'];
         };
@@ -111,8 +109,7 @@ 
         $page = function()
         {
             return  filter_has_var(INPUT_GET, 'pg') && self::$export == false ?
-                (int)filter_input(INPUT_GET, 'pg', FILTER_SANITIZE_NUMBER_INT) :
-                self::$t['page'];
+                (int)filter_input(INPUT_GET, 'pg', FILTER_SANITIZE_NUMBER_INT) : self::$t['page'];
         };
         
         self::$export = $export();