tnhfw / tnh-fw

core/libraries/Upload.php

Spacing +48 added lines, -48 removed lines

@@ -37,7 +37,7 @@ 
     *    @package FileUpload
     *    @version 1.5
     */
-    class Upload{
+    class Upload {
 
         /**
         *   Version
@@ -69,7 +69,7 @@ 
         *    @version    1.0
         *    @var        array
         */
-        private $file_array    = array();
+        private $file_array = array();
 
         /**
         *    If the file you are trying to upload already exists it will
@@ -119,7 +119,7 @@ 
         *    @version    1.0
         *    @var        float
         */
-        private $max_file_size= 0.0;
+        private $max_file_size = 0.0;
 
         /**
         *    List of allowed mime types
@@ -217,12 +217,12 @@ 
         *    @return    object
         *    @method    object    __construct
         */
-        public function __construct(){
-            $this->logger =& class_loader('Log', 'classes');
+        public function __construct() {
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Upload');
 
             Loader::lang('file_upload');
-            $obj =& get_instance();
+            $obj = & get_instance();
 
             $this->error_messages = array(
                 'upload_err_ini_size' => $obj->lang->get('fu_upload_err_ini_size'),
@@ -239,15 +239,15 @@ 
             );
 
             $this->file = array(
-                'status'                =>    false,    // True: success upload
-                'mime'                  =>    '',       // Empty string
-                'filename'              =>    '',       // Empty string
-                'original'              =>    '',       // Empty string
-                'size'                  =>    0,        // 0 Bytes
-                'sizeFormated'          =>    '0B',     // 0 Bytes
-                'destination'           =>    './',     // Default: ./
-                'allowed_mime_types'    =>    array(),  // Allowed mime types
-                'error'                 =>    null,        // File error
+                'status'                =>    false, // True: success upload
+                'mime'                  =>    '', // Empty string
+                'filename'              =>    '', // Empty string
+                'original'              =>    '', // Empty string
+                'size'                  =>    0, // 0 Bytes
+                'sizeFormated'          =>    '0B', // 0 Bytes
+                'destination'           =>    './', // Default: ./
+                'allowed_mime_types'    =>    array(), // Allowed mime types
+                'error'                 =>    null, // File error
             );
 
             // Change dir to current dir
@@ -257,7 +257,7 @@ 
             if (isset($_FILES) && is_array($_FILES)) {
                 $this->file_array = $_FILES;
             }
-            $this->logger->info('The upload file information are : ' .stringfy_vars($this->file_array));
+            $this->logger->info('The upload file information are : ' . stringfy_vars($this->file_array));
         }
         /**
         *    Set input.
@@ -273,7 +273,7 @@ 
         */
         public function setInput($input)
         {
-            if (!empty($input) && (is_string($input) || is_numeric($input) )) {
+            if (!empty($input) && (is_string($input) || is_numeric($input))) {
                 $this->input = $input;
             }
             return $this;
@@ -309,7 +309,7 @@ 
         */
         public function setAutoFilename()
         {
-            $this->filename = sha1(mt_rand(1, 9999).uniqid());
+            $this->filename = sha1(mt_rand(1, 9999) . uniqid());
             $this->filename .= time();
             return $this;
         }
@@ -330,7 +330,7 @@ 
                 $php_size = $this->sizeInBytes((int) ini_get('upload_max_filesize'));
                 // Calculate difference
                 if ($php_size < $file_size) {
-                    $this->logger->warning('The upload max file size you set [' .$file_size. '] is greather than the PHP configuration for upload max file size [' .$php_size. ']');
+                    $this->logger->warning('The upload max file size you set [' . $file_size . '] is greather than the PHP configuration for upload max file size [' . $php_size . ']');
                 }
                 $this->max_file_size = $file_size;
             }
@@ -348,7 +348,7 @@ 
         public function setAllowedMimeTypes(array $mimes)
         {
             if (count($mimes) > 0) {
-                array_map(array($this , 'setAllowMimeType'), $mimes);
+                array_map(array($this, 'setAllowMimeType'), $mimes);
             }
             return $this;
         }
@@ -413,7 +413,7 @@ 
         {
             if (!empty($name) && is_string($name)) {
                 if (array_key_exists($name, $this->mime_helping)) {
-                    return $this->setAllowedMimeTypes($this->mime_helping[ $name ]);
+                    return $this->setAllowedMimeTypes($this->mime_helping[$name]);
                 }
             }
             return $this;
@@ -432,8 +432,8 @@ 
         */
         public function setUploadFunction($function)
         {
-            if (!empty($function) && (is_array($function) || is_string($function) )) {
-                if (is_callable( $function)) {
+            if (!empty($function) && (is_array($function) || is_string($function))) {
+                if (is_callable($function)) {
                     $this->upload_function = $function;
                 }
             }
@@ -478,8 +478,8 @@ 
                         $this->destination_directory = $destination_directory;
                         chdir($destination_directory);
                     }
-                    else{
-                        $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
+                    else {
+                        $this->logger->warning('Can not create the upload directory [' . $destination_directory . ']');
                     }
                 }
             }
@@ -529,7 +529,7 @@ 
         public function isFilename($filename)
         {
             $filename = basename($filename);
-            return (!empty($filename) && (is_string( $filename) || is_numeric($filename)));
+            return (!empty($filename) && (is_string($filename) || is_numeric($filename)));
         }
         /**
         *    Validate mime type with allowed mime types,
@@ -571,11 +571,11 @@ 
         */
         public function isDirpath($path)
         {
-            if (!empty( $path) && (is_string( $path) || is_numeric($path) )) {
+            if (!empty($path) && (is_string($path) || is_numeric($path))) {
                 if (DIRECTORY_SEPARATOR == '/') {
-                    return (preg_match( '/^[^*?"<>|:]*$/' , $path) == 1 );
+                    return (preg_match('/^[^*?"<>|:]*$/', $path) == 1);
                 } else {
-                    return (preg_match( "/^[^*?\"<>|:]*$/" , substr($path,2) ) == 1);
+                    return (preg_match("/^[^*?\"<>|:]*$/", substr($path, 2)) == 1);
                 }
             }
             return false;
@@ -603,7 +603,7 @@ 
         */
         public function getInfo()
         {
-            return (object)$this->file;
+            return (object) $this->file;
         }
 
 
@@ -611,7 +611,7 @@ 
          * Check if the file is uploaded
          * @return boolean
          */
-        public function isUploaded(){
+        public function isUploaded() {
             return isset($this->file_array[$this->input])
             && is_uploaded_file($this->file_array[$this->input]['tmp_name']);
         }
@@ -620,15 +620,15 @@ 
          * Check if file upload has error
          * @return boolean
          */
-        protected function uploadHasError(){
+        protected function uploadHasError() {
             //check if file upload is  allowed in the configuration
-            if(! ini_get('file_uploads')){
+            if (!ini_get('file_uploads')) {
                 $this->setError($this->error_messages['file_uploads']);
                 return true;
             }
 
              //check for php upload error
-            if(is_numeric($this->file['error']) && $this->file['error'] > 0){
+            if (is_numeric($this->file['error']) && $this->file['error'] > 0) {
                 $this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
                 return true;
             }
@@ -663,14 +663,14 @@ 
         *    @return    boolean
         *    @method    boolean    save
         */
-        public function save(){
+        public function save() {
             if (count($this->file_array) > 0) {
                 if (array_key_exists($this->input, $this->file_array)) {
                     // set original filename if not have a new name
                     if (empty($this->filename)) {
                         $this->filename = $this->file_array[$this->input]['name'];
                     }
-                    else{
+                    else {
                         // Replace %s for extension in filename
                         // Before: /[\w\d]*(.[\d\w]+)$/i
                         // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu
@@ -694,15 +694,15 @@ 
                     $this->file['filename']     = $this->filename;
                     $this->file['error']        = $this->file_array[$this->input]['error'];
 
-                    $this->logger->info('The upload file information to process is : ' .stringfy_vars($this->file));
+                    $this->logger->info('The upload file information to process is : ' . stringfy_vars($this->file));
 
                     $error = $this->uploadHasError();
-                    if($error){
+                    if ($error) {
                         return false;
                     }
                     // Execute input callback
-                    if (!empty( $this->callbacks['input'])) {
-                        call_user_func($this->callbacks['input'], (object)$this->file);
+                    if (!empty($this->callbacks['input'])) {
+                        call_user_func($this->callbacks['input'], (object) $this->file);
                     }
                    
 
@@ -714,8 +714,8 @@ 
                     );
 
                     // Execute output callback
-                    if (!empty( $this->callbacks['output'])) {
-                        call_user_func($this->callbacks['output'], (object)$this->file);
+                    if (!empty($this->callbacks['output'])) {
+                        call_user_func($this->callbacks['output'], (object) $this->file);
                     }
                     return $this->file['status'];
                 }
@@ -734,10 +734,10 @@ 
         */
         public function sizeFormat($size, $precision = 2)
         {
-            if($size > 0){
+            if ($size > 0) {
                 $base       = log($size) / log(1024);
                 $suffixes   = array('B', 'K', 'M', 'G', 'T');
-                return round(pow(1024, $base - floor($base)), $precision) . ( isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
+                return round(pow(1024, $base - floor($base)), $precision) . (isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
             }
             return null;
         }
@@ -761,14 +761,14 @@ 
             if (array_key_exists('unit', $matches)) {
                 $unit = strtoupper($matches['unit']);
             }
-            return (floatval($matches['size']) * pow(1024, $units[$unit]) ) ;
+            return (floatval($matches['size']) * pow(1024, $units[$unit]));
         }
 
         /**
          * Get the upload error message
          * @return string
          */
-        public function getError(){
+        public function getError() {
             return $this->error;
         }
 
@@ -776,7 +776,7 @@ 
          * Set the upload error message
          * @param string $message the upload error message to set
          */
-        public function setError($message){
+        public function setError($message) {
             $this->logger->info('The file upload got error : ' . $message);
             $this->error = $message;
         }
@@ -786,7 +786,7 @@ 
          * @param  int $code the error code
          * @return string the error message
          */
-        private function getPhpUploadErrorMessageByCode($code){
+        private function getPhpUploadErrorMessageByCode($code) {
             $codeMessageMaps = array(
                 1 => $this->error_messages['upload_err_ini_size'],
                 2 => $this->error_messages['upload_err_form_size'],

core/libraries/Assets.php

Spacing +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
 	 *  @since 1.0.0
 	 *  @filesource
 	 */
-	class Assets{
+	class Assets {
 		
 		/**
 		 * The logger instance
@@ -50,10 +50,10 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
+		private static function getLogger() {
+			if (self::$logger == null) {
 				//can't assign reference to static variable
-				self::$logger[0] =& class_loader('Log', 'classes');
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Assets');
 			}
 			return self::$logger[0];
@@ -72,13 +72,13 @@ 
 		 *  @param $asset the name of the assets file path with the extension.
 		 *  @return string|null       the absolute path of the assets file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function path($asset){
+		public static function path($asset) {
 			$logger = self::getLogger();	
 			$path = ASSETS_PATH . $asset;
 			
 			$logger->debug('Including the Assets file [' . $path . ']');
 			//Check if the file exists
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] included successfully');
 				return Url::base_url($path);
 			}
@@ -98,7 +98,7 @@ 
 		 *  @param $path the name of the css file without the extension.
 		 *  @return string|null the absolute path of the css file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function css($path){
+		public static function css($path) {
 			$logger = self::getLogger();
 			/*
 			* if the file name contains the ".css" extension, replace it with 
@@ -109,7 +109,7 @@ 
 			
 			$logger->debug('Including the Assets file [' . $path . '] for CSS');
 			//Check if the file exists
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] for CSS included successfully');
 				return Url::base_url($path);
 			}
@@ -129,12 +129,12 @@ 
 		 *  @param $path the name of the javascript file without the extension.
 		 *  @return string|null the absolute path of the javascript file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function js($path){
+		public static function js($path) {
 			$logger = self::getLogger();
 			$path = str_ireplace('.js', '', $path);
 			$path = ASSETS_PATH . 'js/' . $path . '.js';
 			$logger->debug('Including the Assets file [' . $path . '] for javascript');
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] for Javascript included successfully');
 				return Url::base_url($path);
 			}
@@ -154,11 +154,11 @@ 
 		 *  @param $path the name of the image file with the extension.
 		 *  @return string|null the absolute path of the image file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function img($path){
+		public static function img($path) {
 			$logger = self::getLogger();
 			$path = ASSETS_PATH . 'images/' . $path;
 			$logger->debug('Including the Assets file [' . $path . '] for image');
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] for image included successfully');
 				return Url::base_url($path);
 			}