add another key combo, change delimiter for file lists

diff --git a/presenter/deletePic.pl b/presenter/deletePic.pl
index 3a015c9074043d3dd1a65f71df71d32ec5f1650e..3e3a8f864b8f41cfffe37e74cfc134825929021e 100755 (executable)
--- a/presenter/deletePic.pl
+++ b/presenter/deletePic.pl
@@ -14,7 +14,7 @@ if (!($room =~ /^[a-zA-Z0-9]+$/) || !(-d "store/$room")) {
 
  
 my $s = $cgi->param("img");
-my @r = split('%',$s);
+my @r = split('\*',$s);
 
 foreach my $t (@r) {
   if(($t =~ /[\"\$\(\)\/]/ || !(-e "store/$room/$t")) && ($t =~ /.png$/i || $t =~ /.jpg$/i)) {

diff --git a/presenter/scripts.js b/presenter/scripts.js
index 596425f52f7de04d17eaffb78b98fa06c1014e7a..d7b2c488c1f1b54318273da842c7c190a4220554 100644 (file)
--- a/presenter/scripts.js
+++ b/presenter/scripts.js
@@ -41,8 +41,8 @@ function present(f) {
   }
   
 function presentNext(d) {
-  if(d==40) d=1;
-  else if(d==38) d=-1;
+  if(d==40 || d==34) d=1;
+  else if(d==38 || d==33) d=-1;
   else return true;
   current = currentPic.split(',',1);
   for(i=0;i<document.getElementById('filelist').children.length;i++){
@@ -65,7 +65,7 @@ function deletePic(f) {
   x = document.getElementById('filelist');
   for (var i = 0; i < x.options.length; i++) {
    if(x.options[i].selected){
-      g= g + '%' + x.options[i].value;
+      g= g + '*' + x.options[i].value;
     }
   } 
   if(g != "") {