Changeset 301

Timestamp:

Jan 24, 2008 4:30:46 AM (16 years ago)

Author:

quinn

Message:

Added minor functinoality to Upload. Fixed (?) XML serialier config in PEdit.

Files:

• tags/2.0.2/lib/Upload.inc.php (modified) (3 diffs)
• trunk/lib/PEdit.inc.php (modified) (1 diff)
• trunk/lib/Upload.inc.php (modified) (4 diffs)

tags/2.0.2/lib/Upload.inc.php

@@ -279 +279 @@
                     'extension' => $this->getFilenameExtension($file_name),
                     'original_index' => $i,
+                    'original_name' => $files['name'][$i],
                 );
                 continue;
@@ -298 +299 @@
      * @access  public
      * @param   string  $file_name  A name of a file.
+     * @param   bool    $use_glob   Set true to use glob to find the filename (using $file_name as a pattern)
      * @return  bool                Success of operation.
      */
-    function deleteFile($file_name)
+    function deleteFile($file_name, $use_glob=false)
     {
         // Ensure we have a upload directory.
@@ -308 +310 @@
         }
 
-        $file_path_name = $this->getParam('upload_path') . '/' . $file_name;
+        $file_path_name = $this->getParam('upload_path') . '/' . ($use_glob ? $this->getFilenameGlob($file_name) : $file_name);
 
         if (!is_file($file_path_name)) {

trunk/lib/PEdit.inc.php

@@ -87 +87 @@
             XML_SERIALIZER_OPTION_LINEBREAKS => '',
             XML_SERIALIZER_OPTION_RETURN_RESULT => true,
-            XML_SERIALIZER_OPTION_MODE => XML_SERIALIZER_MODE_SIMPLEXML,
             XML_SERIALIZER_OPTION_TYPEHINTS => true,
         ));

trunk/lib/Upload.inc.php

@@ -303 +303 @@
                     'extension' => $file_extension,
                     'original_index' => $i,
+                    'original_name' => $files['name'][$i],
                 );
             } else {
@@ -325 +326 @@
      * @access  public
      * @param   string  $file_name  A name of a file.
+     * @param   bool    $use_glob   Set true to use glob to find the filename (using $file_name as a pattern)
      * @return  bool                Success of operation.
      */
-    function deleteFile($file_name)
+    function deleteFile($file_name, $use_glob=false)
     {
         $app =& App::getInstance();
@@ -337 +339 @@
         }
 
-        $file_path_name = $this->getParam('upload_path') . '/' . $file_name;
+        $file_path_name = $this->getParam('upload_path') . '/' . ($use_glob ? $this->getFilenameGlob($file_name) : $file_name);
 
         if (!is_file($file_path_name)) {
@@ -344 +346 @@
         } else if (unlink($file_path_name)) {
             $app->logMsg(sprintf('Deleted file: %s', $file_path_name), LOG_INFO, __FILE__, __LINE__);
+            return true;
         } else {
             $this->_raiseMsg(sprintf(_("The file %s could not be deleted."), $file_name), MSG_ERR, __FILE__, __LINE__);