X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=rpc.php;h=4bb297331abbad7bff7d38a9e2c66704f8788743;hp=6775647ca6acd84a1b8564bee1c204051ac39e3c;hb=1b98418fc7f31d2d10364a60bc798ee85ef7add1;hpb=dc815d80d15437e0e6a56bfcfbff81b241cdd727

diff --git a/rpc.php b/rpc.php
index 6775647..4bb2973 100644
--- 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
- *  (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
@@ -27,14 +27,12 @@ class PHPFSPOT_RPC {
 
    public function __construct()
    {
-
       session_start();
 
    } // __construct()
 
-   function process_ajax_request()
+   public function process_ajax_request()
    {
-
       require_once 'HTML/AJAX/Server.php';
 
       $server = new HTML_AJAX_Server();
@@ -42,68 +40,120 @@ class PHPFSPOT_RPC {
 
       $fspot = new PHPFSPOT();
 
-      switch($_GET['action']) {
-         case 'showphoto':
+      /* 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'];
 
-            $fspot->showPhoto($_GET['id']);
+      switch($action) {
+         case 'showphoto':
+            if(isset($_GET['id']) && is_numeric($_GET['id'])) {
+               $fspot->showPhoto($_GET['id']);
+            }
             break;
    
          case 'show_available_tags':
-
-            $fspot->getAvailableTags();
+            print $fspot->getAvailableTags();
             break;
 
          case 'show_selected_tags':
-
-            $fspot->getSelectedTags();
+            print $fspot->getSelectedTags();
             break;
 
          case 'addtag':
-
-            $fspot->addTag($_GET['id']);
+            if(isset($_POST['id']) && is_numeric($_POST['id'])) {
+               print $fspot->addTag($_POST['id']);
+            }
             break;
 
          case 'deltag':
-
-            $fspot->delTag($_GET['id']);
+            if(isset($_POST['id']) && is_numeric($_POST['id'])) {
+               print $fspot->delTag($_POST['id']);
+            }
             break;
 
-         case 'resettags':
-
+         case 'reset':
+            $fspot->resetTagSearch();
+            $fspot->resetNameSearch();
             $fspot->resetTags();
+            $fspot->resetDateSearch();
+            $fspot->resetPhotoView();
             break;
 
          case 'tagcondition':
-
-            $fspot->setTagCondition($_GET['mode']);
+            if(isset($_POST['mode']) && in_array($_POST['mode'], Array('or', 'and'))) {
+               print $fspot->setTagCondition($_POST['mode']);
+            }
             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 'showbubbledetails':
-      
-            $fspot->showBubbleDetails($_GET['id'], $_GET['direction']);
-            break;
-
          case 'showcredits':
-
             $fspot->showCredits();
             break;
 
          case 'search':
+            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;
+
+         case 'get_photo_to_show':
+            $fspot->getCurrentPhoto();
+            break;
 
-            $fspot->startSearch($_GET['for']);
+         case 'get_calendar_matrix':
+            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;
+
+         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();
 
-}
+} // class PHPFSPOT_RPC
 
 $rpc = new PHPFSPOT_RPC();
 $rpc->process_ajax_request();