webdivane / table

Tbody.php

Spacing +11 added lines, -14 removed lines

@@ -31,10 +31,10 @@ 
             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>';
+                $trs .= '<tr><td' . self::attributes($r[0][1]) . '>'
+                    .$r[0][0] . '</td></tr>';
             } else {
-                $trs .= '<tr><td>'.implode('</td><td>', $r)
+                $trs .= '<tr><td>' . implode('</td><td>', $r)
                     .'</td></tr>';
             }
         }
@@ -49,16 +49,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) {
                     $cells[] = is_array($row[$column]) ?
-                        $row[$column][0] :
-                        $row[$column];
+                        $row[$column][0] : $row[$column];
                 }
                 $rows[] = $cells;
             }
@@ -87,21 +85,20 @@ 
         switch (self::$export) {
             case 'Excel':
             case 'CSV':
-                $escape = function ($value) {
+                $escape = function($value) {
                     return str_replace("\t", '&#9;', $value);
                 };
 
                 if (($output = fopen('php://output', 'w'))) {
                     if (substr($filename, -2) !== '()') { //4 testing
                         header('Content-Type:application/csv');
-                        header('Content-Disposition:attachment; filename='.
-                                $filename.'.csv');
+                        header('Content-Disposition:attachment; filename=' .
+                                $filename . '.csv');
                     }
                     foreach ($eData as $v) {
                         self::$export === 'CSV' ?
-                                fputcsv($output, $v) :
-                                fwrite($output,
-                                    implode("\t", array_map($escape, $v))."\r\n");
+                                fputcsv($output, $v) : fwrite($output,
+                                    implode("\t", array_map($escape, $v)) . "\r\n");
                     }
                     return fclose($output);
                 }
@@ -115,7 +112,7 @@ 
         $fnReplace[':app'] = self::config('APP');
         $fnReplace[':items'] = self::$t['items'];
         $format = str_replace(':', '.', '%d.%m.%Y  %H:%i:%s');
-        $timeQuery = 'SELECT DATE_FORMAT(Now(), "'.$format.'") AS `now`;';
+        $timeQuery = 'SELECT DATE_FORMAT(Now(), "' . $format . '") AS `now`;';
         $fnReplace[':datetime'] = self::select($timeQuery);
 
         return strtr((string) self::config('EXPORT_FILE_NAME'), $fnReplace);

Table.php

Spacing +6 added lines, -7 removed lines

@@ -38,8 +38,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);
 
@@ -73,9 +72,9 @@ 
         self::$t['order']['col'] = $orderBy;
         $dir = strtolower($orderDir);
         self::$t['order']['dir'] = in_array($dir, ['asc', 'desc']) ?
-            $dir : self::error('Invalid orderDir (Asc/Desc): '.$orderDir);
+            $dir : self::error('Invalid orderDir (Asc/Desc): ' . $orderDir);
         self::$t['paging'] = ($num = abs($paging)) >= 10 ?
-            $num : self::error('Invalid paging (<10): '.$paging);
+            $num : self::error('Invalid paging (<10): ' . $paging);
     }
 
     /**
@@ -94,7 +93,7 @@ 
         self::$t = self::request(self::$export);
 
         $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::query($query, self::$t['filter'], $order, $limit, true);
 
@@ -107,7 +106,7 @@ 
         try {
             self::$data = self::select($q);
         } catch (Exception $e) {
-            self::error('ERROR: '.$q.'<br />'.$e->getMessage());
+            self::error('ERROR: ' . $q . '<br />' . $e->getMessage());
         }
     }
 
@@ -121,7 +120,7 @@ 
         } else {
             $tableId = filter_input(INPUT_GET, 'table-id') ?: //4 testing
                        filter_var($_GET['table-id'], FILTER_SANITIZE_STRING);
-            if ($tableId === self::$t['items'].'-table') {
+            if ($tableId === self::$t['items'] . '-table') {
                 //ob_get_clean();
                 //ob_start('ob_gzhandler');
                 if (!self::$export) {

TraitRequest.php

Spacing +9 added lines, -13 removed lines

@@ -28,11 +28,11 @@ 
             } else {
                 $filterBy = self::$cols[$filterBy][1];
             }
-            $filterBy = 'CONCAT(" ",'.$filterBy.', " ")';
+            $filterBy = 'CONCAT(" ",' . $filterBy . ', " ")';
             if (self::config('FILTER_CASE_SENSITIVE') !== true) {
-                $filterBy .= ' COLLATE '.self::config('DB_COLLATION_CI');
+                $filterBy .= ' COLLATE ' . self::config('DB_COLLATION_CI');
             }
-            $filter = $filterBy.' LIKE '.'"%'.$filter.'%"';
+            $filter = $filterBy . ' LIKE ' . '"%' . $filter . '%"';
         }
 
         return $filter;
@@ -45,18 +45,17 @@ 
             if (isset($v[2]['sort']) && $v[2]['sort'] === false) {
                 continue;
             }
-            $all[] = 'IFNULL('.$v[1].', "")';
+            $all[] = 'IFNULL(' . $v[1] . ', "")';
         }
 
-        return 'CONCAT('.implode(',', $all).')';
+        return 'CONCAT(' . implode(',', $all) . ')';
     }
 
     private static function orderCol()
     {
         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'];
@@ -67,14 +66,12 @@ 
         $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']);
     }
 
     private static function setExport()
     {
-        $exp = filter_input(INPUT_GET, 'export', FILTER_SANITIZE_STRING) ?:
-               filter_var(@$_GET['export'], FILTER_SANITIZE_STRING); //4 testing
+        $exp = filter_input(INPUT_GET, 'export', FILTER_SANITIZE_STRING) ?: filter_var(@$_GET['export'], FILTER_SANITIZE_STRING); //4 testing
 
         return in_array($exp, self::config('SAVES')) ? $exp : false;
     }
@@ -82,7 +79,6 @@ 
     private static function page()
     {
         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'];
     }
 }