@@ -25,8 +25,7 @@ discard block |
||
| 25 | 25 | public static function prepare($setOrCheck = false) |
| 26 | 26 | { |
| 27 | 27 | //@see http://php.net/manual/es/function.filter-input.php#77307 |
| 28 | - $uri = filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL) ?: |
|
| 29 | - filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_URL); |
|
| 28 | + $uri = filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL) ?: filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_URL); |
|
| 30 | 29 | |
| 31 | 30 | $extension = pathinfo(strtok($uri, '?'), PATHINFO_EXTENSION); |
| 32 | 31 | |
@@ -80,7 +79,7 @@ discard block |
||
| 80 | 79 | |
| 81 | 80 | $filter = self::$t['filter']; //self::requestFilter(); |
| 82 | 81 | $order = [self::$t['order']['col'] => self::$t['order']['dir']]; |
| 83 | - $offset = (self::$t['page'] - 1) * self::$t['paging']; |
|
| 82 | + $offset = (self::$t['page'] - 1)*self::$t['paging']; |
|
| 84 | 83 | $limit = [$offset, self::$t['paging']]; |
| 85 | 84 | self::$t['q'] = self::q($q, $filter, $order, $limit, true); |
| 86 | 85 | |
@@ -112,21 +112,18 @@ |
||
| 112 | 112 | $col = filter_input(INPUT_GET, 'col', FILTER_VALIDATE_INT); |
| 113 | 113 | if ($col) { |
| 114 | 114 | return isset(self::$cols[$col][2]['sort']) ? |
| 115 | - self::$cols[$col][2]['sort'] : |
|
| 116 | - self::$cols[$col][1]; |
|
| 115 | + self::$cols[$col][2]['sort'] : self::$cols[$col][1]; |
|
| 117 | 116 | } |
| 118 | 117 | return self::$t['order']['col']; |
| 119 | 118 | case 'OrderDir': |
| 120 | 119 | $reset = filter_has_var(INPUT_GET, 'col') ? 'asc' : null; |
| 121 | 120 | return |
| 122 | 121 | in_array(filter_input(INPUT_GET, 'ord'), ['asc', 'desc']) ? |
| 123 | - filter_input(INPUT_GET, 'ord') : |
|
| 124 | - ($reset ?: self::$t['order']['dir']); |
|
| 122 | + filter_input(INPUT_GET, 'ord') : ($reset ?: self::$t['order']['dir']); |
|
| 125 | 123 | case 'Page': |
| 126 | 124 | return |
| 127 | 125 | filter_has_var(INPUT_GET, 'pg') && self::$export == false ? |
| 128 | - (int)filter_input(INPUT_GET, 'pg', FILTER_SANITIZE_NUMBER_INT) : |
|
| 129 | - self::$t['page']; |
|
| 126 | + (int)filter_input(INPUT_GET, 'pg', FILTER_SANITIZE_NUMBER_INT) : self::$t['page']; |
|
| 130 | 127 | case 'Export': |
| 131 | 128 | $exp = filter_input(INPUT_GET, 'export', FILTER_SANITIZE_STRING); |
| 132 | 129 | return in_array($exp, self::config('SAVES')) ? $exp : false; |