tnhfw / tnh-fw

core/classes/Log.php

Spacing +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
         protected function getLogDebugBacktraceInfo() {
             $dtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
             $i = 0;
-            while ($dtrace[$i]['file'] == __FILE__ ) {
+            while ($dtrace[$i]['file'] == __FILE__) {
                 $i++;
             } 
             $fileInfo = $dtrace[$i];

Indentation +7 added lines, -7 removed lines

@@ -140,11 +140,11 @@ 
                 //NOTE: here need put the show_error() "logging" to false 
                 //to prevent self function loop call
                 show_error('Invalid config log level [' . $configLogLevel . '], '
-                           . 'the value must be one of the following: ' 
-                           . implode(', ', array_map('strtoupper', self::$validConfigLevel))
-                           , 'Log Config Error', 
-                           $logging = false
-                       );
+                            . 'the value must be one of the following: ' 
+                            . implode(', ', array_map('strtoupper', self::$validConfigLevel))
+                            , 'Log Config Error', 
+                            $logging = false
+                        );
                 return;	
             }
 			
@@ -214,7 +214,7 @@ 
         protected function levelCanSaveLog($level) {
             $result = true;
             $configLogLevel = get_config('log_level');
-             //check if can save log regarding the log level configuration
+                //check if can save log regarding the log level configuration
             $configLevel = self::getLevelValue($configLogLevel);
             if ($configLevel > $level) {
                 //can't log
@@ -294,7 +294,7 @@ 
                 //NOTE: here need put the show_error() "logging" to false 
                 //to prevent self function loop call
                 show_error('Error : the log dir does not exist or is not writable',
-                           'Log directory error', $logging = false);
+                            'Log directory error', $logging = false);
             }
 			
             $path = $logSavePath . 'logs-' . date('Y-m-d') . '.log';

app/config/config.php

Indentation +14 added lines, -14 removed lines

@@ -178,20 +178,20 @@
     $config['log_logger_name'] = array();
 
     /**
-    * The logger name custom level to use for the log
-    * 
-    * If this config is set so means the logger level will be used to overwrite 
-    * the default log level configuration above. 
-    *
-    * Example:
-    * $config['log_logger_name_level'] = array('MY_LOGGER1' => 'WARNING'); 
-    * So if $config['log_level'] = 'ERROR' but all log messages with "MY_LOGGER1" as logger name
-    *  will be saved for WARNING message and above
-    *  Note: You can also use an regular expression for the logger name.
-    *  Example:
-    *  $config['log_logger_name_level'] = array('^Class::Con(.*)' => 'info');
-    *  So all logger name like "Class::Config", "Class::Cookie", etc. will be match
-    */  
+     * The logger name custom level to use for the log
+     * 
+     * If this config is set so means the logger level will be used to overwrite 
+     * the default log level configuration above. 
+     *
+     * Example:
+     * $config['log_logger_name_level'] = array('MY_LOGGER1' => 'WARNING'); 
+     * So if $config['log_level'] = 'ERROR' but all log messages with "MY_LOGGER1" as logger name
+     *  will be saved for WARNING message and above
+     *  Note: You can also use an regular expression for the logger name.
+     *  Example:
+     *  $config['log_logger_name_level'] = array('^Class::Con(.*)' => 'info');
+     *  So all logger name like "Class::Config", "Class::Cookie", etc. will be match
+     */  
     $config['log_logger_name_level'] = array();
 	
 	

core/classes/Router.php

Indentation +15 added lines, -15 removed lines

@@ -277,14 +277,14 @@ 
         }
 
         /**
-        * Setting the route configuration using the configuration file 
-        * and additional configuration from param
-        * @param array $overwriteConfig the additional configuration 
-        * to overwrite with the existing one
-        * @param boolean $useConfigFile whether to use route configuration file
-        * 
-        * @return object
-        */
+         * Setting the route configuration using the configuration file 
+         * and additional configuration from param
+         * @param array $overwriteConfig the additional configuration 
+         * to overwrite with the existing one
+         * @param boolean $useConfigFile whether to use route configuration file
+         * 
+         * @return object
+         */
         public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
             $route = array();
             if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) {
@@ -365,7 +365,7 @@ 
             //the URL like http://domain.com/module/controller/method/arg1/arg2
             if (!$this->controller) {
                 $this->logger->info('Cannot determine the routing information ' 
-                       . 'using the predefined routes configuration, will use the request URI parameters');
+                        . 'using the predefined routes configuration, will use the request URI parameters');
                 //determine route parameters using the route URI param
                 $this->determineRouteParamsFromRequestUri();
             }
@@ -478,11 +478,11 @@ 
             }
         }
 
-         /**
-         * Remove the URL suffix and query string values if exists
-         * @param  string $uri the route URI to process
-         * @return string      the final route uri after processed
-         */
+            /**
+             * Remove the URL suffix and query string values if exists
+             * @param  string $uri the route URI to process
+             * @return string      the final route uri after processed
+             */
         protected function removeSuffixAndQueryStringFromUri($uri) {
             $this->logger->debug('Check if URL suffix is enabled in the configuration');
             //remove url suffix from the request URI
@@ -596,7 +596,7 @@ 
                 $this->logger->info(
                                     'After loop in predefined routes configuration,'
                                     . 'the module name is set but the controller is not set,' 
-									. 'so we will use module as the controller'
+                                    . 'so we will use module as the controller'
                                 );
                 $this->controller = $this->module;
             }

Spacing +6 added lines, -6 removed lines

@@ -450,7 +450,7 @@ 
          * Remove the DOCUMENT_ROOT and front controller from segments if exists
          * @return void
          */
-        protected function removeDocumentRootFrontControllerFromSegments(){
+        protected function removeDocumentRootFrontControllerFromSegments() {
             $segment = $this->segments;
             $globals = & class_loader('GlobalVar', 'classes');
             $rootFolder = substr($globals->server('SCRIPT_NAME'), 0, strpos(
@@ -581,7 +581,7 @@ 
                     break;
                 }
             }
-            if($findIndex !== -1){
+            if ($findIndex !== -1) {
                 //$args[0] => full string captured by preg_match
                 //$args[1], $args[2], $args[n] => contains the value of 
                 //(:num), (:alpha), (:alnum), (:any)
@@ -606,7 +606,7 @@ 
          * Find file path of the current controller using the current module
          * @return boolean true if the file path is found otherwise false.
          */
-        protected function findControllerFullPathUsingCurrentModule(){
+        protected function findControllerFullPathUsingCurrentModule() {
             $path = $this->moduleInstance->findControllerFullPath(ucfirst($this->controller), $this->module);
             if (!$path) {
                 $this->logger->info('The controller [' . $this->controller . '] not ' 
@@ -623,7 +623,7 @@ 
          * or the current request does not use module
          * @return void
          */
-        protected function setRouteParamsIfNoModuleOrNotFound(){
+        protected function setRouteParamsIfNoModuleOrNotFound() {
             $segment = $this->segments;
             //controller
             if (isset($segment[0])) {
@@ -644,7 +644,7 @@ 
          * or the current request use module
          * @return void
          */
-        protected function setRouteParamsIfAppHasModuleOrFound(){
+        protected function setRouteParamsIfAppHasModuleOrFound() {
             //get the module list
             $modules = $this->moduleInstance->getModuleList();
             $segment = $this->segments;
@@ -657,7 +657,7 @@ 
                     $this->controller = $segment[0];
 
                     //check if the request use the same module name and controller
-                    if($this->findControllerFullPathUsingCurrentModule()){
+                    if ($this->findControllerFullPathUsingCurrentModule()) {
                         array_shift($segment);
                     }
                 }

core/libraries/Email.php

Indentation +25 added lines, -25 removed lines

@@ -385,7 +385,7 @@ 
             }
             $filename = $this->encodeUtf8($this->filterOther((string) $filename));
             if (empty($data)) {
-               $data = $this->getAttachmentData($path);
+                $data = $this->getAttachmentData($path);
             }
             $this->attachments[] = array(
                 'path' => $path,
@@ -426,7 +426,7 @@ 
             $addresses = array();
             foreach ($pairs as $name => $email) {
                 if (is_numeric($name)) {
-                   $name = null;
+                    $name = null;
                 }
                 $addresses[] = $this->formatHeader($email, $name);
             }
@@ -970,10 +970,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()) {
@@ -1010,11 +1010,11 @@ 
          */
         protected function sendHelloCommand() {
             $responseCode = $this->sendCommand('EHLO ' . $this->getSmtpClientHostname())
-                                 ->getSmtpResponseCode();
+                                    ->getSmtpResponseCode();
             if ($responseCode !== 250) {
                 //May be try with "HELO"
                 $responseCode = $this->sendCommand('HELO ' . $this->getSmtpClientHostname())
-                                     ->getSmtpResponseCode();
+                                        ->getSmtpResponseCode();
                 if ($responseCode !== 250) {
                     $this->error = $this->smtpResponse;
                     return false;
@@ -1158,7 +1158,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';
@@ -1166,10 +1166,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;
@@ -1189,7 +1189,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(
@@ -1223,17 +1223,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
          */
@@ -978,7 +978,7 @@ 
             $message = $this->getWrapMessage();
             if ($this->hasAttachments()) {
                 $this->setAttachmentHeaders();
-                $message  = $this->assembleAttachmentBody();
+                $message = $this->assembleAttachmentBody();
             }
             return $message;
         }
@@ -1068,7 +1068,7 @@ 
                                         $this->smtpConnectionTimeout
                                     );
 
-            if (! is_resource($this->smtpSocket)) {
+            if (!is_resource($this->smtpSocket)) {
                 $this->error = $errorNumber . ':' . $errorMessage;
                 return false;
             }
@@ -1116,7 +1116,7 @@ 
                      * We want the negotiation, so we'll force it below ...
                      */
                     $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);
@@ -1182,7 +1182,7 @@ 
                 'To' => $to
             );
             foreach ($additionalHeaders as $key => $value) {
-                if (! isset($this->headers[$key])) {
+                if (!isset($this->headers[$key])) {
                     $this->headers[$key] = $value;
                 }
             }