tnhfw / tnh-fw

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;

core/libraries/Upload.php

Spacing +3 added lines, -3 removed lines

@@ -283,7 +283,7 @@ 
          *
          * @return object the current instance
          */
-        public function setUploadedFileData(array $fileData){
+        public function setUploadedFileData(array $fileData) {
             $this->uploadedFileData = $fileData;
             return $this;
         }
@@ -526,7 +526,7 @@ 
          *    @return    boolean
          */
         public function isAllowOverwriting() {
-            return $this->overwriteFile ;
+            return $this->overwriteFile;
         }
 
         /**
@@ -565,7 +565,7 @@ 
          *    @return    string
          */
         public function getDestinationDirectory() {
-            return $this->destinationDirectory ;
+            return $this->destinationDirectory;
         }
 
         /**

Indentation +48 added lines, -48 removed lines

@@ -277,10 +277,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the uploade file array
-         *    @return    array
-         */
+            /**
+             *    Get the uploade file array
+             *    @return    array
+             */
         public function getUploadedFileData() {
             return $this->uploadedFileData;
         }
@@ -320,10 +320,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the filename
-         *    @return    string
-         */
+            /**
+             *    Get the filename
+             *    @return    string
+             */
         public function getFilename() {
             return $this->filename;
         }
@@ -352,23 +352,23 @@ 
             return $this;
         }
 
-         /**
-         *    Get the max file size
-         *    @return    double|int
-         */
+            /**
+             *    Get the max file size
+             *    @return    double|int
+             */
         public function getMaxFileSize() {
             return $this->maxFileSize;
         }
 
-         /**
-         *    Append a mime type to allowed mime types
-         *
-         *    @since     1.0
-         *    @version   1.0.1
-         *    @param     string      $mime
-         *    @return    object
-         *    @method    boolean     setAllowMimeType
-         */
+            /**
+             *    Append a mime type to allowed mime types
+             *
+             *    @since     1.0
+             *    @version   1.0.1
+             *    @param     string      $mime
+             *    @return    object
+             *    @method    boolean     setAllowMimeType
+             */
         public function setAllowMimeType($mime) {
             $this->allowedMimeTypes[] = strtolower($mime);
             $this->file['allowed_mime_types'][] = strtolower($mime); 
@@ -485,10 +485,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the upload function name like "copy", "move_uploaded_file"
-         *    @return    string
-         */
+            /**
+             *    Get the upload function name like "copy", "move_uploaded_file"
+             *    @return    string
+             */
         public function getUploadFunction() {
             return $this->uploadFunction;
         }
@@ -506,10 +506,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the allow overwriting
-         *    @return    boolean
-         */
+            /**
+             *    Get the allow overwriting
+             *    @return    boolean
+             */
         public function isAllowOverwriting() {
             return $this->overwriteFile ;
         }
@@ -614,14 +614,14 @@ 
             return $this->error;
         }
 
-         /**
-         *    Retrive status of upload
-         *
-         *    @since     1.0
-         *    @version   1.0
-         *    @return    boolean
-         *    @method    boolean    getStatus
-         */
+            /**
+             *    Retrive status of upload
+             *
+             *    @since     1.0
+             *    @version   1.0
+             *    @return    boolean
+             *    @method    boolean    getStatus
+             */
         public function getStatus() {
             return $this->file['status'];
         }
@@ -654,11 +654,11 @@ 
                                 && is_file($file);
         }
 
-         /**
-         * Set the filename if is empty using the uploaded data information
-         *
-         * @return object the current instance
-         */
+            /**
+             * Set the filename if is empty using the uploaded data information
+             *
+             * @return object the current instance
+             */
         protected function setFilenameUsingUploadedData() {
             // set original filename if not have a new name
             if (empty($this->filename)) {
@@ -742,12 +742,12 @@ 
             return $this->maxFileSize >= $size;
         }
 
-         /**
-         *    Check the file overwritting
-         *    @since     1.0
-         *    @version   1.0
-         *    @return    boolean
-         */
+            /**
+             *    Check the file overwritting
+             *    @since     1.0
+             *    @version   1.0
+             *    @return    boolean
+             */
         protected function checkFileOverwritting() {
             if ($this->fileExists($this->destinationDirectory . $this->filename)) {
                 return $this->overwriteFile;

core/classes/DBSessionHandler.php

Spacing +1 added lines, -1 removed lines

@@ -318,7 +318,7 @@
          * Get some parameters data need like ip address, hostname, browser info, etc.
          * @return array
          */
-        protected function getSessionDataParams(){
+        protected function getSessionDataParams() {
             $this->OBJ->loader->functions('user_agent'); 
             $this->OBJ->loader->library('Browser'); 
             

core/libraries/Cookie.php

Indentation +2 added lines, -2 removed lines

@@ -64,8 +64,8 @@
         public function set($name, $value = '', $expire = 0, $path = '/', $domain = '', $secure = false, $httponly = false) {
             if (headers_sent()) {
                 show_error('There exists a cookie that we wanted to create that we couldn\'t '
-						    . 'because headers was already sent. Make sure to do this first ' 
-							. 'before outputing anything.');
+                            . 'because headers was already sent. Make sure to do this first ' 
+                            . 'before outputing anything.');
             }
             $timestamp = $expire;
             if ($expire) {

core/classes/Controller.php

Indentation +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
          *
          * @codeCoverageIgnore
          */
-         private function startAppSession() {
+            private function startAppSession() {
             //$_SESSION is not available on cli mode 
             if (!IS_CLI) {
                 //set session params
@@ -143,7 +143,7 @@ 
          * @codeCoverageIgnore
          */
         private function setAppSessionConfig() {
-             //the default is to store in the files
+                //the default is to store in the files
             $sessionHandler = $this->config->get('session_handler', 'files');
             $this->logger->info('Session handler: ' . $sessionHandler);
             if ($sessionHandler == 'files') {

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');
@@ -623,7 +623,7 @@ 
          * Only get deleted rows on the next call
          * 
          * @return object the current instance
-        */
+         */
         public function onlyRecordDeleted() {
             $this->returnOnlyRecordDeleted = true;
             return $this;
@@ -649,8 +649,8 @@ 
          * @return array the data after add field for updated time
          */
         public 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;
         }
 
         /**
@@ -695,7 +695,7 @@ 
          */
         public function removeProtectedTableColumns($row) {
             foreach ($this->protectedTableColumns as $attr) {
-               if (isset($row[$attr])) {
+                if (isset($row[$attr])) {
                     unset($row[$attr]);
                 }
             }
@@ -818,23 +818,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(
@@ -845,16 +845,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');

Spacing +5 added lines, -5 removed lines

@@ -823,7 +823,7 @@ 
          * 
          * @return string|boolean
          */
-        protected function getReturnType(){
+        protected function getReturnType() {
             $type = false;
             if ($this->temporaryReturnRecordType == 'array') {
                $type = 'array';
@@ -835,7 +835,7 @@ 
          * Check if soft delete is enable setting the condition
          * @return object the current instance 
          */
-        protected function checkForSoftDelete(){
+        protected function checkForSoftDelete() {
             if ($this->softDeleteStatus && $this->returnRecordWithDeleted !== true) {
                 $this->getQueryBuilder()->where(
                                                 $this->softDeleteTableColumn, 
@@ -855,11 +855,11 @@ 
          * 
          * @return array|object the final row values
          */
-        protected function relateOneToManyAndManyToOne($relationship, $options, $row, $type){
+        protected function relateOneToManyAndManyToOne($relationship, $options, $row, $type) {
             if (in_array($relationship, $this->withs)) {
                 get_instance()->loader->model($options['model'], $relationship . '_model');
                 $model = get_instance()->{$relationship . '_model'};
-                if($type == 'manyToOne'){
+                if ($type == 'manyToOne') {
                     if (is_object($row)) {
                         $row->{$relationship} = $model->getSingleRecord($row->{$options['primary_key']});
                     } else {
@@ -969,7 +969,7 @@ 
                 } else {
                     if (is_int($field)) {
                         //Condition like xxxx->getListRecordCond(array('id'));
-                        $this->getQueryBuilder()->where($value);  // WHERE id = ''
+                        $this->getQueryBuilder()->where($value); // WHERE id = ''
                     } else {
                         //Condition like xxxx->getListRecordCond(array('status' => 0));
                         $this->getQueryBuilder()->where($field, $value); // WHERE status = 0

core/bootstrap.php

Indentation +28 added lines, -28 removed lines

@@ -1,32 +1,32 @@ 
 <?php
     defined('ROOT_PATH') || exit('Access denied');
-     /**
-     * TNH Framework
-     *
-     * A simple PHP framework using HMVC architecture
-     *
-     * This content is released under the MIT License (MIT)
-     *
-     * Copyright (c) 2017 TNH Framework
-     *
-     * Permission is hereby granted, free of charge, to any person obtaining a copy
-     * of this software and associated documentation files (the "Software"), to deal
-     * in the Software without restriction, including without limitation the rights
-     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-     * copies of the Software, and to permit persons to whom the Software is
-     * furnished to do so, subject to the following conditions:
-     *
-     * The above copyright notice and this permission notice shall be included in all
-     * copies or substantial portions of the Software.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-     * SOFTWARE.
-     */
+        /**
+         * TNH Framework
+         *
+         * A simple PHP framework using HMVC architecture
+         *
+         * This content is released under the MIT License (MIT)
+         *
+         * Copyright (c) 2017 TNH Framework
+         *
+         * Permission is hereby granted, free of charge, to any person obtaining a copy
+         * of this software and associated documentation files (the "Software"), to deal
+         * in the Software without restriction, including without limitation the rights
+         * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+         * copies of the Software, and to permit persons to whom the Software is
+         * furnished to do so, subject to the following conditions:
+         *
+         * The above copyright notice and this permission notice shall be included in all
+         * copies or substantial portions of the Software.
+         *
+         * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+         * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+         * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+         * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+         * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+         * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+         * SOFTWARE.
+         */
 
     /**
      *  @file bootstrap.php
@@ -143,7 +143,7 @@ 
     /**
      * Register controllers autoload function
      */
-     spl_autoload_register('autoload_controller');
+        spl_autoload_register('autoload_controller');
 
     /**
      * Loading Security class