@@ -501,18 +501,18 @@ |
||
501 | 501 | } |
502 | 502 | } |
503 | 503 | |
504 | - /** |
|
505 | - * Set the mandory headers, like security, etc. |
|
506 | - */ |
|
504 | + /** |
|
505 | + * Set the mandory headers, like security, etc. |
|
506 | + */ |
|
507 | 507 | protected static function setRequiredHeaders() { |
508 | 508 | $requiredHeaders = array( |
509 | 509 | 'X-XSS-Protection' => '1; mode=block', |
510 | 510 | 'X-Frame-Options' => 'SAMEORIGIN' |
511 | 511 | ); |
512 | 512 | foreach ($requiredHeaders as $key => $value) { |
513 | - if (!isset(self::$headers[$key])) { |
|
513 | + if (!isset(self::$headers[$key])) { |
|
514 | 514 | self::$headers[$key] = $value; |
515 | - } |
|
515 | + } |
|
516 | 516 | } |
517 | 517 | } |
518 | 518 | } |
@@ -204,7 +204,7 @@ |
||
204 | 204 | //If is the SELECT query |
205 | 205 | $this->isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false; |
206 | 206 | |
207 | - //if can use cache feature for this query |
|
207 | + //if can use cache feature for this query |
|
208 | 208 | $this->dbCacheStatus = get_config('cache_enable', false) && $this->cacheTtl > 0; |
209 | 209 | } |
210 | 210 |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | public function getCacheContent() { |
155 | 155 | //set some attributes values |
156 | 156 | $this->setPropertiesValues(); |
157 | - if(! $this->isSqlSELECTQuery || ! $this->dbCacheStatus){ |
|
157 | + if (!$this->isSqlSELECTQuery || !$this->dbCacheStatus) { |
|
158 | 158 | $this->logger->info('The cache is not enabled for this query or is not a SELECT query'); |
159 | 159 | return null; |
160 | 160 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | public function saveCacheContent($result) { |
182 | 182 | //set some attributes values |
183 | 183 | $this->setPropertiesValues(); |
184 | - if(! $this->isSqlSELECTQuery || ! $this->dbCacheStatus){ |
|
184 | + if (!$this->isSqlSELECTQuery || !$this->dbCacheStatus) { |
|
185 | 185 | //just return true |
186 | 186 | return true; |
187 | 187 | } |
@@ -724,12 +724,12 @@ |
||
724 | 724 | * |
725 | 725 | * @return string|null |
726 | 726 | */ |
727 | - protected function buildQueryPart($property, $command = ''){ |
|
727 | + protected function buildQueryPart($property, $command = ''){ |
|
728 | 728 | if (!empty($this->{$property})) { |
729 | 729 | return $command . ' ' . $this->{$property}; |
730 | 730 | } |
731 | 731 | return null; |
732 | - } |
|
732 | + } |
|
733 | 733 | |
734 | 734 | |
735 | 735 | /** |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | $_keys = array(); |
421 | 421 | foreach ($keys as $k => $v) { |
422 | 422 | $v = $this->checkForNullValue($v); |
423 | - if (! is_numeric($v)) { |
|
423 | + if (!is_numeric($v)) { |
|
424 | 424 | $v = $this->escape($v, $escape); |
425 | 425 | } |
426 | 426 | $_keys[] = $v; |
@@ -710,7 +710,7 @@ discard block |
||
710 | 710 | * |
711 | 711 | * @return string|null |
712 | 712 | */ |
713 | - protected function buildQueryPart($property, $command = ''){ |
|
713 | + protected function buildQueryPart($property, $command = '') { |
|
714 | 714 | if (!empty($this->{$property})) { |
715 | 715 | return $command . ' ' . $this->{$property}; |
716 | 716 | } |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | * @param string $clause the clause type "IS NULL", "IS NOT NULLs" |
797 | 797 | * @return object the current DatabaseQueryBuilder instance |
798 | 798 | */ |
799 | - protected function whereIsNullAndNotNull($field, $andOr = 'AND', $clause = 'IS NULL'){ |
|
799 | + protected function whereIsNullAndNotNull($field, $andOr = 'AND', $clause = 'IS NULL') { |
|
800 | 800 | if (is_array($field)) { |
801 | 801 | foreach ($field as $f) { |
802 | 802 | $this->whereIsNullAndNotNull($f, $andOr, $clause); |
@@ -814,7 +814,7 @@ discard block |
||
814 | 814 | * |
815 | 815 | * @return object the current instance |
816 | 816 | */ |
817 | - protected function setSelectStr($newSelect){ |
|
817 | + protected function setSelectStr($newSelect) { |
|
818 | 818 | $this->select = (($this->select == '*' || empty($this->select)) |
819 | 819 | ? $newSelect |
820 | 820 | : $this->select . ', ' . $newSelect); |
@@ -828,8 +828,8 @@ discard block |
||
828 | 828 | * @return string the empty string if the value is null |
829 | 829 | * otherwise the same value will be returned |
830 | 830 | */ |
831 | - protected function checkForNullValue($value){ |
|
832 | - if(is_null($value)){ |
|
831 | + protected function checkForNullValue($value) { |
|
832 | + if (is_null($value)) { |
|
833 | 833 | return ''; |
834 | 834 | } |
835 | 835 | return $value; |
@@ -148,7 +148,7 @@ |
||
148 | 148 | static $cfg; |
149 | 149 | if (empty($cfg)) { |
150 | 150 | $cfg[0] = & load_configurations(); |
151 | - if(! is_array($cfg[0])){ |
|
151 | + if (!is_array($cfg[0])) { |
|
152 | 152 | $cfg[0] = array(); |
153 | 153 | } |
154 | 154 | } |
@@ -343,7 +343,7 @@ |
||
343 | 343 | * Get some parameters data need like ip address, hostname, browser info, etc. |
344 | 344 | * @return array |
345 | 345 | */ |
346 | - protected function getSessionDataParams(){ |
|
346 | + protected function getSessionDataParams() { |
|
347 | 347 | $this->getLoader()->functions('user_agent'); |
348 | 348 | $this->getLoader()->library('Browser'); |
349 | 349 |
@@ -174,7 +174,7 @@ |
||
174 | 174 | } |
175 | 175 | //only test for original event may be during the flow some listeners change this parameter |
176 | 176 | if ($eBackup->returnBack) { |
177 | - if(! $error) { |
|
177 | + if (!$error) { |
|
178 | 178 | return $event; |
179 | 179 | } |
180 | 180 | return null; |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | - defined('ROOT_PATH') || exit('Access denied'); |
|
2 | + defined('ROOT_PATH') || exit('Access denied'); |
|
3 | 3 | /** |
4 | 4 | * File: Browser.php |
5 | 5 | * Author: Chris Schuld (http://chrisschuld.com/) |
@@ -21,68 +21,68 @@ discard block |
||
21 | 21 | * http://www.gnu.org/copyleft/gpl.html |
22 | 22 | * |
23 | 23 | */ |
24 | - class Browser { |
|
25 | - |
|
26 | - /** |
|
27 | - * List of know platforms |
|
28 | - * @var array |
|
29 | - */ |
|
30 | - private $_platforms = array( |
|
31 | - '/windows nt 10/i' => 'Windows 10', |
|
32 | - '/windows phone 10/i' => 'Windows Phone 10', |
|
33 | - '/windows phone 8.1/i' => 'Windows Phone 8.1', |
|
34 | - '/windows phone 8/i' => 'Windows Phone 8', |
|
35 | - '/windows nt 6.3/i' => 'Windows 8.1', |
|
36 | - '/windows nt 6.2/i' => 'Windows 8', |
|
37 | - '/windows nt 6.1/i' => 'Windows 7', |
|
38 | - '/windows nt 6.0/i' => 'Windows Vista', |
|
39 | - '/windows nt 5.2/i' => 'Windows Server 2003/XP x64', |
|
40 | - '/windows nt 5.1/i' => 'Windows XP', |
|
41 | - '/windows xp/i' => 'Windows XP', |
|
42 | - '/windows nt 5.0/i' => 'Windows 2000', |
|
43 | - '/windows me/i' => 'Windows ME', |
|
44 | - '/win98/i' => 'Windows 98', |
|
45 | - '/win95/i' => 'Windows 95', |
|
46 | - '/win16/i' => 'Windows 3.11', |
|
47 | - '/macintosh|mac os x/i' => 'Mac OS X', |
|
48 | - '/mac_powerpc/i' => 'Mac OS 9', |
|
49 | - '/iphone/i' => 'iPhone', |
|
50 | - '/ipod/i' => 'iPod', |
|
51 | - '/ipad/i' => 'iPad', |
|
52 | - '/android/i' => 'Android', |
|
53 | - '/ubuntu/i' => 'Ubuntu', |
|
54 | - '/linux/i' => 'Linux', |
|
55 | - '/blackberry/i' => 'BlackBerry', |
|
56 | - '/webos/i' => 'Mobile' |
|
57 | - ); |
|
58 | - |
|
59 | - /** |
|
60 | - * List of know browsers |
|
61 | - * @var array |
|
62 | - */ |
|
63 | - private $_browsers = array( |
|
64 | - '/mobile/i' => 'Handheld Browser', |
|
65 | - '/msie/i' => 'Internet Explorer', |
|
66 | - '/firefox/i' => 'Firefox', |
|
67 | - '/chrome/i' => 'Chrome', |
|
68 | - '/safari/i' => 'Safari', |
|
69 | - '/edge/i' => 'Edge', |
|
70 | - '/opera/i' => 'Opera', |
|
71 | - '/netscape/i' => 'Netscape', |
|
72 | - '/maxthon/i' => 'Maxthon', |
|
73 | - '/konqueror/i' => 'Konqueror' |
|
74 | - ); |
|
75 | - |
|
76 | - /** |
|
77 | - * Agent string |
|
78 | - * @var string |
|
79 | - */ |
|
80 | - private $_agent = ''; |
|
81 | - |
|
82 | - /** |
|
83 | - * Browser name |
|
84 | - * @var string |
|
85 | - */ |
|
24 | + class Browser { |
|
25 | + |
|
26 | + /** |
|
27 | + * List of know platforms |
|
28 | + * @var array |
|
29 | + */ |
|
30 | + private $_platforms = array( |
|
31 | + '/windows nt 10/i' => 'Windows 10', |
|
32 | + '/windows phone 10/i' => 'Windows Phone 10', |
|
33 | + '/windows phone 8.1/i' => 'Windows Phone 8.1', |
|
34 | + '/windows phone 8/i' => 'Windows Phone 8', |
|
35 | + '/windows nt 6.3/i' => 'Windows 8.1', |
|
36 | + '/windows nt 6.2/i' => 'Windows 8', |
|
37 | + '/windows nt 6.1/i' => 'Windows 7', |
|
38 | + '/windows nt 6.0/i' => 'Windows Vista', |
|
39 | + '/windows nt 5.2/i' => 'Windows Server 2003/XP x64', |
|
40 | + '/windows nt 5.1/i' => 'Windows XP', |
|
41 | + '/windows xp/i' => 'Windows XP', |
|
42 | + '/windows nt 5.0/i' => 'Windows 2000', |
|
43 | + '/windows me/i' => 'Windows ME', |
|
44 | + '/win98/i' => 'Windows 98', |
|
45 | + '/win95/i' => 'Windows 95', |
|
46 | + '/win16/i' => 'Windows 3.11', |
|
47 | + '/macintosh|mac os x/i' => 'Mac OS X', |
|
48 | + '/mac_powerpc/i' => 'Mac OS 9', |
|
49 | + '/iphone/i' => 'iPhone', |
|
50 | + '/ipod/i' => 'iPod', |
|
51 | + '/ipad/i' => 'iPad', |
|
52 | + '/android/i' => 'Android', |
|
53 | + '/ubuntu/i' => 'Ubuntu', |
|
54 | + '/linux/i' => 'Linux', |
|
55 | + '/blackberry/i' => 'BlackBerry', |
|
56 | + '/webos/i' => 'Mobile' |
|
57 | + ); |
|
58 | + |
|
59 | + /** |
|
60 | + * List of know browsers |
|
61 | + * @var array |
|
62 | + */ |
|
63 | + private $_browsers = array( |
|
64 | + '/mobile/i' => 'Handheld Browser', |
|
65 | + '/msie/i' => 'Internet Explorer', |
|
66 | + '/firefox/i' => 'Firefox', |
|
67 | + '/chrome/i' => 'Chrome', |
|
68 | + '/safari/i' => 'Safari', |
|
69 | + '/edge/i' => 'Edge', |
|
70 | + '/opera/i' => 'Opera', |
|
71 | + '/netscape/i' => 'Netscape', |
|
72 | + '/maxthon/i' => 'Maxthon', |
|
73 | + '/konqueror/i' => 'Konqueror' |
|
74 | + ); |
|
75 | + |
|
76 | + /** |
|
77 | + * Agent string |
|
78 | + * @var string |
|
79 | + */ |
|
80 | + private $_agent = ''; |
|
81 | + |
|
82 | + /** |
|
83 | + * Browser name |
|
84 | + * @var string |
|
85 | + */ |
|
86 | 86 | private $_browser_name = ''; |
87 | 87 | |
88 | 88 | /** |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | */ |
122 | 122 | private $_is_facebook = false; |
123 | 123 | |
124 | - /** |
|
124 | + /** |
|
125 | 125 | * Class constructor |
126 | 126 | */ |
127 | 127 | public function __construct($userAgent = '') { |
@@ -248,10 +248,10 @@ discard block |
||
248 | 248 | return $this->_is_facebook; |
249 | 249 | } |
250 | 250 | |
251 | - /** |
|
252 | - * Returns a formatted string with a summary of the details of the browser. |
|
253 | - * @return string formatted string with a summary of the browser |
|
254 | - */ |
|
251 | + /** |
|
252 | + * Returns a formatted string with a summary of the details of the browser. |
|
253 | + * @return string formatted string with a summary of the browser |
|
254 | + */ |
|
255 | 255 | public function __toString() { |
256 | 256 | return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" . |
257 | 257 | "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" . |
@@ -295,69 +295,69 @@ discard block |
||
295 | 295 | /** |
296 | 296 | * Determine the user's platform |
297 | 297 | */ |
298 | - protected function checkPlatform() { |
|
299 | - foreach ($this->_platforms as $regex => $value) { |
|
300 | - if (preg_match($regex, $this->_agent) ) { |
|
301 | - $this->setPlatform($value); |
|
302 | - break; |
|
303 | - } |
|
304 | - } |
|
305 | - } |
|
298 | + protected function checkPlatform() { |
|
299 | + foreach ($this->_platforms as $regex => $value) { |
|
300 | + if (preg_match($regex, $this->_agent) ) { |
|
301 | + $this->setPlatform($value); |
|
302 | + break; |
|
303 | + } |
|
304 | + } |
|
305 | + } |
|
306 | 306 | |
307 | - /** |
|
307 | + /** |
|
308 | 308 | * Routine to determine the browser type |
309 | 309 | */ |
310 | - protected function checkBrowser() { |
|
311 | - foreach ($this->_browsers as $regex => $value) { |
|
312 | - if (preg_match($regex, $this->_agent ) ) { |
|
313 | - $this->setBrowser($value); |
|
314 | - break; |
|
315 | - } |
|
316 | - } |
|
317 | - } |
|
310 | + protected function checkBrowser() { |
|
311 | + foreach ($this->_browsers as $regex => $value) { |
|
312 | + if (preg_match($regex, $this->_agent ) ) { |
|
313 | + $this->setBrowser($value); |
|
314 | + break; |
|
315 | + } |
|
316 | + } |
|
317 | + } |
|
318 | 318 | |
319 | - /** |
|
319 | + /** |
|
320 | 320 | * Routine to determine the browser version |
321 | 321 | */ |
322 | - protected function checkBrowserVersion(){ |
|
323 | - $detected = $this->getBrowser(); |
|
324 | - $d = array_search($detected, $this->_browsers); |
|
325 | - $browser = str_replace(array("/i","/"), "", $d); |
|
326 | - $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i"; |
|
327 | - if (preg_match_all($regex, $this->_agent, $matches)) { |
|
328 | - $found = array_search($browser, $matches["browser"]); |
|
329 | - $this->setVersion($matches["version"][$found]); |
|
330 | - } |
|
331 | - } |
|
332 | - |
|
333 | - /** |
|
322 | + protected function checkBrowserVersion(){ |
|
323 | + $detected = $this->getBrowser(); |
|
324 | + $d = array_search($detected, $this->_browsers); |
|
325 | + $browser = str_replace(array("/i","/"), "", $d); |
|
326 | + $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i"; |
|
327 | + if (preg_match_all($regex, $this->_agent, $matches)) { |
|
328 | + $found = array_search($browser, $matches["browser"]); |
|
329 | + $this->setVersion($matches["version"][$found]); |
|
330 | + } |
|
331 | + } |
|
332 | + |
|
333 | + /** |
|
334 | 334 | * Determine if the browser is Mobile or not |
335 | 335 | */ |
336 | - protected function checkMobile() { |
|
337 | - if (preg_match('/mobile|phone|ipod/i', $this->_agent) ) { |
|
338 | - $this->setMobile(true); |
|
339 | - } |
|
340 | - } |
|
336 | + protected function checkMobile() { |
|
337 | + if (preg_match('/mobile|phone|ipod/i', $this->_agent) ) { |
|
338 | + $this->setMobile(true); |
|
339 | + } |
|
340 | + } |
|
341 | 341 | |
342 | - /** |
|
342 | + /** |
|
343 | 343 | * Determine if the browser is Tablet or not |
344 | 344 | */ |
345 | - protected function checkTablet() { |
|
346 | - if (preg_match('/tablet|ipad/i', $this->_agent) ) { |
|
347 | - $this->setTablet(true); |
|
348 | - } |
|
349 | - } |
|
345 | + protected function checkTablet() { |
|
346 | + if (preg_match('/tablet|ipad/i', $this->_agent) ) { |
|
347 | + $this->setTablet(true); |
|
348 | + } |
|
349 | + } |
|
350 | 350 | |
351 | - /** |
|
351 | + /** |
|
352 | 352 | * Determine if the browser is Robot or not |
353 | 353 | */ |
354 | - protected function checkBot() { |
|
355 | - if (preg_match('/bot/i', $this->_agent) ) { |
|
356 | - $this->setTablet(true); |
|
357 | - } |
|
358 | - } |
|
354 | + protected function checkBot() { |
|
355 | + if (preg_match('/bot/i', $this->_agent) ) { |
|
356 | + $this->setTablet(true); |
|
357 | + } |
|
358 | + } |
|
359 | 359 | |
360 | - /** |
|
360 | + /** |
|
361 | 361 | * Detect if URL is loaded from FacebookExternalHit |
362 | 362 | */ |
363 | 363 | protected function checkFacebook() { |
@@ -370,10 +370,10 @@ discard block |
||
370 | 370 | } |
371 | 371 | |
372 | 372 | |
373 | - /** |
|
374 | - * Protected routine to calculate and determine what |
|
375 | - * the browser is in use (including platform) |
|
376 | - */ |
|
373 | + /** |
|
374 | + * Protected routine to calculate and determine what |
|
375 | + * the browser is in use (including platform) |
|
376 | + */ |
|
377 | 377 | protected function determine() { |
378 | 378 | $this->checkPlatform(); |
379 | 379 | $this->checkBrowser(); |
@@ -384,4 +384,4 @@ discard block |
||
384 | 384 | $this->checkFacebook(); |
385 | 385 | } |
386 | 386 | |
387 | - } |
|
387 | + } |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | */ |
298 | 298 | protected function checkPlatform() { |
299 | 299 | foreach ($this->_platforms as $regex => $value) { |
300 | - if (preg_match($regex, $this->_agent) ) { |
|
300 | + if (preg_match($regex, $this->_agent)) { |
|
301 | 301 | $this->setPlatform($value); |
302 | 302 | break; |
303 | 303 | } |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | */ |
310 | 310 | protected function checkBrowser() { |
311 | 311 | foreach ($this->_browsers as $regex => $value) { |
312 | - if (preg_match($regex, $this->_agent ) ) { |
|
312 | + if (preg_match($regex, $this->_agent)) { |
|
313 | 313 | $this->setBrowser($value); |
314 | 314 | break; |
315 | 315 | } |
@@ -319,10 +319,10 @@ discard block |
||
319 | 319 | /** |
320 | 320 | * Routine to determine the browser version |
321 | 321 | */ |
322 | - protected function checkBrowserVersion(){ |
|
322 | + protected function checkBrowserVersion() { |
|
323 | 323 | $detected = $this->getBrowser(); |
324 | 324 | $d = array_search($detected, $this->_browsers); |
325 | - $browser = str_replace(array("/i","/"), "", $d); |
|
325 | + $browser = str_replace(array("/i", "/"), "", $d); |
|
326 | 326 | $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i"; |
327 | 327 | if (preg_match_all($regex, $this->_agent, $matches)) { |
328 | 328 | $found = array_search($browser, $matches["browser"]); |
@@ -334,7 +334,7 @@ discard block |
||
334 | 334 | * Determine if the browser is Mobile or not |
335 | 335 | */ |
336 | 336 | protected function checkMobile() { |
337 | - if (preg_match('/mobile|phone|ipod/i', $this->_agent) ) { |
|
337 | + if (preg_match('/mobile|phone|ipod/i', $this->_agent)) { |
|
338 | 338 | $this->setMobile(true); |
339 | 339 | } |
340 | 340 | } |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | * Determine if the browser is Tablet or not |
344 | 344 | */ |
345 | 345 | protected function checkTablet() { |
346 | - if (preg_match('/tablet|ipad/i', $this->_agent) ) { |
|
346 | + if (preg_match('/tablet|ipad/i', $this->_agent)) { |
|
347 | 347 | $this->setTablet(true); |
348 | 348 | } |
349 | 349 | } |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | * Determine if the browser is Robot or not |
353 | 353 | */ |
354 | 354 | protected function checkBot() { |
355 | - if (preg_match('/bot/i', $this->_agent) ) { |
|
355 | + if (preg_match('/bot/i', $this->_agent)) { |
|
356 | 356 | $this->setTablet(true); |
357 | 357 | } |
358 | 358 | } |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | if (stristr($this->_agent, 'FacebookExternalHit')) { |
365 | 365 | $this->setRobot(true); |
366 | 366 | $this->setFacebook(true); |
367 | - } else if (stristr($this->_agent, 'FBIOS')) { |
|
367 | + } else if (stristr($this->_agent, 'FBIOS')) { |
|
368 | 368 | $this->setFacebook(true); |
369 | 369 | } |
370 | 370 | } |
@@ -364,7 +364,7 @@ |
||
364 | 364 | if (stristr($this->_agent, 'FacebookExternalHit')) { |
365 | 365 | $this->setRobot(true); |
366 | 366 | $this->setFacebook(true); |
367 | - } else if (stristr($this->_agent, 'FBIOS')) { |
|
367 | + } else if (stristr($this->_agent, 'FBIOS')) { |
|
368 | 368 | $this->setFacebook(true); |
369 | 369 | } |
370 | 370 | } |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | if ($result) { |
223 | 223 | $this->insertId = $this->pdo->lastInsertId(); |
224 | 224 | //if the table doesn't have the auto increment field or sequence, the value of 0 will be returned |
225 | - $id = $this->insertId; |
|
225 | + $id = $this->insertId; |
|
226 | 226 | if (!$id) { |
227 | 227 | $id = true; |
228 | 228 | } |
@@ -440,9 +440,9 @@ discard block |
||
440 | 440 | $this->queryCount++; |
441 | 441 | |
442 | 442 | $queryResult = $this->queryRunner->setQuery($query) |
443 | - ->setReturnType($returnAsList) |
|
444 | - ->setReturnAsArray($returnAsArray) |
|
445 | - ->execute(); |
|
443 | + ->setReturnType($returnAsList) |
|
444 | + ->setReturnAsArray($returnAsArray) |
|
445 | + ->execute(); |
|
446 | 446 | |
447 | 447 | if (is_object($queryResult)) { |
448 | 448 | $this->result = $queryResult->getResult(); |
@@ -424,11 +424,11 @@ |
||
424 | 424 | } |
425 | 425 | } |
426 | 426 | |
427 | - /** |
|
428 | - * Remove the URL suffix and query string values if exists |
|
429 | - * @param string $uri the route URI to process |
|
430 | - * @return string the final route uri after processed |
|
431 | - */ |
|
427 | + /** |
|
428 | + * Remove the URL suffix and query string values if exists |
|
429 | + * @param string $uri the route URI to process |
|
430 | + * @return string the final route uri after processed |
|
431 | + */ |
|
432 | 432 | protected function removeSuffixAndQueryStringFromUri($uri) { |
433 | 433 | $this->logger->debug('Check if URL suffix is enabled in the configuration'); |
434 | 434 | //remove url suffix from the request URI |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | * Remove the DOCUMENT_ROOT and front controller from segments if exists |
409 | 409 | * @return void |
410 | 410 | */ |
411 | - protected function removeDocumentRootFrontControllerFromSegments(){ |
|
411 | + protected function removeDocumentRootFrontControllerFromSegments() { |
|
412 | 412 | $segment = $this->segments; |
413 | 413 | $baseUrl = get_config('base_url'); |
414 | 414 | //check if the app is not in DOCUMENT_ROOT |
@@ -475,7 +475,7 @@ discard block |
||
475 | 475 | break; |
476 | 476 | } |
477 | 477 | } |
478 | - if($findIndex !== -1){ |
|
478 | + if ($findIndex !== -1) { |
|
479 | 479 | array_shift($args); |
480 | 480 | //check if this contains an module |
481 | 481 | $moduleControllerMethod = explode('#', $this->callback[$findIndex]); |