diff options
| -rw-r--r-- | phpfspot.js | 4 | ||||
| -rw-r--r-- | rpc.php | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/phpfspot.js b/phpfspot.js index 17cf109..6671eb2 100644 --- a/phpfspot.js +++ b/phpfspot.js @@ -209,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; @@ -225,7 +227,7 @@ function showCalendar(date_box, click_obj) 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 { @@ -107,9 +107,9 @@ class PHPFSPOT_RPC { break; case 'get_calendar_matrix': - if((is_numeric($_GET['year']) || $_GET['year'] == "") && - (is_numeric($_GET['month']) || $_GET['month'] == "") && - (is_numeric($_GET['day']) || $_GET['month'] == "")) { + if((is_numeric($_GET['year']) || !isset($_GET['year'])) && + (is_numeric($_GET['month']) || !isset($_GET['month'])) && + (is_numeric($_GET['day']) || !isset($_GET['day']))) { $fspot->get_calendar_matrix($_GET['year'], $_GET['month'], $_GET['day']); } break; |