tnhfw / tnh-fw

core/classes/EventDispatcher.php

Indentation +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
                 return;
             } 
             $this->logger->info('Found the registered event listener for the '
-                                 . 'event [' . $event->name . '] the list are: ' . stringfy_vars($list));
+                                    . 'event [' . $event->name . '] the list are: ' . stringfy_vars($list));
             foreach ($list as $listener) {
                 $result = call_user_func_array($listener, array($event));
                 if ($eBackup->returnBack === true) {

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 +8 added lines, -8 removed lines

@@ -169,7 +169,7 @@ 
             $this->log(self::DEBUG, $message);
         } 
 		
-		/**
+        /**
          * Logs with an arbitrary level.
          *
          * @param  integer|string $level   the log level in integer or string format,
@@ -187,11 +187,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;	
             }
 			
@@ -261,7 +261,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
@@ -341,7 +341,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';

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);
                     }
                 }

app/config/config.php

Indentation +34 added lines, -34 removed lines

@@ -134,26 +134,26 @@ 
 	*/
 	
     /** 
-    * The log level
-    *
-    * The valid log level are: OFF, NONE, DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY
-    *
-    * 'OFF' or 'NONE' = do not save log
-    * 'EMERGENCY' = enable log for emergency level and above (EMERGENCY)
-    * 'ALERT' = enable log for alert level and above (ALERT, EMERGENCY)
-    * 'CRITICAL' = enable log for critical level and above (CRITICAL, ALERT, EMERGENCY)
-    * 'ERROR' = enable log for error level and above (ERROR, CRITICAL, ALERT, EMERGENCY)
-    * 'WARNING' = enable log for warning level and above (WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
-    * 'NOTICE' = enable log for notice level and above (NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
-    * 'INFO' = enable log for info level and above (INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
-    * 'DEBUG' = enable log for debug level and above (DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
-    *
-    * The default value is NONE if the config value is: null, '', 0, false
-    * 
-    * Note: in production environment it's recommand to set the log level to 'WARNING' or 'ERROR' if not, in small
-    * time the log file size will increase very fast and will cost the application performance
-    * and also the filesystem usage of your server.
-    */
+     * The log level
+     *
+     * The valid log level are: OFF, NONE, DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY
+     *
+     * 'OFF' or 'NONE' = do not save log
+     * 'EMERGENCY' = enable log for emergency level and above (EMERGENCY)
+     * 'ALERT' = enable log for alert level and above (ALERT, EMERGENCY)
+     * 'CRITICAL' = enable log for critical level and above (CRITICAL, ALERT, EMERGENCY)
+     * 'ERROR' = enable log for error level and above (ERROR, CRITICAL, ALERT, EMERGENCY)
+     * 'WARNING' = enable log for warning level and above (WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
+     * 'NOTICE' = enable log for notice level and above (NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
+     * 'INFO' = enable log for info level and above (INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
+     * 'DEBUG' = enable log for debug level and above (DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY)
+     *
+     * The default value is NONE if the config value is: null, '', 0, false
+     * 
+     * Note: in production environment it's recommand to set the log level to 'WARNING' or 'ERROR' if not, in small
+     * time the log file size will increase very fast and will cost the application performance
+     * and also the filesystem usage of your server.
+     */
     $config['log_level'] = 'NONE';
 
 
@@ -180,20 +180,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/Config.php

Indentation +9 added lines, -9 removed lines

@@ -46,9 +46,9 @@ 
             if ($init) {
                 $this->init();
                 //@codeCoverageIgnoreStart
-                 if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'all'))) {
+                    if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'all'))) {
                     $this->logger->warning('You are in production environment, please set '
-                                           . 'log level to WARNING, ERROR, CRITICAL, ALERT, EMERGENCY to increase the application performance');
+                                            . 'log level to WARNING, ERROR, CRITICAL, ALERT, EMERGENCY to increase the application performance');
                 }
                 //@codeCoverageIgnoreEnd
             }
@@ -146,7 +146,7 @@ 
             if (empty($this->config['base_url'])) {
                 if (ENVIRONMENT == 'production') {
                     $this->logger->warning('Application base URL is not set or invalid, please'
-                                           . ' set application base URL to increase the application loading time');
+                                            . ' set application base URL to increase the application loading time');
                 }
                 $baseUrl = null;
                 $protocol = 'http';
@@ -173,7 +173,7 @@ 
                                                                     );
                 } else {
                     $this->logger->warning('Can not determine the application '
-                                           . 'base URL automatically, use http://localhost as default');
+                                            . 'base URL automatically, use http://localhost as default');
                     $baseUrl = 'http://localhost/';
                 }
                 $this->config['base_url'] = $baseUrl;
@@ -182,11 +182,11 @@ 
         }
          
         /**
-        * Return the server port using variable
-        *
-        * @codeCoverageIgnore
-        * @return string
-        */
+         * Return the server port using variable
+         *
+         * @codeCoverageIgnore
+         * @return string
+         */
         protected function getServerPort() {
             $globals = & class_loader('GlobalVar', 'classes');
             $serverPort = $globals->server('SERVER_PORT');

core/common.php

Spacing +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
         static $cfg;
         if (empty($cfg)) {
             $cfg[0] = & load_configurations();
-            if(! is_array($cfg[0])){
+            if (!is_array($cfg[0])) {
                 $cfg[0] = array();
             }
         }
@@ -197,7 +197,7 @@ 
             set_http_status_header(500);
         }
         $errorType = 'Error';
-        $errorsType = array (
+        $errorsType = array(
                 E_ERROR              => 'Error',
                 E_WARNING            => 'Warning',
                 E_PARSE              => 'Parsing Error',

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) {

core/classes/cache/ApcCache.php

Indentation +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
         /**
          * Construct new ApcCache instance
          */
-	public function __construct() {
+    public function __construct() {
             parent::__construct();
             if (!$this->isSupported()) {
                 show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
@@ -79,7 +79,7 @@ 
         public function set($key, $data, $ttl = 0) {
             $expire = time() + $ttl;
             $this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], '
-                                 . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+                                    . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']');
             $result = apc_store($key, $data, $ttl);
             if ($result === false) {
                 $this->logger->error('Can not save cache data for the key [' . $key . '], return false');
@@ -127,7 +127,7 @@ 
                             'mtime'  => $cacheInfos['creation_time'],
                             'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
                             'ttl'    => $cacheInfos['ttl']
-                           );
+                            );
             } 
             $this->logger->info('This cache does not exists skipping');
             return false;

core/classes/cache/FileCache.php

Indentation +7 added lines, -7 removed lines

@@ -108,13 +108,13 @@ 
         public function set($key, $data, $ttl = 0) {
             $expire = time() + $ttl;
             $this->logger->debug('Setting cache data for key [' . $key . '], '
-                           . 'time to live [' . $ttl . '], '
-                           . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+                            . 'time to live [' . $ttl . '], '
+                            . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']');
             $filePath = $this->getFilePath($key);
             $handle = fopen($filePath, 'w');
             if (!is_resource($handle)) {
                 $this->logger->error('Can not open the file cache '
-                                     . '[' . $filePath . '] for the key [' . $key . '], return false');
+                                        . '[' . $filePath . '] for the key [' . $key . '], return false');
                 return false;
             }
             flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
@@ -191,10 +191,10 @@ 
             if ($data['expire'] > time()) {
                 $this->logger->info('This cache not yet expired return cache informations');
                 return array(
-                           'mtime' => $data['mtime'],
-                           'expire' => $data['expire'],
-                           'ttl' => $data['ttl']
-                         );
+                            'mtime' => $data['mtime'],
+                            'expire' => $data['expire'],
+                            'ttl' => $data['ttl']
+                            );
             }
             $this->logger->info('This cache already expired return false');
             return false;

core/libraries/Email.php

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;
                 }
             }

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;
@@ -1038,7 +1038,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(
                                 'mail_from' => array('MAIL FROM: <' . $this->from . '>', 'MAIL_FROM', 250),
@@ -1089,17 +1089,17 @@ 
         }
 
 
-         /**
-         * 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')) {