X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=rpc.php;h=bdb7004ad6de1d6a03ec68c1760077517aa8e67d;hp=8c72e0f01e1185fabd65a0405eba7eb8f62e30d5;hb=6584ea730d28eac95ad421783c583d2d2ad59852;hpb=de91ca834564f13a8a059f320c469c08309e5e6c diff --git a/rpc.php b/rpc.php index 8c72e0f..bdb7004 100644 --- a/rpc.php +++ b/rpc.php @@ -95,10 +95,18 @@ class PHPFSPOT_RPC { break; case 'search': - $fspot->startSearch($_GET['for'], $_GET['from'], $_GET['to'], $_GET['sort_order']); + $fspot->startSearch($_GET['for'], $_GET['sort_order'], $_GET['from'], $_GET['to']); + + if((isset($_GET['from']) && $fspot->isValidDate($_GET['from'])) && + (isset($_GET['to']) && $fspot->isValidDate($_GET['to']))) { + } + else { + $fspot->startSearch($_GET['for'], $_GET['sort_order']); + } break; case 'get_export': + /* $_GET['mode'] will be validated by getExport() */ $fspot->getExport($_GET['mode']); break; @@ -107,8 +115,9 @@ class PHPFSPOT_RPC { break; case 'get_calendar_matrix': - if(is_numeric($_GET['year']) && is_numeric($_GET['month']) && - is_numeric($_GET['day'])) { + 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;