issue51, first fix for external link to a photo

[phpfspot.git] / phpfspot.class.php

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 1c1e8647e50d7ca4de3567b0584024c1c58f1bf8..0113fe6c7848bd4818b285a55279a109934108fe 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -304,7 +304,7 @@ class PHPFSPOT {
       }
 
       $meta_date = isset($meta['FileDateTime']) ? strftime("%a %x %X", $meta['FileDateTime']) : "n/a";
-      $meta_make = isset($meta['Make']) ? $meta['Make'] ." ". $meta['Model'] : "n/a";
+      $meta_make = isset($meta['Make']) ? $meta['Make'] ." / ". $meta['Model'] : "n/a";
       $meta_size = isset($meta['FileSize']) ? round($meta['FileSize']/1024, 1) ."kbyte" : "n/a";
 
       $extern_link = "index.php?mode=showp&id=". $photo;
@@ -785,6 +785,8 @@ class PHPFSPOT {
             }
          } 
 
+         $dotdot_made = 0;
+
          for($i = 1; $i <= $last_page; $i++) {
 
             if($current_page == $i)
@@ -819,12 +821,16 @@ class PHPFSPOT {
                   $i == $current_page+3 || $i == $current_page+2 || $i == $current_page+1 /* three after */) {
 
                   $page_select.= $select;
+                  $dotdot_made = 0;
                   continue;
 
                }
             }
 
-            $page_select.= ".";
+            if(!$dotdot_made) {
+               $page_select.= ".........&nbsp;";
+               $dotdot_made = 1;
+            }
          }
 
          /* only show the page selector if we have more then one page */
@@ -1569,7 +1575,7 @@ class PHPFSPOT {
       elseif(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
          return "showpi_date";
       }
-      elseif(isset($_SESSION['current_photo'])) {
+      elseif(isset($_SESSION['current_photo']) && $_SESSION['start_action'] == 'showp') {
          return "show_photo";
       }
       elseif(isset($_SESSION['start_action']) && $_SESSION['start_action'] == 'showpi') {