issue103, ensure showPhotoIndex() returns to the right page
[phpfspot.git] / rpc.php
diff --git a/rpc.php b/rpc.php
index b691bd8908abdaa287928a4018fa4ce889c9a4fa..4bb297331abbad7bff7d38a9e2c66704f8788743 100644 (file)
--- a/rpc.php
+++ b/rpc.php
@@ -31,7 +31,7 @@ class PHPFSPOT_RPC {
 
    } // __construct()
 
-   function process_ajax_request()
+   public function process_ajax_request()
    {
       require_once 'HTML/AJAX/Server.php';
 
@@ -40,7 +40,18 @@ 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']);
@@ -48,35 +59,36 @@ class PHPFSPOT_RPC {
             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;
 
@@ -95,10 +107,17 @@ class PHPFSPOT_RPC {
             break;
 
          case 'search':
-            $fspot->startSearch($_GET['for'], $_GET['from'], $_GET['to'], $_GET['sort_order']);
+            print $fspot->startSearch($_GET['for']);
+            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,7 +126,11 @@ class PHPFSPOT_RPC {
             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':
@@ -130,7 +153,7 @@ class PHPFSPOT_RPC {
 
    } // process_ajax_request();
 
-}
+} // class PHPFSPOT_RPC
 
 $rpc = new PHPFSPOT_RPC();
 $rpc->process_ajax_request();