@@ -1,32 +1,32 @@ |
||
1 | 1 | <?php |
2 | 2 | defined('ROOT_PATH') || exit('Access denied'); |
3 | - /** |
|
4 | - * TNH Framework |
|
5 | - * |
|
6 | - * A simple PHP framework using HMVC architecture |
|
7 | - * |
|
8 | - * This content is released under the MIT License (MIT) |
|
9 | - * |
|
10 | - * Copyright (c) 2017 TNH Framework |
|
11 | - * |
|
12 | - * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
13 | - * of this software and associated documentation files (the "Software"), to deal |
|
14 | - * in the Software without restriction, including without limitation the rights |
|
15 | - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
16 | - * copies of the Software, and to permit persons to whom the Software is |
|
17 | - * furnished to do so, subject to the following conditions: |
|
18 | - * |
|
19 | - * The above copyright notice and this permission notice shall be included in all |
|
20 | - * copies or substantial portions of the Software. |
|
21 | - * |
|
22 | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
23 | - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
24 | - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
25 | - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
26 | - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
27 | - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
|
28 | - * SOFTWARE. |
|
29 | - */ |
|
3 | + /** |
|
4 | + * TNH Framework |
|
5 | + * |
|
6 | + * A simple PHP framework using HMVC architecture |
|
7 | + * |
|
8 | + * This content is released under the MIT License (MIT) |
|
9 | + * |
|
10 | + * Copyright (c) 2017 TNH Framework |
|
11 | + * |
|
12 | + * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
13 | + * of this software and associated documentation files (the "Software"), to deal |
|
14 | + * in the Software without restriction, including without limitation the rights |
|
15 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
16 | + * copies of the Software, and to permit persons to whom the Software is |
|
17 | + * furnished to do so, subject to the following conditions: |
|
18 | + * |
|
19 | + * The above copyright notice and this permission notice shall be included in all |
|
20 | + * copies or substantial portions of the Software. |
|
21 | + * |
|
22 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
23 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
24 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
25 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
26 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
27 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
|
28 | + * SOFTWARE. |
|
29 | + */ |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * @file bootstrap.php |
@@ -48,7 +48,7 @@ |
||
48 | 48 | * @link http://github.com/eoghanobrien/php-simple-mail |
49 | 49 | */ |
50 | 50 | |
51 | - class Email extends BaseClass{ |
|
51 | + class Email extends BaseClass { |
|
52 | 52 | /** |
53 | 53 | * @var int $_wrap |
54 | 54 | */ |
@@ -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 $_browser_name = ''; |
94 | 94 | |
95 | 95 | /** |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | */ |
129 | 129 | private $_is_facebook = false; |
130 | 130 | |
131 | - /** |
|
131 | + /** |
|
132 | 132 | * Class constructor |
133 | 133 | */ |
134 | 134 | public function __construct($userAgent = '') { |
@@ -255,12 +255,12 @@ discard block |
||
255 | 255 | return $this->_is_facebook; |
256 | 256 | } |
257 | 257 | |
258 | - /** |
|
259 | - * Returns a formatted string with a summary of the details of the browser. |
|
260 | - * @codeCoverageIgnore |
|
261 | - * |
|
262 | - * @return string formatted string with a summary of the browser |
|
263 | - */ |
|
258 | + /** |
|
259 | + * Returns a formatted string with a summary of the details of the browser. |
|
260 | + * @codeCoverageIgnore |
|
261 | + * |
|
262 | + * @return string formatted string with a summary of the browser |
|
263 | + */ |
|
264 | 264 | public function __toString() { |
265 | 265 | return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" . |
266 | 266 | "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" . |
@@ -304,69 +304,69 @@ discard block |
||
304 | 304 | /** |
305 | 305 | * Determine the user's platform |
306 | 306 | */ |
307 | - protected function checkPlatform() { |
|
308 | - foreach ($this->_platforms as $regex => $value) { |
|
309 | - if (preg_match($regex, $this->_agent) ) { |
|
310 | - $this->setPlatform($value); |
|
311 | - break; |
|
312 | - } |
|
313 | - } |
|
314 | - } |
|
307 | + protected function checkPlatform() { |
|
308 | + foreach ($this->_platforms as $regex => $value) { |
|
309 | + if (preg_match($regex, $this->_agent) ) { |
|
310 | + $this->setPlatform($value); |
|
311 | + break; |
|
312 | + } |
|
313 | + } |
|
314 | + } |
|
315 | 315 | |
316 | - /** |
|
316 | + /** |
|
317 | 317 | * Routine to determine the browser type |
318 | 318 | */ |
319 | - protected function checkBrowser() { |
|
320 | - foreach ($this->_browsers as $regex => $value) { |
|
321 | - if (preg_match($regex, $this->_agent ) ) { |
|
322 | - $this->setBrowser($value); |
|
323 | - break; |
|
324 | - } |
|
325 | - } |
|
326 | - } |
|
319 | + protected function checkBrowser() { |
|
320 | + foreach ($this->_browsers as $regex => $value) { |
|
321 | + if (preg_match($regex, $this->_agent ) ) { |
|
322 | + $this->setBrowser($value); |
|
323 | + break; |
|
324 | + } |
|
325 | + } |
|
326 | + } |
|
327 | 327 | |
328 | - /** |
|
328 | + /** |
|
329 | 329 | * Routine to determine the browser version |
330 | 330 | */ |
331 | - protected function checkBrowserVersion(){ |
|
332 | - $detected = $this->getBrowser(); |
|
333 | - $d = array_search($detected, $this->_browsers); |
|
334 | - $browser = str_replace(array("/i","/"), "", $d); |
|
335 | - $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i"; |
|
336 | - if (preg_match_all($regex, $this->_agent, $matches)) { |
|
337 | - $found = array_search($browser, $matches["browser"]); |
|
338 | - $this->setVersion($matches["version"][$found]); |
|
339 | - } |
|
340 | - } |
|
341 | - |
|
342 | - /** |
|
331 | + protected function checkBrowserVersion(){ |
|
332 | + $detected = $this->getBrowser(); |
|
333 | + $d = array_search($detected, $this->_browsers); |
|
334 | + $browser = str_replace(array("/i","/"), "", $d); |
|
335 | + $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i"; |
|
336 | + if (preg_match_all($regex, $this->_agent, $matches)) { |
|
337 | + $found = array_search($browser, $matches["browser"]); |
|
338 | + $this->setVersion($matches["version"][$found]); |
|
339 | + } |
|
340 | + } |
|
341 | + |
|
342 | + /** |
|
343 | 343 | * Determine if the browser is Mobile or not |
344 | 344 | */ |
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) ) { |
|
347 | - $this->setMobile(true); |
|
348 | - } |
|
349 | - } |
|
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) ) { |
|
347 | + $this->setMobile(true); |
|
348 | + } |
|
349 | + } |
|
350 | 350 | |
351 | - /** |
|
351 | + /** |
|
352 | 352 | * Determine if the browser is Tablet or not |
353 | 353 | */ |
354 | - protected function checkTablet() { |
|
355 | - if (preg_match('/tablet|ipad/i', $this->_agent) ) { |
|
356 | - $this->setTablet(true); |
|
357 | - } |
|
358 | - } |
|
354 | + protected function checkTablet() { |
|
355 | + if (preg_match('/tablet|ipad/i', $this->_agent) ) { |
|
356 | + $this->setTablet(true); |
|
357 | + } |
|
358 | + } |
|
359 | 359 | |
360 | - /** |
|
360 | + /** |
|
361 | 361 | * Determine if the browser is Robot or not |
362 | 362 | */ |
363 | - protected function checkBot() { |
|
364 | - if (preg_match('/bot/i', $this->_agent) ) { |
|
365 | - $this->setRobot(true); |
|
366 | - } |
|
367 | - } |
|
363 | + protected function checkBot() { |
|
364 | + if (preg_match('/bot/i', $this->_agent) ) { |
|
365 | + $this->setRobot(true); |
|
366 | + } |
|
367 | + } |
|
368 | 368 | |
369 | - /** |
|
369 | + /** |
|
370 | 370 | * Detect if URL is loaded from FacebookExternalHit |
371 | 371 | */ |
372 | 372 | protected function checkFacebook() { |
@@ -379,10 +379,10 @@ discard block |
||
379 | 379 | } |
380 | 380 | |
381 | 381 | |
382 | - /** |
|
383 | - * Protected routine to calculate and determine what |
|
384 | - * the browser is in use (including platform) |
|
385 | - */ |
|
382 | + /** |
|
383 | + * Protected routine to calculate and determine what |
|
384 | + * the browser is in use (including platform) |
|
385 | + */ |
|
386 | 386 | protected function determine() { |
387 | 387 | $this->checkPlatform(); |
388 | 388 | $this->checkBrowser(); |
@@ -393,4 +393,4 @@ discard block |
||
393 | 393 | $this->checkFacebook(); |
394 | 394 | } |
395 | 395 | |
396 | - } |
|
396 | + } |
@@ -29,8 +29,8 @@ |
||
29 | 29 | */ |
30 | 30 | |
31 | 31 | /** |
32 | - * DB session handler model class |
|
33 | - */ |
|
32 | + * DB session handler model class |
|
33 | + */ |
|
34 | 34 | abstract class DBSessionHandlerModel extends Model { |
35 | 35 | |
36 | 36 | /** |