tnhfw / tnh-fw

core/common.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
         static $cfg;
         if (empty($cfg)) {
             $cfg[0] = & load_configurations();
-            if(! is_array($cfg[0])){
+            if (!is_array($cfg[0])) {
                 $cfg[0] = array();
             }
         }

Indentation +11 added lines, -11 removed lines

@@ -200,17 +200,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) {

core/classes/Loader.php

Braces +1 added lines, -2 removed lines

@@ -316,8 +316,7 @@
             $searchDir = null;
             if ($type == 'function') {
                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
-            }
-            else if ($type == 'language') {
+            } else if ($type == 'language') {
                 $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
                 $file = $appLang . DS . $file;
             }

Spacing +2 added lines, -2 removed lines

@@ -308,7 +308,7 @@ 
          * @param  string $appLang the application language, only if type = "language"
          * @return string|null          the full file path
          */
-        protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){
+        protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null) {
             $searchDir = null;
             if ($type == 'function') {
                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
@@ -334,7 +334,7 @@ 
          * @param  string|null $module the module if is not null will return it
          * @return string|null
          */
-        protected function getModuleFromSuperController($module){
+        protected function getModuleFromSuperController($module) {
             $obj = & get_instance();
             if (!$module && !empty($obj->moduleName)) {
                 $module = $obj->moduleName;

Indentation +3 added lines, -3 removed lines

@@ -220,7 +220,7 @@ 
             $moduleConfigPath = get_instance()->module->findConfigFullPath($filename, $module);
             if ($moduleConfigPath) {
                 $this->logger->info('Found config [' . $filename . '] from module [' . $module . '], '
-                                  . 'the file path is [' . $moduleConfigPath . '] we will used it');
+                                    . 'the file path is [' . $moduleConfigPath . '] we will used it');
                 $configFilePath = $moduleConfigPath;
             } else {
                 $this->logger->info('Cannot find config [' . $filename . '] from modules using the default location');
@@ -339,7 +339,7 @@ 
         protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){
             $searchDir = null;
             if ($type == 'function') {
-               $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
+                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
             }
             else if ($type == 'language') {
                 $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
@@ -507,7 +507,7 @@ 
             $moduleLibraryPath = get_instance()->module->findLibraryFullPath($class, $module);
             if ($moduleLibraryPath) {
                 $this->logger->info('Found library [' . $class . '] from module [' . $module . '], the '
-                                   . 'file path is [' . $moduleLibraryPath . '] we will used it');
+                                    . 'file path is [' . $moduleLibraryPath . '] we will used it');
                 $libraryFilePath = $moduleLibraryPath;
             } else {
                 $this->logger->info('Cannot find library [' . $class . '] from modules using the default location');

index.php

Indentation +5 added lines, -5 removed lines

@@ -189,11 +189,11 @@
      */
     define('VAR_PATH', ROOT_PATH . 'var' . DS);
     
-     /**
-     * The path to the directory of your cache files.
-     *
-     * This feature is available currently for database and views.
-     */
+        /**
+         * The path to the directory of your cache files.
+         *
+         * This feature is available currently for database and views.
+         */
     define('CACHE_PATH', VAR_PATH . 'cache' . DS);
     
     /**

app/config/autoload.php

Indentation +85 added lines, -85 removed lines

@@ -25,103 +25,103 @@
      */
 
     /**
-	* This file contains the configuration of resources that you want to load automatically: 
-	* personals or systems libraries, configuration files, models, languages
-	* personals functions or systems that are used often in your application 
-	* instead of loading them every time you want to use it.
-	* Note: loading a lot of resources can decrease the performance of your application.
-	*/
+     * This file contains the configuration of resources that you want to load automatically: 
+     * personals or systems libraries, configuration files, models, languages
+     * personals functions or systems that are used often in your application 
+     * instead of loading them every time you want to use it.
+     * Note: loading a lot of resources can decrease the performance of your application.
+     */
 
 
-	/**
-	* If you have personals libraries or systems to load automatically, then list them in the following array.
-	* For example :
-	*
-	*	$autoload['libraries'] = array('library1', 'library2');
-	*
-	* Using module:
-	* 
-	*   $autoload['libraries'] = array('module1/library1', 'module2/library1');
-	*
-	* Note: Systems libraries have priority over personals libraries, 
-	* ie the loading order is as follows: it looks in the folder of the systems libraries, 
-	* if it is found, it is loaded, if not, it search in the module directories, if it is found, 
-	* it is loaded, if not will search in personals libraries folder, 
-	* before returning an error in case it does not find it.
-	*/
+    /**
+     * If you have personals libraries or systems to load automatically, then list them in the following array.
+     * For example :
+     *
+     *	$autoload['libraries'] = array('library1', 'library2');
+     *
+     * Using module:
+     * 
+     *   $autoload['libraries'] = array('module1/library1', 'module2/library1');
+     *
+     * Note: Systems libraries have priority over personals libraries, 
+     * ie the loading order is as follows: it looks in the folder of the systems libraries, 
+     * if it is found, it is loaded, if not, it search in the module directories, if it is found, 
+     * it is loaded, if not will search in personals libraries folder, 
+     * before returning an error in case it does not find it.
+     */
     $autoload['libraries'] = array();
 
     /**
-	* If you have configuration files to load automatically, then list them in the following array.
-	* For example :
-	*
-	*	$autoload['config'] = array('config1', 'config2');
-	*
-	* Using module:
-	* 
-	*   $autoload['config'] = array('module1/config1', 'module2/config2');
-	*
-	* Note 1: the file name must have as prefix "config_" for config file inside CONFIG_PATH folder
-	* for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config,
-	* otherwise the system can not find this configuration file.
-	* For example :
-	*
-	*	$config['key1'] = value1;
-	* 	$config['key2'] = value2;
-	*
-	* Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php".
-	* or inside the "config" of your application modules
-	*/
+     * If you have configuration files to load automatically, then list them in the following array.
+     * For example :
+     *
+     *	$autoload['config'] = array('config1', 'config2');
+     *
+     * Using module:
+     * 
+     *   $autoload['config'] = array('module1/config1', 'module2/config2');
+     *
+     * Note 1: the file name must have as prefix "config_" for config file inside CONFIG_PATH folder
+     * for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config,
+     * otherwise the system can not find this configuration file.
+     * For example :
+     *
+     *	$config['key1'] = value1;
+     * 	$config['key2'] = value2;
+     *
+     * Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php".
+     * or inside the "config" of your application modules
+     */
     $autoload['config'] = array();
 
     /**
-	* If you have models to load automatically, then list them in the following array.
-	* For example :
-	*
-	*	$autoload['models'] = array('model1', 'model2');
-	*
-	* Using module:
-	* 
-	*   $autoload['models'] = array('module1/model1', 'module2/model2');
-	*/
+     * If you have models to load automatically, then list them in the following array.
+     * For example :
+     *
+     *	$autoload['models'] = array('model1', 'model2');
+     *
+     * Using module:
+     * 
+     *   $autoload['models'] = array('module1/model1', 'module2/model2');
+     */
     $autoload['models'] = array();
 
     /**
-	* If you have systems or personals functions to load automatically, specify them in the following array.
-	* For example :
-	*
-	* 	$autoload['functions'] = array('function1', 'function2');
-	*
-	* Using module:
-	* 
-	*   $autoload['functions'] = array('module1/function1', 'module2/function2');
-	*
-	* Note 1: Personal functions have priority over system functions,
-	* that is to say that the order of loading is the following : it looks in the directory of the modules functions, 
-	* if it is found, it is loaded, otherwise, it looks in the directory of the personal functions,
-	* if it is found, it is loaded, otherwise, it looks in the directory of the system functions,
-	* before returning an error in case he does not find it.
-	*
-	* Note 2: the file name must have as prefix "function_" for example "function_foo.php" then
-	* will use:
-	* 
-	*  $autoload['functions'] = array('foo');
-	*/
+     * If you have systems or personals functions to load automatically, specify them in the following array.
+     * For example :
+     *
+     * 	$autoload['functions'] = array('function1', 'function2');
+     *
+     * Using module:
+     * 
+     *   $autoload['functions'] = array('module1/function1', 'module2/function2');
+     *
+     * Note 1: Personal functions have priority over system functions,
+     * that is to say that the order of loading is the following : it looks in the directory of the modules functions, 
+     * if it is found, it is loaded, otherwise, it looks in the directory of the personal functions,
+     * if it is found, it is loaded, otherwise, it looks in the directory of the system functions,
+     * before returning an error in case he does not find it.
+     *
+     * Note 2: the file name must have as prefix "function_" for example "function_foo.php" then
+     * will use:
+     * 
+     *  $autoload['functions'] = array('foo');
+     */
     $autoload['functions'] = array();
 	
     /**
-	* If you have systems or personals languages to load automatically, specify them in the following array.
-	* For example :
-	*
-	* 	$autoload['languages'] = array('lang1', 'lang2');
-	*
-	* Using module:
-	* 
-	*   $autoload['languages'] = array('module1/lang1', 'module2/lang2');
-	*
-	* Note: the file name must have as prefix "lang_" for example "lang_foo.php" then
-	* will use:
-	* 
-	*  $autoload['languages'] = array('foo');
-	*/
+     * If you have systems or personals languages to load automatically, specify them in the following array.
+     * For example :
+     *
+     * 	$autoload['languages'] = array('lang1', 'lang2');
+     *
+     * Using module:
+     * 
+     *   $autoload['languages'] = array('module1/lang1', 'module2/lang2');
+     *
+     * Note: the file name must have as prefix "lang_" for example "lang_foo.php" then
+     * will use:
+     * 
+     *  $autoload['languages'] = array('foo');
+     */
     $autoload['languages'] = array();

core/classes/Router.php

Indentation +12 added lines, -12 removed lines

@@ -241,12 +241,12 @@ 
         }
 
         /**
-        * 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')) {
@@ -423,11 +423,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
@@ -540,7 +540,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

@@ -443,7 +443,7 @@ 
          * Remove the DOCUMENT_ROOT and front controller from segments if exists
          * @return void
          */
-        protected function removeDocumentRootFrontControllerFromSegments(){
+        protected function removeDocumentRootFrontControllerFromSegments() {
             $segment = $this->segments;
             $baseUrl = get_config('base_url');
             //check if the app is not in DOCUMENT_ROOT
@@ -561,7 +561,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)
@@ -586,7 +586,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 found in the module, may be will use the module [' . $this->module . '] as controller');
@@ -602,7 +602,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])) {
@@ -623,7 +623,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;
@@ -636,7 +636,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/classes/model/DBSessionHandlerModel.php

Indentation +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
      */
 	
     /**
-    * DB session handler model class
-    */
+     * DB session handler model class
+     */
     abstract class DBSessionHandlerModel extends Model {
 		
         /**

core/classes/database/DatabaseQueryBuilder.php

Indentation +6 added lines, -6 removed lines

@@ -30,10 +30,10 @@ 
     
     class DatabaseQueryBuilder {
 
-         /**
-         * The DatabaseConnection instance
-         * @var object
-         */
+            /**
+             * The DatabaseConnection instance
+             * @var object
+             */
         private $connection = null;
 
         /**
@@ -727,12 +727,12 @@ 
          * 
          * @return string|null
          */
-         protected function buildQueryPart($property, $command = ''){
+            protected function buildQueryPart($property, $command = ''){
             if (!empty($this->{$property})) {
                 return $command . $this->{$property};
             }
             return null;
-         }
+            }
 
 
         /**

Spacing +6 added lines, -6 removed lines

@@ -414,7 +414,7 @@ 
             $_keys = array();
             foreach ($keys as $k => $v) {
                 $v = $this->checkForNullValue($v);
-                if (! is_numeric($v)) {
+                if (!is_numeric($v)) {
                     $v = $this->connection->escape($v, $escape);
                 }
                 $_keys[] = $v;
@@ -727,7 +727,7 @@ 
          * 
          * @return string|null
          */
-         protected function buildQueryPart($property, $command = ''){
+         protected function buildQueryPart($property, $command = '') {
             if (!empty($this->{$property})) {
                 return $command . $this->{$property};
             }
@@ -742,7 +742,7 @@ 
          * @param string $clause the clause type "IS NULL", "IS NOT NULLs"
          * @return object        the current DatabaseQueryBuilder instance
          */
-        protected function whereIsNullAndNotNull($field, $andOr = 'AND', $clause = 'IS NULL'){
+        protected function whereIsNullAndNotNull($field, $andOr = 'AND', $clause = 'IS NULL') {
             if (is_array($field)) {
                 foreach ($field as $f) {
                     $this->whereIsNullAndNotNull($f, $andOr, $clause);
@@ -760,7 +760,7 @@ 
          *
          * @return object the current instance
          */
-        protected function setSelectStr($newSelect){
+        protected function setSelectStr($newSelect) {
             $this->select = (($this->select == '*' || empty($this->select)) 
                                     ? $newSelect 
                                     : $this->select . ', ' . $newSelect);
@@ -774,8 +774,8 @@ 
          * @return string        the empty string if the value is null
          * otherwise the same value will be returned
          */
-        protected function checkForNullValue($value){
-            if(is_null($value)){
+        protected function checkForNullValue($value) {
+            if (is_null($value)) {
                 return '';
             }
             return $value;

core/classes/database/DatabaseCache.php

Indentation +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
             //If is the SELECT query
             $this->isSelectQuery = stristr($this->query, 'SELECT') !== false;
 
-             //if can use cache feature for this query
+                //if can use cache feature for this query
             $this->dbCacheStatus = get_config('cache_enable', false) && $this->cacheTtl > 0;
         }
         

Spacing +2 added lines, -2 removed lines

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

core/classes/database/DatabaseQueryRunner.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
             if ((double) $responseTime >= 1.000000) {
                 $this->logger->warning(
                                         'High response time while processing database query [' . $this->query . '].' 
-                                        . 'The response time is [' .$responseTime . '] sec.'
+                                        . 'The response time is [' . $responseTime . '] sec.'
                                         );
             }
     		

Indentation +4 added lines, -4 removed lines

@@ -30,10 +30,10 @@
     
     class DatabaseQueryRunner extends BaseClass {
 
-         /**
-         * The DatabaseConnection instance
-         * @var object
-         */
+            /**
+             * The DatabaseConnection instance
+             * @var object
+             */
         private $connection = null;
 
         /**