@@ -34,11 +34,9 @@ discard block |
||
34 | 34 | self::$t['order']['col'] = $orderBy; |
35 | 35 | $dir = strtolower($orderDir); |
36 | 36 | self::$t['order']['dir'] = in_array($dir, ['asc', 'desc']) ? |
37 | - $dir : |
|
38 | - die('Invalid orderDir(Asc/Desc): ' . $orderDir); |
|
37 | + $dir : die('Invalid orderDir(Asc/Desc): ' . $orderDir); |
|
39 | 38 | self::$t['paging'] = ($p = abs($paging)) > 10 ? |
40 | - $p : |
|
41 | - die('Invalid paging(>10): ' . $paging); |
|
39 | + $p : die('Invalid paging(>10): ' . $paging); |
|
42 | 40 | } |
43 | 41 | |
44 | 42 | /** #2. Execute (queries) |
@@ -57,7 +55,7 @@ discard block |
||
57 | 55 | |
58 | 56 | $filter = self::requestFilter(); |
59 | 57 | $order = [self::$t['order']['col'] => self::$t['order']['dir']]; |
60 | - $offset = (self::$t['page'] - 1) * self::$t['paging']; |
|
58 | + $offset = (self::$t['page'] - 1)*self::$t['paging']; |
|
61 | 59 | $limit = [$offset, self::$t['paging']]; |
62 | 60 | self::$t['q'] = self::q($q, $filter, $order, $limit, true); |
63 | 61 | |
@@ -101,8 +99,7 @@ discard block |
||
101 | 99 | public static function prepare($setOrCheck = false) |
102 | 100 | { |
103 | 101 | //@see http://php.net/manual/es/function.filter-input.php#77307 |
104 | - $uri = filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL) ?: |
|
105 | - filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_URL); |
|
102 | + $uri = filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL) ?: filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_URL); |
|
106 | 103 | |
107 | 104 | $extension = pathinfo(strtok($uri, '?'), PATHINFO_EXTENSION); |
108 | 105 |
@@ -32,8 +32,7 @@ discard block |
||
32 | 32 | $sortable = !isset($arg['sort']) || $arg['sort'] !== false; |
33 | 33 | |
34 | 34 | $sort = $sortable ? |
35 | - (isset($arg['sort']) ? $arg['sort'] : $col) : |
|
36 | - null; |
|
35 | + (isset($arg['sort']) ? $arg['sort'] : $col) : null; |
|
37 | 36 | |
38 | 37 | if (($del = isset($arg['type']) && $arg['type'] == 'delete')) { |
39 | 38 | $sortable = false; |
@@ -47,11 +46,10 @@ discard block |
||
47 | 46 | if (isset($arg['width'])) { // Width attribute -> style |
48 | 47 | $width = 'width:' . $arg['width'] . ';'; |
49 | 48 | $arg['style'] = isset($arg['style']) ? |
50 | - $width . $arg['style'] : |
|
51 | - $width; |
|
49 | + $width . $arg['style'] : $width; |
|
52 | 50 | } |
53 | 51 | |
54 | - $attr = array_diff_key((array) $arg, ['sort', 'type', 'width']); |
|
52 | + $attr = array_diff_key((array)$arg, ['sort', 'type', 'width']); |
|
55 | 53 | |
56 | 54 | $th = '<th' . self::attributes($attr) . '>'; |
57 | 55 | if ($sortable) { |
@@ -60,8 +58,7 @@ discard block |
||
60 | 58 | if (!$del) { |
61 | 59 | if ($sort == self::$t['order']['col']) { |
62 | 60 | $span = self::$t['order']['dir'] === 'desc' ? |
63 | - self::config('UTF8_DESC_SYMBOL') : |
|
64 | - self::config('UTF8_ASC_SYMBOL'); |
|
61 | + self::config('UTF8_DESC_SYMBOL') : self::config('UTF8_ASC_SYMBOL'); |
|
65 | 62 | } else { |
66 | 63 | $span = ""; |
67 | 64 | } |
@@ -92,8 +89,7 @@ discard block |
||
92 | 89 | { |
93 | 90 | //Condition: '' | '(HAVING|WHERE|AND) ' . $cond |
94 | 91 | $c = !empty($cond) && !strpos($q, ($cl = !$h ? 'WHERE' : 'HAVING')) ? |
95 | - (' ' . (!strpos($q, $cl) ? $cl : ' AND ') . ' ' . $cond ) : |
|
96 | - ''; |
|
92 | + (' ' . (!strpos($q, $cl) ? $cl : ' AND ') . ' ' . $cond) : ''; |
|
97 | 93 | //Order: '' | 'ORDER BY ' . array_keys($order)[0] . ' ' . $order[0] |
98 | 94 | $o = !empty($order) ? |
99 | 95 | ' ORDER BY ' . implode(', ', |
@@ -104,8 +100,7 @@ discard block |
||
104 | 100 | ''; |
105 | 101 | //Limit: '' | ' LIMIT ' . '(20, 40|20)' |
106 | 102 | $l = !empty($limit) ? |
107 | - (' LIMIT ' . (is_array($limit) ? implode(', ', $limit) : $limit)) : |
|
108 | - ''; |
|
103 | + (' LIMIT ' . (is_array($limit) ? implode(', ', $limit) : $limit)) : ''; |
|
109 | 104 | |
110 | 105 | return $q . $c . $o . $l; |
111 | 106 | } |
@@ -113,8 +108,7 @@ discard block |
||
113 | 108 | protected static function exportData() |
114 | 109 | { |
115 | 110 | $data = self::$exportDataAsDisplayed ? |
116 | - self::$data : |
|
117 | - self::select(self::$t['q']); |
|
111 | + self::$data : self::select(self::$t['q']); |
|
118 | 112 | $fnReplace = []; |
119 | 113 | $fnReplace[':app'] = self::$app; |
120 | 114 | $fnReplace[':items'] = self::$t['items']; |
@@ -160,8 +154,7 @@ discard block |
||
160 | 154 | if (($output = fopen('php://output', 'w'))) { |
161 | 155 | foreach ($eData as $v) { |
162 | 156 | self::$export === 'CSV' ? |
163 | - fputcsv($output, $v) : |
|
164 | - fputs($output, implode("\t", array_map($escape, $v)) . "\r\n"); |
|
157 | + fputcsv($output, $v) : fputs($output, implode("\t", array_map($escape, $v)) . "\r\n"); |
|
165 | 158 | } |
166 | 159 | fclose($output); |
167 | 160 | } |
@@ -203,14 +196,13 @@ discard block |
||
203 | 196 | $q = 'SELECT COUNT(*) FROM (' . self::$t['qAll'] . ') AS dt'; |
204 | 197 | self::$t['rows'] = self::select($q); |
205 | 198 | } |
206 | - self::$t['pages'] = ceil(self::$t['rows'] / self::$t['paging']); |
|
199 | + self::$t['pages'] = ceil(self::$t['rows']/self::$t['paging']); |
|
207 | 200 | |
208 | 201 | $v = []; |
209 | 202 | |
210 | - $v['from'] = ($pageNo - 1) * self::$t['paging'] + 1; |
|
211 | - $v['upto'] = ($pageNo * self::$t['paging'] < self::$t['rows']) ? |
|
212 | - $pageNo * self::$t['paging'] : |
|
213 | - self::$t['rows']; |
|
203 | + $v['from'] = ($pageNo - 1)*self::$t['paging'] + 1; |
|
204 | + $v['upto'] = ($pageNo*self::$t['paging'] < self::$t['rows']) ? |
|
205 | + $pageNo*self::$t['paging'] : self::$t['rows']; |
|
214 | 206 | |
215 | 207 | $v["total"] = self::$t['rows']; |
216 | 208 | $v["items"] = self::$t['items']; |
@@ -304,9 +296,8 @@ discard block |
||
304 | 296 | $select = static::$select; |
305 | 297 | $res = $select($expression, $bindings); |
306 | 298 | //if result is single cell value ($res[0]->value), return the value |
307 | - return (count($res) === 1 && count((array) $res[0]) === 1) ? |
|
308 | - reset($res[0]) : |
|
309 | - $res; |
|
299 | + return (count($res) === 1 && count((array)$res[0]) === 1) ? |
|
300 | + reset($res[0]) : $res; |
|
310 | 301 | } else { |
311 | 302 | throw new Exception('ERROR: table::$select is not a closure. '); |
312 | 303 | } |
@@ -42,8 +42,7 @@ discard block |
||
42 | 42 | if (isset($v)) { |
43 | 43 | return !empty($v) && |
44 | 44 | gettype($v) === gettype(self::$config[$k]) ? |
45 | - $v : |
|
46 | - self::$config[$k]; |
|
45 | + $v : self::$config[$k]; |
|
47 | 46 | } else { |
48 | 47 | return self::$config[$k]; |
49 | 48 | } |
@@ -71,7 +70,7 @@ discard block |
||
71 | 70 | $list = []; |
72 | 71 | foreach ($attributes as $key => $value) { |
73 | 72 | if (is_bool($value)) { |
74 | - if ((bool) $value) { |
|
73 | + if ((bool)$value) { |
|
75 | 74 | $list[] = $key; |
76 | 75 | } |
77 | 76 | } else if (empty($value) && !is_int($value)) { |
@@ -92,7 +91,7 @@ discard block |
||
92 | 91 | extract($vars); |
93 | 92 | ob_start(); |
94 | 93 | require $template; |
95 | - return (string) ob_get_clean(); |
|
94 | + return (string)ob_get_clean(); |
|
96 | 95 | } |
97 | 96 | |
98 | 97 | protected static function paging(&$v) |
@@ -107,13 +106,12 @@ discard block |
||
107 | 106 | |
108 | 107 | $limit = 10; |
109 | 108 | |
110 | - $v['start'] = $v['page'] > ($limit / 2) ? |
|
111 | - ($v['page'] - $limit / 2) : |
|
112 | - 1; |
|
109 | + $v['start'] = $v['page'] > ($limit/2) ? |
|
110 | + ($v['page'] - $limit/2) : 1; |
|
113 | 111 | |
114 | - if ($v['page'] > ($v['pages'] - ($limit / 2))) { |
|
112 | + if ($v['page'] > ($v['pages'] - ($limit/2))) { |
|
115 | 113 | $v['final'] = $v['pages']; |
116 | - } else if ($v['page'] > ($limit / 2)) { |
|
114 | + } else if ($v['page'] > ($limit/2)) { |
|
117 | 115 | $v['final'] = $v['start'] + $limit; |
118 | 116 | } else { |
119 | 117 | $v['final'] = $limit; |
@@ -135,9 +133,9 @@ discard block |
||
135 | 133 | } |
136 | 134 | $jump2show = function($m) use ($direction) { |
137 | 135 | if ($m >= 1000000) { |
138 | - return ($direction . ($m / 1000000) . "M"); |
|
136 | + return ($direction . ($m/1000000) . "M"); |
|
139 | 137 | } else if ($m >= 1000) { |
140 | - return ($direction . ($m / 1000) . "K"); |
|
138 | + return ($direction . ($m/1000) . "K"); |
|
141 | 139 | } else { |
142 | 140 | return ($direction . $m); |
143 | 141 | } |
@@ -154,7 +152,7 @@ discard block |
||
154 | 152 | $html = $direction === '-' ? $add . $html : $html . $add; |
155 | 153 | } |
156 | 154 | |
157 | - return $jump_exists ? self::pagingJumps($html, ($m * 10)) : $html; |
|
155 | + return $jump_exists ? self::pagingJumps($html, ($m*10)) : $html; |
|
158 | 156 | } |
159 | 157 | |
160 | 158 | protected static function filterValues(&$f, &$opts = []) |
@@ -204,8 +202,7 @@ discard block |
||
204 | 202 | { |
205 | 203 | if (($col = filter_input(INPUT_GET, 'col', FILTER_VALIDATE_INT))) { |
206 | 204 | return isset(self::$cols[$col][2]['sort']) ? |
207 | - self::$cols[$col][2]['sort'] : |
|
208 | - self::$cols[$col][1]; |
|
205 | + self::$cols[$col][2]['sort'] : self::$cols[$col][1]; |
|
209 | 206 | } |
210 | 207 | return self::$t['order']['col']; |
211 | 208 | } |
@@ -214,8 +211,7 @@ discard block |
||
214 | 211 | { |
215 | 212 | $reset = filter_has_var(INPUT_GET, 'col') ? 'asc' : null; |
216 | 213 | return in_array(filter_input(INPUT_GET, 'ord'), ['asc', 'desc']) ? |
217 | - filter_input(INPUT_GET, 'ord') : |
|
218 | - ($reset ?: self::$t['order']['dir']); |
|
214 | + filter_input(INPUT_GET, 'ord') : ($reset ?: self::$t['order']['dir']); |
|
219 | 215 | } |
220 | 216 | |
221 | 217 | protected static function requestExport() |
@@ -227,7 +223,6 @@ discard block |
||
227 | 223 | protected static function requestPage() |
228 | 224 | { |
229 | 225 | return filter_has_var(INPUT_GET, 'pg') && self::$export == false ? |
230 | - (int) filter_input(INPUT_GET, 'pg', FILTER_SANITIZE_NUMBER_INT) : |
|
231 | - self::$t['page']; |
|
226 | + (int)filter_input(INPUT_GET, 'pg', FILTER_SANITIZE_NUMBER_INT) : self::$t['page']; |
|
232 | 227 | } |
233 | 228 | } |