--- index.php 2010-12-15 09:35:44.000000000 +0100
+++ index.php 2011-07-15 05:26:06.000000000 +0200
@@ -63,6 +63,10 @@
$display_exif = 0;
$messages = "Error: PHP EXIF is not available. Set $display_exif = 0; in config.php to remove this message";
}
+if (!extension_loaded('gd')) {
+ $messages = "Warning: PHP GD extension is not available/loaded. Thumbs disabled.";
+ $label_loading = "GD not available!";
+}
//-----------------------
// FUNCTIONS
@@ -145,7 +149,8 @@
//}
if (!defined("GALLERY_ROOT")) define("GALLERY_ROOT", "");
-$thumbdir = rtrim('photos' . "/" .$_REQUEST["dir"],"/");
+if ( ! isset($_GET["dir"]) ) { $_GET["dir"] = ''; }
+$thumbdir = rtrim('photos' . "/" .$_GET["dir"],"/");
$thumbdir = str_replace("/..", "", $thumbdir); // Prevent looking at any up-level folders
$currentdir = GALLERY_ROOT . $thumbdir;
@@ -207,7 +212,7 @@
}
}
fclose($file_handle);
-}
+} else $img_captions[$file] = $file;
// 3. LOAD FILES
if ($file != "." && $file != ".." && $file != "folder.jpg")
@@ -279,6 +284,7 @@
//-----------------------
// OFFSET DETERMINATION
//-----------------------
+ if ( ! isset($_GET["page"]) ) { $_GET["page"] = 1; }
$offset_start = ($_GET["page"] * $thumbs_pr_page) - $thumbs_pr_page;
if (!isset($_GET["page"])) $offset_start = 0;
$offset_end = $offset_start + $thumbs_pr_page;
@@ -316,7 +322,7 @@
if ($_GET['dir'] != "")
{
$breadcrumb_navigation .= "" . $label_home . " > ";
- $navitems = explode("/", $_REQUEST['dir']);
+ $navitems = explode("/", $_GET['dir']);
for($i = 0; $i < sizeof($navitems); $i++)
{
if ($i == sizeof($navitems)-1) $breadcrumb_navigation .= $navitems[$i];
@@ -366,6 +372,7 @@
}
//Include hidden links for all images AFTER current page so lightbox is able to browse images on different pages
+if ( $i >= 0 )
for ($y = $i; $y < sizeof($files); $y++)
{
$page_navigation .= "";