Fix upload.php to respect $EnableReadOnly.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@3044 524c5546-5005-0410-9a3e-e25e191bd360

2 files changed, 11 insertions, 4 deletions

diff --git a/scripts/pagelist.php b/scripts/pagelist.php
index 24221467..dd954079 100644
--- a/scripts/pagelist.php
+++ b/scripts/pagelist.php
@@ -475,6 +475,7 @@ function PageListSort(&$list, &$opt, $pn, &$page) {
     uasort($list,
            create_function('$x,$y', "global \$PCache; $code return 0;"));
   StopWatch('PageListSort end');
+  xmp($PCache);
 }
 
 
diff --git a/scripts/upload.php b/scripts/upload.php
index 6811be39..a019a32e 100644
--- a/scripts/upload.php
+++ b/scripts/upload.php
@@ -1,5 +1,5 @@
 <?php if (!defined('PmWiki')) exit();
-/*  Copyright 2004-2014 Patrick R. Michaud (pmichaud@pobox.com)
+/*  Copyright 2004-2015 Patrick R. Michaud (pmichaud@pobox.com)
     This file is part of PmWiki; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published
     by the Free Software Foundation; either version 2 of the License, or
@@ -171,7 +171,7 @@ function UploadAuth($pagename, $auth, $cache=0){
 }
 
 function HandleUpload($pagename, $auth = 'upload') {
-  global $FmtV,$UploadExtMax,
+  global $FmtV,$UploadExtMax, $EnableReadOnly,
     $HandleUploadFmt,$PageStartFmt,$PageEndFmt,$PageUploadFmt;
   UploadAuth($pagename, $auth, 1);
   $FmtV['$UploadName'] = MakeUploadName($pagename,@$_REQUEST['upname']);
@@ -180,7 +180,8 @@ function HandleUpload($pagename, $auth = 'upload') {
   $FmtV['$upext'] = PHSC(@$_REQUEST['upext']);
   $FmtV['$upmax'] = PHSC(@$_REQUEST['upmax']);
   $FmtV['$UploadResult'] = ($upresult) ?
-    FmtPageName("<i>$uprname</i>: $[UL$upresult]",$pagename) : '';
+    FmtPageName("<i>$uprname</i>: $[UL$upresult]",$pagename) : 
+      @$EnableReadOnly ? 'Cannot modify site -- $EnableReadOnly is set': '';
   SDV($HandleUploadFmt,array(&$PageStartFmt,&$PageUploadFmt,&$PageEndFmt));
   PrintFmt($pagename,$HandleUploadFmt);
 }
@@ -222,7 +223,12 @@ function HandlePostUpload($pagename, $auth = 'upload') {
   global $UploadVerifyFunction, $UploadFileFmt, $LastModFile, 
     $EnableUploadVersions, $Now, $RecentUploadsFmt, $FmtV,
     $NotifyItemUploadFmt, $NotifyItemFmt, $IsUploadPosted,
-    $UploadRedirectFunction, $UploadPermAdd, $UploadPermSet;
+    $UploadRedirectFunction, $UploadPermAdd, $UploadPermSet,
+    $EnableReadOnly;
+    
+  if(IsEnabled($EnableReadOnly, 0))
+    Abort('Cannot modify site -- $EnableReadOnly is set', 'readonly');
+
   UploadAuth($pagename, $auth);
   $uploadfile = $_FILES['uploadfile'];
   $upname = $_REQUEST['upname'];