@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | */ |
| 112 | 112 | public function __construct(DatabaseConnection $connection = null) { |
| 113 | 113 | parent::__construct(); |
| 114 | - if ($connection !== null) { |
|
| 114 | + if ($connection !== null) { |
|
| 115 | 115 | $this->connection = $connection; |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -385,9 +385,9 @@ discard block |
||
| 385 | 385 | $this->queryCount++; |
| 386 | 386 | |
| 387 | 387 | $queryResult = $this->queryRunner->setQuery($query) |
| 388 | - ->setReturnType($returnAsList) |
|
| 389 | - ->setReturnAsArray($returnAsArray) |
|
| 390 | - ->execute(); |
|
| 388 | + ->setReturnType($returnAsList) |
|
| 389 | + ->setReturnAsArray($returnAsArray) |
|
| 390 | + ->execute(); |
|
| 391 | 391 | |
| 392 | 392 | if (is_object($queryResult)) { |
| 393 | 393 | $this->result = $queryResult->getResult(); |
@@ -156,7 +156,7 @@ |
||
| 156 | 156 | return; |
| 157 | 157 | } |
| 158 | 158 | $this->logger->info('Found the registered event listener for the ' |
| 159 | - . 'event [' . $event->name . '] the list are: ' . stringfy_vars($list)); |
|
| 159 | + . 'event [' . $event->name . '] the list are: ' . stringfy_vars($list)); |
|
| 160 | 160 | foreach ($list as $listener) { |
| 161 | 161 | $result = call_user_func_array($listener, array($event)); |
| 162 | 162 | if ($eBackup->returnBack === true) { |
@@ -134,26 +134,26 @@ discard block |
||
| 134 | 134 | */ |
| 135 | 135 | |
| 136 | 136 | /** |
| 137 | - * The log level |
|
| 138 | - * |
|
| 139 | - * The valid log level are: OFF, NONE, DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY |
|
| 140 | - * |
|
| 141 | - * 'OFF' or 'NONE' = do not save log |
|
| 142 | - * 'EMERGENCY' = enable log for emergency level and above (EMERGENCY) |
|
| 143 | - * 'ALERT' = enable log for alert level and above (ALERT, EMERGENCY) |
|
| 144 | - * 'CRITICAL' = enable log for critical level and above (CRITICAL, ALERT, EMERGENCY) |
|
| 145 | - * 'ERROR' = enable log for error level and above (ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 146 | - * 'WARNING' = enable log for warning level and above (WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 147 | - * 'NOTICE' = enable log for notice level and above (NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 148 | - * 'INFO' = enable log for info level and above (INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 149 | - * 'DEBUG' = enable log for debug level and above (DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 150 | - * |
|
| 151 | - * The default value is NONE if the config value is: null, '', 0, false |
|
| 152 | - * |
|
| 153 | - * Note: in production environment it's recommand to set the log level to 'WARNING' or 'ERROR' if not, in small |
|
| 154 | - * time the log file size will increase very fast and will cost the application performance |
|
| 155 | - * and also the filesystem usage of your server. |
|
| 156 | - */ |
|
| 137 | + * The log level |
|
| 138 | + * |
|
| 139 | + * The valid log level are: OFF, NONE, DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY |
|
| 140 | + * |
|
| 141 | + * 'OFF' or 'NONE' = do not save log |
|
| 142 | + * 'EMERGENCY' = enable log for emergency level and above (EMERGENCY) |
|
| 143 | + * 'ALERT' = enable log for alert level and above (ALERT, EMERGENCY) |
|
| 144 | + * 'CRITICAL' = enable log for critical level and above (CRITICAL, ALERT, EMERGENCY) |
|
| 145 | + * 'ERROR' = enable log for error level and above (ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 146 | + * 'WARNING' = enable log for warning level and above (WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 147 | + * 'NOTICE' = enable log for notice level and above (NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 148 | + * 'INFO' = enable log for info level and above (INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 149 | + * 'DEBUG' = enable log for debug level and above (DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 150 | + * |
|
| 151 | + * The default value is NONE if the config value is: null, '', 0, false |
|
| 152 | + * |
|
| 153 | + * Note: in production environment it's recommand to set the log level to 'WARNING' or 'ERROR' if not, in small |
|
| 154 | + * time the log file size will increase very fast and will cost the application performance |
|
| 155 | + * and also the filesystem usage of your server. |
|
| 156 | + */ |
|
| 157 | 157 | $config['log_level'] = 'NONE'; |
| 158 | 158 | |
| 159 | 159 | |
@@ -180,20 +180,20 @@ discard block |
||
| 180 | 180 | $config['log_logger_name'] = array(); |
| 181 | 181 | |
| 182 | 182 | /** |
| 183 | - * The logger name custom level to use for the log |
|
| 184 | - * |
|
| 185 | - * If this config is set so means the logger level will be used to overwrite |
|
| 186 | - * the default log level configuration above. |
|
| 187 | - * |
|
| 188 | - * Example: |
|
| 189 | - * $config['log_logger_name_level'] = array('MY_LOGGER1' => 'WARNING'); |
|
| 190 | - * So if $config['log_level'] = 'ERROR' but all log messages with "MY_LOGGER1" as logger name |
|
| 191 | - * will be saved for WARNING message and above |
|
| 192 | - * Note: You can also use an regular expression for the logger name. |
|
| 193 | - * Example: |
|
| 194 | - * $config['log_logger_name_level'] = array('^Class::Con(.*)' => 'info'); |
|
| 195 | - * So all logger name like "Class::Config", "Class::Cookie", etc. will be match |
|
| 196 | - */ |
|
| 183 | + * The logger name custom level to use for the log |
|
| 184 | + * |
|
| 185 | + * If this config is set so means the logger level will be used to overwrite |
|
| 186 | + * the default log level configuration above. |
|
| 187 | + * |
|
| 188 | + * Example: |
|
| 189 | + * $config['log_logger_name_level'] = array('MY_LOGGER1' => 'WARNING'); |
|
| 190 | + * So if $config['log_level'] = 'ERROR' but all log messages with "MY_LOGGER1" as logger name |
|
| 191 | + * will be saved for WARNING message and above |
|
| 192 | + * Note: You can also use an regular expression for the logger name. |
|
| 193 | + * Example: |
|
| 194 | + * $config['log_logger_name_level'] = array('^Class::Con(.*)' => 'info'); |
|
| 195 | + * So all logger name like "Class::Config", "Class::Cookie", etc. will be match |
|
| 196 | + */ |
|
| 197 | 197 | $config['log_logger_name_level'] = array(); |
| 198 | 198 | |
| 199 | 199 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | /** |
| 34 | 34 | * Construct new ApcCache instance |
| 35 | 35 | */ |
| 36 | - public function __construct() { |
|
| 36 | + public function __construct() { |
|
| 37 | 37 | parent::__construct(); |
| 38 | 38 | if (!$this->isSupported()) { |
| 39 | 39 | show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.'); |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | public function set($key, $data, $ttl = 0) { |
| 80 | 80 | $expire = time() + $ttl; |
| 81 | 81 | $this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], ' |
| 82 | - . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']'); |
|
| 82 | + . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']'); |
|
| 83 | 83 | $result = apc_store($key, $data, $ttl); |
| 84 | 84 | if ($result === false) { |
| 85 | 85 | $this->logger->error('Can not save cache data for the key [' . $key . '], return false'); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | 'mtime' => $cacheInfos['creation_time'], |
| 128 | 128 | 'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'], |
| 129 | 129 | 'ttl' => $cacheInfos['ttl'] |
| 130 | - ); |
|
| 130 | + ); |
|
| 131 | 131 | } |
| 132 | 132 | $this->logger->info('This cache does not exists skipping'); |
| 133 | 133 | return false; |
@@ -108,13 +108,13 @@ discard block |
||
| 108 | 108 | public function set($key, $data, $ttl = 0) { |
| 109 | 109 | $expire = time() + $ttl; |
| 110 | 110 | $this->logger->debug('Setting cache data for key [' . $key . '], ' |
| 111 | - . 'time to live [' . $ttl . '], ' |
|
| 112 | - . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']'); |
|
| 111 | + . 'time to live [' . $ttl . '], ' |
|
| 112 | + . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']'); |
|
| 113 | 113 | $filePath = $this->getFilePath($key); |
| 114 | 114 | $handle = fopen($filePath, 'w'); |
| 115 | 115 | if (!is_resource($handle)) { |
| 116 | 116 | $this->logger->error('Can not open the file cache ' |
| 117 | - . '[' . $filePath . '] for the key [' . $key . '], return false'); |
|
| 117 | + . '[' . $filePath . '] for the key [' . $key . '], return false'); |
|
| 118 | 118 | return false; |
| 119 | 119 | } |
| 120 | 120 | flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed |
@@ -191,10 +191,10 @@ discard block |
||
| 191 | 191 | if ($data['expire'] > time()) { |
| 192 | 192 | $this->logger->info('This cache not yet expired return cache informations'); |
| 193 | 193 | return array( |
| 194 | - 'mtime' => $data['mtime'], |
|
| 195 | - 'expire' => $data['expire'], |
|
| 196 | - 'ttl' => $data['ttl'] |
|
| 197 | - ); |
|
| 194 | + 'mtime' => $data['mtime'], |
|
| 195 | + 'expire' => $data['expire'], |
|
| 196 | + 'ttl' => $data['ttl'] |
|
| 197 | + ); |
|
| 198 | 198 | } |
| 199 | 199 | $this->logger->info('This cache already expired return false'); |
| 200 | 200 | return false; |
@@ -44,9 +44,9 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | class Assets extends BaseClass { |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * Construct new instance |
|
| 49 | - */ |
|
| 47 | + /** |
|
| 48 | + * Construct new instance |
|
| 49 | + */ |
|
| 50 | 50 | public function __construct() { |
| 51 | 51 | parent::__construct(); |
| 52 | 52 | } |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * @see Assets:link |
| 96 | 96 | */ |
| 97 | 97 | public function css($path) { |
| 98 | - return $this->link($path, 'css'); |
|
| 98 | + return $this->link($path, 'css'); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
@@ -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 | * TNH Framework |
| 5 | 5 | * |
@@ -28,68 +28,68 @@ discard block |
||
| 28 | 28 | * SOFTWARE. |
| 29 | 29 | */ |
| 30 | 30 | |
| 31 | - class Browser { |
|
| 32 | - |
|
| 33 | - /** |
|
| 34 | - * List of know platforms |
|
| 35 | - * @var array |
|
| 36 | - */ |
|
| 37 | - private $platforms = array( |
|
| 38 | - '/windows nt 10/i' => 'Windows 10', |
|
| 39 | - '/windows phone 10/i' => 'Windows Phone 10', |
|
| 40 | - '/windows phone 8.1/i' => 'Windows Phone 8.1', |
|
| 41 | - '/windows phone 8/i' => 'Windows Phone 8', |
|
| 42 | - '/windows nt 6.3/i' => 'Windows 8.1', |
|
| 43 | - '/windows nt 6.2/i' => 'Windows 8', |
|
| 44 | - '/windows nt 6.1/i' => 'Windows 7', |
|
| 45 | - '/windows nt 6.0/i' => 'Windows Vista', |
|
| 46 | - '/windows nt 5.2/i' => 'Windows Server 2003/XP x64', |
|
| 47 | - '/windows nt 5.1/i' => 'Windows XP', |
|
| 48 | - '/windows xp/i' => 'Windows XP', |
|
| 49 | - '/windows nt 5.0/i' => 'Windows 2000', |
|
| 50 | - '/windows me/i' => 'Windows ME', |
|
| 51 | - '/win98/i' => 'Windows 98', |
|
| 52 | - '/win95/i' => 'Windows 95', |
|
| 53 | - '/win16/i' => 'Windows 3.11', |
|
| 54 | - '/ipad/i' => 'iPad', |
|
| 31 | + class Browser { |
|
| 32 | + |
|
| 33 | + /** |
|
| 34 | + * List of know platforms |
|
| 35 | + * @var array |
|
| 36 | + */ |
|
| 37 | + private $platforms = array( |
|
| 38 | + '/windows nt 10/i' => 'Windows 10', |
|
| 39 | + '/windows phone 10/i' => 'Windows Phone 10', |
|
| 40 | + '/windows phone 8.1/i' => 'Windows Phone 8.1', |
|
| 41 | + '/windows phone 8/i' => 'Windows Phone 8', |
|
| 42 | + '/windows nt 6.3/i' => 'Windows 8.1', |
|
| 43 | + '/windows nt 6.2/i' => 'Windows 8', |
|
| 44 | + '/windows nt 6.1/i' => 'Windows 7', |
|
| 45 | + '/windows nt 6.0/i' => 'Windows Vista', |
|
| 46 | + '/windows nt 5.2/i' => 'Windows Server 2003/XP x64', |
|
| 47 | + '/windows nt 5.1/i' => 'Windows XP', |
|
| 48 | + '/windows xp/i' => 'Windows XP', |
|
| 49 | + '/windows nt 5.0/i' => 'Windows 2000', |
|
| 50 | + '/windows me/i' => 'Windows ME', |
|
| 51 | + '/win98/i' => 'Windows 98', |
|
| 52 | + '/win95/i' => 'Windows 95', |
|
| 53 | + '/win16/i' => 'Windows 3.11', |
|
| 54 | + '/ipad/i' => 'iPad', |
|
| 55 | 55 | '/ipod/i' => 'iPod', |
| 56 | 56 | '/iphone/i' => 'iPhone', |
| 57 | 57 | '/macintosh|mac os x/i' => 'Mac OS X', |
| 58 | - '/mac_powerpc/i' => 'Mac OS 9', |
|
| 59 | - '/android/i' => 'Android', |
|
| 60 | - '/ubuntu/i' => 'Ubuntu', |
|
| 61 | - '/linux/i' => 'Linux', |
|
| 62 | - '/blackberry/i' => 'BlackBerry', |
|
| 63 | - '/webos/i' => 'Mobile' |
|
| 64 | - ); |
|
| 65 | - |
|
| 66 | - /** |
|
| 67 | - * List of know browsers |
|
| 68 | - * @var array |
|
| 69 | - */ |
|
| 70 | - private $browsers = array( |
|
| 71 | - '/mobile/i' => 'Handheld Browser', |
|
| 72 | - '/msie/i' => 'Internet Explorer', |
|
| 73 | - '/firefox/i' => 'Firefox', |
|
| 74 | - '/chrome/i' => 'Chrome', |
|
| 75 | - '/safari/i' => 'Safari', |
|
| 76 | - '/edge/i' => 'Edge', |
|
| 77 | - '/opera/i' => 'Opera', |
|
| 78 | - '/netscape/i' => 'Netscape', |
|
| 79 | - '/maxthon/i' => 'Maxthon', |
|
| 80 | - '/konqueror/i' => 'Konqueror' |
|
| 81 | - ); |
|
| 82 | - |
|
| 83 | - /** |
|
| 84 | - * Agent string |
|
| 85 | - * @var string |
|
| 86 | - */ |
|
| 87 | - private $agent = ''; |
|
| 88 | - |
|
| 89 | - /** |
|
| 90 | - * Browser name |
|
| 91 | - * @var string |
|
| 92 | - */ |
|
| 58 | + '/mac_powerpc/i' => 'Mac OS 9', |
|
| 59 | + '/android/i' => 'Android', |
|
| 60 | + '/ubuntu/i' => 'Ubuntu', |
|
| 61 | + '/linux/i' => 'Linux', |
|
| 62 | + '/blackberry/i' => 'BlackBerry', |
|
| 63 | + '/webos/i' => 'Mobile' |
|
| 64 | + ); |
|
| 65 | + |
|
| 66 | + /** |
|
| 67 | + * List of know browsers |
|
| 68 | + * @var array |
|
| 69 | + */ |
|
| 70 | + private $browsers = array( |
|
| 71 | + '/mobile/i' => 'Handheld Browser', |
|
| 72 | + '/msie/i' => 'Internet Explorer', |
|
| 73 | + '/firefox/i' => 'Firefox', |
|
| 74 | + '/chrome/i' => 'Chrome', |
|
| 75 | + '/safari/i' => 'Safari', |
|
| 76 | + '/edge/i' => 'Edge', |
|
| 77 | + '/opera/i' => 'Opera', |
|
| 78 | + '/netscape/i' => 'Netscape', |
|
| 79 | + '/maxthon/i' => 'Maxthon', |
|
| 80 | + '/konqueror/i' => 'Konqueror' |
|
| 81 | + ); |
|
| 82 | + |
|
| 83 | + /** |
|
| 84 | + * Agent string |
|
| 85 | + * @var string |
|
| 86 | + */ |
|
| 87 | + private $agent = ''; |
|
| 88 | + |
|
| 89 | + /** |
|
| 90 | + * Browser name |
|
| 91 | + * @var string |
|
| 92 | + */ |
|
| 93 | 93 | private $browserName = ''; |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | private $isFacebook = false; |
| 130 | 130 | |
| 131 | - /** |
|
| 131 | + /** |
|
| 132 | 132 | * Class constructor |
| 133 | 133 | */ |
| 134 | 134 | public function __construct($userAgent = '') { |
@@ -231,12 +231,12 @@ discard block |
||
| 231 | 231 | return $this->isFacebook; |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - /** |
|
| 235 | - * Returns a formatted string with a summary of the details of the browser. |
|
| 236 | - * @codeCoverageIgnore |
|
| 237 | - * |
|
| 238 | - * @return string formatted string with a summary of the browser |
|
| 239 | - */ |
|
| 234 | + /** |
|
| 235 | + * Returns a formatted string with a summary of the details of the browser. |
|
| 236 | + * @codeCoverageIgnore |
|
| 237 | + * |
|
| 238 | + * @return string formatted string with a summary of the browser |
|
| 239 | + */ |
|
| 240 | 240 | public function __toString() { |
| 241 | 241 | return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" . |
| 242 | 242 | "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" . |
@@ -248,70 +248,70 @@ discard block |
||
| 248 | 248 | /** |
| 249 | 249 | * Determine the user's platform |
| 250 | 250 | */ |
| 251 | - protected function checkPlatform() { |
|
| 252 | - foreach ($this->platforms as $regex => $value) { |
|
| 253 | - if (preg_match($regex, $this->agent) ) { |
|
| 254 | - $this->platform = $value; |
|
| 255 | - break; |
|
| 256 | - } |
|
| 257 | - } |
|
| 258 | - } |
|
| 259 | - |
|
| 260 | - /** |
|
| 251 | + protected function checkPlatform() { |
|
| 252 | + foreach ($this->platforms as $regex => $value) { |
|
| 253 | + if (preg_match($regex, $this->agent) ) { |
|
| 254 | + $this->platform = $value; |
|
| 255 | + break; |
|
| 256 | + } |
|
| 257 | + } |
|
| 258 | + } |
|
| 259 | + |
|
| 260 | + /** |
|
| 261 | 261 | * Routine to determine the browser type |
| 262 | 262 | */ |
| 263 | - protected function checkBrowser() { |
|
| 264 | - foreach ($this->browsers as $regex => $value) { |
|
| 265 | - if (preg_match($regex, $this->agent ) ) { |
|
| 266 | - $this->browserName = $value; |
|
| 267 | - break; |
|
| 268 | - } |
|
| 269 | - } |
|
| 270 | - } |
|
| 271 | - |
|
| 272 | - /** |
|
| 263 | + protected function checkBrowser() { |
|
| 264 | + foreach ($this->browsers as $regex => $value) { |
|
| 265 | + if (preg_match($regex, $this->agent ) ) { |
|
| 266 | + $this->browserName = $value; |
|
| 267 | + break; |
|
| 268 | + } |
|
| 269 | + } |
|
| 270 | + } |
|
| 271 | + |
|
| 272 | + /** |
|
| 273 | 273 | * Routine to determine the browser version |
| 274 | 274 | */ |
| 275 | - protected function checkBrowserVersion(){ |
|
| 276 | - $detected = $this->getBrowser(); |
|
| 277 | - $detect = array_search($detected, $this->browsers); |
|
| 278 | - $browser = str_replace(array('/i','/'), '', $detect); |
|
| 279 | - $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i"; |
|
| 280 | - if (preg_match_all($regex, $this->agent, $matches)) { |
|
| 281 | - $found = array_search($browser, $matches['browser']); |
|
| 282 | - $this->version = $matches['version'][$found]; |
|
| 283 | - } |
|
| 284 | - } |
|
| 285 | - |
|
| 286 | - /** |
|
| 275 | + protected function checkBrowserVersion(){ |
|
| 276 | + $detected = $this->getBrowser(); |
|
| 277 | + $detect = array_search($detected, $this->browsers); |
|
| 278 | + $browser = str_replace(array('/i','/'), '', $detect); |
|
| 279 | + $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i"; |
|
| 280 | + if (preg_match_all($regex, $this->agent, $matches)) { |
|
| 281 | + $found = array_search($browser, $matches['browser']); |
|
| 282 | + $this->version = $matches['version'][$found]; |
|
| 283 | + } |
|
| 284 | + } |
|
| 285 | + |
|
| 286 | + /** |
|
| 287 | 287 | * Determine if the browser is Mobile or not |
| 288 | 288 | */ |
| 289 | - protected function checkMobile() { |
|
| 290 | - if (preg_match('/(android|avantgo|blackberry|bolt|boost|cricket' |
|
| 289 | + protected function checkMobile() { |
|
| 290 | + if (preg_match('/(android|avantgo|blackberry|bolt|boost|cricket' |
|
| 291 | 291 | . '|docomo|fone|hiptop|mini|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i', $this->agent) ) { |
| 292 | - $this->isMobile = true; |
|
| 293 | - } |
|
| 294 | - } |
|
| 292 | + $this->isMobile = true; |
|
| 293 | + } |
|
| 294 | + } |
|
| 295 | 295 | |
| 296 | - /** |
|
| 296 | + /** |
|
| 297 | 297 | * Determine if the browser is Tablet or not |
| 298 | 298 | */ |
| 299 | - protected function checkTablet() { |
|
| 300 | - if (preg_match('/tablet|ipad/i', $this->agent) ) { |
|
| 301 | - $this->isTablet = true; |
|
| 302 | - } |
|
| 303 | - } |
|
| 299 | + protected function checkTablet() { |
|
| 300 | + if (preg_match('/tablet|ipad/i', $this->agent) ) { |
|
| 301 | + $this->isTablet = true; |
|
| 302 | + } |
|
| 303 | + } |
|
| 304 | 304 | |
| 305 | - /** |
|
| 305 | + /** |
|
| 306 | 306 | * Determine if the browser is Robot or not |
| 307 | 307 | */ |
| 308 | - protected function checkBot() { |
|
| 309 | - if (preg_match('/bot/i', $this->agent) ) { |
|
| 310 | - $this->isRobot = true; |
|
| 311 | - } |
|
| 312 | - } |
|
| 308 | + protected function checkBot() { |
|
| 309 | + if (preg_match('/bot/i', $this->agent) ) { |
|
| 310 | + $this->isRobot = true; |
|
| 311 | + } |
|
| 312 | + } |
|
| 313 | 313 | |
| 314 | - /** |
|
| 314 | + /** |
|
| 315 | 315 | * Detect if URL is loaded from FacebookExternalHit |
| 316 | 316 | */ |
| 317 | 317 | protected function checkFacebook() { |
@@ -324,10 +324,10 @@ discard block |
||
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | |
| 327 | - /** |
|
| 328 | - * Protected routine to calculate and determine what |
|
| 329 | - * the browser is in use (including platform) |
|
| 330 | - */ |
|
| 327 | + /** |
|
| 328 | + * Protected routine to calculate and determine what |
|
| 329 | + * the browser is in use (including platform) |
|
| 330 | + */ |
|
| 331 | 331 | protected function determine() { |
| 332 | 332 | $this->checkPlatform(); |
| 333 | 333 | $this->checkBrowser(); |
@@ -338,4 +338,4 @@ discard block |
||
| 338 | 338 | $this->checkFacebook(); |
| 339 | 339 | } |
| 340 | 340 | |
| 341 | - } |
|
| 341 | + } |
|
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | if ($cookieLang && $this->isValid($cookieLang)) { |
| 80 | 80 | $this->current = $cookieLang; |
| 81 | 81 | $this->logger->info('Language from cookie [' . $cfgKey . '] is valid so ' |
| 82 | - .'we will set the language using the cookie value [' . $cookieLang . ']'); |
|
| 82 | + .'we will set the language using the cookie value [' . $cookieLang . ']'); |
|
| 83 | 83 | } else { |
| 84 | 84 | $this->logger->info('Language from cookie [' . $cfgKey . '] is not set, use the default value [' . $this->getDefault() . ']'); |
| 85 | 85 | $this->current = $this->getDefault(); |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | $moduleConfigPath = get_instance()->module->findConfigFullPath($filename, $module); |
| 220 | 220 | if ($moduleConfigPath) { |
| 221 | 221 | $this->logger->info('Found config [' . $filename . '] from module [' . $module . '], ' |
| 222 | - . 'the file path is [' . $moduleConfigPath . '] we will used it'); |
|
| 222 | + . 'the file path is [' . $moduleConfigPath . '] we will used it'); |
|
| 223 | 223 | $configFilePath = $moduleConfigPath; |
| 224 | 224 | } else { |
| 225 | 225 | $this->logger->info('Cannot find config [' . $filename . '] from modules using the default location'); |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | $moduleLibraryPath = get_instance()->module->findLibraryFullPath($class, $module); |
| 480 | 480 | if ($moduleLibraryPath) { |
| 481 | 481 | $this->logger->info('Found library [' . $class . '] from module [' . $module . '], the ' |
| 482 | - . 'file path is [' . $moduleLibraryPath . '] we will used it'); |
|
| 482 | + . 'file path is [' . $moduleLibraryPath . '] we will used it'); |
|
| 483 | 483 | $libraryFilePath = $moduleLibraryPath; |
| 484 | 484 | } else { |
| 485 | 485 | $this->logger->info('Cannot find library [' . $class . '] from modules using the default location'); |