Add $EnableUploadDrop based on Cookbook:DragDropMultiUpload.

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

2 files changed, 59 insertions, 53 deletions

diff --git a/scripts/upload.php b/scripts/upload.php
index e88472ac..910078d3 100644
--- a/scripts/upload.php
+++ b/scripts/upload.php
@@ -105,6 +105,7 @@ SDV($PageUploadFmt,array("
 XLSDV('en',array(
   'ULby' => 'uploaded by',
   'ULsuccess' => 'successfully uploaded',
+  'ULdroplabel' => 'Drop files to upload:',
   'ULinvalidtoken' => 'Token invalid or missing.',
   'ULmimemismatch' => 'extension \'$upext\' doesn\'t match file type \'$upmime\'',
   'ULfileinfo' => 'EnableUploadMimeMatch requires PHP Fileinfo functions to be enabled, see https://php.net/fileinfo.installation',
@@ -200,8 +201,14 @@ function UploadAuth($pagename, $auth, $cache=0){
     SDV($GroupAttributesFmt,'$Group/GroupAttributes');
     $pn_upload = FmtPageName($GroupAttributesFmt, $pagename);
   } else $pn_upload = $pagename;
-  $page = RetrieveAuthPage($pn_upload, $auth, true, READPAGE_CURRENT);
-  if (!$page) Abort("?No '$auth' permissions for $pagename");
+  $authprompt = @$_POST['pmdrop']? false: true;
+  $page = RetrieveAuthPage($pn_upload, $auth, $authprompt, READPAGE_CURRENT);
+  if (!$page) {
+    $msg = "?No '$auth' permissions for $pagename";
+    if (@$_POST['pmdrop'])
+      return PrintJSON($pagename, array('error'=>1,'msg'=>$msg));
+    Abort($msg);
+  }
   if ($cache) PCache($pn_upload,$page);
   return true;
 }
@@ -354,6 +361,17 @@ function HandlePostUpload($pagename, $auth = 'upload') {
     }
   }
   $FmtV['$upresult'] = $result;
+  if (@$_POST['pmdrop']) {
+    $out = array('uprname'=>$upname);
+    preg_match('/^upresult=([a-zA-Z]+)(.*)$/', $result, $m);    
+    $out['msg'] = "$upname: ".FmtPageName(XL("UL{$m[1]}"), $pagename);
+    
+    if ($m[1] != 'success') $out['error'] = 1;
+    else $out['href'] = $FmtV['$upurl'];
+    
+    PrintJSON($pagename, $out);
+    exit;
+  }
   SDV($UploadRedirectFunction, 'Redirect');
   $UploadRedirectFunction($pagename,"{\$PageUrl}?action=upload&uprname=$upname&$result");
 }
@@ -362,7 +380,7 @@ function UploadVerifyBasic($pagename,$uploadfile,&$filepath,&$upname=null) {
   global $EnableUploadOverwrite, $UploadExtSize, $UploadPrefixQuota,
     $EnableUploadVersions, $UploadDirQuota, $UploadDir, $UploadBlacklist,
     $Author, $EnablePostAuthorRequired, $EnableUploadAuthorRequired,
-    $UploadExts, $EnableUploadMimeMatch, $Now;
+    $UploadExts, $EnableUploadMimeMatch, $Now, $FmtV;
 
   if (! pmtoken(1)) {
     return 'upresult=invalidtoken';
@@ -382,7 +400,7 @@ function UploadVerifyBasic($pagename,$uploadfile,&$filepath,&$upname=null) {
     }
   }
   if (IsEnabled($EnableUploadVersions, 0)==2 && file_exists($filepath)) {
-    if(preg_match('!^(.*/([^/]+))(\\.[a-z0-9]+)$!i', $filepath, $m)) {
+    if (preg_match('!^(.*/([^/]+))(\\.[a-z0-9]+)$!i', $filepath, $m)) {
       $stamp36 = base_convert($Now, 10, 36);
       $filepath = "{$m[1]}-$stamp36{$m[3]}";
       $upname = "{$m[2]}-$stamp36{$m[3]}";
@@ -391,9 +409,12 @@ function UploadVerifyBasic($pagename,$uploadfile,&$filepath,&$upname=null) {
   if (!$EnableUploadOverwrite && file_exists($filepath)) 
     return 'upresult=exists';
   preg_match('/\\.([^.\\/]+)$/',$filepath,$match); $ext=@$match[1];
-  if(!isset($UploadExtSize[$ext]))
+  
+  $FmtV['$upext'] = $ext;
+  if (!isset($UploadExtSize[$ext]))
     return "upresult=badtype&upext=$ext";
   $maxsize = $UploadExtSize[$ext];
+  $FmtV['$upmax'] = $maxsize;      
   if ($maxsize<=0) return "upresult=badtype&upext=$ext";
   if (intval(@$uploadfile['size'])>$maxsize) 
     return "upresult=toobigext&upext=$ext&upmax=$maxsize";
@@ -409,12 +430,14 @@ function UploadVerifyBasic($pagename,$uploadfile,&$filepath,&$upname=null) {
       return "upresult=fileinfo";
 
     $mime = mime_content_type($uploadfile['tmp_name']);
+    $FmtV['$upmime'] = $mime;      
     
     if ($mime != $UploadExts[$ext]) {
       if (!is_array($EnableUploadMimeMatch)
       || !isset($EnableUploadMimeMatch[$ext])
-      || !preg_match($EnableUploadMimeMatch[$ext], $mime))
+      || !preg_match($EnableUploadMimeMatch[$ext], $mime)) {
         return "upresult=mimemismatch&upext=$ext&upmime=$mime";
+      }
     }
   }
   
diff --git a/scripts/utils.php b/scripts/utils.php
index bcbdcf10..a26b786c 100644
--- a/scripts/utils.php
+++ b/scripts/utils.php
@@ -21,17 +21,18 @@
     To disable all these functions, add to config.php:
       $EnablePmUtils = 0;
 */
-function PmUtilsJS() {
+function PmUtilsJS($pagename) {
   global $PmTOC, $EnableSortable, $EnableHighlight, $EnableLocalTimes, $ToggleNextSelector,
     $LinkFunctions, $FarmD, $HTMLStylesFmt, $HTMLHeaderFmt, $EnablePmSyntax, $CustomSyntax, 
-    $EnableCopyCode, $EnableDarkThemeToggle, $EnableRedirectQuiet;
+    $EnableCopyCode, $EnableDarkThemeToggle, $EnableRedirectQuiet, 
+    $EnableUploadDrop, $UploadExtSize, $EnableUploadAuthorRequired;
 
   $utils = "$FarmD/pub/pmwiki-utils.js";
   $dark  = "$FarmD/pub/pmwiki-darktoggle.js";
   
   $cc = IsEnabled($EnableCopyCode, 0)? XL('Copy code') : '';
   
-  if($cc) {
+  if ($cc) {
     SDVA($HTMLStylesFmt, array('copycode'=>'
     .pmcopycode { cursor:pointer; display:block; border-radius:.2em; opacity:.2; position:relative; z-index:2; }
     .pmcopycode::before { content:"+"; display:block; width:.8em; height:.8em; line-height:.8em; text-align:center;  }
@@ -41,6 +42,24 @@ function PmUtilsJS() {
     pre:hover .pmcopycode { opacity:1; }
     '));
   }
+  if (IsEnabled($EnableUploadDrop, 0) && CondAuth($pagename, 'upload', 1)) {
+    $ddmu = array(
+      'action'  => '{$PageUrl}?action=postupload',
+      'token'   => ['$TokenName', pmtoken()],
+      'label'   => XL('ULdroplabel'),
+      'badtype' => str_replace('$', '#', XL('ULbadtype')),
+      'toobig'  => str_replace('$', '#', preg_replace('/\\s+/',' ', XL('ULtoobigext'))),
+      'sizes'   => array(),
+    );
+    if(IsEnabled($EnableUploadAuthorRequired, 0)) {
+      $ddmu['areq'] = XL('ULauthorrequired');
+    }
+    
+    foreach($UploadExtSize as $ext=>$bytes) {
+      if($bytes>0) $ddmu['sizes'][$ext] = $bytes;
+    }
+  }
+  else $ddmu = false;
   
   if (file_exists($utils)) {
     $mtime = filemtime($utils);
@@ -51,6 +70,7 @@ function PmUtilsJS() {
       'toggle' => IsEnabled($ToggleNextSelector, 0),
       'localtimes' => IsEnabled($EnableLocalTimes, 0),
       'rediquiet' => IsEnabled($EnableRedirectQuiet, 0),
+      'updrop' => $ddmu,
     );
     $enabled = $PmTOC['Enable'];
     foreach($config as $i) {
@@ -69,12 +89,15 @@ function PmUtilsJS() {
   if (IsEnabled($EnablePmSyntax, 0)) { # inject before skins and local.css
     $cs = is_array(@$CustomSyntax) ? 
       pm_json_encode(array_values($CustomSyntax), true) : '';
-    array_unshift($HTMLHeaderFmt, "<link rel='stylesheet' 
-      href='\$FarmPubDirUrl/guiedit/pmwiki.syntax.css'>
-    <script src='\$FarmPubDirUrl/guiedit/pmwiki.syntax.js' data-imap='{\$EnabledIMap}'
+    array_unshift($HTMLHeaderFmt, "<script data-imap='{\$EnabledIMap}'
+      src='\$FarmPubDirUrl/guiedit/pmwiki.syntax.js'
       data-label=\"$[Highlight]\" data-mode='$EnablePmSyntax'
       data-custom=\"$cs\"></script>");
   }
+  if (IsEnabled($EnablePmSyntax, 0) || $ddmu) {
+    array_unshift($HTMLHeaderFmt, "<link rel='stylesheet' 
+      href='\$FarmPubDirUrl/guiedit/pmwiki.syntax.css'>");
+  }
   
   // Dark theme toggle, needs to be very early
   $enabled = IsEnabled($EnableDarkThemeToggle, 0);
@@ -89,45 +112,5 @@ function PmUtilsJS() {
       data-config='$json'></script>");
   }
 }
-PmUtilsJS();
-
-##  This is a replacement for json_encode+PHSC, but only for arrays that
-##  are used by the PmWiki core. It may or may not work in other cases.
-##  This may fail with international characters if UTF-8 is not enabled.
-function pm_json_encode($x, $encodespecial=false) {
-  if (!isset($x) || is_null($x)) return 'null';
-  if (is_bool($x)) return $x? "true" : "false";
-  if (is_int($x) || is_float($x)) return strval($x);
-  
-  if (function_exists('json_encode'))
-    $out = json_encode($x);
-  
-  elseif (is_string($x)) ## escape controls and specials per RFC:8259
-    $out = '"'.preg_replace_callback("/[\x00-\x1f\\/\\\\\"]/",'cb_rfc8259',$x).'"';
-    
-  elseif (is_array($x)) {
-    $a = array();
-    if (array_values($x) === $x) { # numeric sequential array
-      foreach($x as $v)
-        $a[] = pm_json_encode($v);
-
-      $out = "[".implode(',', $a)."]";
-    }
-    else { # associative array -> json object
-      foreach($x as $k=>$v) {
-        $jk = is_int($k)? "\"$k\"" : pm_json_encode($k);
-        $jv = pm_json_encode($v);
-        $a[] = "$jk:$jv";
-      }
-      $out = "{".implode(',', $a)."}";
-    }
-  }
-  
-  else return 'null'; # other types not yet supported
-
-  return $encodespecial? PHSC($out, ENT_QUOTES) : $out;
-}
-function cb_rfc8259($m) { 
-  return sprintf('\\u00%02x', ord($m[0]));
-}
+PmUtilsJS($pagename);