From 8a3f6866d05db64f00e1bb0441344c3201320fb6 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Mon, 3 Jan 2011 20:11:52 -0500
Subject: [PATCH] Fix generation of mobile thumbnails when not using
 vfs-direct.

Also, add a config switch for tinySrc.mobi support. Mostly to ease
testing while using locahost ;)
---
 ansel/config/conf.xml                      | 6 ++++++
 ansel/img/thumb.php                        | 8 ++++++--
 ansel/lib/Ansel.php                        | 6 ++++++
 ansel/lib/Gallery.php                      | 7 ++++---
 ansel/templates/mobile/javascript_defs.php | 1 -
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ansel/config/conf.xml b/ansel/config/conf.xml
index 985fc2539..1b78488e7 100644
--- a/ansel/config/conf.xml
+++ b/ansel/config/conf.xml
@@ -94,6 +94,12 @@
    if available when generating mini or square thumbnails? This gives a better
    change that the crop will contain an interesting part of the image, but will
    increase CPU usage during image generation."></configboolean>
+   <configboolean name="tiny" desc="Should Ansel use the TinySrc.mobi webservice
+   to generate mobile image screen views if appropriate? The gallery must either
+   be publicly viewable or you must be using the VFS direct option above. If
+   this is enabled, and these conditions are not met, Ansel will fall back to
+   an average sized mobile image. Note also that if you are using localhost or
+   something similar as the server name, this will fail.">false</configboolean>
    <configstring name="num_uploads" desc="How many photos should a user be
    allowed to upload at once?">5</configstring>
    <configstring name="font" required="false" desc="What font would you like
diff --git a/ansel/img/thumb.php b/ansel/img/thumb.php
index 2b81c8de1..bd7dbab76 100644
--- a/ansel/img/thumb.php
+++ b/ansel/img/thumb.php
@@ -13,11 +13,15 @@ Horde_Registry::appInit('ansel');
 
 $thumbstyle = Horde_Util::getFormData('t');
 $background = Horde_Util::getFormData('b');
+$w = Horde_Util::getFormData('w');
+$h = Horde_Util::getFormData('h');
 
 // Create a dummy style object with only what is needed to generate
-if ($thumbstyle && $background) {
+if ($thumbstyle || $background || $w || $h) {
     $style = new Ansel_Style(array('thumbstyle' => $thumbstyle,
-                                   'background' => $background));
+                                   'background' => $background,
+                                   'width' => $w,
+                                   'height' => $h));
 } else {
     $style = null;
 }
diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index 223f363c4..89a5d6e50 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -398,6 +398,12 @@ class Ansel
             if (!is_null($style)) {
                 $params['t'] = $style->thumbstyle;
                 $params['b'] = $style->background;
+                if ($style->width) {
+                    $params['w'] = $style->width;
+                }
+                if ($style->height) {
+                    $params['h'] = $style->height;
+                }
             }
 
             return Horde::url('img/' . $view . '.php', $full)->add($params);
diff --git a/ansel/lib/Gallery.php b/ansel/lib/Gallery.php
index 83ff03cf5..58abab507 100644
--- a/ansel/lib/Gallery.php
+++ b/ansel/lib/Gallery.php
@@ -1032,7 +1032,8 @@ class Ansel_Gallery extends Horde_Share_Object_Sql_Hierarchical implements Seria
         }
 
         if ($full) {
-            $json->tiny = ($GLOBALS['conf']['vfs']['src'] == 'direct' || $this->hasPermission('', Horde_Perms::READ));
+            $json->tiny = ($GLOBALS['conf']['image']['tiny'] &&
+                           ($GLOBALS['conf']['vfs']['src'] == 'direct' || $this->hasPermission('', Horde_Perms::READ)));
             $json->sg = array();
             if ($this->hasSubGalleries()) {
                 $sgs = $GLOBALS['injector']->getInstance('Ansel_Storage')->listGalleries(array('parent' => $this->getId(), 'all_levels' => false));
@@ -1045,8 +1046,8 @@ class Ansel_Gallery extends Horde_Share_Object_Sql_Hierarchical implements Seria
             foreach ($images as $img) {
                 $i = new StdClass();
                 $i->id = $img->id;
-                $i->url = Ansel::getImageUrl($img->id, 'thumb', false, Ansel::getStyleDefinition('ansel_mobile'))->toString();
-                $i->screen = Ansel::getImageUrl($img->id, 'screen', $json->tiny, Ansel::getStyleDefinition('ansel_default'))->toString();
+                $i->url = Ansel::getImageUrl($img->id, 'thumb', false, Ansel::getStyleDefinition('ansel_mobile'))->toString(true);
+                $i->screen = Ansel::getImageUrl($img->id, 'screen', $json->tiny, Ansel::getStyleDefinition('ansel_default'))->toString(true);
                 $i->fn = $img->filename;
                 $json->imgs[] = $i;
             }
diff --git a/ansel/templates/mobile/javascript_defs.php b/ansel/templates/mobile/javascript_defs.php
index 6aba72af0..e4fbf8ade 100644
--- a/ansel/templates/mobile/javascript_defs.php
+++ b/ansel/templates/mobile/javascript_defs.php
@@ -3,7 +3,6 @@ global $prefs, $registry;
 
 $ansel_webroot = $registry->get('webroot');
 $horde_webroot = $registry->get('webroot', 'horde');
-$has_tasks = $registry->hasInterface('tasks');
 
 /* Variables used in core javascript files. */
 $code['conf'] = array(
-- 
2.11.0