X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=rpc.php;h=ada2857a1083fbfec0cb70ee7dd206f025d166d0;hp=d7dafce23d68f486a28c34301ba5593471647d9f;hb=dcc26041d1dd86d47516e143fd5e475e588180cf;hpb=005562e4a4fb2b37fc6f1d4a8ca4a9c11ab42ed1

diff --git a/rpc.php b/rpc.php
index d7dafce..ada2857 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
@@ -23,108 +24,155 @@
 
 require_once "phpfspot.class.php";
 
+/**
+ * PHPFSPOT_RPC class
+ *
+ * handles AJAX-RPC calls from client browsers
+ * @package phpfspot
+ */
 class PHPFSPOT_RPC {
 
+   /**
+    * PHPFSPOT_RPC constructor
+    */
    public function __construct()
    {
+      /* start PHP session */
       session_start();
 
    } // __construct()
 
-   function process_ajax_request()
+   public function process_ajax_request()
    {
       require_once 'HTML/AJAX/Server.php';
 
       $server = new HTML_AJAX_Server();
       $server->handleRequest();
 
-      $fspot = new PHPFSPOT();
+      $phpfspot = 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;
 
-            $fspot->showPhoto($_GET['id']);
+      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'])) {
+               print $phpfspot->showPhoto($_GET['id']);
+            }
             break;
    
-         case 'show_available_tags':
+         case 'getxmltaglist':
+            print $phpfspot->get_xml_tag_list();
+            break;
 
-            $fspot->getAvailableTags();
+         case 'show_available_tags':
+            print $phpfspot->getAvailableTags();
             break;
 
          case 'show_selected_tags':
-
-            $fspot->getSelectedTags();
+            print $phpfspot->getSelectedTags();
             break;
 
          case 'addtag':
-
-            $fspot->addTag($_GET['id']);
+            if(isset($_POST['id']) && is_numeric($_POST['id'])) {
+               print $phpfspot->addTag($_POST['id']);
+            }
             break;
 
          case 'deltag':
-
-            $fspot->delTag($_GET['id']);
+            if(isset($_POST['id']) && is_numeric($_POST['id'])) {
+               print $phpfspot->delTag($_POST['id']);
+            }
             break;
 
          case 'reset':
-
-            $fspot->resetTagSearch();
-            $fspot->resetTags();
-            $fspot->resetDateSearch();
-            $fspot->resetPhotoView();
+            $phpfspot->resetTagSearch();
+            $phpfspot->resetNameSearch();
+            $phpfspot->resetTags();
+            $phpfspot->resetDateSearch();
+            $phpfspot->resetRateSearch();
+            $phpfspot->resetPhotoView();
             break;
 
          case 'tagcondition':
-
-            $fspot->setTagCondition($_GET['mode']);
+            if(isset($_POST['mode']) && in_array($_POST['mode'], Array('or', 'and'))) {
+               print $phpfspot->setTagCondition($_POST['mode']);
+            }
             break;
 
          case 'show_photo_index':
+            if(isset($_GET['begin_with']) && is_numeric($_GET['begin_with'])) {
+               $_SESSION['begin_with'] = $_GET['begin_with'];
+            }
+            else {
+               unset($_SESSION['begin_with']);
+            }
+            if(isset($_GET['last_photo']) && is_numeric($_GET['last_photo']))
+               $_SESSION['last_photo'] = $_GET['last_photo'];
 
-            $_SESSION['begin_with'] = $_GET['begin_with'];
-            $fspot->showPhotoIndex();
+            print $phpfspot->showPhotoIndex();
             break;
    
          case 'showcredits':
-
-            $fspot->showCredits();
+            $phpfspot->showCredits();
             break;
 
          case 'search':
+            print $phpfspot->startSearch();
+            break;
 
-            $fspot->startSearch($_GET['for'], $_GET['from'], $_GET['to'], $_GET['sort_order']);
+         case 'update_sort_order':
+            if(isset($_POST['value']) && is_string($_POST['value'])) {
+               print $phpfspot->updateSortOrder($_POST['value']);
+            }
             break;
 
          case 'get_export':
-
-            $fspot->getExport($_GET['mode']);
+            /* $_GET['mode'] will be validated by getExport() */
+            $phpfspot->getExport($_GET['mode']);
             break;
 
          case 'get_photo_to_show':
-            $fspot->getCurrentPhoto();
+            $phpfspot->getCurrentPhoto();
             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']))) {
+               $phpfspot->get_calendar_matrix($_GET['year'], $_GET['month'], $_GET['day']);
+            }
             break;
 
          case 'what_to_do':
-            print $fspot->whatToDo();
+            print $phpfspot->whatToDo();
             break;
 
          case 'reset_slideshow':
-            print $fspot->resetSlideShow();
+            print $phpfspot->resetSlideShow();
             break;
 
          case 'get_next_slideshow_img':
-            print $fspot->getNextSlideShowImage();
+            print $phpfspot->getNextSlideShowImage();
+            break;
+         
+         case 'get_prev_slideshow_img':
+            print $phpfspot->getPrevSlideShowImage();
             break;
 
       }
 
    } // process_ajax_request();
 
-}
+} // class PHPFSPOT_RPC
 
 $rpc = new PHPFSPOT_RPC();
 $rpc->process_ajax_request();