Passed
Branch 1.0.0-dev (a5e91d)
by nguereza
02:42
created
core/bootstrap.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -1,32 +1,32 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
core/libraries/Browser.php 1 patch
Indentation   +120 added lines, -120 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
393 393
             $this->checkFacebook();
394 394
         }
395 395
 		
396
-	}
396
+    }
Please login to merge, or discard this patch.
core/classes/model/DBSessionHandlerModel.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@
 block discarded – undo
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
         /**
Please login to merge, or discard this patch.
core/classes/database/DatabaseQueryRunner.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@  discard block
 block discarded – undo
30 30
     
31 31
     class DatabaseQueryRunner extends BaseClass {
32 32
 
33
-         /**
34
-         * The DatabaseConnection instance
35
-         * @var object
36
-         */
33
+            /**
34
+             * The DatabaseConnection instance
35
+             * @var object
36
+             */
37 37
         private $connection = null;
38 38
 
39 39
         /**
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
                 //by default count() return 1 if the parameter is not an array
187 187
                 //object or object implements Countable.
188 188
                 if (is_array($result) || is_object($result) || $result instanceof Countable) {
189
-                     $numRows = count($result);  
189
+                        $numRows = count($result);  
190 190
                 }
191 191
             } else {
192 192
                 $numRows = $this->pdoStatment->rowCount(); 
Please login to merge, or discard this patch.
core/classes/database/Database.php 1 patch
Indentation   +8 added lines, -9 removed lines patch added patch discarded remove patch
@@ -387,9 +387,9 @@  discard block
 block discarded – undo
387 387
                 $this->queryCount++;
388 388
                 
389 389
                 $queryResult = $this->queryRunner->setQuery($query)
390
-                                                 ->setReturnType($returnAsList)
391
-                                                 ->setReturnAsArray($returnAsArray)
392
-                                                 ->execute();
390
+                                                    ->setReturnType($returnAsList)
391
+                                                    ->setReturnAsArray($returnAsArray)
392
+                                                    ->execute();
393 393
 
394 394
                 if (is_object($queryResult)) {
395 395
                     $this->result  = $queryResult->getResult();
@@ -405,11 +405,11 @@  discard block
 block discarded – undo
405 405
             return $this->result;
406 406
         }
407 407
 
408
-         /**
409
-         * Set the connection instance using database configuration file
410
-         *
411
-         * @return object|void
412
-         */
408
+            /**
409
+             * Set the connection instance using database configuration file
410
+             *
411
+             * @return object|void
412
+             */
413 413
         protected function setConnectionUsingConfigFile(){
414 414
             $dbConfigFromFile = $this->getDatabaseConfigFromFile();
415 415
             $connection = &class_loader('DatabaseConnection', 'classes/database');
@@ -422,7 +422,6 @@  discard block
 block discarded – undo
422 422
 
423 423
         /**
424 424
          * Get the database configuration using the configuration file
425
-         
426 425
          * @return array the database configuration from file
427 426
          */
428 427
         protected function getDatabaseConfigFromFile() {
Please login to merge, or discard this patch.
core/classes/database/DatabaseConnection.php 1 patch
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -42,28 +42,28 @@  discard block
 block discarded – undo
42 42
          */
43 43
         private $driver = null;
44 44
 
45
-         /**
46
-         * The database hostname
47
-         * @var string
48
-         */
45
+            /**
46
+             * The database hostname
47
+             * @var string
48
+             */
49 49
         private $hostname = null;
50 50
 
51
-          /**
52
-         * The database port
53
-         * @var integer
54
-         */
51
+            /**
52
+             * The database port
53
+             * @var integer
54
+             */
55 55
         private $port = null;
56 56
         
57
-         /**
58
-         * The database username
59
-         * @var string
60
-         */
57
+            /**
58
+             * The database username
59
+             * @var string
60
+             */
61 61
         private $username = null;
62 62
 
63
-         /**
64
-         * The database password
65
-         * @var string
66
-         */
63
+            /**
64
+             * The database password
65
+             * @var string
66
+             */
67 67
         private $password = null;
68 68
 
69 69
         /**
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
          */
73 73
         private $databaseName = null;
74 74
 
75
-         /**
76
-         * The database charset
77
-         * @var string
78
-         */
75
+            /**
76
+             * The database charset
77
+             * @var string
78
+             */
79 79
         private $charset = null;
80 80
 
81 81
         /**
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
          */
85 85
         private $collation = null;
86 86
 
87
-         /**
88
-         * The database tables prefix
89
-         * @var string
90
-         */
87
+            /**
88
+             * The database tables prefix
89
+             * @var string
90
+             */
91 91
         private $prefix = null;
92 92
 
93 93
         /**
@@ -114,11 +114,11 @@  discard block
 block discarded – undo
114 114
             }
115 115
         }
116 116
 
117
-         /**
118
-         * This is method is used to connect to database
119
-         * 
120
-         * @return boolean true in case of successfully connection false if error
121
-         */
117
+            /**
118
+             * This is method is used to connect to database
119
+             * 
120
+             * @return boolean true in case of successfully connection false if error
121
+             */
122 122
         public function connect() {
123 123
             try {
124 124
                 $this->pdo = new PDO($this->getDsnValue(), $this->getUsername(), $this->getPassword());
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
             $this->populatePropertiesFromConfig();
410 410
 
411 411
             if (!empty($this->config)) {
412
-               //For logging
412
+                //For logging
413 413
                 $configInfo = $this->config;
414 414
                 //Hide password from log
415 415
                 $configInfo['password'] = string_hidden($this->getPassword());
@@ -418,11 +418,11 @@  discard block
 block discarded – undo
418 418
             return $this;
419 419
         }
420 420
 
421
-         /**
422
-         * Update the properties using the current database configuration
423
-         * 
424
-         * @return object the current instance
425
-         */
421
+            /**
422
+             * Update the properties using the current database configuration
423
+             * 
424
+             * @return object the current instance
425
+             */
426 426
         protected function populatePropertiesFromConfig() {
427 427
             foreach ($this->config as $key => $value) {
428 428
                 $setter = 'set' . ucfirst($key);
Please login to merge, or discard this patch.
core/classes/database/DatabaseQueryBuilder.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@  discard block
 block discarded – undo
30 30
     
31 31
     class DatabaseQueryBuilder {
32 32
 
33
-         /**
34
-         * The DatabaseConnection instance
35
-         * @var object
36
-         */
33
+            /**
34
+             * The DatabaseConnection instance
35
+             * @var object
36
+             */
37 37
         private $connection = null;
38 38
 
39 39
         /**
@@ -727,12 +727,12 @@  discard block
 block discarded – undo
727 727
          * 
728 728
          * @return string|null
729 729
          */
730
-         protected function buildQueryPart($property, $command = ''){
730
+            protected function buildQueryPart($property, $command = ''){
731 731
             if (!empty($this->{$property})) {
732 732
                 return $command . $this->{$property};
733 733
             }
734 734
             return null;
735
-         }
735
+            }
736 736
 
737 737
 
738 738
         /**
Please login to merge, or discard this patch.
core/classes/database/DatabaseCache.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -208,7 +208,7 @@
 block discarded – undo
208 208
             //If is the SELECT query
209 209
             $this->isSelectQuery = stristr($this->query, 'SELECT') !== false;
210 210
 
211
-             //if can use cache feature for this query
211
+                //if can use cache feature for this query
212 212
             $this->dbCacheStatus = get_config('cache_enable', false) && $this->cacheTtl > 0;
213 213
         }
214 214
         
Please login to merge, or discard this patch.
core/libraries/FormValidation.php 1 patch
Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -133,11 +133,11 @@  discard block
 block discarded – undo
133 133
             }
134 134
         }
135 135
 
136
-         /**
137
-         * Reset the form validation instance
138
-         *
139
-         * @return object the current instance
140
-         */
136
+            /**
137
+             * Reset the form validation instance
138
+             *
139
+             * @return object the current instance
140
+             */
141 141
         public function reset() {
142 142
             $this->rules        = array();
143 143
             $this->labels       = array();
@@ -160,11 +160,11 @@  discard block
 block discarded – undo
160 160
             return $this;
161 161
         }
162 162
 
163
-         /**
164
-         * Return the validation data
165
-         * 
166
-         * @return array the validation data
167
-         */
163
+            /**
164
+             * Return the validation data
165
+             * 
166
+             * @return array the validation data
167
+             */
168 168
         public function getData() {
169 169
             return $this->data;
170 170
         }
@@ -213,11 +213,11 @@  discard block
 block discarded – undo
213 213
             return $this->rules;
214 214
         }
215 215
 
216
-         /**
217
-         * Return the list of the validations rules for the given field
218
-         * 
219
-         * @return array
220
-         */
216
+            /**
217
+             * Return the list of the validations rules for the given field
218
+             * 
219
+             * @return array
220
+             */
221 221
         public function getFieldRules($field) {
222 222
             $rules = array();
223 223
             if (array_key_exists($field, $this->rules)) {
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
          * @return string|null
234 234
          */
235 235
         public function getFieldValue($field) {
236
-             $value = null;
236
+                $value = null;
237 237
             if (array_key_exists($field, $this->data)) {
238 238
                 $value = $this->data[$field];
239 239
             }
@@ -255,15 +255,15 @@  discard block
 block discarded – undo
255 255
         }
256 256
             
257 257
         
258
-       /**
259
-        * Return the list of validation errors
260
-        * 
261
-        * @return array the errors list. 
262
-        * Format:
263
-        *  [field1] => 'error message 1', 
264
-        *  [field2] => 'error message 2' 
265
-        */
266
-       public function getErrors() {
258
+        /**
259
+         * Return the list of validation errors
260
+         * 
261
+         * @return array the errors list. 
262
+         * Format:
263
+         *  [field1] => 'error message 1', 
264
+         *  [field2] => 'error message 2' 
265
+         */
266
+        public function getErrors() {
267 267
             return $this->errors;
268 268
         }
269 269
 
@@ -346,11 +346,11 @@  discard block
 block discarded – undo
346 346
             return $this;
347 347
         }
348 348
 
349
-         /**
350
-         * Set the database instance using get_instance() if is null
351
-         *
352
-         * @return object the current instance
353
-         */
349
+            /**
350
+             * Set the database instance using get_instance() if is null
351
+             *
352
+             * @return object the current instance
353
+             */
354 354
         protected function setDatabaseFromSuperInstanceIfNotSet() {
355 355
             if (!is_object($this->database)) {
356 356
                 $this->database = get_instance()->database;
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
          * @param string|null $field2     the second field used in some validation rule like "matches", "not_equal"
388 388
          *
389 389
          */
390
-         protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) {
390
+            protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) {
391 391
             //if the field is not required and his value is not set don't set error
392 392
             //but in case the field have value validate it
393 393
             if (!$this->fieldIsRequired($field) && strlen($value) <= 0) {
@@ -413,9 +413,9 @@  discard block
 block discarded – undo
413 413
          * @return string       the name of the validation method
414 414
          */
415 415
         protected function getRuleValidationMethod($rule) {
416
-             $parts = explode('_', $rule);
417
-             $parts = array_map('ucfirst', $parts);
418
-             return 'checkRule' . implode('', $parts);
416
+                $parts = explode('_', $rule);
417
+                $parts = array_map('ucfirst', $parts);
418
+                return 'checkRule' . implode('', $parts);
419 419
         }
420 420
         
421 421
         /**
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
         protected function filterValidationData() {
427 427
             foreach ($this->data as $key => $value ) {
428 428
                 if (is_array($value)) {
429
-                   $this->data[$key] = array_map('trim', $value);
429
+                    $this->data[$key] = array_map('trim', $value);
430 430
                 } else {
431 431
                     $this->data[$key] = trim($value);
432 432
                 }
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
                 $template['field2}']  = $field2;
474 474
                 $template['{value2}'] = $this->getFieldValue($field2);
475 475
                 $template['{label2}'] = $this->getFieldLabel($field2);
476
-             }     
476
+                }     
477 477
             $message = $this->messages[$rule];
478 478
             //Check for custom message
479 479
             if (isset($this->customErrors[$field][$rule])) {
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
                 //Get the name of the method to validate this rule
505 505
                 $method = $this->getRuleValidationMethod($realRuleName);
506 506
                 if (method_exists($this, $method)) {
507
-                       call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue));
507
+                        call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue));
508 508
                 } else {
509 509
                     $this->forceError = true;
510 510
                     show_error('Invalid validaton rule "' . $realRuleName . '"');
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
          * @param  string|null  $paramValue  the rule parameter
598 598
          */ 
599 599
         protected function checkRuleMinLength($field, $rule, $paramValue) {
600
-           $value = $this->getFieldValue($field);    
600
+            $value = $this->getFieldValue($field);    
601 601
             if (strlen($value) < $paramValue) {
602 602
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
603 603
             }
@@ -611,7 +611,7 @@  discard block
 block discarded – undo
611 611
          * @param  string|null  $paramValue  the rule parameter
612 612
          */
613 613
         protected function checkRuleMaxLength($field, $rule, $paramValue) {
614
-           $value = $this->getFieldValue($field);    
614
+            $value = $this->getFieldValue($field);    
615 615
             if (strlen($value) > $paramValue) {
616 616
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
617 617
             }
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
          * @param  string|null  $paramValue  the rule parameter
626 626
          */
627 627
         protected function checkRuleExactLength($field, $rule, $paramValue) {
628
-           $value = $this->getFieldValue($field);    
628
+            $value = $this->getFieldValue($field);    
629 629
             if (strlen($value) != $paramValue) {
630 630
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
631 631
             }
@@ -732,7 +732,7 @@  discard block
 block discarded – undo
732 732
         protected function checkRuleNumeric($field, $rule, $paramValue) {
733 733
             $value = $this->getFieldValue($field);    
734 734
             if (!is_numeric($value)) {
735
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
735
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
736 736
             }
737 737
         }
738 738
 
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
         protected function checkRuleInteger($field, $rule, $paramValue) {
747 747
             $value = $this->getFieldValue($field);    
748 748
             if (filter_var($value, FILTER_VALIDATE_INT) === false) {
749
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
749
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
750 750
             }
751 751
         }
752 752
 
@@ -760,7 +760,7 @@  discard block
 block discarded – undo
760 760
         protected function checkRuleIntegerNatural($field, $rule, $paramValue) {
761 761
             $value = $this->getFieldValue($field);    
762 762
             if (filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0) {
763
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
763
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
764 764
             }
765 765
         }
766 766
 
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
847 847
             $format = $paramValue;
848 848
             $dateValue = date_create_from_format($format, $value);    
849 849
             if ($dateValue === false || $dateValue->format($format) !== $value) {
850
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
850
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
851 851
             }
852 852
         }
853 853
 
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
         protected function checkRuleUrl($field, $rule, $paramValue) {
892 892
             $value = $this->getFieldValue($field);    
893 893
             if (filter_var($value, FILTER_VALIDATE_URL) === false) {
894
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
894
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
895 895
             }
896 896
         }
897 897
 
@@ -906,7 +906,7 @@  discard block
 block discarded – undo
906 906
         protected function checkRuleIp($field, $rule, $paramValue) {
907 907
             $value = $this->getFieldValue($field);    
908 908
             if (filter_var($value, FILTER_VALIDATE_IP) === false) {
909
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
909
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
910 910
             }
911 911
         }
912 912
 
@@ -951,7 +951,7 @@  discard block
 block discarded – undo
951 951
             $value = $this->getFieldValue($field);    
952 952
             list($table, $column) = explode('.', $paramValue);
953 953
             $this->database->getQueryBuilder()->from($table)
954
-                                              ->where($column, $value);
954
+                                                ->where($column, $value);
955 955
             $this->database->get();
956 956
             if ($this->database->numRows() > 0) {
957 957
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
@@ -973,8 +973,8 @@  discard block
 block discarded – undo
973 973
             list($table, $column) = explode('.', $data[0]);
974 974
             list($columnKey, $valueKey) = explode('=', $data[1]);
975 975
             $this->database->getQueryBuilder()->from($table)
976
-                                              ->where($column, $value)
977
-                                              ->where($columnKey, '!=', trim($valueKey));
976
+                                                ->where($column, $value)
977
+                                                ->where($columnKey, '!=', trim($valueKey));
978 978
             $this->database->get();
979 979
             if ($this->database->numRows() > 0) {
980 980
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
@@ -994,7 +994,7 @@  discard block
 block discarded – undo
994 994
             $value = $this->getFieldValue($field);    
995 995
             list($table, $column) = explode('.', $paramValue);
996 996
             $this->database->getQueryBuilder()->from($table)
997
-                                              ->where($column, $value);
997
+                                                ->where($column, $value);
998 998
             $this->database->get();
999 999
             if ($this->database->numRows() <= 0) {
1000 1000
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
Please login to merge, or discard this patch.