webdivane / table

table.php

Spacing +4 added lines, -7 removed lines

@@ -34,11 +34,9 @@ 
         self::$t['order']['col'] = $orderBy;
         $dir = strtolower($orderDir);
         self::$t['order']['dir'] = in_array($dir, ['asc', 'desc']) ?
-                $dir :
-                die('Invalid orderDir(Asc/Desc): ' . $orderDir);
+                $dir : die('Invalid orderDir(Asc/Desc): ' . $orderDir);
         self::$t['paging'] = ($p = abs($paging)) > 10 ?
-                $p :
-                die('Invalid paging(>10): ' . $paging);
+                $p : die('Invalid paging(>10): ' . $paging);
     }
 
     /** #2. Execute (queries)
@@ -57,7 +55,7 @@ 
 
         $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);
 
@@ -101,8 +99,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);
 

table_setter.php

Spacing +11 added lines, -14 removed lines

@@ -49,7 +49,7 @@ 
         $list = [];
         foreach ($attributes as $key => $value) {
             if (is_bool($value)) {
-                if ((bool) $value) {
+                if ((bool)$value) {
                     $list[] = $key;
                 }
             } else if (empty($value) && !is_int($value)) {
@@ -70,7 +70,7 @@ 
         extract($vars);
         ob_start();
         require $template;
-        return (string) ob_get_clean();
+        return (string)ob_get_clean();
     }
 
     protected static function paging(&$v)
@@ -85,11 +85,11 @@ 
 
             $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;
@@ -111,9 +111,9 @@ 
         }
         $jump2show = function($m) use ($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);
             }
@@ -130,7 +130,7 @@ 
             $html = $direction === '-' ? $add . $html : $html . $add;
         }
 
-        return $jump_exists ? self::pagingJumps($html, ($m * 10)) : $html;
+        return $jump_exists ? self::pagingJumps($html, ($m*10)) : $html;
     }
 
     protected static function filterValues(&$f, &$opts = [])
@@ -180,8 +180,7 @@ 
     {
         if (($col = filter_input(INPUT_GET, 'col', FILTER_VALIDATE_INT))) {
             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'];
     }
@@ -190,8 +189,7 @@ 
     {
         $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']);
     }
 
     protected static function requestExport()
@@ -204,7 +202,6 @@ 
     protected static function requestPage()
     {
         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'];
     }
 }

table_getter.php

Spacing +14 added lines, -23 removed lines

@@ -32,8 +32,7 @@ 
                 $sortable = !isset($arg['sort']) || $arg['sort'] !== false;
 
                 $sort = $sortable ?
-                        (isset($arg['sort']) ? $arg['sort'] : $col) :
-                        null;
+                        (isset($arg['sort']) ? $arg['sort'] : $col) : null;
 
                 if (($del = isset($arg['type']) && $arg['type'] == 'delete')) {
                     $sortable = false;
@@ -47,11 +46,10 @@ 
                 if (isset($arg['width'])) { // Width attribute -> style
                     $width = 'width:' . $arg['width'] . ';';
                     $arg['style'] = isset($arg['style']) ?
-                            $width . $arg['style'] :
-                            $width;
+                            $width . $arg['style'] : $width;
                 }
 
-                $attr = array_diff_key((array) $arg, ['sort', 'type', 'width']);
+                $attr = array_diff_key((array)$arg, ['sort', 'type', 'width']);
 
                 $th = '<th' . self::attributes($attr) . '>';
                 if ($sortable) {
@@ -60,8 +58,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 = "";
                     }
@@ -92,8 +89,7 @@ 
     {
         //Condition: '' | '(HAVING|WHERE|AND) ' . $cond
         $c = !empty($cond) && !strpos($q, ($cl = !$h ? 'WHERE' : 'HAVING')) ?
-                (' ' . (!strpos($q, $cl) ? $cl : ' AND ') . ' ' . $cond ) :
-                '';
+                (' ' . (!strpos($q, $cl) ? $cl : ' AND ') . ' ' . $cond) : '';
         //Order: '' | 'ORDER BY ' . array_keys($order)[0] . ' ' . $order[0]
         $o = !empty($order) ?
                 ' ORDER BY ' . implode(', ',
@@ -104,8 +100,7 @@ 
                 '';
         //Limit: '' | ' LIMIT ' . '(20, 40|20)'
         $l = !empty($limit) ?
-                (' LIMIT ' . (is_array($limit) ? implode(', ', $limit) : $limit)) :
-                '';
+                (' LIMIT ' . (is_array($limit) ? implode(', ', $limit) : $limit)) : '';
 
         return $q . $c . $o . $l;
     }
@@ -113,8 +108,7 @@ 
     protected static function exportData()
     {
         $data = self::$exportDataAsDisplayed ?
-                self::$data :
-                self::select(self::$t['q']);
+                self::$data : self::select(self::$t['q']);
         $fnReplace = [];
         $fnReplace[':app'] = self::$app;
         $fnReplace[':items'] = self::$t['items'];
@@ -160,8 +154,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);
                 }
@@ -203,14 +196,13 @@ 
                 $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 = [];
 
-            $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'];
@@ -304,9 +296,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. ');
         }