From 48b46c22412ee4e388140ed0b78504e7b84d9d23 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Mon, 12 May 2008 07:39:04 +0200 Subject: issue118, fix some problems with session vars for user-friendly urls Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 49d0c7d..6dcc8de 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -776,12 +776,12 @@ class PHPFSPOT {
tags[$tag] ."\"> - + cfg->web_path ."/phpfspot_img.php?tagidx=". $tag ."\" />
tags[$tag] ."\"> - + cfg->web_path ."/resources/underbar.png\" />
@@ -1332,7 +1332,6 @@ class PHPFSPOT { if($last_page > 1) $this->tmpl->assign('page_selector', $page_select); } - $current_tags = $this->getCurrentTags(); $extern_link = "index.php?mode=showpi"; @@ -3129,6 +3128,7 @@ class PHPFSPOT { break; case 'tag': if(is_numeric($options[2])) { + $this->session_cleanup(); $_GET['tags'] = $options[2]; $_SESSION['selected_tags'] = Array($options[2]); return $this->showPhotoIndex(); @@ -3155,6 +3155,21 @@ class PHPFSPOT { } // is_user_friendly_url() + /** + * session cleanup + * + * this function will cleanup user's session information + */ + private function session_cleanup() + { + unset($_SESSION['begin_with']); + $this->resetDateSearch(); + $this->resetPhotoView(); + $this->resetTagSearch(); + $this->resetNameSearch(); + $this->resetDateSearch(); + + } // session_cleanup() } // class PHPFSPOT -- cgit v1.2.3-18-g5258 From 3d867f5190b42114820df35143a46c8bc8521404 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Mon, 12 May 2008 08:01:18 +0200 Subject: check if parameter of ts2str is really numeric Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 6dcc8de..f64e9ff 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -2710,7 +2710,9 @@ class PHPFSPOT { */ private function ts2str($timestamp) { - return strftime("%Y-%m-%d", $timestamp); + if(!empty($timestamp) && is_numeric($timestamp)) + return strftime("%Y-%m-%d", $timestamp); + } // ts2str() /** -- cgit v1.2.3-18-g5258 From 94b3b6259391b0d2f206c792974b6ff53a70aa63 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Mon, 12 May 2008 08:03:25 +0200 Subject: issue118, fix using variable name for search.tpl and photo_index.tpl twice Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 4 ++-- themes/default/templates/search.tpl | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index f64e9ff..00b3af4 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -311,8 +311,8 @@ class PHPFSPOT { $this->tmpl->assign('date_search_enabled', true); $this->tmpl->register_function("sort_select_list", array(&$this, "smarty_sort_select_list"), false); - $this->tmpl->assign('from_date', $this->get_calendar('from')); - $this->tmpl->assign('to_date', $this->get_calendar('to')); + $this->tmpl->assign('search_from_date', $this->get_calendar('from')); + $this->tmpl->assign('search_to_date', $this->get_calendar('to')); $this->tmpl->assign('preset_selected_tags', $this->getSelectedTags()); $this->tmpl->assign('preset_available_tags', $this->getAvailableTags()); diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl index 401d9af..767cbcf 100644 --- a/themes/default/templates/search.tpl +++ b/themes/default/templates/search.tpl @@ -51,13 +51,11 @@   - {$from_date} from + {$search_from_date} from   - - {$to_date} to - + {$search_to_date} to -- cgit v1.2.3-18-g5258 From 1445a54ab47df6b11199cdd1c35b2abd8001d61e Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Mon, 12 May 2008 08:26:46 +0200 Subject: refix some introduced template-errors in the HTML code Signed-off-by: Andreas Unterkircher --- themes/default/templates/photo_index.tpl | 4 +++- themes/default/templates/single_photo.tpl | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl index 2dedf86..333d80e 100644 --- a/themes/default/templates/photo_index.tpl +++ b/themes/default/templates/photo_index.tpl @@ -49,10 +49,12 @@ with some small pictures in a bar. --> { if $tag_result } +
+
- Tags: + Tags:
{ $selected_tags }
diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl index fb79985..3f85e96 100644 --- a/themes/default/templates/single_photo.tpl +++ b/themes/default/templates/single_photo.tpl @@ -14,17 +14,15 @@ {/if} {/if} -
+
- +  Auto-Browse {if $extern_link }  External Link {/if} - - original resolution - + original resolution Fullsize
-- cgit v1.2.3-18-g5258 From a3a90c2dc722e2b2a81dd1ee5eedea96e5f9fd4d Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Tue, 13 May 2008 06:11:00 +0200 Subject: display photos in photo-index also if no JavaScript is enabled Signed-off-by: Andreas Unterkircher --- themes/default/templates/photo_index.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl index 333d80e..b14afe4 100644 --- a/themes/default/templates/photo_index.tpl +++ b/themes/default/templates/photo_index.tpl @@ -70,7 +70,7 @@
- +
{$img_name[thumb]} -- cgit v1.2.3-18-g5258 From 8a63e413682afe18c55098f7fc165d602288337a Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Tue, 13 May 2008 06:28:58 +0200 Subject: issue118, jumpin to a specific starting point in the photo-index Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 00b3af4..0e2ea44 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -1294,7 +1294,16 @@ class PHPFSPOT { else $style = ""; - $select = "is_user_friendly_url()) { + $select = "cfg->web_path ."/tag/205/". $start_with ."\""; + } + else { + $select = "cfg->web_path ."/index.php?mode=showpi tags=". $current_tags ." begin_with=". $begin_with ."\""; + } + $select.= " onclick=\"showPhotoIndex(". $start_with ."); return false;\""; + if($style != "") $select.= $style; $select.= ">". $i ." "; @@ -3133,6 +3142,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; -- cgit v1.2.3-18-g5258 From 8e14a6b9e1c7d2dfc25e786c425d76acc115f393 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Tue, 13 May 2008 19:31:16 +0200 Subject: issue118, user-friendly-url's to jump from photo-index to single-photo-view Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 5 +++++ themes/default/templates/photo_index.tpl | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 0e2ea44..f938dbc 100644 --- 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() diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl index b14afe4..9f0531e 100644 --- a/themes/default/templates/photo_index.tpl +++ b/themes/default/templates/photo_index.tpl @@ -69,7 +69,11 @@ {if $images[thumb] }
- + { if $user_friendly_url } + + { else } + + { /if }
{$img_name[thumb]} -- cgit v1.2.3-18-g5258