X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=b3455f014cc5450eee2b5de64975343597b6c724;hp=60521adf247c2a15ed98d3f6a6abc4de7917e05f;hb=190c8dd8f2ef82917c3febbaa2e7aa09ada5dbb8;hpb=dcc26041d1dd86d47516e143fd5e475e588180cf

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 60521ad..b3455f0 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -347,11 +347,21 @@ class PHPFSPOT {
       $this->tmpl->assign('preset_available_tags', $this->getAvailableTags());
       $this->tmpl->assign('rate_search', $this->get_rate_search());
 
+      /* if no site-content has been set yet... */
       if(!isset($content)) {
-         if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags']))
+         /* if tags are already selected, we can immediately display photo-index */
+         if((isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags']) &&
+            $_SESSION['start_action'] != 'showp') || $_SESSION['start_action'] == 'showpi')
             $this->tmpl->assign('initial_content', $this->showPhotoIndex());
-         else
-            $this->tmpl->assign('initial_content', $this->tmpl->fetch('welcome.tpl'));
+         else {
+            /* if a photo is already selected, we can immediately display single-photo */
+            if(isset($_SESSION['current_photo']) && !empty($_SESSION['current_photo']))
+               $this->tmpl->assign('initial_content', $this->showPhoto($_SESSION['current_photo']));
+            else {
+               /* ok, then let us show the welcome page... */
+               $this->tmpl->assign('initial_content', $this->tmpl->fetch('welcome.tpl'));
+            }
+         }
       }
       else
          $this->tmpl->assign('initial_content', $content);