@@ -32,8 +32,8 @@ |
||
32 | 32 | <p>Required PHP version : <b>PHP >= <?php echo TNH_MIN_PHP_VERSION; ?>, PHP < <?php echo TNH_MAX_PHP_VERSION; ?></b></p> |
33 | 33 | <p>Release date : <b><?php echo TNH_RELEASE_DATE; ?></b></p> |
34 | 34 | <hr /> |
35 | - <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php';?></b> |
|
36 | - <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php';?></b> |
|
35 | + <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php'; ?></b> |
|
36 | + <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php'; ?></b> |
|
37 | 37 | </div> |
38 | 38 | </div> |
39 | 39 | </div> |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | * Reset all properties |
145 | 145 | */ |
146 | 146 | public function reset() { |
147 | - $this->_agent = get_instance()->globalvar->server('HTTP_USER_AGENT'); |
|
147 | + $this->_agent = get_instance()->globalvar->server('HTTP_USER_AGENT'); |
|
148 | 148 | $this->_browser_name = 'unknown'; |
149 | 149 | $this->_version = 'unknown'; |
150 | 150 | $this->_platform = 'unknown'; |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | */ |
307 | 307 | protected function checkPlatform() { |
308 | 308 | foreach ($this->_platforms as $regex => $value) { |
309 | - if (preg_match($regex, $this->_agent) ) { |
|
309 | + if (preg_match($regex, $this->_agent)) { |
|
310 | 310 | $this->setPlatform($value); |
311 | 311 | break; |
312 | 312 | } |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | */ |
319 | 319 | protected function checkBrowser() { |
320 | 320 | foreach ($this->_browsers as $regex => $value) { |
321 | - if (preg_match($regex, $this->_agent ) ) { |
|
321 | + if (preg_match($regex, $this->_agent)) { |
|
322 | 322 | $this->setBrowser($value); |
323 | 323 | break; |
324 | 324 | } |
@@ -328,10 +328,10 @@ discard block |
||
328 | 328 | /** |
329 | 329 | * Routine to determine the browser version |
330 | 330 | */ |
331 | - protected function checkBrowserVersion(){ |
|
331 | + protected function checkBrowserVersion() { |
|
332 | 332 | $detected = $this->getBrowser(); |
333 | 333 | $d = array_search($detected, $this->_browsers); |
334 | - $browser = str_replace(array("/i","/"), "", $d); |
|
334 | + $browser = str_replace(array("/i", "/"), "", $d); |
|
335 | 335 | $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i"; |
336 | 336 | if (preg_match_all($regex, $this->_agent, $matches)) { |
337 | 337 | $found = array_search($browser, $matches["browser"]); |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | * Determine if the browser is Mobile or not |
344 | 344 | */ |
345 | 345 | protected function checkMobile() { |
346 | - if (preg_match('/(android|avantgo|blackberry|bolt|boost|cricket|docomo|fone|hiptop|mini|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i', $this->_agent) ) { |
|
346 | + if (preg_match('/(android|avantgo|blackberry|bolt|boost|cricket|docomo|fone|hiptop|mini|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i', $this->_agent)) { |
|
347 | 347 | $this->setMobile(true); |
348 | 348 | } |
349 | 349 | } |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | * Determine if the browser is Tablet or not |
353 | 353 | */ |
354 | 354 | protected function checkTablet() { |
355 | - if (preg_match('/tablet|ipad/i', $this->_agent) ) { |
|
355 | + if (preg_match('/tablet|ipad/i', $this->_agent)) { |
|
356 | 356 | $this->setTablet(true); |
357 | 357 | } |
358 | 358 | } |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | * Determine if the browser is Robot or not |
362 | 362 | */ |
363 | 363 | protected function checkBot() { |
364 | - if (preg_match('/bot/i', $this->_agent) ) { |
|
364 | + if (preg_match('/bot/i', $this->_agent)) { |
|
365 | 365 | $this->setRobot(true); |
366 | 366 | } |
367 | 367 | } |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | if (stristr($this->_agent, 'FacebookExternalHit')) { |
374 | 374 | $this->setRobot(true); |
375 | 375 | $this->setFacebook(true); |
376 | - } else if (stristr($this->_agent, 'FBIOS')) { |
|
376 | + } else if (stristr($this->_agent, 'FBIOS')) { |
|
377 | 377 | $this->setFacebook(true); |
378 | 378 | } |
379 | 379 | } |
@@ -234,10 +234,10 @@ discard block |
||
234 | 234 | return $this->removeVars($_ENV, $key); |
235 | 235 | } |
236 | 236 | |
237 | - /** |
|
238 | - * Get the value from $GLOBALS for given key. if the key is empty will return all values |
|
239 | - * @see GlobalVar::getVars |
|
240 | - */ |
|
237 | + /** |
|
238 | + * Get the value from $GLOBALS for given key. if the key is empty will return all values |
|
239 | + * @see GlobalVar::getVars |
|
240 | + */ |
|
241 | 241 | public function globals($key = null, $xss = true) { |
242 | 242 | return $this->getVars($GLOBALS, $key, $xss); |
243 | 243 | } |
@@ -259,16 +259,16 @@ discard block |
||
259 | 259 | } |
260 | 260 | |
261 | 261 | |
262 | - /** |
|
263 | - * Set the value for $_GET, $_POST, $_SERVER etc. if the key is an array will |
|
264 | - * set the current super variable value by this. |
|
265 | - * @param array $var the super global variable to use, can be "$_POST", "$_GET", etc. |
|
266 | - * @param string|array $key the item key to be set or array if need set the current global variable |
|
267 | - * by this value |
|
268 | - * @param mixed $value the value to set if $key is not an array |
|
269 | - * |
|
270 | - * @return object the current instance |
|
271 | - */ |
|
262 | + /** |
|
263 | + * Set the value for $_GET, $_POST, $_SERVER etc. if the key is an array will |
|
264 | + * set the current super variable value by this. |
|
265 | + * @param array $var the super global variable to use, can be "$_POST", "$_GET", etc. |
|
266 | + * @param string|array $key the item key to be set or array if need set the current global variable |
|
267 | + * by this value |
|
268 | + * @param mixed $value the value to set if $key is not an array |
|
269 | + * |
|
270 | + * @return object the current instance |
|
271 | + */ |
|
272 | 272 | protected function setVars(&$var, $key, $value = null) { |
273 | 273 | if (is_array($key)) { |
274 | 274 | //set all |
@@ -165,17 +165,17 @@ |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | /** |
168 | - * Return the server port using variable |
|
169 | - * |
|
170 | - * @codeCoverageIgnore |
|
171 | - * @return string |
|
172 | - */ |
|
168 | + * Return the server port using variable |
|
169 | + * |
|
170 | + * @codeCoverageIgnore |
|
171 | + * @return string |
|
172 | + */ |
|
173 | 173 | protected static function getServerPort() { |
174 | 174 | $globals = & class_loader('GlobalVar', 'classes'); |
175 | 175 | $serverPortValue = $globals->server('SERVER_PORT'); |
176 | 176 | $serverPort = 80; |
177 | 177 | if ($serverPortValue) { |
178 | - $serverPort = $serverPortValue; |
|
178 | + $serverPort = $serverPortValue; |
|
179 | 179 | } |
180 | 180 | $port = ''; |
181 | 181 | if ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80)) { |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | public function getCacheContent() { |
159 | 159 | //set some attributes values |
160 | 160 | $this->setPropertiesValues(); |
161 | - if(! $this->isSelectQuery || ! $this->dbCacheStatus){ |
|
161 | + if (!$this->isSelectQuery || !$this->dbCacheStatus) { |
|
162 | 162 | $this->logger->info('The cache is not enabled for this query or is not a SELECT query'); |
163 | 163 | return null; |
164 | 164 | } |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | public function saveCacheContent($result) { |
180 | 180 | //set some attributes values |
181 | 181 | $this->setPropertiesValues(); |
182 | - if(! $this->isSelectQuery || ! $this->dbCacheStatus){ |
|
182 | + if (!$this->isSelectQuery || !$this->dbCacheStatus) { |
|
183 | 183 | return null; |
184 | 184 | } |
185 | 185 | $this->setCacheInstanceFromSuperInstanceIfNull(); |
@@ -207,10 +207,10 @@ |
||
207 | 207 | return $this; |
208 | 208 | } |
209 | 209 | |
210 | - /** |
|
211 | - * Return the instance of session. |
|
212 | - * @return object the session instance |
|
213 | - */ |
|
210 | + /** |
|
211 | + * Return the instance of session. |
|
212 | + * @return object the session instance |
|
213 | + */ |
|
214 | 214 | public function getSession() { |
215 | 215 | return $this->session; |
216 | 216 | } |