tnhfw / tnh-fw

core/libraries/Upload.php

Braces +2 added lines, -4 removed lines

@@ -479,8 +479,7 @@ 
                     if (mkdir($destination_directory, 0775, true)) {
                         $this->destination_directory = $destination_directory;
                         chdir($destination_directory);
-                    }
-                    else{
+                    } else{
                         $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
                     }
                 }
@@ -632,8 +631,7 @@ 
                     // set original filename if not have a new name
                     if (empty($this->filename)) {
                         $this->filename = $this->file_array[$this->input]['name'];
-                    }
-                    else{
+                    } else{
                         // Replace %s for extension in filename
                         // Before: /[\w\d]*(.[\d\w]+)$/i
                         // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu

core/classes/Database.php

Braces +23 added lines, -46 removed lines

@@ -206,14 +206,12 @@ 
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
-          }
-          catch (PDOException $e){
+          } catch (PDOException $e){
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
           }
-      }
-      else{
+      } else{
         show_error('Database configuration is not set.');
         return false;
       }
@@ -231,8 +229,7 @@ 
           $froms .= $this->prefix . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
-      }
-      else{
+      } else{
         $this->from = $this->prefix . $table;
       }
       return $this;
@@ -338,8 +335,7 @@ 
       }
       if (empty($this->join)){
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      else{
+      } else{
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -410,8 +406,7 @@ 
         foreach($field as $f){
         	$this->whereIsNull($f, $andOr);
         }
-      }
-      else{
+      } else{
            $this->setWhereStr($field.' IS NULL ', $andOr);
       }
       return $this;
@@ -428,8 +423,7 @@ 
         foreach($field as $f){
           $this->whereIsNotNull($f, $andOr);
         }
-      }
-      else{
+      } else{
           $this->setWhereStr($field.' IS NOT NULL ', $andOr);
       }
       return $this;
@@ -449,8 +443,7 @@ 
       $whereStr = '';
       if (is_array($where)){
         $whereStr = $this->getWhereStrIfIsArray($where, $type, $andOr, $escape);
-      }
-      else{
+      } else{
         if (is_array($op)){
           $whereStr = $this->getWhereStrIfOperatorIsArray($where, $op, $type, $escape);
         } else {
@@ -498,12 +491,10 @@ 
     public function groupStart($type = '', $andOr = ' AND'){
       if (empty($this->where)){
         $this->where = $type . ' (';
-      }
-      else{
+      } else{
           if (substr($this->where, -1) == '('){
             $this->where .= $type . ' (';
-          }
-          else{
+          } else{
           	$this->where .= $andOr . ' ' . $type . ' (';
           }
       }
@@ -702,8 +693,7 @@ 
       }
       if (! is_null($limitEnd)){
         $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
+      } else{
         $this->limit = $limit;
       }
       return $this;
@@ -718,8 +708,7 @@ 
     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);
@@ -735,8 +724,7 @@ 
     public function groupBy($field){
       if (is_array($field)){
         $this->groupBy = implode(', ', $field);
-      }
-      else{
+      } else{
         $this->groupBy = $field;
       }
       return $this;
@@ -763,14 +751,12 @@ 
   	      }
       	}
         $this->having = $w;
-      }
-      else if (! in_array($op, $this->operatorList)){
+      } else if (! in_array($op, $this->operatorList)){
         if (is_null($op)){
           $op = '';
         }
         $this->having = $field . ' > ' . ($this->escape($op, $escape));
-      }
-      else{
+      } else{
         if (is_null($val)){
           $val = '';
         }
@@ -815,8 +801,7 @@ 
       $query = $this->getAll(true);
       if ($returnSQLQueryOrResultType === true){
         return $query;
-      }
-      else{
+      } else{
         return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -1165,8 +1150,7 @@ 
                                             $dbCacheStatus && $isSqlSELECTQuery, 
                                             $this->temporaryCacheTtl
                                           );
-          }
-          else{
+          } else{
               $this->setQueryResultForNonSelect($sqlQuery);
               if (! $this->result){
                 $this->setQueryError();
@@ -1193,8 +1177,7 @@ 
     protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
       if ($logger !== null){
         $this->logger = $logger;
-      }
-      else{
+      } else{
           $this->logger =& class_loader('Log', 'classes');
           $this->logger->setLogger('Library::Database');
       }
@@ -1320,8 +1303,7 @@ 
             $op = '';
           }
           $w = $type . $where . ' = ' . ($this->escape($op, $escape));
-        }
-        else{
+        } else{
           if (is_null($val)){
             $val = '';
           }
@@ -1338,12 +1320,10 @@ 
       protected function setWhereStr($whereStr, $andOr = 'AND'){
         if (empty($this->where)){
           $this->where = $whereStr;
-        }
-        else{
+        } else{
           if (substr($this->where, -1) == '('){
             $this->where = $this->where . ' ' . $whereStr;
-          }
-          else{
+          } else{
             $this->where = $this->where . ' '.$andOr.' ' . $whereStr;
           }
         }
@@ -1421,15 +1401,13 @@ 
       //if need return all result like list of record
       if (is_bool($all) && $all){
           $this->result = ($array === false) ? $pdoStatment->fetchAll(PDO::FETCH_OBJ) : $pdoStatment->fetchAll(PDO::FETCH_ASSOC);
-      }
-      else{
+      } else{
           $this->result = ($array === false) ? $pdoStatment->fetch(PDO::FETCH_OBJ) : $pdoStatment->fetch(PDO::FETCH_ASSOC);
       }
       //Sqlite and pgsql always return 0 when using rowCount()
       if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
         $this->numRows = count($this->result);  
-      }
-      else{
+      } else{
         $this->numRows = $pdoStatment->rowCount(); 
       }
     }
@@ -1443,8 +1421,7 @@ 
       if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
         $this->result = 1; //to test the result for the query like UPDATE, INSERT, DELETE
         $this->numRows = 1;  
-      }
-      else{
+      } else{
           $this->result = $pdoStatment->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
           $this->numRows = $pdoStatment->rowCount(); 
       }