X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=rpc.php;h=bdb7004ad6de1d6a03ec68c1760077517aa8e67d;hp=891f395d77bbc89a9fc2ea022a7444b7bf857ade;hb=8de7a22ceac0fab9eb984854758608d7aeb079d3;hpb=4a0b6f6114f19cebd796b3b1c6e5253edc3267c3

diff --git a/rpc.php b/rpc.php
index 891f395..bdb7004 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
@@ -42,32 +42,32 @@ class PHPFSPOT_RPC {
 
       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':
-
             $fspot->getAvailableTags();
             break;
 
          case 'show_selected_tags':
-
             $fspot->getSelectedTags();
             break;
 
          case 'addtag':
-
-            $fspot->addTag($_GET['id']);
+            if(isset($_GET['id']) && is_numeric($_GET['id'])) {
+               $fspot->addTag($_GET['id']);
+            }
             break;
 
          case 'deltag':
-
-            $fspot->delTag($_GET['id']);
+            if(isset($_GET['id']) && is_numeric($_GET['id'])) {
+               $fspot->delTag($_GET['id']);
+            }
             break;
 
          case 'reset':
-
             $fspot->resetTagSearch();
             $fspot->resetTags();
             $fspot->resetDateSearch();
@@ -75,36 +75,38 @@ class PHPFSPOT_RPC {
             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':
-
-            $_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->showCredits();
             break;
 
-         case 'tag_search':
-
-            $fspot->resetDateSearch();
-            $fspot->startTagSearch($_GET['for']);
-            break;
-
-         case 'date_search':
-   
-            $fspot->resetTagSearch();
-            $fspot->resetTags();
-            $fspot->startDateSearch($_GET['from'], $_GET['to']);
+         case 'search':
+               $fspot->startSearch($_GET['for'], $_GET['sort_order'], $_GET['from'], $_GET['to']);
+            
+            if((isset($_GET['from']) && $fspot->isValidDate($_GET['from'])) &&
+               (isset($_GET['to']) && $fspot->isValidDate($_GET['to']))) {
+            }
+            else {
+               $fspot->startSearch($_GET['for'], $_GET['sort_order']);
+            }
             break;
 
          case 'get_export':
-
+            /* $_GET['mode'] will be validated by getExport() */
             $fspot->getExport($_GET['mode']);
             break;
 
@@ -113,7 +115,27 @@ 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':
+            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;
 
       }