@@ -34,8 +34,8 @@ |
||
34 | 34 | <p>Author : <b><?php echo TNH_AUTHOR; ?></b></p> |
35 | 35 | <p>Author E-mail : <b><?php echo TNH_AUTHOR_EMAIL; ?></b></p> |
36 | 36 | <hr /> |
37 | - <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php';?></b> |
|
38 | - <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php';?></b> |
|
37 | + <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php'; ?></b> |
|
38 | + <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php'; ?></b> |
|
39 | 39 | </div> |
40 | 40 | </div> |
41 | 41 | </div> |
@@ -142,7 +142,7 @@ |
||
142 | 142 | * @return string the final path after add suffix if configured |
143 | 143 | * otherwise the same value will be returned |
144 | 144 | */ |
145 | - protected static function addSuffixInPath($path){ |
|
145 | + protected static function addSuffixInPath($path) { |
|
146 | 146 | $suffix = get_config('url_suffix'); |
147 | 147 | if ($suffix && $path) { |
148 | 148 | if (strpos($path, '?') !== false) { |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | $instance = $db; |
152 | 152 | } else { |
153 | 153 | $obj = & get_instance(); |
154 | - if (isset($obj->database)){ |
|
154 | + if (isset($obj->database)) { |
|
155 | 155 | /** |
156 | 156 | * NOTE: Need use "clone" because some Model need have the personal instance of the database library |
157 | 157 | * to prevent duplication |
@@ -730,7 +730,7 @@ discard block |
||
730 | 730 | * @return object |
731 | 731 | */ |
732 | 732 | protected function getLoaderInstanceOrCreate() { |
733 | - if (! is_object($this->loaderInstance)) { |
|
733 | + if (!is_object($this->loaderInstance)) { |
|
734 | 734 | $this->loaderInstance = & get_instance()->loader; |
735 | 735 | } |
736 | 736 | return $this->loaderInstance; |
@@ -740,7 +740,7 @@ discard block |
||
740 | 740 | * Get the return type array or object |
741 | 741 | * @return string|boolean |
742 | 742 | */ |
743 | - protected function getReturnType(){ |
|
743 | + protected function getReturnType() { |
|
744 | 744 | $type = false; |
745 | 745 | if ($this->_temporary_return_type == 'array') { |
746 | 746 | $type = 'array'; |
@@ -752,7 +752,7 @@ discard block |
||
752 | 752 | * Check if soft delete is enable setting the condition |
753 | 753 | * @return object the current instance |
754 | 754 | */ |
755 | - protected function checkForSoftDelete(){ |
|
755 | + protected function checkForSoftDelete() { |
|
756 | 756 | if ($this->soft_delete && $this->_temporary_with_deleted !== true) { |
757 | 757 | $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted); |
758 | 758 | } |
@@ -767,12 +767,12 @@ discard block |
||
767 | 767 | * @param string $type the type can be "belongs_to", "has_many" |
768 | 768 | * @return mixed the final row values |
769 | 769 | */ |
770 | - protected function relateBelongsToAndHasMany($relationship, $options, $row, $type){ |
|
770 | + protected function relateBelongsToAndHasMany($relationship, $options, $row, $type) { |
|
771 | 771 | if (in_array($relationship, $this->_with)) { |
772 | 772 | $loaderInstance = $this->getLoaderInstanceOrCreate(); |
773 | 773 | $loaderInstance->model($options['model'], $relationship . '_model'); |
774 | 774 | |
775 | - if($type == 'belongs_to'){ |
|
775 | + if ($type == 'belongs_to') { |
|
776 | 776 | if (is_object($row)) { |
777 | 777 | $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']}); |
778 | 778 | } else { |