1 files changed, 33 insertions, 10 deletions
diff --git a/phpfspot.js b/phpfspot.js
index 58e48de..5aac788 100644
--- a/phpfspot.js
+++ b/phpfspot.js
@@ -90,16 +90,10 @@ function setCheckedValue(condition, value) {
    }
 }
 
-function startTagSearch(searchfor)
+function startSearch()
 {
-   HTML_AJAX.grab(encodeURI('rpc.php?action=tag_search&for=' + searchfor));
-   refreshAvailableTags();
-   refreshSelectedTags();
-   showPhotoIndex();
-}
+   var searchfor = document.getElementsByName('searchfor')[0].value
 
-function startDateSearch()
-{
    from_year = document.getElementById('fromyear').value;
    from_month = document.getElementById('frommonth').value;
    from_day = document.getElementById('fromday').value;
@@ -109,10 +103,39 @@ function startDateSearch()
    to_day = document.getElementById('today').value;
    to = to_year +"-"+ to_month +"-"+ to_day;
 
-   HTML_AJAX.grab(encodeURI('rpc.php?action=date_search&from='+ from +'&to='+ to));
+   var request = 'rpc.php?action=search';
 
-   refreshPhotoIndex();
+   if(searchfor != "") {
+      request = request + '&for=' + searchfor;
+   }
    
+   if(document.getElementsByName('consider_date')[0].checked == true) {
+      request = request + '&from='+ from +'&to='+ to;
+   }
+
+   HTML_AJAX.grab(encodeURI(request));
+
+   refreshAvailableTags();
+   refreshSelectedTags();
+   showPhotoIndex();
+   
+}
+
+function datesearch()
+{
+   var mode = true;
+
+   if(document.getElementsByName('consider_date')[0].checked == true) {
+      mode = false;
+   }
+      
+   document.getElementById('fromyear').disabled = mode;
+   document.getElementById('frommonth').disabled = mode;
+   document.getElementById('fromday').disabled = mode;
+   document.getElementById('toyear').disabled = mode;
+   document.getElementById('tomonth').disabled = mode;
+   document.getElementById('today').disabled = mode;
+ 
 }
 
 function setViewMode(mode)