tnhfw / tnh-fw

core/classes/model/Model.php

Indentation +31 added lines, -31 removed lines

@@ -30,7 +30,7 @@ 
 
     class Model {
 
-       /**
+        /**
          * This model's default database table. 
          * @var string the name of table
          */
@@ -173,12 +173,12 @@ 
             if ($db !== null) {
                 $this->setDb($db);
             } else {
-                 /**
-                 * NOTE: Need use "clone" because some Model need have the personal instance of the database library
-                 * to prevent duplication
-                 */
-                 $obj = & get_instance();
-                 $this->setDb(clone $obj->database);
+                    /**
+                     * NOTE: Need use "clone" because some Model need have the personal instance of the database library
+                     * to prevent duplication
+                     */
+                    $obj = & get_instance();
+                    $this->setDb(clone $obj->database);
             }
             array_unshift($this->beforeCreateCallbacks, 'removeProtectedTableColumns');
             array_unshift($this->beforeUpdateCallbacks, 'removeProtectedTableColumns');
@@ -592,7 +592,7 @@ 
          * Only get deleted rows on the next call
          * 
          * @return object the current instance
-        */
+         */
         public function onlyRecordDeleted() {
             $this->returnOnlyRecordDeleted = true;
             return $this;
@@ -686,8 +686,8 @@ 
          * @return array the data after add field for updated time
          */
         protected function updatedAt($row) {
-           $row['updated_at'] = date('Y-m-d H:i:s');
-           return $row;
+            $row['updated_at'] = date('Y-m-d H:i:s');
+            return $row;
         }
 
         /**
@@ -732,7 +732,7 @@ 
          */
         protected function removeProtectedTableColumns($row) {
             foreach ($this->protectedTableColumns as $attr) {
-               if (isset($row[$attr])) {
+                if (isset($row[$attr])) {
                     unset($row[$attr]);
                 }
             }
@@ -787,23 +787,23 @@ 
             return false;
         }
 
-         /**
-         * Get the record return type array or object
-         * 
-         * @return string|boolean
-         */
+            /**
+             * Get the record return type array or object
+             * 
+             * @return string|boolean
+             */
         protected function getReturnType(){
             $type = false;
             if ($this->temporaryReturnRecordType == 'array') {
-               $type = 'array';
+                $type = 'array';
             }
             return $type;
         }
 
-         /**
-         * Check if soft delete is enable setting the condition
-         * @return object the current instance 
-         */
+            /**
+             * Check if soft delete is enable setting the condition
+             * @return object the current instance 
+             */
         protected function checkForSoftDelete(){
             if ($this->softDeleteStatus && $this->returnRecordWithDeleted !== true) {
                 $this->getQueryBuilder()->where(
@@ -814,16 +814,16 @@ 
             return $this;
         }
 
-         /**
-         * Relate for "manyToOne" and "oneToMany"
-         * 
-         * @param  string $relationship the name of relation
-         * @param  string|array $options      the model and primary key values
-         * @param  object|array $row          the row to update
-         * @param  string $type the type can be "manyToOne", "oneToMany"
-         * 
-         * @return array|object the final row values
-         */
+            /**
+             * Relate for "manyToOne" and "oneToMany"
+             * 
+             * @param  string $relationship the name of relation
+             * @param  string|array $options      the model and primary key values
+             * @param  object|array $row          the row to update
+             * @param  string $type the type can be "manyToOne", "oneToMany"
+             * 
+             * @return array|object the final row values
+             */
         protected function relateOneToManyAndManyToOne($relationship, $options, $row, $type){
             if (in_array($relationship, $this->withs)) {
                 get_instance()->loader->model($options['model'], $relationship . '_model');

core/classes/database/DatabaseQueryBuilder.php

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