tnhfw / tnh-fw

core/classes/database/DatabaseCache.php

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
         public function getCacheContent() {
             //set some attributes values
             $this->setPropertiesValues();
-            if (! $this->canUseCache()) {
+            if (!$this->canUseCache()) {
                 $this->logger->info('The cache is not enabled for this query or is not a SELECT query'); 
                 return null;
             }
@@ -178,7 +178,7 @@ 
         public function saveCacheContent($result) {
             //set some attributes values
             $this->setPropertiesValues();
-            if (! $this->canUseCache()) {
+            if (!$this->canUseCache()) {
                 $this->logger->info('The cache is not enabled for this query or is not a SELECT query'); 
                 return null;
             }

core/libraries/Email.php

Indentation +23 added lines, -23 removed lines

@@ -395,7 +395,7 @@ 
             $addresses = array();
             foreach ($pairs as $name => $email) {
                 if (is_numeric($name)) {
-                   $name = null;
+                    $name = null;
                 }
                 $addresses[] = $this->formatHeader($email, $name);
             }
@@ -837,10 +837,10 @@ 
             return $headers;
         }
 
-         /**
-         * Get the attachment message for send or the simple message
-         * @return string
-         */
+            /**
+             * Get the attachment message for send or the simple message
+             * @return string
+             */
         protected function getMessageWithAttachmentForSend() {
             $message = $this->getWrapMessage();
             if ($this->hasAttachments()) {
@@ -870,7 +870,7 @@ 
          */
         protected function sendHelloCommand() {
             $responseCode = $this->sendCommand('EHLO ' . $this->getSmtpClientHostname())
-                                 ->getSmtpResponseCode();
+                                    ->getSmtpResponseCode();
             if ($responseCode !== 250) {
                 $this->error = $this->smtpResponse;
                 return false;
@@ -1017,7 +1017,7 @@ 
             $message = $this->getMessageWithAttachmentForSend();
             $headers = $this->getHeadersForSend(); 
             $this->logger->info('Sending new mail using mail protocol, the information are listed below: '
-                                  . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
+                                    . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
             $result = mail($to, $this->subject, $message, $headers, $this->params);
             if (!$result) {
                 $this->error = 'Error when sending mail using mail protocol';
@@ -1025,10 +1025,10 @@ 
             return $result;
         }
 
-         /**
-         * Send mail using "smtp" protocol
-         * @return boolean
-         */
+            /**
+             * Send mail using "smtp" protocol
+             * @return boolean
+             */
         protected function sendSmtp() {
             if (!$this->smtpConnection()) {
                 return false;
@@ -1048,7 +1048,7 @@ 
             $message = $this->getMessageWithAttachmentForSend();
             $headers = $this->getHeadersForSend();
             $this->logger->info('Sending new mail using SMTP protocol, the information are listed below: '
-                                  . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
+                                    . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
             
             $recipients = array_merge($this->to, $this->cc, $this->bcc);
             $commands = array(
@@ -1081,17 +1081,17 @@ 
             return empty($this->error);
         }
 
-         /**
-         * Return the client hostname for SMTP
-         * 
-         * There are only two legal types of hostname - either a fully
-         * qualified domain name (eg: "mail.example.com") or an IP literal
-         * (eg: "[1.2.3.4]").
-         *
-         * @link    https://tools.ietf.org/html/rfc5321#section-2.3.5
-         * @link    http://cbl.abuseat.org/namingproblems.html
-         * @return string
-         */
+            /**
+             * Return the client hostname for SMTP
+             * 
+             * There are only two legal types of hostname - either a fully
+             * qualified domain name (eg: "mail.example.com") or an IP literal
+             * (eg: "[1.2.3.4]").
+             *
+             * @link    https://tools.ietf.org/html/rfc5321#section-2.3.5
+             * @link    http://cbl.abuseat.org/namingproblems.html
+             * @return string
+             */
         protected function getSmtpClientHostname() {
             $globals = &class_loader('GlobalVar', 'classes');
             if ($globals->server('SERVER_NAME')) {

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
      * SOFTWARE.
      */
 
-    class Email extends BaseClass{
+    class Email extends BaseClass {
         /**
          * @var int $wrap
          */
@@ -845,7 +845,7 @@ 
             $message = $this->getWrapMessage();
             if ($this->hasAttachments()) {
                 $this->setAttachmentHeaders();
-                $message  = $this->assembleAttachmentBody();
+                $message = $this->assembleAttachmentBody();
             }
             return $message;
         }
@@ -925,7 +925,7 @@ 
                                         $this->getSmtpConfig('connection_timeout', 30)
                                     );
 
-            if (! is_resource($this->smtpSocket)) {
+            if (!is_resource($this->smtpSocket)) {
                 $this->error = $errorNumber . ': ' . $errorMessage;
                 return false;
             }
@@ -974,7 +974,7 @@ 
                      */
                     if (is_resource($this->smtpSocket)) {
                         $method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
-                        if(version_compare(PHP_VERSION, '5.6', '>=')) {
+                        if (version_compare(PHP_VERSION, '5.6', '>=')) {
                             $method = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
                         }
                         stream_socket_enable_crypto($this->smtpSocket, true, $method);
@@ -1041,7 +1041,7 @@ 
                 'To' => $to
             );
             foreach ($additionalHeaders as $key => $value) {
-                if (! isset($this->headers[$key])) {
+                if (!isset($this->headers[$key])) {
                     $this->headers[$key] = $value;
                 }
             }

core/libraries/Assets.php

Indentation +4 added lines, -4 removed lines

@@ -44,9 +44,9 @@ 
      */
     class Assets extends BaseClass {
 
-         /**
-         * Construct new instance
-         */
+            /**
+             * Construct new instance
+             */
         public function __construct() {
             parent::__construct();
         }
@@ -95,7 +95,7 @@ 
          * @see Assets:link
          */
         public function css($path) {
-           return $this->link($path, 'css');
+            return $this->link($path, 'css');
         }
 
         /**

core/libraries/Pagination.php

Indentation +9 added lines, -9 removed lines

@@ -90,10 +90,10 @@ 
         }
 
         /**
-        * Set the value of the pagination query string
-        * @param string $pQueryString the new value
-        * @return object
-        */
+         * Set the value of the pagination query string
+         * @param string $pQueryString the new value
+         * @return object
+         */
         public function setPaginationQueryString($pQueryString) {
             $this->paginationQueryString = $pQueryString;
             return $this;
@@ -244,15 +244,15 @@ 
                 }
             }
             $navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' 
-                       . $this->config['next_text'] . '</a>' . $this->config['next_close'];
+                        . $this->config['next_text'] . '</a>' . $this->config['next_close'];
             return $navbar;
         }
 
 
-         /**
-         * Build the pagination link for the first page
-         * @see Pagination::buildPaginationLinkForFirstAndLastPage
-         */
+            /**
+             * Build the pagination link for the first page
+             * @see Pagination::buildPaginationLinkForFirstAndLastPage
+             */
         protected function buildPaginationLinkForFirstPage($begin, $end, $currentPageNumber) {
             return $this->buildPaginationLinkForFirstAndLastPage($begin, $end, $currentPageNumber, 'first');
         }

core/libraries/FormValidation.php

Indentation +208 added lines, -208 removed lines

@@ -133,11 +133,11 @@ 
             }
         }
 
-         /**
-         * Reset the form validation instance
-         *
-         * @return object the current instance
-         */
+            /**
+             * Reset the form validation instance
+             *
+             * @return object the current instance
+             */
         public function reset() {
             $this->rules        = array();
             $this->labels       = array();
@@ -161,11 +161,11 @@ 
             return $this;
         }
 
-         /**
-         * Return the validation data
-         * 
-         * @return array the validation data
-         */
+            /**
+             * Return the validation data
+             * 
+             * @return array the validation data
+             */
         public function getData() {
             return $this->data;
         }
@@ -214,11 +214,11 @@ 
             return $this->rules;
         }
 
-         /**
-         * Return the list of the validations rules for the given field
-         * 
-         * @return array
-         */
+            /**
+             * Return the list of the validations rules for the given field
+             * 
+             * @return array
+             */
         public function getFieldRules($field) {
             $rules = array();
             if (array_key_exists($field, $this->rules)) {
@@ -234,7 +234,7 @@ 
          * @return string|null
          */
         public function getFieldValue($field) {
-             $value = null;
+                $value = null;
             if (array_key_exists($field, $this->data)) {
                 $value = $this->data[$field];
             }
@@ -256,15 +256,15 @@ 
         }
             
         
-       /**
-        * Return the list of validation errors
-        * 
-        * @return array the errors list. 
-        * Format:
-        *  [field1] => 'error message 1', 
-        *  [field2] => 'error message 2' 
-        */
-       public function getErrors() {
+        /**
+         * Return the list of validation errors
+         * 
+         * @return array the errors list. 
+         * Format:
+         *  [field1] => 'error message 1', 
+         *  [field2] => 'error message 2' 
+         */
+        public function getErrors() {
             return $this->errors;
         }
 
@@ -347,11 +347,11 @@ 
             return $this;
         }
 
-         /**
-         * Set the database instance using get_instance() if is null
-         *
-         * @return object the current instance
-         */
+            /**
+             * Set the database instance using get_instance() if is null
+             *
+             * @return object the current instance
+             */
         protected function setDatabaseFromSuperInstanceIfNotSet() {
             if (!is_object($this->database)) {
                 $this->database = get_instance()->database;
@@ -388,7 +388,7 @@ 
          * @param string|null $field2     the second field used in some validation rule like "matches", "not_equal"
          *
          */
-         protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) {
+            protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) {
             //if the field is not required and his value is not set don't set error
             //but in case the field have value validate it
             if (!$this->fieldIsRequired($field) && strlen($value) <= 0) {
@@ -432,9 +432,9 @@ 
          * @return string       the name of the validation method
          */
         protected function getRuleValidationMethod($rule) {
-             $parts = explode('_', $rule);
-             $parts = array_map('ucfirst', $parts);
-             return 'checkRule' . implode('', $parts);
+                $parts = explode('_', $rule);
+                $parts = array_map('ucfirst', $parts);
+                return 'checkRule' . implode('', $parts);
         }
         
         /**
@@ -445,7 +445,7 @@ 
         protected function filterValidationData() {
             foreach ($this->data as $key => $value ) {
                 if (is_string($value)) {
-                   $this->data[$key] = trim($value);
+                    $this->data[$key] = trim($value);
                 } else if(is_array($value)) {
                     $this->data[$key] = array_map('trim', $value);
                 }
@@ -492,7 +492,7 @@ 
                 $template['field2}']  = $field2;
                 $template['{value2}'] = $this->getFieldValue($field2);
                 $template['{label2}'] = $this->getFieldLabel($field2);
-             }     
+                }     
             $message = $this->messages[$rule];
             //Check for custom message
             if (isset($this->customErrors[$field][$rule])) {
@@ -523,7 +523,7 @@ 
                 //Get the name of the method to validate this rule
                 $method = $this->getRuleValidationMethod($realRuleName);
                 if (method_exists($this, $method)) {
-                       call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue));
+                        call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue));
                 } else {
                     $this->forceError = true;
                     show_error('Invalid validaton rule "' . $realRuleName . '"');
@@ -615,14 +615,14 @@ 
          * @param  string|null  $paramValue  the rule parameter
          */ 
         protected function checkRuleMinLength($field, $rule, $paramValue) {
-           $value = $this->getFieldValue($field);  
-           $this->setSmpleFieldError(
-                                     strlen($value) < $paramValue, 
-                                     $field, 
-                                     $value, 
-                                     $rule, 
-                                     $paramValue
-                                 );
+            $value = $this->getFieldValue($field);  
+            $this->setSmpleFieldError(
+                                        strlen($value) < $paramValue, 
+                                        $field, 
+                                        $value, 
+                                        $rule, 
+                                        $paramValue
+                                    );
         }
 
         /**
@@ -633,14 +633,14 @@ 
          * @param  string|null  $paramValue  the rule parameter
          */
         protected function checkRuleMaxLength($field, $rule, $paramValue) {
-           $value = $this->getFieldValue($field);
-           $this->setSmpleFieldError(
-                                     strlen($value) > $paramValue, 
-                                     $field, 
-                                     $value, 
-                                     $rule, 
-                                     $paramValue
-                                 );
+            $value = $this->getFieldValue($field);
+            $this->setSmpleFieldError(
+                                        strlen($value) > $paramValue, 
+                                        $field, 
+                                        $value, 
+                                        $rule, 
+                                        $paramValue
+                                    );
         }
 
         /**
@@ -651,14 +651,14 @@ 
          * @param  string|null  $paramValue  the rule parameter
          */
         protected function checkRuleExactLength($field, $rule, $paramValue) {
-           $value = $this->getFieldValue($field);
-           $this->setSmpleFieldError(
-                                     strlen($value) != $paramValue, 
-                                     $field, 
-                                     $value, 
-                                     $rule, 
-                                     $paramValue
-                                 );
+            $value = $this->getFieldValue($field);
+            $this->setSmpleFieldError(
+                                        strlen($value) != $paramValue, 
+                                        $field, 
+                                        $value, 
+                                        $rule, 
+                                        $paramValue
+                                    );
         }
 
         /**
@@ -671,13 +671,13 @@ 
         protected function checkRuleMatches($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             $this->setSmpleFieldError(
-                                     $value != $this->getFieldValue($paramValue), 
-                                     $field, 
-                                     $value, 
-                                     $rule, 
-                                     $paramValue,
-                                     $paramValue //field2
-                                 );
+                                        $value != $this->getFieldValue($paramValue), 
+                                        $field, 
+                                        $value, 
+                                        $rule, 
+                                        $paramValue,
+                                        $paramValue //field2
+                                    );
         }
 
         /**
@@ -690,13 +690,13 @@ 
         protected function checkRuleNotEqual($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             $this->setSmpleFieldError(
-                                     $value == $this->getFieldValue($paramValue), 
-                                     $field, 
-                                     $value, 
-                                     $rule, 
-                                     $paramValue,
-                                     $paramValue //field2
-                                 );
+                                        $value == $this->getFieldValue($paramValue), 
+                                        $field, 
+                                        $value, 
+                                        $rule, 
+                                        $paramValue,
+                                        $paramValue //field2
+                                    );
         }
 
         /**
@@ -709,12 +709,12 @@ 
         protected function checkRuleMin($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);  
             $this->setSmpleFieldError(
-                                 $value < $paramValue, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    $value < $paramValue, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -727,12 +727,12 @@ 
         protected function checkRuleMax($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field); 
             $this->setSmpleFieldError(
-                                 $value > $paramValue, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    $value > $paramValue, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -748,12 +748,12 @@ 
             $betweens = explode(',', $paramValue, 2);
             $betweens = array_map('trim', $betweens);
             $this->setSmpleFieldError(
-                                 ($value < $betweens[0]) || ($value > $betweens[1]), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    ($value < $betweens[0]) || ($value > $betweens[1]), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -770,12 +770,12 @@ 
             $list = array_map('trim', $list);
             $paramValue = implode(',', $list);
             $this->setSmpleFieldError(
-                                 !in_array($value, $list), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             ); 
+                                    !in_array($value, $list), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                ); 
         }
 
         /**
@@ -788,12 +788,12 @@ 
         protected function checkRuleNumeric($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             $this->setSmpleFieldError(
-                                 !is_numeric($value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    !is_numeric($value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -805,13 +805,13 @@ 
          */
         protected function checkRuleInteger($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);  
-             $this->setSmpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_INT) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                $this->setSmpleFieldError(
+                                    filter_var($value, FILTER_VALIDATE_INT) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -824,12 +824,12 @@ 
         protected function checkRuleIntegerNatural($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSmpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -842,12 +842,12 @@ 
         protected function checkRuleAlpha($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSmpleFieldError(
-                                 !preg_match('/^[\pL\pM\s]+$/u', $value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    !preg_match('/^[\pL\pM\s]+$/u', $value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -860,12 +860,12 @@ 
         protected function checkRuleAlphaDash($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSmpleFieldError(
-                                 !preg_match('/^[\pL\pM_-]+$/u', $value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    !preg_match('/^[\pL\pM_-]+$/u', $value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -878,12 +878,12 @@ 
         protected function checkRuleAlnum($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSmpleFieldError(
-                                 !preg_match('/^[\pL\pM\pN\s]+$/u', $value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    !preg_match('/^[\pL\pM\pN\s]+$/u', $value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -896,12 +896,12 @@ 
         protected function checkRuleAlnumDash($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSmpleFieldError(
-                                 !preg_match('/^[\pL\pM\pN_-]+$/u', $value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    !preg_match('/^[\pL\pM\pN_-]+$/u', $value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -914,12 +914,12 @@ 
         protected function checkRuleEmail($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field); 
             $this->setSmpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_EMAIL) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_EMAIL) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -935,12 +935,12 @@ 
             $format = $paramValue;
             $dateValue = date_create_from_format($format, $value);  
             $this->setSmpleFieldError(
-                                 $dateValue === false || $dateValue->format($format) !== $value, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    $dateValue === false || $dateValue->format($format) !== $value, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -953,13 +953,13 @@ 
          */
         protected function checkRuleDateBefore($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
-             $this->setSmpleFieldError(
-                                 strtotime($value) >= strtotime($paramValue), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                $this->setSmpleFieldError(
+                                    strtotime($value) >= strtotime($paramValue), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -973,12 +973,12 @@ 
         protected function checkRuleDateAfter($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSmpleFieldError(
-                                 strtotime($value) <= strtotime($paramValue), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    strtotime($value) <= strtotime($paramValue), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -991,12 +991,12 @@ 
         protected function checkRuleUrl($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSmpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_URL) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_URL) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -1010,12 +1010,12 @@ 
         protected function checkRuleIp($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);   
             $this->setSmpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_IP) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_IP) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -1028,12 +1028,12 @@ 
         protected function checkRuleIpv4($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);  
             $this->setSmpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -1046,12 +1046,12 @@ 
         protected function checkRuleIpv6($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);   
             $this->setSmpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -1067,7 +1067,7 @@ 
             $value = $this->getFieldValue($field);    
             list($table, $column) = explode('.', $paramValue);
             $this->database->getQueryBuilder()->from($table)
-                                              ->where($column, $value);
+                                                ->where($column, $value);
             $this->database->get();
             if ($this->database->numRows() > 0) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
@@ -1089,8 +1089,8 @@ 
             list($table, $column) = explode('.', $data[0]);
             list($columnKey, $valueKey) = explode('=', $data[1]);
             $this->database->getQueryBuilder()->from($table)
-                                              ->where($column, $value)
-                                              ->where($columnKey, '!=', trim($valueKey));
+                                                ->where($column, $value)
+                                                ->where($columnKey, '!=', trim($valueKey));
             $this->database->get();
             if ($this->database->numRows() > 0) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
@@ -1110,7 +1110,7 @@ 
             $value = $this->getFieldValue($field);    
             list($table, $column) = explode('.', $paramValue);
             $this->database->getQueryBuilder()->from($table)
-                                              ->where($column, $value);
+                                                ->where($column, $value);
             $this->database->get();
             if ($this->database->numRows() <= 0) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
@@ -1127,13 +1127,13 @@ 
          */
         protected function checkRuleRegex($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
-             $this->setSmpleFieldError(
-                                 !preg_match($paramValue, $value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );       
+                $this->setSmpleFieldError(
+                                    !preg_match($paramValue, $value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );       
         }
 
         /**
@@ -1155,12 +1155,12 @@ 
             $value = $this->getFieldValue($field);    
             if (is_callable($paramValue)) {
                 $this->setSmpleFieldError(
-                                 call_user_func_array($paramValue, array($value)) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             ); 
+                                    call_user_func_array($paramValue, array($value)) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                ); 
             } else{
                 $this->forceError = true;
                 show_error('The callback validation function/method "' . $paramValue . '" does not exist');

Spacing +3 added lines, -3 removed lines

@@ -443,10 +443,10 @@ 
          * @return object the current instance
          */
         protected function filterValidationData() {
-            foreach ($this->data as $key => $value ) {
+            foreach ($this->data as $key => $value) {
                 if (is_string($value)) {
                    $this->data[$key] = trim($value);
-                } else if(is_array($value)) {
+                } else if (is_array($value)) {
                     $this->data[$key] = array_map('trim', $value);
                 }
             }
@@ -1161,7 +1161,7 @@ 
                                  $rule, 
                                  $paramValue
                              ); 
-            } else{
+            } else {
                 $this->forceError = true;
                 show_error('The callback validation function/method "' . $paramValue . '" does not exist');
             }

core/libraries/Upload.php

Indentation +48 added lines, -48 removed lines

@@ -277,10 +277,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the uploade file array
-         *    @return    array
-         */
+            /**
+             *    Get the uploade file array
+             *    @return    array
+             */
         public function getUploadedFileData() {
             return $this->uploadedFileData;
         }
@@ -320,10 +320,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the filename
-         *    @return    string
-         */
+            /**
+             *    Get the filename
+             *    @return    string
+             */
         public function getFilename() {
             return $this->filename;
         }
@@ -352,23 +352,23 @@ 
             return $this;
         }
 
-         /**
-         *    Get the max file size
-         *    @return    double|int
-         */
+            /**
+             *    Get the max file size
+             *    @return    double|int
+             */
         public function getMaxFileSize() {
             return $this->maxFileSize;
         }
 
-         /**
-         *    Append a mime type to allowed mime types
-         *
-         *    @since     1.0
-         *    @version   1.0.1
-         *    @param     string      $mime
-         *    @return    object
-         *    @method    boolean     setAllowMimeType
-         */
+            /**
+             *    Append a mime type to allowed mime types
+             *
+             *    @since     1.0
+             *    @version   1.0.1
+             *    @param     string      $mime
+             *    @return    object
+             *    @method    boolean     setAllowMimeType
+             */
         public function setAllowMimeType($mime) {
             $this->allowedMimeTypes[] = strtolower($mime);
             $this->file['allowed_mime_types'][] = strtolower($mime); 
@@ -485,10 +485,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the upload function name like "copy", "move_uploaded_file"
-         *    @return    string
-         */
+            /**
+             *    Get the upload function name like "copy", "move_uploaded_file"
+             *    @return    string
+             */
         public function getUploadFunction() {
             return $this->uploadFunction;
         }
@@ -506,10 +506,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the allow overwriting
-         *    @return    boolean
-         */
+            /**
+             *    Get the allow overwriting
+             *    @return    boolean
+             */
         public function isAllowOverwriting() {
             return $this->overwriteFile ;
         }
@@ -614,14 +614,14 @@ 
             return $this->error;
         }
 
-         /**
-         *    Retrive status of upload
-         *
-         *    @since     1.0
-         *    @version   1.0
-         *    @return    boolean
-         *    @method    boolean    getStatus
-         */
+            /**
+             *    Retrive status of upload
+             *
+             *    @since     1.0
+             *    @version   1.0
+             *    @return    boolean
+             *    @method    boolean    getStatus
+             */
         public function getStatus() {
             return $this->file['status'];
         }
@@ -654,11 +654,11 @@ 
                                 && is_file($file);
         }
 
-         /**
-         * Set the filename if is empty using the uploaded data information
-         *
-         * @return object the current instance
-         */
+            /**
+             * Set the filename if is empty using the uploaded data information
+             *
+             * @return object the current instance
+             */
         protected function setFilenameUsingUploadedData() {
             // set original filename if not have a new name
             if (empty($this->filename)) {
@@ -742,12 +742,12 @@ 
             return $this->maxFileSize >= $size;
         }
 
-         /**
-         *    Check the file overwritting
-         *    @since     1.0
-         *    @version   1.0
-         *    @return    boolean
-         */
+            /**
+             *    Check the file overwritting
+             *    @since     1.0
+             *    @version   1.0
+             *    @return    boolean
+             */
         protected function checkFileOverwritting() {
             if ($this->fileExists($this->destinationDirectory . $this->filename)) {
                 return $this->overwriteFile;

core/libraries/Browser.php

Indentation +122 added lines, -122 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
+    defined('ROOT_PATH') || exit('Access denied');
     /**
      * TNH Framework
      *
@@ -28,68 +28,68 @@ 
      * SOFTWARE.
      */
     
-	class Browser {
-
-		/**
-		 * List of know platforms
-		 * @var array
-		 */
-		private $platforms = array(
-									'/windows nt 10/i'      =>  'Windows 10',
-									'/windows phone 10/i'   =>  'Windows Phone 10',
-									'/windows phone 8.1/i'  =>  'Windows Phone 8.1',
-									'/windows phone 8/i'    =>  'Windows Phone 8',
-									'/windows nt 6.3/i'     =>  'Windows 8.1',
-									'/windows nt 6.2/i'     =>  'Windows 8',
-									'/windows nt 6.1/i'     =>  'Windows 7',
-									'/windows nt 6.0/i'     =>  'Windows Vista',
-									'/windows nt 5.2/i'     =>  'Windows Server 2003/XP x64',
-									'/windows nt 5.1/i'     =>  'Windows XP',
-									'/windows xp/i'         =>  'Windows XP',
-									'/windows nt 5.0/i'     =>  'Windows 2000',
-									'/windows me/i'         =>  'Windows ME',
-									'/win98/i'              =>  'Windows 98',
-									'/win95/i'              =>  'Windows 95',
-									'/win16/i'              =>  'Windows 3.11',
-									'/ipad/i'               =>  'iPad',
+    class Browser {
+
+        /**
+         * List of know platforms
+         * @var array
+         */
+        private $platforms = array(
+                                    '/windows nt 10/i'      =>  'Windows 10',
+                                    '/windows phone 10/i'   =>  'Windows Phone 10',
+                                    '/windows phone 8.1/i'  =>  'Windows Phone 8.1',
+                                    '/windows phone 8/i'    =>  'Windows Phone 8',
+                                    '/windows nt 6.3/i'     =>  'Windows 8.1',
+                                    '/windows nt 6.2/i'     =>  'Windows 8',
+                                    '/windows nt 6.1/i'     =>  'Windows 7',
+                                    '/windows nt 6.0/i'     =>  'Windows Vista',
+                                    '/windows nt 5.2/i'     =>  'Windows Server 2003/XP x64',
+                                    '/windows nt 5.1/i'     =>  'Windows XP',
+                                    '/windows xp/i'         =>  'Windows XP',
+                                    '/windows nt 5.0/i'     =>  'Windows 2000',
+                                    '/windows me/i'         =>  'Windows ME',
+                                    '/win98/i'              =>  'Windows 98',
+                                    '/win95/i'              =>  'Windows 95',
+                                    '/win16/i'              =>  'Windows 3.11',
+                                    '/ipad/i'               =>  'iPad',
                                     '/ipod/i'               =>  'iPod',
                                     '/iphone/i'             =>  'iPhone',
                                     '/macintosh|mac os x/i' =>  'Mac OS X',
-									'/mac_powerpc/i'        =>  'Mac OS 9',
-									'/android/i'            =>  'Android',
-									'/ubuntu/i'             =>  'Ubuntu',
-									'/linux/i'              =>  'Linux',
-									'/blackberry/i'         =>  'BlackBerry',
-									'/webos/i'              =>  'Mobile'
-								);
-
-		/**
-		 * List of know browsers
-		 * @var array
-		 */
-	 	private $browsers = array(
-									'/mobile/i'     =>  'Handheld Browser',
-									'/msie/i'       =>  'Internet Explorer',
-									'/firefox/i'    =>  'Firefox',
-									'/chrome/i'     =>  'Chrome',
-									'/safari/i'     =>  'Safari',
-									'/edge/i'       =>  'Edge',
-									'/opera/i'      =>  'Opera',
-									'/netscape/i'   =>  'Netscape',
-									'/maxthon/i'    =>  'Maxthon',
-									'/konqueror/i'  =>  'Konqueror'
-								);
-
-	 	/**
-	 	 * Agent string
-	 	 * @var string
-	 	 */
-		private $agent = '';
-
-		/**
-		 * Browser name
-		 * @var string
-		 */
+                                    '/mac_powerpc/i'        =>  'Mac OS 9',
+                                    '/android/i'            =>  'Android',
+                                    '/ubuntu/i'             =>  'Ubuntu',
+                                    '/linux/i'              =>  'Linux',
+                                    '/blackberry/i'         =>  'BlackBerry',
+                                    '/webos/i'              =>  'Mobile'
+                                );
+
+        /**
+         * List of know browsers
+         * @var array
+         */
+            private $browsers = array(
+                                    '/mobile/i'     =>  'Handheld Browser',
+                                    '/msie/i'       =>  'Internet Explorer',
+                                    '/firefox/i'    =>  'Firefox',
+                                    '/chrome/i'     =>  'Chrome',
+                                    '/safari/i'     =>  'Safari',
+                                    '/edge/i'       =>  'Edge',
+                                    '/opera/i'      =>  'Opera',
+                                    '/netscape/i'   =>  'Netscape',
+                                    '/maxthon/i'    =>  'Maxthon',
+                                    '/konqueror/i'  =>  'Konqueror'
+                                );
+
+            /**
+             * Agent string
+             * @var string
+             */
+        private $agent = '';
+
+        /**
+         * Browser name
+         * @var string
+         */
         private $browserName = '';
 
         /**
@@ -128,7 +128,7 @@ 
          */
         private $isFacebook = false;
 
-		/**
+        /**
          * Class constructor
          */
         public function __construct($userAgent = '') {
@@ -231,12 +231,12 @@ 
             return $this->isFacebook;
         }
 
-         /**
-         * Returns a formatted string with a summary of the details of the browser.
-         * @codeCoverageIgnore
-         * 
-         * @return string formatted string with a summary of the browser
-         */
+            /**
+             * Returns a formatted string with a summary of the details of the browser.
+             * @codeCoverageIgnore
+             * 
+             * @return string formatted string with a summary of the browser
+             */
         public function __toString() {
             return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
                 "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
@@ -248,70 +248,70 @@ 
         /**
          * Determine the user's platform
          */
-		protected function checkPlatform() { 
-			foreach ($this->platforms as $regex => $value) { 
-				if (preg_match($regex, $this->agent) ) {
-					$this->platform = $value;
-					break;
-				}
-			}   
-		}
-
-		/**
+        protected function checkPlatform() { 
+            foreach ($this->platforms as $regex => $value) { 
+                if (preg_match($regex, $this->agent) ) {
+                    $this->platform = $value;
+                    break;
+                }
+            }   
+        }
+
+        /**
          * Routine to determine the browser type
          */
-		protected function checkBrowser() {
-			foreach ($this->browsers as $regex => $value) { 
-				if (preg_match($regex, $this->agent ) ) {
-					$this->browserName = $value;
-					break;
-				}
-			}
-		}
-
-		/**
+        protected function checkBrowser() {
+            foreach ($this->browsers as $regex => $value) { 
+                if (preg_match($regex, $this->agent ) ) {
+                    $this->browserName = $value;
+                    break;
+                }
+            }
+        }
+
+        /**
          * Routine to determine the browser version
          */
-		protected function checkBrowserVersion(){
-			$detected = $this->getBrowser();
-			$detect = array_search($detected, $this->browsers);
-			$browser = str_replace(array('/i','/'), '', $detect);
-			$regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i";
-			if (preg_match_all($regex, $this->agent, $matches)) {
-				$found = array_search($browser, $matches['browser']);
-				$this->version = $matches['version'][$found];
-			}
-		}
-
-		/**
+        protected function checkBrowserVersion(){
+            $detected = $this->getBrowser();
+            $detect = array_search($detected, $this->browsers);
+            $browser = str_replace(array('/i','/'), '', $detect);
+            $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i";
+            if (preg_match_all($regex, $this->agent, $matches)) {
+                $found = array_search($browser, $matches['browser']);
+                $this->version = $matches['version'][$found];
+            }
+        }
+
+        /**
          * Determine if the browser is Mobile or not
          */
-		protected function checkMobile() {
-			if (preg_match('/(android|avantgo|blackberry|bolt|boost|cricket'
+        protected function checkMobile() {
+            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) ) {
-				$this->isMobile = true;
-			}
-		}
+                $this->isMobile = true;
+            }
+        }
 
-		/**
+        /**
          * Determine if the browser is Tablet or not
          */
-		protected function checkTablet() {
-			if (preg_match('/tablet|ipad/i', $this->agent) ) {
-				$this->isTablet = true;
-			}
-		}
+        protected function checkTablet() {
+            if (preg_match('/tablet|ipad/i', $this->agent) ) {
+                $this->isTablet = true;
+            }
+        }
 
-		/**
+        /**
          * Determine if the browser is Robot or not
          */
-		protected function checkBot() {
-			if (preg_match('/bot/i', $this->agent) ) {
-				$this->isRobot = true;
-			}
-		}
+        protected function checkBot() {
+            if (preg_match('/bot/i', $this->agent) ) {
+                $this->isRobot = true;
+            }
+        }
 
-		/**
+        /**
          * Detect if URL is loaded from FacebookExternalHit
          */
         protected function checkFacebook() {
@@ -324,10 +324,10 @@ 
         }
 
 
-		 /**
-         * Protected routine to calculate and determine what
-         *  the browser is in use (including platform)
-         */
+            /**
+             * Protected routine to calculate and determine what
+             *  the browser is in use (including platform)
+             */
         protected function determine() {
             $this->checkPlatform();
             $this->checkBrowser();
@@ -338,4 +338,4 @@ 
             $this->checkFacebook();
         }
 		
-	}
+    }

Spacing +9 added lines, -9 removed lines

@@ -144,7 +144,7 @@ 
          * Reset all properties
          */
         public function reset() {
-            $this->agent =  get_instance()->globalvar->server('HTTP_USER_AGENT');
+            $this->agent = get_instance()->globalvar->server('HTTP_USER_AGENT');
             $this->browserName = 'unknown';
             $this->version = 'unknown';
             $this->platform = 'unknown';
@@ -250,7 +250,7 @@ 
          */
 		protected function checkPlatform() { 
 			foreach ($this->platforms as $regex => $value) { 
-				if (preg_match($regex, $this->agent) ) {
+				if (preg_match($regex, $this->agent)) {
 					$this->platform = $value;
 					break;
 				}
@@ -262,7 +262,7 @@ 
          */
 		protected function checkBrowser() {
 			foreach ($this->browsers as $regex => $value) { 
-				if (preg_match($regex, $this->agent ) ) {
+				if (preg_match($regex, $this->agent)) {
 					$this->browserName = $value;
 					break;
 				}
@@ -272,10 +272,10 @@ 
 		/**
          * Routine to determine the browser version
          */
-		protected function checkBrowserVersion(){
+		protected function checkBrowserVersion() {
 			$detected = $this->getBrowser();
 			$detect = array_search($detected, $this->browsers);
-			$browser = str_replace(array('/i','/'), '', $detect);
+			$browser = str_replace(array('/i', '/'), '', $detect);
 			$regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i";
 			if (preg_match_all($regex, $this->agent, $matches)) {
 				$found = array_search($browser, $matches['browser']);
@@ -288,7 +288,7 @@ 
          */
 		protected function checkMobile() {
 			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) ) {
+                . '|docomo|fone|hiptop|mini|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i', $this->agent)) {
 				$this->isMobile = true;
 			}
 		}
@@ -297,7 +297,7 @@ 
          * Determine if the browser is Tablet or not
          */
 		protected function checkTablet() {
-			if (preg_match('/tablet|ipad/i', $this->agent) ) {
+			if (preg_match('/tablet|ipad/i', $this->agent)) {
 				$this->isTablet = true;
 			}
 		}
@@ -306,7 +306,7 @@ 
          * Determine if the browser is Robot or not
          */
 		protected function checkBot() {
-			if (preg_match('/bot/i', $this->agent) ) {
+			if (preg_match('/bot/i', $this->agent)) {
 				$this->isRobot = true;
 			}
 		}
@@ -318,7 +318,7 @@ 
             if (stristr($this->agent, 'FacebookExternalHit')) {
                 $this->isRobot = true;
                 $this->isFacebook = true;
-            }  else if (stristr($this->agent, 'FBIOS')) {
+            } else if (stristr($this->agent, 'FBIOS')) {
                 $this->isFacebook = true;
             }
         }

Braces +1 added lines, -1 removed lines

@@ -318,7 +318,7 @@
             if (stristr($this->agent, 'FacebookExternalHit')) {
                 $this->isRobot = true;
                 $this->isFacebook = true;
-            }  else if (stristr($this->agent, 'FBIOS')) {
+            } else if (stristr($this->agent, 'FBIOS')) {
                 $this->isFacebook = true;
             }
         }

core/common.php

Indentation +13 added lines, -13 removed lines

@@ -91,7 +91,7 @@ 
 		
         //record the class instance
         $classes[$class] = isset($params) ? new $class($params) : new $class();
-		return $classes[$class];
+        return $classes[$class];
     }
 
     /**
@@ -179,17 +179,17 @@ 
         die();
     }
 
-     /**
-     *  Function defined for PHP error message handling
-     *              
-     *  @param int $errno the type of error for example: E_USER_ERROR, E_USER_WARNING, etc.
-     *  @param string $errstr the error message
-     *  @param string $errfile the file where the error occurred
-     *  @param int $errline the line number where the error occurred
-     *  @codeCoverageIgnore
-     *  
-     *  @return boolean 
-     */
+        /**
+         *  Function defined for PHP error message handling
+         *              
+         *  @param int $errno the type of error for example: E_USER_ERROR, E_USER_WARNING, etc.
+         *  @param string $errstr the error message
+         *  @param string $errfile the file where the error occurred
+         *  @param int $errline the line number where the error occurred
+         *  @codeCoverageIgnore
+         *  
+         *  @return boolean 
+         */
     function fw_error_handler($errno, $errstr, $errfile, $errline) {
         $isError = (((E_ERROR | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $errno) === $errno);
         if ($isError) {
@@ -212,7 +212,7 @@ 
                 E_RECOVERABLE_ERROR  => 'Catchable Fatal Error'
         );
         if (isset($errorsType[$errno])) {
-           $errorType = $errorsType[$errno];
+            $errorType = $errorsType[$errno];
         }
         $errorText = 'An error is occurred in the file ' . $errfile . ' at line ' . $errline . ' raison : ' . $errstr;
         if ((error_reporting() & $errno) !== $errno) {