@@ -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 | |
@@ -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 | /** |
@@ -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 | + } |
|
@@ -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 |
@@ -746,22 +746,22 @@ discard block |
||
| 746 | 746 | return $this->loaderInstance; |
| 747 | 747 | } |
| 748 | 748 | |
| 749 | - /** |
|
| 750 | - * Get the return type array or object |
|
| 751 | - * @return string|boolean |
|
| 752 | - */ |
|
| 749 | + /** |
|
| 750 | + * Get the return type array or object |
|
| 751 | + * @return string|boolean |
|
| 752 | + */ |
|
| 753 | 753 | protected function getReturnType(){ |
| 754 | 754 | $type = false; |
| 755 | 755 | if ($this->_temporary_return_type == 'array') { |
| 756 | - $type = 'array'; |
|
| 756 | + $type = 'array'; |
|
| 757 | 757 | } |
| 758 | 758 | return $type; |
| 759 | 759 | } |
| 760 | 760 | |
| 761 | - /** |
|
| 762 | - * Check if soft delete is enable setting the condition |
|
| 763 | - * @return object the current instance |
|
| 764 | - */ |
|
| 761 | + /** |
|
| 762 | + * Check if soft delete is enable setting the condition |
|
| 763 | + * @return object the current instance |
|
| 764 | + */ |
|
| 765 | 765 | protected function checkForSoftDelete(){ |
| 766 | 766 | if ($this->soft_delete && $this->_temporary_with_deleted !== true) { |
| 767 | 767 | $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted); |
@@ -769,14 +769,14 @@ discard block |
||
| 769 | 769 | return $this; |
| 770 | 770 | } |
| 771 | 771 | |
| 772 | - /** |
|
| 773 | - * Relate for "belongs_to" and "has_many" |
|
| 774 | - * @param string $relationship the name of relation |
|
| 775 | - * @param string|array $options the model and primary key values |
|
| 776 | - * @param object|array $row the row to update |
|
| 777 | - * @param string $type the type can be "belongs_to", "has_many" |
|
| 778 | - * @return mixed the final row values |
|
| 779 | - */ |
|
| 772 | + /** |
|
| 773 | + * Relate for "belongs_to" and "has_many" |
|
| 774 | + * @param string $relationship the name of relation |
|
| 775 | + * @param string|array $options the model and primary key values |
|
| 776 | + * @param object|array $row the row to update |
|
| 777 | + * @param string $type the type can be "belongs_to", "has_many" |
|
| 778 | + * @return mixed the final row values |
|
| 779 | + */ |
|
| 780 | 780 | protected function relateBelongsToAndHasMany($relationship, $options, $row, $type){ |
| 781 | 781 | if (in_array($relationship, $this->_with)) { |
| 782 | 782 | $loaderInstance = $this->getLoaderInstanceOrCreate(); |
@@ -355,13 +355,13 @@ discard block |
||
| 355 | 355 | public function setMessage() { |
| 356 | 356 | $numArgs = func_num_args(); |
| 357 | 357 | if ($numArgs == 2) { |
| 358 | - foreach ($this->post(null) as $key => $val) { |
|
| 358 | + foreach ($this->post(null) as $key => $val) { |
|
| 359 | 359 | $this->_errorMsgOverrides[$key][func_get_arg(0)] = func_get_arg(1); |
| 360 | 360 | } |
| 361 | 361 | return true; |
| 362 | 362 | } else if ($numArgs == 3) { |
| 363 | 363 | $this->_errorMsgOverrides[func_get_arg(1)][func_get_arg(0)] = func_get_arg(2); |
| 364 | - return true; |
|
| 364 | + return true; |
|
| 365 | 365 | } |
| 366 | 366 | return false; |
| 367 | 367 | } |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | if (!empty($regexRule[0])) { |
| 469 | 469 | $ruleSets[] = $regexRule[0]; |
| 470 | 470 | } |
| 471 | - $ruleStringRegex = explode('|', $ruleStringTemp); |
|
| 471 | + $ruleStringRegex = explode('|', $ruleStringTemp); |
|
| 472 | 472 | foreach ($ruleStringRegex as $rule) { |
| 473 | 473 | $rule = trim($rule); |
| 474 | 474 | if ($rule) { |
@@ -315,7 +315,7 @@ |
||
| 315 | 315 | protected static function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){ |
| 316 | 316 | $searchDir = null; |
| 317 | 317 | if ($type == 'function') { |
| 318 | - $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH); |
|
| 318 | + $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH); |
|
| 319 | 319 | } |
| 320 | 320 | else if ($type == 'language') { |
| 321 | 321 | $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH); |