issue60, make sure provided photo id is numeric

[phpfspot.git] / phpfspot.js

diff --git a/phpfspot.js b/phpfspot.js
index 88af0b5ba07b51f7b124cb701c69f345c179e8bd..6671eb2cb1914a49a4da406cf0bd446055358038 100644 (file)
--- a/phpfspot.js
+++ b/phpfspot.js
@@ -151,6 +151,11 @@ function setViewMode(mode)
 function clearSearch()
 {
    document.getElementsByName('searchfor')[0].value = '';
+
+   if(document.getElementsByName('consider_date')[0].checked == true) {
+      document.getElementsByName('consider_date')[0].checked = false;
+      datesearch();
+   }  
 }
 
 function AskServerWhatToDo()
@@ -204,6 +209,8 @@ function getPhotoToShow()
 function showCalendar(date_box, click_obj)
 {
    var calendar = document.getElementById('calendar');
+   var year = document.getElementById(date_box+'year').value;
+   var month = document.getElementById(date_box+'month').value;
    if(date_box == 'from') {
       var xpos = document.getElementById('frompic').offsetLeft;
       var ypos = document.getElementById('frompic').offsetTop;
@@ -214,16 +221,24 @@ function showCalendar(date_box, click_obj)
       var ypos = document.getElementById('topic').offsetTop;
       calendar_mode = 'to';
    }
-   calendar.style.left = xpos + 60 + 'px';
+   calendar.style.left = xpos + 100 + 'px';
    calendar.style.top = ypos + 80 + 'px';
 
    if(calendar.style.visibility == "" || calendar.style.visibility == 'hidden') {
       calendar.style.visibility = 'visible';
       calendar.innerHTML = "Loading...";
-      calendar.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=get_calendar_matrix'));
+      calendar.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=get_calendar_matrix&year=' + year + '&month=' + month));
       calendar_shown = 1;
    }
    else {
+      hideCalendar();
+   }
+}
+
+function hideCalendar()
+{
+   var calendar = document.getElementById('calendar');
+   if(calendar.style.visibility != 'hidden') {
       calendar.style.visibility = 'hidden';
       calendar_shown = 0;
    }
@@ -241,6 +256,7 @@ function setCalendarDate(year, month, day)
    document.getElementById(calendar_mode+'year').value = year;
    document.getElementById(calendar_mode+'month').value = month;
    document.getElementById(calendar_mode+'day').value = day;
+   hideCalendar();
 }
 
 function resetAll()