tnhfw / tnh-fw

core/bootstrap.php

Indentation +29 added lines, -29 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
@@ -93,7 +93,7 @@ 
                     . '] please install a PHP version that is compatible.', 'PHP Error environment');	
     }
     $LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_MIN_PHP_VERSION 
-                   . 'REQUIRED MAXIMUM: ' . TNH_MAX_PHP_VERSION . '], application can work without any issue');
+                    . 'REQUIRED MAXIMUM: ' . TNH_MAX_PHP_VERSION . '], application can work without any issue');
 
     /**
      * Setting of the PHP error message handling function
@@ -155,7 +155,7 @@ 
     /**
      * Register controllers autoload function
      */
-     spl_autoload_register('autoload_controller');
+        spl_autoload_register('autoload_controller');
 
     /**
      * Loading Security class

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
      */
     $TIMEZONE = get_config('server_timezone', 'UTC');
     if (!date_default_timezone_set($TIMEZONE)) {
-        show_error('Invalid server timezone configuration "' .$TIMEZONE. '"');
+        show_error('Invalid server timezone configuration "' . $TIMEZONE . '"');
     }
 
     /**

core/classes/Module.php

Indentation +8 added lines, -8 removed lines

@@ -58,8 +58,8 @@ 
          */
         public function add($name) {
             if (in_array($name, $this->list)) {
-               $this->logger->warning('The module [' .$name. '] already added skipping.');
-               return $this;
+                $this->logger->warning('The module [' .$name. '] already added skipping.');
+                return $this;
             }
             $this->list[] = $name;
             return $this;
@@ -91,10 +91,10 @@ 
             $this->list = array();
         }
 
-         /**
-         * Get the list of module loaded
-         * @return array the module list
-         */
+            /**
+             * Get the list of module loaded
+             * @return array the module list
+             */
         public function getModuleList() {
             return $this->list;
         }
@@ -241,7 +241,7 @@ 
             $this->logger->debug('Check if the application contains the modules ...');
             $dirList = glob(MODULE_PATH . '*', GLOB_ONLYDIR);
             if ($dirList !== false) {
-               $this->list = array_map('basename', $dirList);
+                $this->list = array_map('basename', $dirList);
             }
             if (!empty($this->list)) {
                 $this->logger->info('The application contains the module below [' . implode(', ', $this->list) . ']');
@@ -264,7 +264,7 @@ 
             $filePath = MODULE_PATH . $module . DS . $type . DS . $classFile;
             if (file_exists($filePath)) {
                 $this->logger->info('Found class [' . $class . '] in module [' . $module . '] '
-                                     . 'for [' . $type . '] the file path is [' . $filePath . ']');
+                                        . 'for [' . $type . '] the file path is [' . $filePath . ']');
                 return $filePath;
             }
             $this->logger->info('Class [' . $class . '] does not exist in the module [' . $module . '] for [' . $type . ']');

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
          */
         public function add($name) {
             if (in_array($name, $this->list)) {
-               $this->logger->warning('The module [' .$name. '] already added skipping.');
+               $this->logger->warning('The module [' . $name . '] already added skipping.');
                return $this;
             }
             $this->list[] = $name;

core/classes/database/DatabaseConnection.php

Indentation +38 added lines, -38 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 {
                 if(empty($this->config) && file_exists(CONFIG_PATH . 'database.php')) {
@@ -182,9 +182,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];
@@ -422,7 +422,7 @@ 
             $this->populatePropertiesFromConfig();
 
             if (!empty($this->config)) {
-               //For logging
+                //For logging
                 $configInfo = $this->config;
                 //Hide password from log
                 $configInfo['password'] = string_hidden($this->getPassword());
@@ -431,11 +431,11 @@ 
             return $this;
         }
         
-         /**
-         * 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);

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
          */
         public function connect() {
             try {
-                if(empty($this->config) && file_exists(CONFIG_PATH . 'database.php')) {
+                if (empty($this->config) && file_exists(CONFIG_PATH . 'database.php')) {
                     $db = array();
                     require CONFIG_PATH . 'database.php';
                     //Note need use the method to set config
@@ -130,7 +130,7 @@ 
                     PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ
                 );
                 $this->pdo = new PDO($this->getDsn(), $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() . "'");
                 }

core/libraries/Pagination.php

Indentation +5 added lines, -5 removed lines

@@ -225,15 +225,15 @@
                 }
             }
             $navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' 
-                       . $this->config['next_text'] . '</a>' . $this->config['next_close'];
+                        . $this->config['next_text'] . '</a>' . $this->config['next_close'];
             return $navbar;
         }
 
 
-         /**
-         * Build the pagination link for the first page
-         * @see Pagination::buildPaginationLinkForFirstAndLastPage
-         */
+            /**
+             * Build the pagination link for the first page
+             * @see Pagination::buildPaginationLinkForFirstAndLastPage
+             */
         protected function buildPaginationLinkForFirstPage($begin, $end, $currentPageNumber) {
             return $this->buildPaginationLinkForFirstAndLastPage($begin, $end, $currentPageNumber, 'first');
         }

core/libraries/Upload.php

Indentation +32 added lines, -32 removed lines

@@ -316,15 +316,15 @@ 
             return $this;
         }
 
-         /**
-         *    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); 
@@ -438,10 +438,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the allow overwriting
-         *    @return    boolean
-         */
+            /**
+             *    Get the allow overwriting
+             *    @return    boolean
+             */
         public function isAllowOverwriting() {
             return $this->overwriteFile ;
         }
@@ -532,14 +532,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'];
         }
@@ -572,11 +572,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)) {
@@ -660,12 +660,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;

Spacing +1 added lines, -1 removed lines

@@ -443,7 +443,7 @@
          *    @return    boolean
          */
         public function isAllowOverwriting() {
-            return $this->overwriteFile ;
+            return $this->overwriteFile;
         }
 
         /**

core/libraries/Email.php

Indentation +23 added lines, -23 removed lines

@@ -347,7 +347,7 @@ 
             $addresses = array();
             foreach ($pairs as $name => $email) {
                 if (is_numeric($name)) {
-                   $name = null;
+                    $name = null;
                 }
                 $addresses[] = $this->formatHeader($email, $name);
             }
@@ -738,10 +738,10 @@ 
             return $headers;
         }
 
-         /**
-         * Get the attachment message for send or the simple message
-         * @return string
-         */
+            /**
+             * Get the attachment message for send or the simple message
+             * @return string
+             */
         protected function getMessageWithAttachmentForSend() {
             $message = wordwrap($this->message, $this->wrap);
             if ($this->hasAttachments()) {
@@ -771,7 +771,7 @@ 
          */
         protected function sendHelloCommand() {
             $responseCode = $this->sendCommand('EHLO ' . $this->getSmtpClientHostname())
-                                 ->getSmtpResponseCode();
+                                    ->getSmtpResponseCode();
             if ($responseCode !== 250) {
                 $this->error = $this->smtpResponse;
                 return false;
@@ -918,7 +918,7 @@ 
             $message = $this->getMessageWithAttachmentForSend();
             $headers = $this->getHeadersForSend(); 
             $this->logger->info('Sending new mail using mail protocol, the information are listed below: '
-                                  . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
+                                    . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
             $result = mail($to, $this->subject, $message, $headers, $this->params);
             if (!$result) {
                 $this->error = 'Error when sending mail using mail protocol';
@@ -926,10 +926,10 @@ 
             return $result;
         }
 
-         /**
-         * Send mail using "smtp" protocol
-         * @return boolean
-         */
+            /**
+             * Send mail using "smtp" protocol
+             * @return boolean
+             */
         protected function sendSmtp() {
             if (!$this->smtpConnection()) {
                 return false;
@@ -939,7 +939,7 @@ 
             $message = $this->getMessageWithAttachmentForSend();
             $headers = $this->getHeadersForSend();
             $this->logger->info('Sending new mail using SMTP protocol, the information are listed below: '
-                                  . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
+                                    . 'destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
             $recipients = array_merge($this->to, $this->cc, $this->bcc);
             $commands = array(
                                 'mail_from' => array('MAIL FROM: <' . $this->from . '>', 'MAIL_FROM', 250),
@@ -990,17 +990,17 @@ 
         }
 
 
-         /**
-         * Return the client hostname for SMTP
-         * 
-         * There are only two legal types of hostname - either a fully
-         * qualified domain name (eg: "mail.example.com") or an IP literal
-         * (eg: "[1.2.3.4]").
-         *
-         * @link    https://tools.ietf.org/html/rfc5321#section-2.3.5
-         * @link    http://cbl.abuseat.org/namingproblems.html
-         * @return string
-         */
+            /**
+             * Return the client hostname for SMTP
+             * 
+             * There are only two legal types of hostname - either a fully
+             * qualified domain name (eg: "mail.example.com") or an IP literal
+             * (eg: "[1.2.3.4]").
+             *
+             * @link    https://tools.ietf.org/html/rfc5321#section-2.3.5
+             * @link    http://cbl.abuseat.org/namingproblems.html
+             * @return string
+             */
         protected function getSmtpClientHostname() {
             $globals = &class_loader('GlobalVar', 'classes');
             if ($globals->server('SERVER_NAME')) {

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
      * SOFTWARE.
      */
 
-    class Email extends BaseClass{
+    class Email extends BaseClass {
         /**
          * @var int $wrap
          */
@@ -746,7 +746,7 @@ 
             $message = wordwrap($this->message, $this->wrap);
             if ($this->hasAttachments()) {
                 $this->setAttachmentHeaders();
-                $message  = $this->assembleAttachmentBody();
+                $message = $this->assembleAttachmentBody();
             }
             return $message;
         }
@@ -826,7 +826,7 @@ 
                                         $this->smtpConfig['connection_timeout']
                                     );
 
-            if (! is_resource($this->smtpSocket)) {
+            if (!is_resource($this->smtpSocket)) {
                 $this->error = $errorNumber . ': ' . $errorMessage;
                 return false;
             }
@@ -875,7 +875,7 @@ 
                      */
                     if (is_resource($this->smtpSocket)) {
                         $method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
-                        if(version_compare(PHP_VERSION, '5.6', '>=')) {
+                        if (version_compare(PHP_VERSION, '5.6', '>=')) {
                             $method = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
                         }
                         stream_socket_enable_crypto($this->smtpSocket, true, $method);
@@ -983,7 +983,7 @@ 
                 'To' => $to
             );
             foreach ($additionalHeaders as $key => $value) {
-                if (! isset($this->headers[$key])) {
+                if (!isset($this->headers[$key])) {
                     $this->headers[$key] = $value;
                 }
             }