X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.js;h=ca3f9c01508fa8c94e25eae0794823d7986b8f12;hp=1b1f05d5ca4e1ec8f6f39ad54f56453991dd8198;hb=a65027a61ac189bc723710454401f95f1dba6b21;hpb=248141f2861881843e972c6f5f8a9ad4f71b06ef

diff --git a/phpfspot.js b/phpfspot.js
index 1b1f05d..ca3f9c0 100644
--- a/phpfspot.js
+++ b/phpfspot.js
@@ -12,24 +12,35 @@ function showCredits()
 
 function Tags(mode, id)
 {
+   var objTemp = new Object();
+
    if(mode == "add") {
-      // add the tag to users session
-      HTML_AJAX.grab(encodeURI('rpc.php?action=addtag&id=' + id));
+      // add tag to users session
+      objTemp['action'] = 'addtag';
+      objTemp['id'] = id;
    }
    else if(mode == "del") {
-      // del the tag from users session
-      HTML_AJAX.grab(encodeURI('rpc.php?action=deltag&id=' + id));
+      // del tag from users session
+      objTemp['action'] = 'deltag';
+      objTemp['id'] = id;
    }
    else if(mode == "condition") {
       setCheckedValue(id, id.value);
-      HTML_AJAX.grab(encodeURI('rpc.php?action=tagcondition&mode=' + id.value));
+      objTemp['action'] = 'tagcondition';
+      objTemp['mode'] = id.value;
    }
 
-   refreshAvailableTags();
-   refreshSelectedTags();
-   refreshPhotoIndex();
+   var retr = HTML_AJAX.post('rpc.php', objTemp);
+   if(retr == "ok") {
+      refreshAvailableTags();
+      refreshSelectedTags();
+      refreshPhotoIndex();
+   }
+   else {
+      window.alert(retr);
+   }
 
-}
+} // Tags()
 
 function refreshAvailableTags()
 {
@@ -58,7 +69,7 @@ function showPhotoIndex(begin_with)
 // if photo index is currently shown, refresh it
 function refreshPhotoIndex()
 {
-   if(document.getElementById("matrix") != undefined || startup == 1) {
+   if(document.getElementById("index") != undefined || startup == 1) {
       showPhotoIndex();
       startup = 0;
    }
@@ -92,8 +103,6 @@ function setCheckedValue(condition, value) {
 
 function startSearch()
 {
-   var searchfor = document.getElementsByName('searchfor')[0].value
-
    from_year = document.getElementById('fromyear').value;
    from_month = document.getElementById('frommonth').value;
    from_day = document.getElementById('fromday').value;
@@ -103,23 +112,31 @@ function startSearch()
    to_day = document.getElementById('today').value;
    to = to_year +"-"+ to_month +"-"+ to_day;
 
-   var request = 'rpc.php?action=search';
+   var objTemp = new Object();
+   objTemp['action'] = 'search';
 
-   if(searchfor != "") {
-      request = request + '&for=' + searchfor;
+   if(document.getElementsByName('searchfor_tag')[0].value != "") {
+      objTemp['for_tag'] = document.getElementsByName('searchfor_tag')[0].value;
+   }
+   if(document.getElementsByName('searchfor_name')[0].value != "") {
+      objTemp['for_name'] = document.getElementsByName('searchfor_name')[0].value;
    }
-   
    if(document.getElementsByName('consider_date')[0].checked == true) {
-      request = request + '&from='+ from +'&to='+ to;
+      objTemp['from'] = from;
+      objTemp['to'] = to;
    }
 
-   HTML_AJAX.grab(encodeURI(request));
+   var retr = HTML_AJAX.post('rpc.php', objTemp);
+   if(retr == "ok") {
+      refreshAvailableTags();
+      refreshSelectedTags();
+      showPhotoIndex();
+   }
+   else {
+      window.alert(retr);
+   }
 
-   refreshAvailableTags();
-   refreshSelectedTags();
-   showPhotoIndex();
-   
-}
+} // startSearch()
 
 function datesearch()
 {
@@ -147,7 +164,8 @@ function setViewMode(mode)
 
 function clearSearch()
 {
-   document.getElementsByName('searchfor')[0].value = '';
+   document.getElementsByName('searchfor_tag')[0].value = '';
+   document.getElementsByName('searchfor_name')[0].value = '';
 
    if(document.getElementsByName('consider_date')[0].checked == true) {
       document.getElementsByName('consider_date')[0].checked = false;
@@ -442,6 +460,14 @@ function keyDown(e) {
          }
          return;
       }
+      if(key == 73 && evt.altKey && evt.ctrlKey) /* ctrl+alt+i */ {
+         showPhotoIndex();
+         return;
+      }
+      if(key == 82 && evt.altKey && evt.ctrlKey) /* ctrl+alt+r */ {
+         resetAll();
+         return;
+      }
    }
 }