X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=rpc.php;h=b691bd8908abdaa287928a4018fa4ce889c9a4fa;hp=49d1930def0052d59db2bbd59408146e400a1d63;hb=c27cc05f7b47278202f3ef6cda4b85b09a8edbdf;hpb=a365bbcf0ccc18cc5cee9e5cc697725279b02e53

diff --git a/rpc.php b/rpc.php
index 49d1930..b691bd8 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,60 +42,63 @@ 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();
             $fspot->resetPhotoView();
             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->startTagSearch($_GET['for']);
+         case 'search':
+            $fspot->startSearch($_GET['for'], $_GET['from'], $_GET['to'], $_GET['sort_order']);
             break;
 
          case 'get_export':
-
             $fspot->getExport($_GET['mode']);
             break;
 
@@ -103,6 +106,26 @@ class PHPFSPOT_RPC {
             $fspot->getCurrentPhoto();
             break;
 
+         case 'get_calendar_matrix':
+            $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();