webdivane / table

table_setter.php

Spacing +24 added lines, -27 removed lines

@@ -49,16 +49,16 @@ 
         $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)) {
+            } else if (empty($value) && !is_int($value)) {
                 $list[] = $key;
             } else {
                 $list[] = $key . '="' . $value . '"';
             }
         }
-        return (count($list)>0 ? ' ' : '') . join(' ', $list);
+        return (count($list) > 0 ? ' ' : '') . join(' ', $list);
     }
 
     /** Parses view to string
@@ -70,12 +70,12 @@ 
         extract($vars);
         ob_start();
         require $template;
-        return (string) ob_get_clean();
+        return (string)ob_get_clean();
     }
 
     protected static function paging(&$v)
     {
-        if (self::$t['pages']>1) {
+        if (self::$t['pages'] > 1) {
             $v['pages'] = self::$t['pages'];
             $v['page'] = self::$t['page'];
             $v['jumpL'] = self::pagingJumps();
@@ -85,12 +85,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)) {
-                $v['final'] = $v['start']+$limit;
+            } else if ($v['page'] > ($limit/2)) {
+                $v['final'] = $v['start'] + $limit;
             } else {
                 $v['final'] = $limit;
             }
@@ -110,9 +110,9 @@ 
             $m = 100;
         }
         $jump2show = function($m) use ($direction) {
-            if ($m >=1000000) {
+            if ($m >= 1000000) {
                 return ($direction . ($m/1000000) . "M");
-            } else if ($m >=1000) {
+            } else if ($m >= 1000) {
                 return ($direction . ($m/1000) . "K");
             } else {
                 return ($direction . $m);
@@ -120,14 +120,14 @@ 
         };
         $add = '<li class="jump"><a>' . $jump2show($m) . '</a></li>';
 
-        if ($direction ==='-') {
-            $jump_exists = (self::$t['page']-$m)>0;
+        if ($direction === '-') {
+            $jump_exists = (self::$t['page'] - $m) > 0;
         } else {
-            $jump_exists = (self::$t['page']+$m) <=self::$t['pages'];
+            $jump_exists = (self::$t['page'] + $m) <= self::$t['pages'];
         }
 
         if ($jump_exists) {
-            $html = $direction ==='-' ? $add . $html : $html . $add;
+            $html = $direction === '-' ? $add . $html : $html . $add;
         }
 
         return $jump_exists ? self::pagingJumps($html, ($m*10)) : $html;
@@ -139,13 +139,13 @@ 
 
         $by = filter_input(INPUT_GET, 'filter-by', FILTER_VALIDATE_INT);
         foreach (self::$cols as $k => $v) {
-            if (isset($v[2]['sort'])&&$v[2]['sort'] ===false) {
+            if (isset($v[2]['sort']) && $v[2]['sort'] === false) {
                 continue;
             }
             if (empty($v)) {
                 $v = [null];
             } // fix for column requested as []
-            $selected = $by ===$k ? ' selected' : null;
+            $selected = $by === $k ? ' selected' : null;
             $opts[] = "<option value=\"{$k}\"{$selected}>{$v[0]}</option>";
         }
     }
@@ -155,10 +155,10 @@ 
         $filter = filter_input(INPUT_GET, 'filter') ?: false;
         if ($filter) {
             $by = filter_input(INPUT_GET, 'filter-by', FILTER_VALIDATE_INT);
-            if ($by ===false||is_null($by)) {
+            if ($by === false || is_null($by)) {
                 $by = [];
                 foreach (self::$cols as $v) {
-                    if (isset($v[2]['sort'])&&$v[2]['sort'] ===false) {
+                    if (isset($v[2]['sort']) && $v[2]['sort'] === false) {
                         continue;
                     }
                     $by[] = 'IFNULL(' . $v[1] . ', "")';
@@ -168,7 +168,7 @@ 
                 $by = self::$cols[$by][1];
             }
             $by = 'CONCAT(" ",' . $by . ', " ")';
-            if (self::config('FILTER_CASE_SENSITIVE') !==true) {
+            if (self::config('FILTER_CASE_SENSITIVE') !== true) {
                 $by .= ' COLLATE ' . self::config('DB_COLLATION_CI');
             }
             $filter = $by . ' LIKE ' . '"%' . $filter . '%"';
@@ -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()
@@ -202,8 +200,7 @@ 
 
     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'];
+        return filter_has_var(INPUT_GET, 'pg') && self::$export == false ?
+                (int)filter_input(INPUT_GET, 'pg', FILTER_SANITIZE_NUMBER_INT) : self::$t['page'];
     }
 }

table.php

Spacing +9 added lines, -12 removed lines

@@ -33,10 +33,8 @@ 
         self::prepare(true);
         self::$t['order']['col'] = $orderBy;
         $dir = strtolower($orderDir);
-        self::$t['order']['dir'] = in_array($dir, ['asc', 'desc']) ? $dir :
-                die('Invalid orderDir(Asc/Desc): ' . $orderDir);
-        self::$t['paging'] = ($p = abs($paging)) > 10 ? $p :
-                die('Invalid paging(>10): ' . $paging);
+        self::$t['order']['dir'] = in_array($dir, ['asc', 'desc']) ? $dir : die('Invalid orderDir(Asc/Desc): ' . $orderDir);
+        self::$t['paging'] = ($p = abs($paging)) > 10 ? $p : die('Invalid paging(>10): ' . $paging);
     }
 
     /** #2. Execute (queries)
@@ -55,15 +53,15 @@ 
 
         $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);
 
-        $qAll = isset($qTotal) && ! $filter ? $qTotal : $q;
-        $orderAll = ! self::$export ? [] : $order;
+        $qAll = isset($qTotal) && !$filter ? $qTotal : $q;
+        $orderAll = !self::$export ? [] : $order;
         self::$t['qAll'] = self::q($qAll, $filter, $orderAll, 0, true);
 
-        $query = ! self::$export ? self::$t['q'] : self::$t['qAll'];
+        $query = !self::$export ? self::$t['q'] : self::$t['qAll'];
 
         try {
             self::$data = self::select($query);
@@ -81,7 +79,7 @@ 
             ob_get_clean();
             $tableId = filter_input(INPUT_GET, 'table-id') ?: null;
             if ($tableId === self::$t['items'] . '-table') {
-                if ( ! self::$export) {
+                if (!self::$export) {
                     header('Content-Type: application/json');
                     $jsonArr = ['body' => self::jsonGetBodyData(),
                         'footer' => self::jsonGetFooterData()];
@@ -99,8 +97,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);
 
@@ -108,7 +105,7 @@ 
         self::$pageExt = strtolower($extension);
 
         if (self::$helper_class::prepare(__METHOD__, $setOrCheck) !== true) {
-            if (self::$pageExt === 'json' && ! isset(self::$t['prepared'])) {
+            if (self::$pageExt === 'json' && !isset(self::$t['prepared'])) {
                 ob_start();
                 self::$t['prepared'] = true;
             }

table_getter.php

Spacing +35 added lines, -44 removed lines

@@ -22,23 +22,22 @@ 
         if (self::$cols) {
             $ths = [];
             $length = sizeof(self::$cols);
-            for ($i = 0; $i<$length; $i++) {
+            for ($i = 0; $i < $length; $i++) {
                 list($lbl, $col, $arg) = array_pad(self::$cols[$i], 3, null);
 
                 if (is_null($col)) {
                     $arg['sort'] = false;
                 }
 
-                $sortable = !isset($arg['sort'])||$arg['sort'] !==false;
+                $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')) {
+                if (($del = isset($arg['type']) && $arg['type'] == 'delete')) {
                     $sortable = false;
-                    if (!isset($arg['width'])&&
-                            false ===strpos($arg['width'], 'width:')
+                    if (!isset($arg['width']) &&
+                            false === strpos($arg['width'], 'width:')
                     ) {
                         $arg['width'] = '1%';
                     }
@@ -47,21 +46,19 @@ 
                 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) {
                     $th .= '<a onclick="table.Sort(' . $i . ',this);">';
                 }
                 if (!$del) {
-                    if ($sort ==self::$t['order']['col']) {
-                        $span = self::$t['order']['dir'] ==='desc' ?
-                                self::config('UTF8_DESC_SYMBOL') :
-                                self::config('UTF8_ASC_SYMBOL');
+                    if ($sort == self::$t['order']['col']) {
+                        $span = self::$t['order']['dir'] === 'desc' ?
+                                self::config('UTF8_DESC_SYMBOL') : self::config('UTF8_ASC_SYMBOL');
                     } else {
                         $span = "";
                     }
@@ -91,9 +88,8 @@ 
     protected static function q($q, $cond = null, array $order = [], $limit = 0, $h = false)
     {
         //Condition: '' | '(HAVING|WHERE|AND) ' . $cond
-        $c = !empty($cond)&&!strpos($q, ($cl = !$h ? 'WHERE' : 'HAVING')) ?
-                (' ' . (!strpos($q, $cl) ? $cl : ' AND ') . ' ' . $cond ) :
-                '';
+        $c = !empty($cond) && !strpos($q, ($cl = !$h ? 'WHERE' : 'HAVING')) ?
+                (' ' . (!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'];
@@ -124,14 +118,14 @@ 
         $outFilename = strtr(self::config('EXPORT_FILE_NAME'), $fnReplace);
         $outColumns = $outHeader = [];
         foreach (self::$cols as $c) {
-            if (isset($c[2]['sort'])&&$c[2]['sort'] ===false) {
+            if (isset($c[2]['sort']) && $c[2]['sort'] === false) {
                 continue;
             }
             $outColumns[] = $c[1];
             $outHeader[] = $c[0];
         }
         $eData = [$outHeader];
-        if (count($data)>0) {
+        if (count($data) > 0) {
             foreach ($data as $row) {
                 $rowData = [];
                 foreach ($row as $dbName => $value) {
@@ -157,11 +151,10 @@ 
                 header('Content-Disposition:attachment; filename=' .
                         $outFilename . '.csv');
                 
-                if(($output = fopen('php://output', 'w'))){
+                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");
+                        self::$export === 'CSV' ?
+                        fputcsv($output, $v) : fputs($output, implode("\t", array_map($escape, $v)) . "\r\n");
                     }
                     fclose($output);
                 }
@@ -175,7 +168,7 @@ 
         foreach (self::$cols as $c) {
             $outColumns[] = isset($c[1]) ? $c[1] : null;
         }
-        if ((self::$t['rows'] = count(self::$data))>0) {
+        if ((self::$t['rows'] = count(self::$data)) > 0) {
             foreach (self::$data as $row) {
                 $rowData = [];
                 foreach ($outColumns as $dbName) {
@@ -194,9 +187,9 @@ 
     protected static function jsonGetFooterData()
     {
         $jsonArrFooter = [];
-        if (count(self::$data)>0) {
+        if (count(self::$data) > 0) {
             $pageNo = self::$t['page'];
-            if ($pageNo ===1&&count(self::$data)<self::$t['paging']) {
+            if ($pageNo === 1 && count(self::$data) < self::$t['paging']) {
                 //Skips total count query
                 self::$t['rows'] = count(self::$data);
             } else {
@@ -207,15 +200,14 @@ 
 
             $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'];
 
-            if (self::$exportActive ===true) {
+            if (self::$exportActive === true) {
                 $url = strtok(self::$t['slug'], "?&") . ".json?table=" .
                         self::$t['items'] . "&export=";
                 $v["export"] = ["url" => $url, "types" => self::config('SAVES')];
@@ -265,10 +257,10 @@ 
     private static function rows($for)
     {
         $trs = '';
-        if ($for ==='body') {
+        if ($for === 'body') {
             foreach (self::jsonGetBodyData() as $r) {
-                if (isset($r[0][1], $r[0][1]['class'])&&
-                        $r[0][1]['class'] ==='no-results'
+                if (isset($r[0][1], $r[0][1]['class']) &&
+                        $r[0][1]['class'] === 'no-results'
                 ) {
                     $trs .= '<tr><td' . self::attributes($r[0][1]) . '>'
                             . $r[0][0] . '</td></tr>';
@@ -277,8 +269,8 @@ 
                             . '</td></tr>';
                 }
             }
-        } else if ($for ==='footer') {
-            if (self::$t['rows']>0) {
+        } else if ($for === 'footer') {
+            if (self::$t['rows'] > 0) {
                 $ftr = self::jsonGetFooterData()[0][0];
                 $trs .= '<tr><td' . self::attributes($ftr[1]) . '>'
                         . $ftr[0] . '</td></tr>';
@@ -300,13 +292,12 @@ 
 
     static function select(string $expression, array $bindings = [])
     {
-        if (is_object(static::$select)&&(static::$select instanceof Closure)) {
+        if (is_object(static::$select) && (static::$select instanceof Closure)) {
             $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 {
             die('ERROR: table::$select is not a valid closure. '
                     . __METHOD__ . '() #' . __LINE__);