tnhfw / tnh-fw

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/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/classes/database/DatabaseConnection.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
                     PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ
                 );
                 $this->pdo = new PDO($this->getDsnValue(), $this->getUsername(), $this->getPassword(), $options);
-                if($this->getDriver() == 'mysql') {
+                if ($this->getDriver() == 'mysql') {
                     $this->pdo->exec("SET NAMES '" . $this->getCharset() . "' COLLATE '" . $this->getCollation() . "'");
                     $this->pdo->exec("SET CHARACTER SET '" . $this->getCharset() . "'");
                 }

Indentation +42 added lines, -43 removed lines

@@ -42,28 +42,28 @@ 
          */
         private $driver = null;
 
-         /**
-         * The database hostname
-         * @var string
-         */
+            /**
+             * The database hostname
+             * @var string
+             */
         private $hostname = null;
 
-          /**
-         * The database port
-         * @var integer
-         */
+            /**
+             * The database port
+             * @var integer
+             */
         private $port = null;
         
-         /**
-         * The database username
-         * @var string
-         */
+            /**
+             * The database username
+             * @var string
+             */
         private $username = null;
 
-         /**
-         * The database password
-         * @var string
-         */
+            /**
+             * The database password
+             * @var string
+             */
         private $password = null;
 
         /**
@@ -72,10 +72,10 @@ 
          */
         private $databaseName = null;
 
-         /**
-         * The database charset
-         * @var string
-         */
+            /**
+             * The database charset
+             * @var string
+             */
         private $charset = null;
 
         /**
@@ -84,10 +84,10 @@ 
          */
         private $collation = null;
 
-         /**
-         * The database tables prefix
-         * @var string
-         */
+            /**
+             * The database tables prefix
+             * @var string
+             */
         private $prefix = null;
 
         /**
@@ -113,11 +113,11 @@ 
             }
         }
 
-         /**
-         * This is method is used to connect to database
-         * 
-         * @return boolean true in case of successfully connection false if error
-         */
+            /**
+             * This is method is used to connect to database
+             * 
+             * @return boolean true in case of successfully connection false if error
+             */
         public function connect() {
             try {
                 $options = array(
@@ -176,9 +176,9 @@ 
             );
             if ($port) {
                 $driversPort = array(
-                      'mysql'  => 'port=' . $port . ';',
-                      'pgsql'  => 'port=' . $port . ';',
-                      'oracle' => ':' . $port
+                        'mysql'  => 'port=' . $port . ';',
+                        'pgsql'  => 'port=' . $port . ';',
+                        'oracle' => ':' . $port
                 );
                 if (isset($driversPort[$driver])) {
                     $port = $driversPort[$driver];
@@ -416,7 +416,7 @@ 
             $this->populatePropertiesFromConfig();
 
             if (!empty($this->config)) {
-               //For logging
+                //For logging
                 $configInfo = $this->config;
                 //Hide password from log
                 $configInfo['password'] = string_hidden($this->getPassword());
@@ -425,11 +425,10 @@ 
             return $this;
         }
 
-         /**
-         * Get the database configuration using the configuration file
-         
-         * @return array the database configuration from file
-         */
+            /**
+             * Get the database configuration using the configuration file
+             * @return array the database configuration from file
+             */
         public function getDatabaseConfigFromFile() {
             $db = array();
             if (file_exists(CONFIG_PATH . 'database.php')) {
@@ -440,11 +439,11 @@ 
             return $db;
         }
 
-         /**
-         * Update the properties using the current database configuration
-         * 
-         * @return object the current instance
-         */
+            /**
+             * Update the properties using the current database configuration
+             * 
+             * @return object the current instance
+             */
         protected function populatePropertiesFromConfig() {
             foreach ($this->config as $key => $value) {
                 $setter = 'set' . ucfirst($key);

core/classes/database/Database.php

Indentation +4 added lines, -4 removed lines

@@ -111,7 +111,7 @@ 
          */
         public function __construct(DatabaseConnection $connection = null) {
             parent::__construct();
-    		if ($connection !== null) {
+            if ($connection !== null) {
                 $this->connection = $connection;
             } 
         }
@@ -385,9 +385,9 @@ 
                 $this->queryCount++;
                 
                 $queryResult = $this->queryRunner->setQuery($query)
-                                                 ->setReturnType($returnAsList)
-                                                 ->setReturnAsArray($returnAsArray)
-                                                 ->execute();
+                                                    ->setReturnType($returnAsList)
+                                                    ->setReturnAsArray($returnAsArray)
+                                                    ->execute();
 
                 if (is_object($queryResult)) {
                     $this->result  = $queryResult->getResult();

core/classes/Response.php

Spacing +4 added lines, -4 removed lines

@@ -249,7 +249,7 @@ 
             $cacheInfo = $cache->getInfo($pageCacheKey);
             if ($cacheInfo) {
                 $status = $this->sendCacheNotYetExpireInfoToBrowser($cacheInfo);
-                if($status === false) {
+                if ($status === false) {
                     return $this->sendCachePageContentToBrowser($cache);
                 }
                 return true;
@@ -323,7 +323,7 @@ 
          */
         public function sendError(array $data = array()) {
             $path = CORE_VIEWS_PATH . 'errors.php';
-            if(file_exists($path)){
+            if (file_exists($path)) {
                 //compress the output if is available
                 $compressOutputHandler = $this->getCompressOutputHandler();
                 ob_start($compressOutputHandler);
@@ -335,7 +335,7 @@ 
                 echo $content;
             }
             //@codeCoverageIgnoreStart
-            else{
+            else {
                 //can't use show_error() at this time because 
                 //some dependencies not yet loaded
                 set_http_status_header(503);
@@ -389,7 +389,7 @@ 
          * 
          * @return string|null          the full file path
          */
-        protected function getDefaultFilePathForView($file){
+        protected function getDefaultFilePathForView($file) {
             $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH);
             $fullFilePath = null;
             foreach ($searchDir as $dir) {

Indentation +27 added lines, -27 removed lines

@@ -185,7 +185,7 @@ 
                 $this->logger->info('Cannot find view [' . $view . '] in module [' . $module . '] '
                                     . 'using the default location');
             }
-	    if (!$path) {
+        if (!$path) {
                 $path = $this->getDefaultFilePathForView($viewFile);
             }
             $this->logger->info('The view file path to be loaded is [' . $path . ']');
@@ -261,12 +261,12 @@ 
             return $this->finalPageContent;
         }
 
-         /**
-         * Set the final page to be rendered
-         * @param string $finalPage the content of the final page
-         * 
-         * @return object
-         */
+            /**
+             * Set the final page to be rendered
+             * @param string $finalPage the content of the final page
+             * 
+             * @return object
+             */
         public function setFinalPageContent($finalPage) {
             $this->finalPageContent = $finalPage;
             return $this;
@@ -339,12 +339,12 @@ 
             //@codeCoverageIgnoreEnd
         }
 
-         /**
-         * Dispatch the FINAL_VIEW_READY event
-         *             
-         * @return string|null the final view content after processing by each listener
-         * if they exists otherwise the same content will be returned
-         */
+            /**
+             * Dispatch the FINAL_VIEW_READY event
+             *             
+             * @return string|null the final view content after processing by each listener
+             * if they exists otherwise the same content will be returned
+             */
         protected function dispatchFinalViewEvent() {
             //dispatch
             $event = get_instance()->eventdispatcher->dispatch(
@@ -388,12 +388,12 @@ 
                                           && (bool) ini_get('zlib.output_compression') === false;
         }
 
-         /**
-         * Return the default full file path for view
-         * @param  string $file    the filename
-         * 
-         * @return string|null          the full file path
-         */
+            /**
+             * Return the default full file path for view
+             * @param  string $file    the filename
+             * 
+             * @return string|null          the full file path
+             */
         protected function getDefaultFilePathForView($file){
             $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH);
             $fullFilePath = null;
@@ -426,7 +426,7 @@ 
                 $headerModifiedSince = $globals->server('HTTP_IF_MODIFIED_SINCE');
                 if (!empty($headerModifiedSince) && $lastModified <= strtotime($headerModifiedSince)) {
                     $this->logger->info('The cache page content is not yet expire for the '
-                                         . 'URL [' . $this->currentUrl . '] send 304 header to browser');
+                                            . 'URL [' . $this->currentUrl . '] send 304 header to browser');
                     $this->sendHeaders(304);
                     return true;
                 }
@@ -441,8 +441,8 @@ 
          */
         protected function sendCachePageContentToBrowser(&$cache) {
             $this->logger->info('The cache page content is expired or the browser does '
-                 . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->currentUrl . '] '
-                 . 'send cache headers to tell the browser');
+                    . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->currentUrl . '] '
+                    . 'send cache headers to tell the browser');
             $this->sendHeaders(200);
             //current page cache key
             $pageCacheKey = $this->currentUrlCacheKey;
@@ -581,18 +581,18 @@ 
             }
         }
 
-         /**
-         * Set the mandory headers, like security, etc.
-         */
+            /**
+             * Set the mandory headers, like security, etc.
+             */
         protected function setRequiredHeaders() {
             $requiredHeaders = array(
                                 'X-XSS-Protection' => '1; mode=block',
                                 'X-Frame-Options'  => 'SAMEORIGIN'
                             );
             foreach ($requiredHeaders as $key => $value) {
-               if (!isset($this->headers[$key])) {
+                if (!isset($this->headers[$key])) {
                     $this->headers[$key] = $value;
-               } 
+                } 
             }
         }
     }

core/classes/EventDispatcher.php

Indentation +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
                 return;
             } 
             $this->logger->info('Found the registered event listener for the '
-                                 . 'event [' . $event->name . '] the list are: ' . stringfy_vars($list));
+                                    . 'event [' . $event->name . '] the list are: ' . stringfy_vars($list));
             foreach ($list as $listener) {
                 $result = call_user_func_array($listener, array($event));
                 if ($eBackup->returnBack === true) {