issue118, user-friendly-url's to jump from photo-index to single-photo-view

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 0e2ea44b7cd9ae92fcd8cbc04d13f2fced4f0228..f938dbc30ef4710640744fa619ec8bf19213d377 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -223,6 +223,11 @@ class PHPFSPOT {
       if(isset($_SESSION['begin_with']) && $this->cfg->thumbs_per_page == 0)
          unset($_SESSION['begin_with']);
 
       if(isset($_SESSION['begin_with']) && $this->cfg->thumbs_per_page == 0)
          unset($_SESSION['begin_with']);
 

+      // if user-friendly-url's are enabled, set also a flag for the template handler
+      if($this->is_user_friendly_url()) {
+         $this->tmpl->assign('user_friendly_url', 'true');
+      }
+

    } // __construct()
 
    public function __destruct()
    } // __construct()
 
    public function __destruct()

diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index b14afe4a65583ff2e08e5f0ba828c6df3ee99ffe..9f0531e960f60eff2c93939f5483bdc04543f58b 100644 (file)
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -69,7 +69,11 @@
   {if $images[thumb] }
 
    <div class="thumb" onmouseover="setBackGrdColor(this, 'mouseover');" onmouseout="setBackGrdColor(this, 'mouseout');" style="width: { $thumb_container_width }px; height: { $thumb_container_height }px;">
   {if $images[thumb] }
 
    <div class="thumb" onmouseover="setBackGrdColor(this, 'mouseover');" onmouseout="setBackGrdColor(this, 'mouseout');" style="width: { $thumb_container_width }px; height: { $thumb_container_height }px;">

-    <a href="javascript:showImage({$images[thumb]}, 'scrollup');" id="thumblink{$images[thumb]}" name="image{$img_id[thumb]}" class="thumblink" onclick="click(this);" title="{$img_title[thumb]}">
+    { if $user_friendly_url }
+    <a href="{$web_path}/photoview/{$images[thumb]}" onclick="showImage({$images[thumb]}, 'scrollup'); return false;" id="thumblink{$images[thumb]}" name="image{$img_id[thumb]}" class="thumblink" onfocus="click(this);" title="{$img_title[thumb]}">
+    { else }
+    <a href="{$web_path}/index.php?mode=showp&amp;id={$images[thumb]}" onclick="showImage({$images[thumb]}, 'scrollup'); return false;" id="thumblink{$images[thumb]}" name="image{$img_id[thumb]}" class="thumblink" onfocus="click(this);" title="{$img_title[thumb]}">
+    { /if }

      <img class="thumb" id="thumbimg{$images[thumb]}" width="{$img_width[thumb]}" height="{$img_height[thumb]}" src="{$web_path}/phpfspot_img.php?idx={$images[thumb]}&width={$width}" />
      <br />
     {$img_name[thumb]}
      <img class="thumb" id="thumbimg{$images[thumb]}" width="{$img_width[thumb]}" height="{$img_height[thumb]}" src="{$web_path}/phpfspot_img.php?idx={$images[thumb]}&width={$width}" />
      <br />
     {$img_name[thumb]}