fixed SQL syntax error on AND conjunction of multiple tags

[phpfspot.git] / rpc.php

diff --git a/rpc.php b/rpc.php
index 49d1930def0052d59db2bbd59408146e400a1d63..937f4323d803d15a03aac5d1d01831cf8ea96172 100644 (file)
--- 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
@@ -70,6 +70,7 @@ class PHPFSPOT_RPC {
 
             $fspot->resetTagSearch();
             $fspot->resetTags();
+            $fspot->resetDateSearch();
             $fspot->resetPhotoView();
             break;
 
@@ -89,9 +90,9 @@ class PHPFSPOT_RPC {
             $fspot->showCredits();
             break;
 
-         case 'tag_search':
+         case 'search':
 
-            $fspot->startTagSearch($_GET['for']);
+            $fspot->startSearch($_GET['for'], $_GET['from'], $_GET['to'], $_GET['sort_order']);
             break;
 
          case 'get_export':
@@ -103,6 +104,14 @@ 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;
+
       }
 
    } // process_ajax_request();