Merge branch 'master' into htmlfix

[phpfspot.git] / phpfspot.class.php

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 00b3af4a08f402fedcaf6e1ba162adf6c30bce3c..d2bb907009a9a29d98809247f7699b1aecb65425 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 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()
@@ -867,7 +872,7 @@ class PHPFSPOT {
    } // resetTags()
 
    /**
-    * returns the value for the autocomplet tag-search
+    * returns the value for the autocomplete tag-search
     * @return string
     */
    public function get_xml_tag_list()
@@ -1294,7 +1299,16 @@ class PHPFSPOT {
             else
                $style = "";
 
-            $select = "<a href=\"javascript:showPhotoIndex(". (($i*$photo_per_page)-$photo_per_page) .");\"";
+            $start_with = ($i*$photo_per_page)-$photo_per_page;
+
+            if($this->is_user_friendly_url()) {
+               $select = "<a href=\"". $this->cfg->web_path ."/tag/205/". $start_with ."\"";
+            }
+            else {
+               $select = "<a href=\"". $this->cfg->web_path ."/index.php?mode=showpi&nbsp;tags=". $current_tags ."&nbsp;begin_with=". $begin_with ."\"";
+            }
+            $select.= " onclick=\"showPhotoIndex(". $start_with ."); return false;\"";
+
                if($style != "")
                   $select.= $style;
             $select.= ">". $i ."</a>&nbsp;";
@@ -3133,6 +3147,8 @@ class PHPFSPOT {
                   $this->session_cleanup();
                   $_GET['tags'] = $options[2];
                   $_SESSION['selected_tags'] = Array($options[2]);
+                  if(isset($options[3]) && is_numeric($options[3]))
+                     $_SESSION['begin_with'] = $options[3];
                   return $this->showPhotoIndex();
                }
                break;