@@ -262,24 +262,24 @@ |
||
262 | 262 | return $this; |
263 | 263 | } |
264 | 264 | |
265 | - /** |
|
266 | - * Return the instance of session. |
|
267 | - * @return object the session instance |
|
268 | - */ |
|
265 | + /** |
|
266 | + * Return the instance of session. |
|
267 | + * @return object the session instance |
|
268 | + */ |
|
269 | 269 | public function getSession() { |
270 | 270 | return $this->session; |
271 | 271 | } |
272 | 272 | |
273 | - /** |
|
274 | - * Set the value for $_GET, $_POST, $_SERVER etc. if the key is an array will |
|
275 | - * set the current super variable value by this. |
|
276 | - * @param string $type the type can be "post", "get", etc. |
|
277 | - * @param string|array $key the item key to be set or array if need set the current global variable |
|
278 | - * by this value |
|
279 | - * @param mixed $value the value to set if $key is not an array |
|
280 | - * |
|
281 | - * @return object the current instance |
|
282 | - */ |
|
273 | + /** |
|
274 | + * Set the value for $_GET, $_POST, $_SERVER etc. if the key is an array will |
|
275 | + * set the current super variable value by this. |
|
276 | + * @param string $type the type can be "post", "get", etc. |
|
277 | + * @param string|array $key the item key to be set or array if need set the current global variable |
|
278 | + * by this value |
|
279 | + * @param mixed $value the value to set if $key is not an array |
|
280 | + * |
|
281 | + * @return object the current instance |
|
282 | + */ |
|
283 | 283 | protected function setVars($type, $key, $value = null) { |
284 | 284 | if (is_array($key)) { |
285 | 285 | //set all |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | } else { |
186 | 186 | $logger->info('Cannot find view [' . $view . '] in module [' . $module . '] using the default location'); |
187 | 187 | } |
188 | - if (!$path) { |
|
188 | + if (!$path) { |
|
189 | 189 | $path = $this->getDefaultFilePathForView($viewFile); |
190 | 190 | } |
191 | 191 | $logger->info('The view file path to be loaded is [' . $path . ']'); |
@@ -273,12 +273,12 @@ discard block |
||
273 | 273 | return $this->_pageRender; |
274 | 274 | } |
275 | 275 | |
276 | - /** |
|
277 | - * Set the final page to be rendered |
|
278 | - * @param string $finalPage the content of the final page |
|
279 | - * |
|
280 | - * @return object |
|
281 | - */ |
|
276 | + /** |
|
277 | + * Set the final page to be rendered |
|
278 | + * @param string $finalPage the content of the final page |
|
279 | + * |
|
280 | + * @return object |
|
281 | + */ |
|
282 | 282 | public function setFinalPageContent($finalPage) { |
283 | 283 | $this->_pageRender = $finalPage; |
284 | 284 | return $this; |
@@ -351,12 +351,12 @@ discard block |
||
351 | 351 | ob_end_flush(); |
352 | 352 | } |
353 | 353 | |
354 | - /** |
|
355 | - * Return the default full file path for view |
|
356 | - * @param string $file the filename |
|
357 | - * |
|
358 | - * @return string|null the full file path |
|
359 | - */ |
|
354 | + /** |
|
355 | + * Return the default full file path for view |
|
356 | + * @param string $file the filename |
|
357 | + * |
|
358 | + * @return string|null the full file path |
|
359 | + */ |
|
360 | 360 | protected static function getDefaultFilePathForView($file){ |
361 | 361 | $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH); |
362 | 362 | $fullFilePath = null; |
@@ -548,18 +548,18 @@ discard block |
||
548 | 548 | } |
549 | 549 | } |
550 | 550 | |
551 | - /** |
|
552 | - * Set the mandory headers, like security, etc. |
|
553 | - */ |
|
551 | + /** |
|
552 | + * Set the mandory headers, like security, etc. |
|
553 | + */ |
|
554 | 554 | protected static function setRequiredHeaders() { |
555 | 555 | $requiredHeaders = array( |
556 | 556 | 'X-XSS-Protection' => '1; mode=block', |
557 | 557 | 'X-Frame-Options' => 'SAMEORIGIN' |
558 | 558 | ); |
559 | 559 | foreach ($requiredHeaders as $key => $value) { |
560 | - if (!isset(self::$headers[$key])) { |
|
560 | + if (!isset(self::$headers[$key])) { |
|
561 | 561 | self::$headers[$key] = $value; |
562 | - } |
|
562 | + } |
|
563 | 563 | } |
564 | 564 | } |
565 | 565 | } |
@@ -241,12 +241,12 @@ discard block |
||
241 | 241 | } |
242 | 242 | |
243 | 243 | /** |
244 | - * Setting the route configuration using the configuration file and additional configuration from param |
|
245 | - * @param array $overwriteConfig the additional configuration to overwrite with the existing one |
|
246 | - * @param boolean $useConfigFile whether to use route configuration file |
|
247 | - * |
|
248 | - * @return object |
|
249 | - */ |
|
244 | + * Setting the route configuration using the configuration file and additional configuration from param |
|
245 | + * @param array $overwriteConfig the additional configuration to overwrite with the existing one |
|
246 | + * @param boolean $useConfigFile whether to use route configuration file |
|
247 | + * |
|
248 | + * @return object |
|
249 | + */ |
|
250 | 250 | public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) { |
251 | 251 | $route = array(); |
252 | 252 | if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) { |
@@ -423,11 +423,11 @@ discard block |
||
423 | 423 | } |
424 | 424 | } |
425 | 425 | |
426 | - /** |
|
427 | - * Remove the URL suffix and query string values if exists |
|
428 | - * @param string $uri the route URI to process |
|
429 | - * @return string the final route uri after processed |
|
430 | - */ |
|
426 | + /** |
|
427 | + * Remove the URL suffix and query string values if exists |
|
428 | + * @param string $uri the route URI to process |
|
429 | + * @return string the final route uri after processed |
|
430 | + */ |
|
431 | 431 | protected function removeSuffixAndQueryStringFromUri($uri) { |
432 | 432 | $this->logger->debug('Check if URL suffix is enabled in the configuration'); |
433 | 433 | //remove url suffix from the request URI |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | $this->logger->info( |
541 | 541 | 'After loop in predefined routes configuration,' |
542 | 542 | . 'the module name is set but the controller is not set,' |
543 | - . 'so we will use module as the controller' |
|
543 | + . 'so we will use module as the controller' |
|
544 | 544 | ); |
545 | 545 | $this->controller = $this->module; |
546 | 546 | } |
@@ -84,10 +84,10 @@ |
||
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
87 | - * This method is used to check the whitelist IP address access |
|
88 | - * |
|
89 | - * @return boolean |
|
90 | - */ |
|
87 | + * This method is used to check the whitelist IP address access |
|
88 | + * |
|
89 | + * @return boolean |
|
90 | + */ |
|
91 | 91 | public static function checkWhiteListIpAccess() { |
92 | 92 | $logger = self::getLogger(); |
93 | 93 | $logger->debug('Validation of the IP address access ...'); |
@@ -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 | * |
@@ -24,68 +24,68 @@ discard block |
||
24 | 24 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
25 | 25 | */ |
26 | 26 | |
27 | - class Browser { |
|
28 | - |
|
29 | - /** |
|
30 | - * List of know platforms |
|
31 | - * @var array |
|
32 | - */ |
|
33 | - private $_platforms = array( |
|
34 | - '/windows nt 10/i' => 'Windows 10', |
|
35 | - '/windows phone 10/i' => 'Windows Phone 10', |
|
36 | - '/windows phone 8.1/i' => 'Windows Phone 8.1', |
|
37 | - '/windows phone 8/i' => 'Windows Phone 8', |
|
38 | - '/windows nt 6.3/i' => 'Windows 8.1', |
|
39 | - '/windows nt 6.2/i' => 'Windows 8', |
|
40 | - '/windows nt 6.1/i' => 'Windows 7', |
|
41 | - '/windows nt 6.0/i' => 'Windows Vista', |
|
42 | - '/windows nt 5.2/i' => 'Windows Server 2003/XP x64', |
|
43 | - '/windows nt 5.1/i' => 'Windows XP', |
|
44 | - '/windows xp/i' => 'Windows XP', |
|
45 | - '/windows nt 5.0/i' => 'Windows 2000', |
|
46 | - '/windows me/i' => 'Windows ME', |
|
47 | - '/win98/i' => 'Windows 98', |
|
48 | - '/win95/i' => 'Windows 95', |
|
49 | - '/win16/i' => 'Windows 3.11', |
|
50 | - '/ipad/i' => 'iPad', |
|
27 | + class Browser { |
|
28 | + |
|
29 | + /** |
|
30 | + * List of know platforms |
|
31 | + * @var array |
|
32 | + */ |
|
33 | + private $_platforms = array( |
|
34 | + '/windows nt 10/i' => 'Windows 10', |
|
35 | + '/windows phone 10/i' => 'Windows Phone 10', |
|
36 | + '/windows phone 8.1/i' => 'Windows Phone 8.1', |
|
37 | + '/windows phone 8/i' => 'Windows Phone 8', |
|
38 | + '/windows nt 6.3/i' => 'Windows 8.1', |
|
39 | + '/windows nt 6.2/i' => 'Windows 8', |
|
40 | + '/windows nt 6.1/i' => 'Windows 7', |
|
41 | + '/windows nt 6.0/i' => 'Windows Vista', |
|
42 | + '/windows nt 5.2/i' => 'Windows Server 2003/XP x64', |
|
43 | + '/windows nt 5.1/i' => 'Windows XP', |
|
44 | + '/windows xp/i' => 'Windows XP', |
|
45 | + '/windows nt 5.0/i' => 'Windows 2000', |
|
46 | + '/windows me/i' => 'Windows ME', |
|
47 | + '/win98/i' => 'Windows 98', |
|
48 | + '/win95/i' => 'Windows 95', |
|
49 | + '/win16/i' => 'Windows 3.11', |
|
50 | + '/ipad/i' => 'iPad', |
|
51 | 51 | '/ipod/i' => 'iPod', |
52 | 52 | '/iphone/i' => 'iPhone', |
53 | 53 | '/macintosh|mac os x/i' => 'Mac OS X', |
54 | - '/mac_powerpc/i' => 'Mac OS 9', |
|
55 | - '/android/i' => 'Android', |
|
56 | - '/ubuntu/i' => 'Ubuntu', |
|
57 | - '/linux/i' => 'Linux', |
|
58 | - '/blackberry/i' => 'BlackBerry', |
|
59 | - '/webos/i' => 'Mobile' |
|
60 | - ); |
|
61 | - |
|
62 | - /** |
|
63 | - * List of know browsers |
|
64 | - * @var array |
|
65 | - */ |
|
66 | - private $_browsers = array( |
|
67 | - '/mobile/i' => 'Handheld Browser', |
|
68 | - '/msie/i' => 'Internet Explorer', |
|
69 | - '/firefox/i' => 'Firefox', |
|
70 | - '/chrome/i' => 'Chrome', |
|
71 | - '/safari/i' => 'Safari', |
|
72 | - '/edge/i' => 'Edge', |
|
73 | - '/opera/i' => 'Opera', |
|
74 | - '/netscape/i' => 'Netscape', |
|
75 | - '/maxthon/i' => 'Maxthon', |
|
76 | - '/konqueror/i' => 'Konqueror' |
|
77 | - ); |
|
78 | - |
|
79 | - /** |
|
80 | - * Agent string |
|
81 | - * @var string |
|
82 | - */ |
|
83 | - private $_agent = ''; |
|
84 | - |
|
85 | - /** |
|
86 | - * Browser name |
|
87 | - * @var string |
|
88 | - */ |
|
54 | + '/mac_powerpc/i' => 'Mac OS 9', |
|
55 | + '/android/i' => 'Android', |
|
56 | + '/ubuntu/i' => 'Ubuntu', |
|
57 | + '/linux/i' => 'Linux', |
|
58 | + '/blackberry/i' => 'BlackBerry', |
|
59 | + '/webos/i' => 'Mobile' |
|
60 | + ); |
|
61 | + |
|
62 | + /** |
|
63 | + * List of know browsers |
|
64 | + * @var array |
|
65 | + */ |
|
66 | + private $_browsers = array( |
|
67 | + '/mobile/i' => 'Handheld Browser', |
|
68 | + '/msie/i' => 'Internet Explorer', |
|
69 | + '/firefox/i' => 'Firefox', |
|
70 | + '/chrome/i' => 'Chrome', |
|
71 | + '/safari/i' => 'Safari', |
|
72 | + '/edge/i' => 'Edge', |
|
73 | + '/opera/i' => 'Opera', |
|
74 | + '/netscape/i' => 'Netscape', |
|
75 | + '/maxthon/i' => 'Maxthon', |
|
76 | + '/konqueror/i' => 'Konqueror' |
|
77 | + ); |
|
78 | + |
|
79 | + /** |
|
80 | + * Agent string |
|
81 | + * @var string |
|
82 | + */ |
|
83 | + private $_agent = ''; |
|
84 | + |
|
85 | + /** |
|
86 | + * Browser name |
|
87 | + * @var string |
|
88 | + */ |
|
89 | 89 | private $_browser_name = ''; |
90 | 90 | |
91 | 91 | /** |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | */ |
125 | 125 | private $_is_facebook = false; |
126 | 126 | |
127 | - /** |
|
127 | + /** |
|
128 | 128 | * Class constructor |
129 | 129 | */ |
130 | 130 | public function __construct($userAgent = '') { |
@@ -251,12 +251,12 @@ discard block |
||
251 | 251 | return $this->_is_facebook; |
252 | 252 | } |
253 | 253 | |
254 | - /** |
|
255 | - * Returns a formatted string with a summary of the details of the browser. |
|
256 | - * @codeCoverageIgnore |
|
257 | - * |
|
258 | - * @return string formatted string with a summary of the browser |
|
259 | - */ |
|
254 | + /** |
|
255 | + * Returns a formatted string with a summary of the details of the browser. |
|
256 | + * @codeCoverageIgnore |
|
257 | + * |
|
258 | + * @return string formatted string with a summary of the browser |
|
259 | + */ |
|
260 | 260 | public function __toString() { |
261 | 261 | return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" . |
262 | 262 | "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" . |
@@ -300,69 +300,69 @@ discard block |
||
300 | 300 | /** |
301 | 301 | * Determine the user's platform |
302 | 302 | */ |
303 | - protected function checkPlatform() { |
|
304 | - foreach ($this->_platforms as $regex => $value) { |
|
305 | - if (preg_match($regex, $this->_agent) ) { |
|
306 | - $this->setPlatform($value); |
|
307 | - break; |
|
308 | - } |
|
309 | - } |
|
310 | - } |
|
303 | + protected function checkPlatform() { |
|
304 | + foreach ($this->_platforms as $regex => $value) { |
|
305 | + if (preg_match($regex, $this->_agent) ) { |
|
306 | + $this->setPlatform($value); |
|
307 | + break; |
|
308 | + } |
|
309 | + } |
|
310 | + } |
|
311 | 311 | |
312 | - /** |
|
312 | + /** |
|
313 | 313 | * Routine to determine the browser type |
314 | 314 | */ |
315 | - protected function checkBrowser() { |
|
316 | - foreach ($this->_browsers as $regex => $value) { |
|
317 | - if (preg_match($regex, $this->_agent ) ) { |
|
318 | - $this->setBrowser($value); |
|
319 | - break; |
|
320 | - } |
|
321 | - } |
|
322 | - } |
|
315 | + protected function checkBrowser() { |
|
316 | + foreach ($this->_browsers as $regex => $value) { |
|
317 | + if (preg_match($regex, $this->_agent ) ) { |
|
318 | + $this->setBrowser($value); |
|
319 | + break; |
|
320 | + } |
|
321 | + } |
|
322 | + } |
|
323 | 323 | |
324 | - /** |
|
324 | + /** |
|
325 | 325 | * Routine to determine the browser version |
326 | 326 | */ |
327 | - protected function checkBrowserVersion(){ |
|
328 | - $detected = $this->getBrowser(); |
|
329 | - $d = array_search($detected, $this->_browsers); |
|
330 | - $browser = str_replace(array("/i","/"), "", $d); |
|
331 | - $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i"; |
|
332 | - if (preg_match_all($regex, $this->_agent, $matches)) { |
|
333 | - $found = array_search($browser, $matches["browser"]); |
|
334 | - $this->setVersion($matches["version"][$found]); |
|
335 | - } |
|
336 | - } |
|
337 | - |
|
338 | - /** |
|
327 | + protected function checkBrowserVersion(){ |
|
328 | + $detected = $this->getBrowser(); |
|
329 | + $d = array_search($detected, $this->_browsers); |
|
330 | + $browser = str_replace(array("/i","/"), "", $d); |
|
331 | + $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i"; |
|
332 | + if (preg_match_all($regex, $this->_agent, $matches)) { |
|
333 | + $found = array_search($browser, $matches["browser"]); |
|
334 | + $this->setVersion($matches["version"][$found]); |
|
335 | + } |
|
336 | + } |
|
337 | + |
|
338 | + /** |
|
339 | 339 | * Determine if the browser is Mobile or not |
340 | 340 | */ |
341 | - protected function checkMobile() { |
|
342 | - 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) ) { |
|
343 | - $this->setMobile(true); |
|
344 | - } |
|
345 | - } |
|
341 | + protected function checkMobile() { |
|
342 | + 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) ) { |
|
343 | + $this->setMobile(true); |
|
344 | + } |
|
345 | + } |
|
346 | 346 | |
347 | - /** |
|
347 | + /** |
|
348 | 348 | * Determine if the browser is Tablet or not |
349 | 349 | */ |
350 | - protected function checkTablet() { |
|
351 | - if (preg_match('/tablet|ipad/i', $this->_agent) ) { |
|
352 | - $this->setTablet(true); |
|
353 | - } |
|
354 | - } |
|
350 | + protected function checkTablet() { |
|
351 | + if (preg_match('/tablet|ipad/i', $this->_agent) ) { |
|
352 | + $this->setTablet(true); |
|
353 | + } |
|
354 | + } |
|
355 | 355 | |
356 | - /** |
|
356 | + /** |
|
357 | 357 | * Determine if the browser is Robot or not |
358 | 358 | */ |
359 | - protected function checkBot() { |
|
360 | - if (preg_match('/bot/i', $this->_agent) ) { |
|
361 | - $this->setRobot(true); |
|
362 | - } |
|
363 | - } |
|
359 | + protected function checkBot() { |
|
360 | + if (preg_match('/bot/i', $this->_agent) ) { |
|
361 | + $this->setRobot(true); |
|
362 | + } |
|
363 | + } |
|
364 | 364 | |
365 | - /** |
|
365 | + /** |
|
366 | 366 | * Detect if URL is loaded from FacebookExternalHit |
367 | 367 | */ |
368 | 368 | protected function checkFacebook() { |
@@ -375,10 +375,10 @@ discard block |
||
375 | 375 | } |
376 | 376 | |
377 | 377 | |
378 | - /** |
|
379 | - * Protected routine to calculate and determine what |
|
380 | - * the browser is in use (including platform) |
|
381 | - */ |
|
378 | + /** |
|
379 | + * Protected routine to calculate and determine what |
|
380 | + * the browser is in use (including platform) |
|
381 | + */ |
|
382 | 382 | protected function determine() { |
383 | 383 | $this->checkPlatform(); |
384 | 384 | $this->checkBrowser(); |
@@ -389,4 +389,4 @@ discard block |
||
389 | 389 | $this->checkFacebook(); |
390 | 390 | } |
391 | 391 | |
392 | - } |
|
392 | + } |
@@ -170,7 +170,7 @@ |
||
170 | 170 | //by default count() return 1 if the parameter is not an array |
171 | 171 | //object or object implements Countable. |
172 | 172 | if (is_array($result) || is_object($result) || $result instanceof Countable) { |
173 | - $numRows = count($result); |
|
173 | + $numRows = count($result); |
|
174 | 174 | } |
175 | 175 | } else { |
176 | 176 | $numRows = $this->pdoStatment->rowCount(); |
@@ -45,7 +45,7 @@ |
||
45 | 45 | $attributes['accept-charset'] = get_config('charset', 'UTF-8'); |
46 | 46 | } |
47 | 47 | if (!empty($enctype)) { |
48 | - $attributes['enctype'] = $enctype; |
|
48 | + $attributes['enctype'] = $enctype; |
|
49 | 49 | } |
50 | 50 | $str .= attributes_to_string($attributes); |
51 | 51 | $str .= '>'; |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | $logger->debug('Check if the application contains the modules ...'); |
41 | 41 | $dirList = glob(MODULE_PATH . '*', GLOB_ONLYDIR); |
42 | 42 | if ($dirList !== false) { |
43 | - self::$list = array_map('basename', $dirList); |
|
43 | + self::$list = array_map('basename', $dirList); |
|
44 | 44 | } |
45 | 45 | if (!empty(self::$list)) { |
46 | 46 | $logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']'); |
@@ -57,8 +57,8 @@ discard block |
||
57 | 57 | public function add($name) { |
58 | 58 | $logger = self::getLogger(); |
59 | 59 | if (in_array($name, self::$list)) { |
60 | - $logger->info('The module [' .$name. '] already added skipping.'); |
|
61 | - return $this; |
|
60 | + $logger->info('The module [' .$name. '] already added skipping.'); |
|
61 | + return $this; |
|
62 | 62 | } |
63 | 63 | self::$list[] = $name; |
64 | 64 | return $this; |
@@ -88,10 +88,10 @@ discard block |
||
88 | 88 | self::$list = array(); |
89 | 89 | } |
90 | 90 | |
91 | - /** |
|
92 | - * Get the list of module loaded |
|
93 | - * @return array the module list |
|
94 | - */ |
|
91 | + /** |
|
92 | + * Get the list of module loaded |
|
93 | + * @return array the module list |
|
94 | + */ |
|
95 | 95 | public static function getModuleList() { |
96 | 96 | return self::$list; |
97 | 97 | } |
@@ -781,12 +781,12 @@ |
||
781 | 781 | * |
782 | 782 | * @return string|null |
783 | 783 | */ |
784 | - protected function buildQueryPart($property, $command = ''){ |
|
784 | + protected function buildQueryPart($property, $command = ''){ |
|
785 | 785 | if (!empty($this->{$property})) { |
786 | 786 | return $command . $this->{$property}; |
787 | 787 | } |
788 | 788 | return null; |
789 | - } |
|
789 | + } |
|
790 | 790 | |
791 | 791 | |
792 | 792 | /** |