tnhfw / tnh-fw

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

@@ -410,7 +410,7 @@ 
             $keysList = array();
             foreach ($keys as $k => $v) {
                 $v = $this->checkForNullValue($v);
-                if (! is_numeric($v)) {
+                if (!is_numeric($v)) {
                     $v = $this->connection->escape($v, $escape);
                 }
                 $keysList[] = $v;
@@ -721,7 +721,7 @@ 
          * 
          * @return string|null
          */
-         protected function buildQueryPart($property, $command = ''){
+         protected function buildQueryPart($property, $command = '') {
             if (!empty($this->{$property})) {
                 return $command . $this->{$property};
             }
@@ -736,7 +736,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);
@@ -754,7 +754,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);
@@ -768,8 +768,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;
@@ -796,7 +796,7 @@ 
          *
          * @return string
          */
-        protected function getWhereStrForOperator($where, $op = null, $value= null, $type = '', $escape = true) {
+        protected function getWhereStrForOperator($where, $op = null, $value = null, $type = '', $escape = true) {
             $w = '';
             if (!in_array((string) $op, $this->operatorList)) {
                 $op = $this->checkForNullValue($op);

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

@@ -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 setCacheContent($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/classes/GlobalVar.php

Indentation +14 added lines, -14 removed lines

@@ -234,10 +234,10 @@ 
             return $this->removeVars($_ENV, $key);
         }
 
-         /**
-         * Get the value from $GLOBALS for given key. if the key is empty will return all values
-         * @see GlobalVar::getVars 
-         */
+            /**
+             * Get the value from $GLOBALS for given key. if the key is empty will return all values
+             * @see GlobalVar::getVars 
+             */
         public function globals($key = null, $xss = true) {
             return $this->getVars($GLOBALS, $key, $xss);
         }
@@ -259,16 +259,16 @@ 
         }
 
         
-         /**
-         * Set the value for $_GET, $_POST, $_SERVER etc. if the key is an array will
-         * set the current super variable value by this.
-         * @param array $var the super global variable to use, can be "$_POST", "$_GET", etc.
-         * @param  string|array  $key the item key to be set or array if need set the current global variable 
-         * by this value
-         * @param mixed $value the value to set if $key is not an array
-         *
-         * @return object       the current instance
-         */
+            /**
+             * Set the value for $_GET, $_POST, $_SERVER etc. if the key is an array will
+             * set the current super variable value by this.
+             * @param array $var the super global variable to use, can be "$_POST", "$_GET", etc.
+             * @param  string|array  $key the item key to be set or array if need set the current global variable 
+             * by this value
+             * @param mixed $value the value to set if $key is not an array
+             *
+             * @return object       the current instance
+             */
         protected function setVars(&$var, $key, $value = null) {
             if (is_array($key)) {
                 //set all

core/classes/database/DatabaseQueryRunner.php

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;
 
         /**

Spacing +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
             //reset instance
             $this->reset();
 
-            $this->logger->debug('Begin execution of SQL query [' . $this->query .']');
+            $this->logger->debug('Begin execution of SQL query [' . $this->query . ']');
            
             //for database query execution time
             $benchmarkMarkerKey = $this->getBenchmarkKey();
@@ -117,7 +117,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.'
                                         );
             }
     		

core/classes/Security.php

Indentation +4 added lines, -4 removed lines

@@ -98,10 +98,10 @@
         }
 		
         /**
-        * This method is used to check the whitelist IP address access
-        *
-        * @return boolean
-        */
+         * This method is used to check the whitelist IP address access
+         *
+         * @return boolean
+         */
         public function checkWhiteListIpAccess() {
             $this->logger->debug('Validation of the IP address access ...');
             $this->logger->debug('Check if whitelist IP access is enabled in the configuration ...');

app/views/home.php

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
             <p>Required PHP version : <b>PHP &gt;= <?php echo TNH_MIN_PHP_VERSION; ?>, PHP &lt; <?php echo TNH_MAX_PHP_VERSION; ?></b></p>
             <p>Release date : <b><?php echo TNH_RELEASE_DATE; ?></b></p>
             <hr />
-            <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php';?></b>
-            <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php';?></b>
+            <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php'; ?></b>
+            <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php'; ?></b>
           </div>
         </div>
       </div>

core/classes/Url.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
      * SOFTWARE.
      */
 
-    class Url extends BaseClass{
+    class Url extends BaseClass {
 
         /**
          * Construct new instance
@@ -151,7 +151,7 @@ 
          * @return string the final path after add suffix if configured
          * otherwise the same value will be returned
          */
-        protected function addSuffixInPath($path){
+        protected function addSuffixInPath($path) {
             $suffix = get_config('url_suffix');
             if ($suffix && $path) {
                 if (strpos($path, '?') !== false) {

Indentation +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
                     break;
                 }
             }
-	    $port = get_instance()->request->server('SERVER_PORT');
+        $port = get_instance()->request->server('SERVER_PORT');
             if ($port && !in_array($port, array(80, 443))) {
                 $domain .= ':' . $port;
             }