summaryrefslogtreecommitdiffstats
path: root/rpc.php
diff options
context:
space:
mode:
authorAndreas Unterkircher <unki@netshadow.at>2008-08-18 06:16:37 +0200
committerAndreas Unterkircher <unki@netshadow.at>2008-08-18 06:16:37 +0200
commit4712f548702a1a7f9ad86360ebd1fa44356791a3 (patch)
tree1acc716fd123ab8a7077b39cdd31d43d7184c853 /rpc.php
parentc1811f2887d9a888247ffb87b0b693ef1646dae0 (diff)
parent88e26f8f6bdc9dcb443759ec2781f343146bb889 (diff)
fix conflict in phpfspot.class.php
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
Diffstat (limited to 'rpc.php')
-rw-r--r--rpc.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/rpc.php b/rpc.php
index ada2857..17af073 100644
--- a/rpc.php
+++ b/rpc.php
@@ -135,13 +135,20 @@ class PHPFSPOT_RPC {
}
break;
+ case 'update_photo_version':
+ if(isset($_POST['photo_version']) && is_numeric($_POST['photo_version']) &&
+ isset($_POST['photo_idx']) && is_numeric($_POST['photo_idx'])) {
+ print $phpfspot->update_photo_version($_POST['photo_idx'], $_POST['photo_version']);
+ }
+ break;
+
case 'get_export':
/* $_GET['mode'] will be validated by getExport() */
$phpfspot->getExport($_GET['mode']);
break;
case 'get_photo_to_show':
- $phpfspot->getCurrentPhoto();
+ print $phpfspot->get_current_photo();
break;
case 'get_calendar_matrix':