tnhfw / tnh-fw

core/libraries/Upload.php

Spacing +47 added lines, -47 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
@@ -259,7 +259,7 @@ 
             } elseif (isset($HTTP_POST_FILES) && is_array($HTTP_POST_FILES)) {
                 $this->file_array = $HTTP_POST_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.
@@ -275,7 +275,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;
@@ -311,7 +311,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;
         }
@@ -332,7 +332,7 @@ 
                 $php_size = $this->sizeInBytes(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;
             }
@@ -350,7 +350,7 @@ 
         public function setAllowedMimeTypes(array $mimes)
         {
             if (count($mimes) > 0) {
-                array_map(array($this , 'setAllowMimeType'), $mimes);
+                array_map(array($this, 'setAllowMimeType'), $mimes);
             }
             return $this;
         }
@@ -415,7 +415,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;
@@ -434,8 +434,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;
                 }
             }
@@ -488,8 +488,8 @@ 
                             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 . ']');
                     }
                 }
             }
@@ -539,7 +539,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,
@@ -581,11 +581,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;
@@ -613,10 +613,10 @@ 
         */
         public function getInfo()
         {
-            return (object)$this->file;
+            return (object) $this->file;
         }
 
-        public function isUploaded(){
+        public function isUploaded() {
             return isset($this->file_array[$this->input])
             &&
             is_uploaded_file($this->file_array[$this->input]['tmp_name']);
@@ -629,9 +629,9 @@ 
         *    @return    boolean
         *    @method    boolean    save
         */
-        public function save(){
+        public function save() {
             //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 false;
             }
@@ -641,7 +641,7 @@ 
                     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
@@ -652,7 +652,7 @@ 
                             '$1',
                             $this->file_array[$this->input]['name']
                         );
-                        $this->filename = $this->filename.'.'.$extension;
+                        $this->filename = $this->filename . '.' . $extension;
                     }
 
                     // set file info
@@ -665,10 +665,10 @@ 
                     $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));
 
                     //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 false;
                     }
@@ -697,8 +697,8 @@ 
                     }
 
                     // 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);
                     }
                    
 
@@ -710,8 +710,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'];
                 }
@@ -730,10 +730,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;
         }
@@ -757,14 +757,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;
         }
 
@@ -772,7 +772,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 upload got error : ' . $message);
             $this->error = $message;
         }
@@ -782,7 +782,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'],

tests/tnhfw/classes/DBSessionHandlerTest.php

Spacing +8 added lines, -8 removed lines

@@ -47,7 +47,7 @@ 
 
 		
 		
-		public function testUsingSessionConfiguration(){
+		public function testUsingSessionConfiguration() {
 			//using value in the configuration
 			static::$config->set('session_save_path', 'DBSessionModel');
 			static::$config->set('session_secret', $this->secret);
@@ -73,7 +73,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testWhenDataIsExpired(){
+		public function testWhenDataIsExpired() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -86,7 +86,7 @@ 
 			$this->assertFalse($dbsh->read('foo'));
 		}
 		
-		public function testWhenDataAlreadyExistDoUpdate(){
+		public function testWhenDataAlreadyExistDoUpdate() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -99,7 +99,7 @@ 
 			$this->assertEquals($dbsh->read('foo'), '445');	
 		}
 		
-		public function testUsingCustomModelInstance(){
+		public function testUsingCustomModelInstance() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -127,7 +127,7 @@ 
 		}
 			
 			
-		public function testUsingCustomLogInstance(){
+		public function testUsingCustomLogInstance() {
 			$dbsh = new DBSessionHandler($this->model, new Log());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -154,7 +154,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testUsingCustomLoaderInstance(){
+		public function testUsingCustomLoaderInstance() {
 			$dbsh = new DBSessionHandler($this->model, null, new Loader());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -182,7 +182,7 @@ 
 		}
 		
 		
-		public function testWhenModelInsanceIsNotSet(){
+		public function testWhenModelInsanceIsNotSet() {
 			$dbsh = new DBSessionHandler(null, null, new Loader());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -210,7 +210,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testWhenModelTableColumnsIsNotSet(){
+		public function testWhenModelTableColumnsIsNotSet() {
 			//session table is empty
 			$this->model->setSessionTableColumns(array());
 			$dbsh = new DBSessionHandler($this->model);