From 131ba5f153b1803a710938a7460307123087c9e3 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sun, 13 Jun 2004 11:34:22 +0000
Subject: [PATCH] fixed bug #969532 (space in uploaded filenames) improved
 upload error messages

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3670 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/Request.php       | 20 ++++++++++++++++----
 lib/plugin/UpLoad.php | 15 +++++++++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/lib/Request.php b/lib/Request.php
index 819496574..782350ecc 100644
--- a/lib/Request.php
+++ b/lib/Request.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: Request.php,v 1.58 2004-06-04 20:32:53 rurban Exp $');
+rcs_id('$Id: Request.php,v 1.59 2004-06-13 11:34:22 rurban Exp $');
 /*
  Copyright (C) 2002,2004 $ThePhpWikiProgrammingTeam
  
@@ -581,6 +581,7 @@ class Request_UploadedFile {
         }
 
         // With windows/php 4.2.1 is_uploaded_file() always returns false.
+        // Be sure that upload_tmp_dir ends with a slash!
         if (!is_uploaded_file($fileinfo['tmp_name'])) {
             if (isWindows()) {
                 if (!$tmp_file = get_cfg_var('upload_tmp_dir')) {
@@ -589,17 +590,23 @@ class Request_UploadedFile {
                 $tmp_file .= '/' . basename($fileinfo['tmp_name']);
                 /* but ending slash in php.ini upload_tmp_dir is required. */
                 if (ereg_replace('/+', '/', $tmp_file) != $fileinfo['tmp_name']) {
-                    trigger_error(sprintf("Uploaded tmpfile illegal: %s != %s",$tmp_file, $fileinfo['tmp_name']),
+                    trigger_error(sprintf("Uploaded tmpfile illegal: %s != %s.",$tmp_file, $fileinfo['tmp_name']).
+                    	          "\n".
+                    	          "Probably illegal TEMP environment or upload_tmp_dir setting.",
                                   E_USER_ERROR);
                     return false;
                 } else {
+                    /*
                     trigger_error(sprintf("Workaround for PHP/Windows is_uploaded_file() problem for %s.",
                                           $fileinfo['tmp_name'])."\n".
-            	                  "Probably illegal TEMP environment setting.",E_USER_NOTICE);
+            	                  "Probably illegal TEMP environment or upload_tmp_dir setting.", 
+            	                  E_USER_NOTICE);
+            	    */
+            	    ;
                 }
             } else {
               trigger_error(sprintf("Uploaded tmpfile %s not found.",$fileinfo['tmp_name'])."\n".
-                           " Probably illegal TEMP environment setting.",
+                           " Probably illegal TEMP environment or upload_tmp_dir setting.",
                           E_USER_WARNING);
             }
         }
@@ -982,6 +989,11 @@ class HTTP_ValidatorSet {
 
 
 // $Log: not supported by cvs2svn $
+// Revision 1.58  2004/06/04 20:32:53  rurban
+// Several locale related improvements suggested by Pierrick Meignen
+// LDAP fix by John Cole
+// reanable admin check without ENABLE_PAGEPERM in the admin plugins
+//
 // Revision 1.57  2004/06/03 18:54:25  rurban
 // fixed "lost level in session" warning, now that signout sets level = 0 (before -1)
 //
diff --git a/lib/plugin/UpLoad.php b/lib/plugin/UpLoad.php
index 09d5750bb..b9bb8b785 100644
--- a/lib/plugin/UpLoad.php
+++ b/lib/plugin/UpLoad.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: UpLoad.php,v 1.11 2004-06-11 09:07:30 rurban Exp $');
+rcs_id('$Id: UpLoad.php,v 1.12 2004-06-13 11:34:22 rurban Exp $');
 /*
  Copyright 2003, 2004 $ThePhpWikiProgrammingTeam
 
@@ -141,14 +141,17 @@ ws[cfh]");
             if (preg_match("/(\." . join("|\.", $this->disallowed_extensions) . ")\$/",
                            $userfile_name))
             {
+            	$message->pushContent(fmt("ERROR uploading '%s': ",$userfile_name));
                 $message->pushContent(fmt("Files with extension %s are not allowed",
                                           join(", ", $this->disallowed_extensions)),HTML::br(),HTML::br());
             }
             elseif (file_exists($file_dir . $userfile_name)) {
+            	$message->pushContent(fmt("ERROR uploading '%s': ",$userfile_name));
                 $message->pushContent(fmt("There is already a file with name %s uploaded",
                                           $userfile_name),HTML::br(),HTML::br());
             }
             elseif ($userfile->getSize() > (MAX_UPLOAD_SIZE)) {
+            	$message->pushContent(fmt("ERROR uploading '%s': ",$userfile_name));
                 $message->pushContent(_("Sorry but this file is too big"),HTML::br(),HTML::br());
             }
             elseif (move_uploaded_file($userfile_tmpname, $file_dir . $userfile_name) or
@@ -161,8 +164,8 @@ ws[cfh]");
                 $message->pushContent(HTML::ul(HTML::li($link)));
 
                 // the upload was a success and we need to mark this event in the "upload log"
-                $upload_log = $file_dir . basename($logfile);
                 if ($logfile) { 
+                    $upload_log = $file_dir . basename($logfile);
                     $this->log($userfile, $upload_log, &$message);
                 }
                 if ($autolink) {
@@ -172,7 +175,7 @@ ws[cfh]");
                         $current = $pagehandle->getCurrentRevision();
                         $version = $current->getVersion();
                         $text = $current->getPackedContent();
-                        $newtext = $text . "\n* Upload:$userfile_name";
+                        $newtext = $text . "\n* [Upload:$userfile_name]";
                         $meta = $current->_data;
                         $meta['summary'] = sprintf(_("uploaded %s"),$userfile_name);
                         $pagehandle->save($newtext, $version + 1, $meta);
@@ -180,7 +183,8 @@ ws[cfh]");
                 }
             }
             else {
-                $message->pushContent(HTML::br(),_("Uploading failed: "),$userfile_name, HTML::br());
+            	$message->pushContent(fmt("ERROR uploading '%s': ",$userfile_name));
+                $message->pushContent(HTML::br(),_("Uploading failed."),HTML::br());
             }
         }
         else {
@@ -225,6 +229,9 @@ ws[cfh]");
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.11  2004/06/11 09:07:30  rurban
+// support theme-specific LinkIconAttr: front or after or none
+//
 // Revision 1.10  2004/04/12 10:19:18  rurban
 // fixed copyright year
 //
-- 
2.45.0