tnhfw / tnh-fw

core/classes/database/DatabaseQueryBuilder.php

Spacing +25 added lines, -25 removed lines

@@ -215,17 +215,17 @@ 
      * @param  string $type   the type of join (INNER, LEFT, RIGHT)
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
+    public function join($table, $field1 = null, $op = null, $field2 = null, $type = '') {
         $on = $field1;
         $table = $this->getPrefix() . $table;
-        if (! is_null($op)){
-        $on = (! in_array($op, $this->operatorList) 
+        if (!is_null($op)) {
+        $on = (!in_array($op, $this->operatorList) 
                                                     ? ($this->getPrefix() . $field1 . ' = ' . $this->getPrefix() . $op) 
                                                     : ($this->getPrefix() . $field1 . ' ' . $op . ' ' . $this->getPrefix() . $field2));
         }
-        if (empty($this->join)){
+        if (empty($this->join)) {
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-        } else{
+        } else {
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
         }
         return $this;
@@ -329,12 +329,12 @@ 
      * @param  boolean $escape whether to escape or not the $val
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
+    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true) {
         $whereStr = '';
-        if (is_array($where)){
+        if (is_array($where)) {
         $whereStr = $this->getWhereStrIfIsArray($where, $type, $andOr, $escape);
-        } else{
-        if (is_array($op)){
+        } else {
+        if (is_array($op)) {
             $whereStr = $this->getWhereStrIfOperatorIsArray($where, $op, $type, $escape);
         } else {
             $whereStr = $this->getWhereStrForOperator($where, $op, $val, $type, $escape);
@@ -577,13 +577,13 @@ 
      * @param  int $limitEnd the limit count
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function limit($limit, $limitEnd = null){
-        if (empty($limit)){
+    public function limit($limit, $limitEnd = null) {
+        if (empty($limit)) {
         $limit = 0;
         }
-        if (! is_null($limitEnd)){
+        if (!is_null($limitEnd)) {
         $this->limit = $limit . ', ' . $limitEnd;
-        } else{
+        } else {
         $this->limit = $limit;
         }
         return $this;
@@ -595,10 +595,10 @@ 
      * @param  string $orderDir the order direction (ASC or DESC)
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orderBy($orderBy, $orderDir = ' ASC'){
-        if (stristr($orderBy, ' ') || $orderBy == 'rand()'){
+    public function orderBy($orderBy, $orderDir = ' ASC') {
+        if (stristr($orderBy, ' ') || $orderBy == 'rand()') {
         $this->orderBy = empty($this->orderBy) ? $orderBy : $this->orderBy . ', ' . $orderBy;
-        } else{
+        } else {
         $this->orderBy = empty($this->orderBy) 
                         ? ($orderBy . ' ' . strtoupper($orderDir)) 
                         : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
@@ -611,10 +611,10 @@ 
      * @param  string|array $field the field name used or array of field list
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function groupBy($field){
-        if (is_array($field)){
+    public function groupBy($field) {
+        if (is_array($field)) {
         $this->groupBy = implode(', ', $field);
-        } else{
+        } else {
         $this->groupBy = $field;
         }
         return $this;
@@ -628,16 +628,16 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function having($field, $op = null, $val = null, $escape = true){
-        if (is_array($op)){
+    public function having($field, $op = null, $val = null, $escape = true) {
+        if (is_array($op)) {
         $this->having = $this->getHavingStrIfOperatorIsArray($field, $op, $escape);
-        } else if (! in_array($op, $this->operatorList)){
-        if (is_null($op)){
+        } else if (!in_array($op, $this->operatorList)) {
+        if (is_null($op)) {
             $op = '';
         }
         $this->having = $field . ' > ' . ($this->escape($op, $escape));
-        } else{
-        if (is_null($val)){
+        } else {
+        if (is_null($val)) {
             $val = '';
         }
         $this->having = $field . ' ' . $op . ' ' . ($this->escape($val, $escape));

core/classes/database/Database.php

Spacing +4 added lines, -4 removed lines

@@ -149,7 +149,7 @@ 
             $this->updateQueryBuilderAndRunnerProperties();
 
             return is_object($this->pdo);
-            } catch (PDOException $e){
+            } catch (PDOException $e) {
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
@@ -596,17 +596,17 @@ 
      * @param  string $driver the driver name
      * @return string|null         the dsn name
      */
-    protected function getDsnValueForDriver($driver){
+    protected function getDsnValueForDriver($driver) {
         $dsn = '';
         $config = $this->getDatabaseConfiguration();
-        if (empty($config)){
+        if (empty($config)) {
         return null;
         }
         switch ($driver) {
             case 'mysql':
             case 'pgsql':
               $port = '';
-                if (! empty($config['port'])) {
+                if (!empty($config['port'])) {
                 $port = 'port=' . $config['port'] . ';';
                 }
                 $dsn = $driver . ':host=' . $config['hostname'] . ';' . $port . 'dbname=' . $config['database'];

core/classes/database/DatabaseQueryRunner.php

Spacing +20 added lines, -20 removed lines

@@ -130,18 +130,18 @@ 
                                                                 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')'
                                                                 );
             //TODO use the configuration value for the high response time currently is 1 second
-        if ($responseTime >= 1 ){
+        if ($responseTime >= 1) {
             $this->logger->warning(
                                     'High response time while processing database query [' . $this->query . ']. 
-                                     The response time is [' .$responseTime. '] sec.'
+                                     The response time is [' .$responseTime . '] sec.'
                                     );
         }
 		
-        if ($this->pdoStatment !== false){
+        if ($this->pdoStatment !== false) {
             $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
-            if($isSqlSELECTQuery){
+            if ($isSqlSELECTQuery) {
                 $this->setResultForSelect();              
-            } else{
+            } else {
                 $this->setResultForNonSelect();
             }
             return $this->queryResult;
@@ -153,26 +153,26 @@ 
      * Return the result for SELECT query
      * @see DatabaseQueryRunner::execute
      */
-    protected function setResultForSelect(){
+    protected function setResultForSelect() {
         //if need return all result like list of record
         $result = null;
         $numRows = 0;
         $fetchMode = PDO::FETCH_OBJ;
-        if($this->returnAsArray){
+        if ($this->returnAsArray) {
         $fetchMode = PDO::FETCH_ASSOC;
         }
-        if ($this->returnAsList){
+        if ($this->returnAsList) {
             $result = $this->pdoStatment->fetchAll($fetchMode);
-        } else{
+        } else {
             $result = $this->pdoStatment->fetch($fetchMode);
         }
         //Sqlite and pgsql always return 0 when using rowCount()
-        if (in_array($this->driver, array('sqlite', 'pgsql'))){
+        if (in_array($this->driver, array('sqlite', 'pgsql'))) {
         $numRows = count($result);  
-        } else{
+        } else {
         $numRows = $this->pdoStatment->rowCount(); 
         }
-        if(! is_object($this->queryResult)){
+        if (!is_object($this->queryResult)) {
             $this->queryResult = & class_loader('DatabaseQueryResult', 'classes/database');
         }
         $this->queryResult->setResult($result);
@@ -183,19 +183,19 @@ 
      * Return the result for non SELECT query
      * @see DatabaseQueryRunner::execute
      */
-    protected function setResultForNonSelect(){
+    protected function setResultForNonSelect() {
         //Sqlite and pgsql always return 0 when using rowCount()
         $result = false;
         $numRows = 0;
-        if (in_array($this->driver, array('sqlite', 'pgsql'))){
+        if (in_array($this->driver, array('sqlite', 'pgsql'))) {
         $result = true; //to test the result for the query like UPDATE, INSERT, DELETE
         $numRows = 1; //TODO use the correct method to get the exact affected row
-        } else{
+        } else {
             //to test the result for the query like UPDATE, INSERT, DELETE
             $result  = $this->pdoStatment->rowCount() >= 0; 
             $numRows = $this->pdoStatment->rowCount(); 
         }
-        if(! is_object($this->queryResult)){
+        if (!is_object($this->queryResult)) {
             $this->queryResult = & class_loader('DatabaseQueryResult', 'classes/database');
         }
         $this->queryResult->setResult($result);
@@ -347,11 +347,11 @@ 
      * Set the Log instance using argument or create new instance
      * @param object $logger the Log instance if not null
      */
-    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-        if ($logger !== null){
+    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null) {
+        if ($logger !== null) {
         $this->logger = $logger;
-        } else{
-            $this->logger =& class_loader('Log', 'classes');
+        } else {
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::DatabaseQueryRunner');
         }
     }

core/classes/Request.php

Spacing +4 added lines, -4 removed lines

@@ -90,20 +90,20 @@
         /**
          * Construct new request instance
          */
-        public function __construct(){
+        public function __construct() {
             $this->get = $_GET;
             $this->post = $_POST;
             $this->server = $_SERVER;
             $this->query = $_REQUEST;
             $this->cookie = $_COOKIE;
             $this->file = $_FILES;
-            $this->session =& class_loader('Session', 'classes');
+            $this->session = & class_loader('Session', 'classes');
             $this->method = $this->server('REQUEST_METHOD');
             $this->requestUri = $this->server('REQUEST_URI');
             $this->header = array();
-            if(function_exists('apache_request_headers')){
+            if (function_exists('apache_request_headers')) {
                 $this->header = apache_request_headers();
-            } else if(function_exists('getallheaders')){
+            } else if (function_exists('getallheaders')) {
                 $this->header = getallheaders();
             }
         }

core/classes/Security.php

Spacing +9 added lines, -9 removed lines

@@ -38,13 +38,13 @@ 
             $expire = get_config('csrf_expire', 60);
             $keyExpire = 'csrf_expire';
             $currentTime = time();
-            if(Session::exists($key) && Session::exists($keyExpire) && Session::get($keyExpire) > $currentTime){
+            if (Session::exists($key) && Session::exists($keyExpire) && Session::get($keyExpire) > $currentTime) {
                 $logger->info('The CSRF token not yet expire just return it');
                 return Session::get($key);
-            } else{
+            } else {
                 $newTime = $currentTime + $expire;
                 $token = sha1(uniqid()) . sha1(uniqid());
-                $logger->info('The CSRF informations are listed below: key [' .$key. '], key expire [' .$keyExpire. '], expire time [' .$expire. '], token [' .$token. ']');
+                $logger->info('The CSRF informations are listed below: key [' . $key . '], key expire [' . $keyExpire . '], expire time [' . $expire . '], token [' . $token . ']');
                 Session::set($keyExpire, $newTime);
                 Session::set($key, $token);
                 return Session::get($key);
@@ -87,23 +87,23 @@ 
         /**
          * This method is used to check the whitelist IP address access
          */
-            public static function checkWhiteListIpAccess(){
+            public static function checkWhiteListIpAccess() {
             $logger = self::getLogger();
             $logger->debug('Validation of the IP address access ...');
             $logger->debug('Check if whitelist IP access is enabled in the configuration ...');
             $isEnable = get_config('white_list_ip_enable', false);
-            if($isEnable){
+            if ($isEnable) {
                 $logger->info('Whitelist IP access is enabled in the configuration');
                 $list = get_config('white_list_ip_addresses', array());
-                if(! empty($list)){
+                if (!empty($list)) {
                     //Can't use Loader::functions() at this time because teh "Loader" library is loader after the security prossessing
                     require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
                     $ip = get_ip();
-                    if((count($list) == 1 && $list[0] == '*') || in_array($ip, $list)){
+                    if ((count($list) == 1 && $list[0] == '*') || in_array($ip, $list)) {
                         $logger->info('IP address ' . $ip . ' allowed using the wildcard "*" or the full IP');
                         //wildcard to access all ip address
                         return;
-                    } else{
+                    } else {
                         // go through all whitelisted ips
                         foreach ($list as $ipaddr) {
                             // find the wild card * in whitelisted ip (f.e. find position in "127.0.*" or "127*")
@@ -128,7 +128,7 @@ 
                         show_error('Access to this application is not allowed');
                     }
                 }
-            } else{
+            } else {
                 $logger->info('Whitelist IP access is not enabled in the configuration, ignore checking');
             }
             }

core/bootstrap.php

Spacing +14 added lines, -14 removed lines

@@ -86,9 +86,9 @@ 
     /**
      * Verification of the PHP environment: minimum and maximum version
      */
-    if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
+    if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')) {
         show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
-    } else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
+    } else if (version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')) {
         show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
     }
     $LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
@@ -110,10 +110,10 @@ 
 	
     //if user have some composer packages
     $LOGGER->debug('Check for composer autoload');
-    if(file_exists(VENDOR_PATH . 'autoload.php')){
+    if (file_exists(VENDOR_PATH . 'autoload.php')) {
         $LOGGER->info('The composer autoload file exists include it');
         require_once VENDOR_PATH . 'autoload.php';
-    } else{
+    } else {
         $LOGGER->info('The composer autoload file does not exist skipping');
     }
 	
@@ -158,35 +158,35 @@ 
     /**
      * Loading Security class
      */
-    $SECURITY =& class_loader('Security', 'classes');
+    $SECURITY = & class_loader('Security', 'classes');
     $SECURITY->checkWhiteListIpAccess();
 	
     /**
      * Loading Url class
      */
-    $URL =& class_loader('Url', 'classes');
+    $URL = & class_loader('Url', 'classes');
 	
-    if(get_config('cache_enable', false)){
+    if (get_config('cache_enable', false)) {
         /**
          * Load Cache interface file
          */
         require_once CORE_CLASSES_CACHE_PATH . 'CacheInterface.php';
         $cacheHandler = get_config('cache_handler');
-        if(! $cacheHandler){
+        if (!$cacheHandler) {
             show_error('The cache feature is enabled in the configuration but the cache handler class is not set.');
         }
         $CACHE = null;
         //first check if the cache handler is the system driver
-        if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
-            $CACHE =& class_loader($cacheHandler, 'classes/cache');
-        } else{
+        if (file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')) {
+            $CACHE = & class_loader($cacheHandler, 'classes/cache');
+        } else {
             //it's not a system driver use user library
-            $CACHE =& class_loader($cacheHandler);
+            $CACHE = & class_loader($cacheHandler);
         }
         //check if the page already cached
-        if(! empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get'){
+        if (!empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get') {
             $RESPONSE = & class_loader('Response', 'classes');
-            if ($RESPONSE->renderFinalPageFromCache($CACHE)){
+            if ($RESPONSE->renderFinalPageFromCache($CACHE)) {
                 return;
             }
         }