From 6c22ef35969d06351c9080f71742c5b8af1bc322 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Wed, 12 Sep 2007 19:39:46 +0000
Subject: [PATCH] Ensure ending uploads slash even on user provided UPLOAD
 constants. Fixes plugin/UpLoad

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5931 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/config.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/config.php b/lib/config.php
index 42e29a8e6..ad6147441 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: config.php,v 1.145 2007-06-02 18:24:39 rurban Exp $');
+rcs_id('$Id: config.php,v 1.146 2007-09-12 19:39:46 rurban Exp $');
 /*
  * NOTE: The settings here should probably not need to be changed.
  * The user-configurable settings have been moved to IniConfig.php
@@ -581,14 +581,24 @@ function safe_wordwrap($str, $width=80, $break="\n", $cut=false) {
 }
 
 function getUploadFilePath() {
-    if (defined('UPLOAD_FILE_PATH')) return UPLOAD_FILE_PATH;
+    if (defined('UPLOAD_FILE_PATH')) {
+    	if (string_ends_with(UPLOAD_FILE_PATH, "/") 
+    	    or string_ends_with(UPLOAD_FILE_PATH, "\\"))
+	    return UPLOAD_FILE_PATH;
+	else
+	    return UPLOAD_FILE_PATH."/";
+    }
     return defined('PHPWIKI_DIR') 
         ? PHPWIKI_DIR . "/uploads/" 
         : realpath(dirname(__FILE__) . "/../uploads/");
 }
 function getUploadDataPath() {
-    if (defined('UPLOAD_DATA_PATH')) return UPLOAD_DATA_PATH;
-    return SERVER_URL . ((substr(DATA_PATH,0,1)=='/') ? '' : "/") . DATA_PATH . '/uploads/';
+    if (defined('UPLOAD_FILE_PATH')) {
+	return string_ends_with(UPLOAD_DATA_PATH, "/") 
+	    ? UPLOAD_DATA_PATH : UPLOAD_DATA_PATH."/";
+    }
+    return SERVER_URL . (string_ends_with(DATA_PATH, "/") ? '' : "/") 
+	 . DATA_PATH . '/uploads/';
 }
 
 /**
@@ -646,6 +656,9 @@ function htmlspecialchars_workaround($str, $quote=ENT_COMPAT, $charset='iso-8859
 */
 
 // $Log: not supported by cvs2svn $
+// Revision 1.145  2007/06/02 18:24:39  rurban
+// case-insensitive browser check. Imrpoved isBrowserSafari
+//
 // Revision 1.143  2007/05/24 18:36:56  rurban
 // *** empty log message ***
 //
-- 
2.45.0