Changeset 42 for trunk/lib/Upload.inc.php

Timestamp:

Dec 18, 2005 12:16:03 AM (18 years ago)

Author:

scdev

Message:

detabbed all files ;P

File:

• trunk/lib/Upload.inc.php (modified) (24 diffs)

trunk/lib/Upload.inc.php

@@ -1 +1 @@
 <?php
 /**
- * Upload.inc.php 
+ * Upload.inc.php
  * Code by Strangecode :: www.strangecode.com :: This document contains copyrighted information
  *
@@ -22 +22 @@
 
 class Upload {
-    
+
     // General object parameters.
     var $_params = array(
-    
+
         // Which messages do we pass to raiseMsg?
         'display_messages' => UPLOAD_MSG_ALL,
-        
+
         // Existing files will be overwritten when there is a name conflict?
         'allow_overwriting' => false,
@@ -222 +222 @@
         'ice'     => 'x-conference/x-cooltalk',
     );
-    
+
     /**
      * Set (or overwrite existing) parameters by passing an array of new parameters.
@@ -232 +232 @@
     {
         if (isset($params) && is_array($params)) {
-        
+
             // Enforce valid upload_path parameter.
             if (isset($params['upload_path'])) {
@@ -249 +249 @@
                 $params['upload_path'] = preg_replace('!/+$!', '', $params['upload_path']);
             }
-        
+
             // Merge new parameters with old overriding only those passed.
             $this->_params = array_merge($this->_params, $params);
@@ -276 +276 @@
     /**
      * Process uploaded files. Processes files existing within the specified $_FILES['form_name'] array.
-     * It tests for errors, cleans the filename, optionally sets custom file names. It will process 
+     * It tests for errors, cleans the filename, optionally sets custom file names. It will process
      * multiple files automatically if the file form element is an array (<input type="file" name="myfiles[]" />).
      *
@@ -296 +296 @@
             return false;
         }
-        
+
         // Ensure the file form element specified actually exists.
         if (!isset($_FILES[$form_name])) {
@@ -303 +303 @@
             return false;
         }
-        
+
         if (is_array($_FILES[$form_name]['name'])) {
             $files = $_FILES[$form_name];
@@ -318 +318 @@
 
         // To keep this script running even if user tries to stop browser.
-        ignore_user_abort(true); 
+        ignore_user_abort(true);
         ini_set('max_execution_time', 300);
         ini_set('max_input_time', 300);
@@ -332 +332 @@
                 continue;
             }
-            
+
             // Determine final file name.
             if ($num == 1) {
@@ -362 +362 @@
             // Clean the file name of bad characters.
             $file_name = $this->cleanFileName($file_name);
-            
+
             // If the file name has no extension, use the mime-type extension.
             if (!preg_match('/\.[^.]{1,5}$/', $file_name) && function_exists('mime_content_type')) {
@@ -369 +369 @@
                 }
             }
-            
+
             // Set the path and file name.
             $file_path_name = $this->getParam('upload_path') . '/' . $file_name;
-            
-            
+
+
             // Check The php upload error messages.
             if (UPLOAD_ERR_INI_SIZE === $files['error'][$i]) {
@@ -407 +407 @@
                 continue;
             }
-            
+
             // Check to be sure it's an uploaded file.
             if (!is_uploaded_file($files['tmp_name'][$i])) {
@@ -415 +415 @@
                 continue;
             }
-            
+
             // Check to be sure the file is not empty.
             if ($files['size'][$i] < 1) {
@@ -423 +423 @@
                 continue;
             }
-            
+
             // Check to be sure the file has a valid file name extension.
             if (!in_array(strtolower($this->getFilenameExtension($file_name)), $this->getParam('valid_file_extensions'))) {
@@ -431 +431 @@
                 continue;
             }
-            
+
             // Check to be sure the file has a unique file name.
             if (!$this->getParam('allow_overwriting') && $this->exists($file_name)) {
@@ -439 +439 @@
                 continue;
             }
-            
+
             // Move the file to the final place.
             if (move_uploaded_file($files['tmp_name'][$i], $file_path_name)) {
@@ -462 +462 @@
             }
         }
-        
+
         // Return names of files uploaded (or empty array when none processed).
         return $new_file_names;
     }
-    
+
     /**
      * Remove file within upload path.
@@ -481 +481 @@
             return false;
         }
-        
+
         $file_path_name = $this->getParam('upload_path') . '/' . $file_name;
 
@@ -495 +495 @@
         }
     }
-    
+
     /**
      * Renames a file within the upload path.
@@ -511 +511 @@
             return false;
         }
-        
+
         $old_file_path_name = $this->getParam('upload_path') . '/' . $old_name;
         $new_file_path_name = $this->getParam('upload_path') . '/' . $new_name;
@@ -529 +529 @@
         }
     }
-    
+
     /**
      * Tests if a file exists within the current upload_path.
@@ -544 +544 @@
             return false;
         }
-        
+
         return file_exists($this->getParam('upload_path') . '/' . $file_name);
     }
 
     /**
-     * Get filename by glob pattern. Searches a directory for an image that matches the 
+     * Get filename by glob pattern. Searches a directory for an image that matches the
      * specified glob pattern and returns the filename of the first file found.
      *
@@ -620 +620 @@
         return isset($ext[1]) ? $ext[1] : '';
     }
-    
+
     /**
      * An alias for App::raiseMsg that only sends messages configured by display_messages.