X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=rpc.php;h=e4fecf8121048c1726bff6b8a409e67f1e5b6d04;hp=8c72e0f01e1185fabd65a0405eba7eb8f62e30d5;hb=14eb0419012155b6d36f25dd9bd1d2ba683dbed7;hpb=de91ca834564f13a8a059f320c469c08309e5e6c diff --git a/rpc.php b/rpc.php index 8c72e0f..e4fecf8 100644 --- a/rpc.php +++ b/rpc.php @@ -2,8 +2,9 @@ /* ************************************************************************* * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * 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 @@ -31,7 +32,7 @@ class PHPFSPOT_RPC { } // __construct() - function process_ajax_request() + public function process_ajax_request() { require_once 'HTML/AJAX/Server.php'; @@ -40,43 +41,59 @@ class PHPFSPOT_RPC { $fspot = new PHPFSPOT(); - switch($_GET['action']) { + /* if no action is specified, no need to further process this + * function here. + */ + if(!isset($_GET['action']) && !isset($_POST['action'])) + return; + + if(isset($_GET['action'])) + $action = $_GET['action']; + if(isset($_POST['action'])) + $action = $_POST['action']; + + switch($action) { case 'showphoto': if(isset($_GET['id']) && is_numeric($_GET['id'])) { $fspot->showPhoto($_GET['id']); } break; + case 'getxmltaglist': + print $fspot->get_xml_tag_list(); + break; + case 'show_available_tags': - $fspot->getAvailableTags(); + print $fspot->getAvailableTags(); break; case 'show_selected_tags': - $fspot->getSelectedTags(); + print $fspot->getSelectedTags(); break; case 'addtag': - if(isset($_GET['id']) && is_numeric($_GET['id'])) { - $fspot->addTag($_GET['id']); + if(isset($_POST['id']) && is_numeric($_POST['id'])) { + print $fspot->addTag($_POST['id']); } break; case 'deltag': - if(isset($_GET['id']) && is_numeric($_GET['id'])) { - $fspot->delTag($_GET['id']); + if(isset($_POST['id']) && is_numeric($_POST['id'])) { + print $fspot->delTag($_POST['id']); } break; case 'reset': $fspot->resetTagSearch(); + $fspot->resetNameSearch(); $fspot->resetTags(); $fspot->resetDateSearch(); $fspot->resetPhotoView(); break; case 'tagcondition': - if(isset($_GET['mode']) && in_array($_GET['mode'], Array('or', 'and'))) { - $fspot->setTagCondition($_GET['mode']); + if(isset($_POST['mode']) && in_array($_POST['mode'], Array('or', 'and'))) { + print $fspot->setTagCondition($_POST['mode']); } break; @@ -87,6 +104,9 @@ class PHPFSPOT_RPC { else { unset($_SESSION['begin_with']); } + if(isset($_GET['last_photo']) && is_numeric($_GET['last_photo'])) + $_SESSION['last_photo'] = $_GET['last_photo']; + $fspot->showPhotoIndex(); break; @@ -95,10 +115,17 @@ class PHPFSPOT_RPC { break; case 'search': - $fspot->startSearch($_GET['for'], $_GET['from'], $_GET['to'], $_GET['sort_order']); + print $fspot->startSearch(); + break; + + case 'update_sort_order': + if(isset($_POST['value']) && is_string($_POST['value'])) { + print $fspot->updateSortOrder($_POST['value']); + } break; case 'get_export': + /* $_GET['mode'] will be validated by getExport() */ $fspot->getExport($_GET['mode']); break; @@ -107,8 +134,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; @@ -133,7 +161,7 @@ class PHPFSPOT_RPC { } // process_ajax_request(); -} +} // class PHPFSPOT_RPC $rpc = new PHPFSPOT_RPC(); $rpc->process_ajax_request();