Merge branch 'lefant'

[phpfspot.git] / rpc.php

diff --git a/rpc.php b/rpc.php
index b2d258c5c0748b1530bcc229d4ebfcafc6232c09..e4fecf8121048c1726bff6b8a409e67f1e5b6d04 100644 (file)
--- 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
@@ -58,6 +59,10 @@ class PHPFSPOT_RPC {
             }
             break;
    
+         case 'getxmltaglist':
+            print $fspot->get_xml_tag_list();
+            break;
+
          case 'show_available_tags':
             print $fspot->getAvailableTags();
             break;
@@ -67,14 +72,14 @@ class PHPFSPOT_RPC {
             break;
 
          case 'addtag':
-            if(isset($_GET['id']) && is_numeric($_GET['id'])) {
-               $fspot->addTag($_GET['id']);
+            if(isset($_POST['id']) && is_numeric($_POST['id'])) {
+               print $fspot->addTag($_POST['id']);
             }
             break;
 
          case 'deltag':
-            if(isset($_GET['id']) && is_numeric($_GET['id'])) {
-               $fspot->delTag($_GET['id']);
+            if(isset($_POST['id']) && is_numeric($_POST['id'])) {
+               print $fspot->delTag($_POST['id']);
             }
             break;
 
@@ -87,8 +92,8 @@ class PHPFSPOT_RPC {
             break;
 
          case 'tagcondition':
-            if(isset($_GET['mode']) && in_array($_GET['mode'], Array('or', 'and'))) {
-               $fspot->setTagCondition($_GET['mode']);
+            if(isset($_POST['mode']) && in_array($_POST['mode'], Array('or', 'and'))) {
+               print $fspot->setTagCondition($_POST['mode']);
             }
             break;
 
@@ -99,6 +104,9 @@ class PHPFSPOT_RPC {
             else {
                unset($_SESSION['begin_with']);
             }
+            if(isset($_GET['last_photo']) && is_numeric($_GET['last_photo']))
+               $_SESSION['last_photo'] = $_GET['last_photo'];
+
             $fspot->showPhotoIndex();
             break;
    
@@ -107,7 +115,7 @@ class PHPFSPOT_RPC {
             break;
 
          case 'search':
-            print $fspot->startSearch($_GET['for']);
+            print $fspot->startSearch();
             break;
 
          case 'update_sort_order':