summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Unterkircher <unki@netshadow.at>2007-07-28 07:10:25 +0000
committerAndreas Unterkircher <unki@netshadow.at>2007-07-28 07:10:25 +0000
commitfc802d09f196e338f7485e38057ec84df5c81bf2 (patch)
tree254911c7864291849b1d200e30f01ed7bd599937
parentd017dda4269c5122cd522218357a11fcb4880a5d (diff)
issue69, fixed calendar matrix always starting with the current time
git-svn-id: file:///var/lib/svn/phpfspot/trunk@260 fa6a889d-dae6-447d-9e79-4ba9a3039384
-rw-r--r--phpfspot.js4
-rw-r--r--rpc.php6
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 {
diff --git a/rpc.php b/rpc.php
index 4ffae5f..d0a6c1c 100644
--- a/rpc.php
+++ b/rpc.php
@@ -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;