projects
/
phpfspot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
issue59, fixed position of photo-index navigation after removing html tables
[phpfspot.git]
/
rpc.php
diff --git
a/rpc.php
b/rpc.php
index 078fafd4cba587a1cf6290f54ae267534f8cb116..6c94e8f72653a0e6715bd09fe0ee04519c66576e 100644
(file)
--- a/
rpc.php
+++ b/
rpc.php
@@
-8,7
+8,7
@@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
- *
(at your option)
any later version.
+ * any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-31,7
+31,7
@@
class PHPFSPOT_RPC {
} // __construct()
} // __construct()
- function process_ajax_request()
+
public
function process_ajax_request()
{
require_once 'HTML/AJAX/Server.php';
{
require_once 'HTML/AJAX/Server.php';
@@
-40,34
+40,40
@@
class PHPFSPOT_RPC {
$fspot = new PHPFSPOT();
$fspot = new PHPFSPOT();
+ /* if no action is specified, no need to further process this
+ * function here.
+ */
+ if(!isset($_GET['action']))
+ return;
+
switch($_GET['action']) {
case 'showphoto':
switch($_GET['action']) {
case 'showphoto':
-
- $fspot->showPhoto($_GET['id']);
+ if(isset($_GET['id']) && is_numeric($_GET['id'])) {
+ $fspot->showPhoto($_GET['id']);
+ }
break;
case 'show_available_tags':
break;
case 'show_available_tags':
-
- $fspot->getAvailableTags();
+ print $fspot->getAvailableTags();
break;
case 'show_selected_tags':
break;
case 'show_selected_tags':
-
- $fspot->getSelectedTags();
+ print $fspot->getSelectedTags();
break;
case 'addtag':
break;
case 'addtag':
-
- $fspot->addTag($_GET['id']);
+ if(isset($_GET['id']) && is_numeric($_GET['id'])) {
+ $fspot->addTag($_GET['id']);
+ }
break;
case 'deltag':
break;
case 'deltag':
-
- $fspot->delTag($_GET['id']);
+ if(isset($_GET['id']) && is_numeric($_GET['id'])) {
+ $fspot->delTag($_GET['id']);
+ }
break;
case 'reset':
break;
case 'reset':
-
$fspot->resetTagSearch();
$fspot->resetTags();
$fspot->resetDateSearch();
$fspot->resetTagSearch();
$fspot->resetTags();
$fspot->resetDateSearch();
@@
-75,36
+81,44
@@
class PHPFSPOT_RPC {
break;
case 'tagcondition':
break;
case 'tagcondition':
-
- $fspot->setTagCondition($_GET['mode']);
+ if(isset($_GET['mode']) && in_array($_GET['mode'], Array('or', 'and'))) {
+ $fspot->setTagCondition($_GET['mode']);
+ }
break;
case 'show_photo_index':
break;
case 'show_photo_index':
-
- $_SESSION['begin_with'] = $_GET['begin_with'];
+ if(isset($_GET['begin_with']) && is_numeric($_GET['begin_with'])) {
+ $_SESSION['begin_with'] = $_GET['begin_with'];
+ }
+ else {
+ unset($_SESSION['begin_with']);
+ }
$fspot->showPhotoIndex();
break;
case 'showcredits':
$fspot->showPhotoIndex();
break;
case 'showcredits':
-
$fspot->showCredits();
break;
$fspot->showCredits();
break;
- case 'tag_search':
-
- $fspot->resetDateSearch();
- $fspot->startTagSearch($_GET['for']);
+ case 'search':
+ $fspot->startSearch($_GET['for'], $_GET['from'], $_GET['to']);
+
+ if((isset($_GET['from']) && $fspot->isValidDate($_GET['from'])) &&
+ (isset($_GET['to']) && $fspot->isValidDate($_GET['to']))) {
+ }
+ else {
+ $fspot->startSearch($_GET['for']);
+ }
break;
break;
- case 'date_search':
-
- $fspot->resetTagSearch();
- $fspot->resetTags();
- $fspot->startDateSearch($_GET['from'], $_GET['to']);
+ case 'update_sort_order':
+ if(isset($_POST['value']) && is_string($_POST['value'])) {
+ print $fspot->updateSortOrder($_POST['value']);
+ }
break;
case 'get_export':
break;
case 'get_export':
-
+ /* $_GET['mode'] will be validated by getExport() */
$fspot->getExport($_GET['mode']);
break;
$fspot->getExport($_GET['mode']);
break;
@@
-113,18
+127,34
@@
class PHPFSPOT_RPC {
break;
case 'get_calendar_matrix':
break;
case 'get_calendar_matrix':
- $fspot->get_calendar_matrix($_GET['year'], $_GET['month'], $_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;
case 'what_to_do':
print $fspot->whatToDo();
break;
break;
case 'what_to_do':
print $fspot->whatToDo();
break;
+ case 'reset_slideshow':
+ print $fspot->resetSlideShow();
+ break;
+
+ case 'get_next_slideshow_img':
+ print $fspot->getNextSlideShowImage();
+ break;
+
+ case 'get_prev_slideshow_img':
+ print $fspot->getPrevSlideShowImage();
+ break;
+
}
} // process_ajax_request();
}
} // process_ajax_request();
-}
+}
// class PHPFSPOT_RPC
$rpc = new PHPFSPOT_RPC();
$rpc->process_ajax_request();
$rpc = new PHPFSPOT_RPC();
$rpc->process_ajax_request();