Changeset 806 for trunk/lib

Timestamp:

Jan 13, 2024 8:56:57 PM (4 months ago)

Author:

anonymous

Message:

 

Location:

trunk/lib

Files:

• Upload.inc.php (modified) (2 diffs)
• Utilities.inc.php (modified) (1 diff)

trunk/lib/Upload.inc.php

@@ -361 +361 @@
 
         if (!is_file($file_path_name)) {
-            $app->logMsg(sprintf('Error deleting nonexistent file: %s', $file_path_name), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Error deleting; not a file: %s', $file_path_name), LOG_ERR, __FILE__, __LINE__);
             return false;
         } else if (unlink($file_path_name)) {
@@ -393 +393 @@
         $old_file_path_name = $this->getParam('upload_path') . '/' . $old_name;
         $new_file_path_name = $this->getParam('upload_path') . '/' . $new_name;
-        if (file_exists($old_file_path_name)) {
+        if (file_exists($old_file_path_name) && is_file($old_file_path_name)) {
             if (rename($old_file_path_name, $new_file_path_name)) {
                 $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), basename($old_file_path_name), basename($new_file_path_name)), MSG_NOTICE, __FILE__, __LINE__);

trunk/lib/Utilities.inc.php

@@ -1684 +1684 @@
     $current_url = absoluteMe();
     $referrer_url = getenv('HTTP_REFERER');
+
+    // If either is empty, don't continue with a comparison.
+    if ('' == $current_url || '' == $referrer_url) {
+        return false;
+    }
 
     // If one of the hostnames is an IP address, compare only the path of both.