Merge pull request #74 from bifek/cleanup
clean up spacing and bracing according to PSR-2
This commit is contained in:
commit
2687cff8a8
1 changed files with 353 additions and 387 deletions
268
index.php
268
index.php
|
@ -21,21 +21,9 @@ by Sébastien SAUVAGE.
|
|||
|
||||
*/
|
||||
|
||||
// Do not edit below this section unless you know what you are doing!
|
||||
|
||||
|
||||
//-----------------------
|
||||
// Debug stuff
|
||||
//-----------------------
|
||||
// error_reporting(E_ERROR);
|
||||
// error_reporting(E_ALL);
|
||||
error_reporting(-1);
|
||||
/*
|
||||
$mtime = microtime();
|
||||
$mtime = explode(" ",$mtime);
|
||||
$mtime = $mtime[1] + $mtime[0];
|
||||
$starttime = $mtime;
|
||||
*/
|
||||
|
||||
// Do not edit below this section unless you know what you are doing!
|
||||
|
||||
header('Content-Type: text/html; charset=UTF-8'); // We use UTF-8 for proper international characters handling.
|
||||
$version = "0.3.7";
|
||||
|
@ -43,6 +31,7 @@ ini_set("memory_limit","256M");
|
|||
|
||||
require("config-default.php");
|
||||
include("config.php");
|
||||
|
||||
//-----------------------
|
||||
// DEFINE VARIABLES
|
||||
//-----------------------
|
||||
|
@ -66,30 +55,35 @@ if (!function_exists('exif_read_data') && $display_exif == 1) {
|
|||
//-----------------------
|
||||
// FUNCTIONS
|
||||
//-----------------------
|
||||
function padstring($name, $length) {
|
||||
function padstring($name, $length)
|
||||
{
|
||||
global $label_max_length;
|
||||
if (!isset($length)) $length = $label_max_length;
|
||||
if (strlen($name) > $length) {
|
||||
if (!isset($length))
|
||||
$length = $label_max_length;
|
||||
if (strlen($name) > $length)
|
||||
return substr($name, 0, $length) . "...";
|
||||
} else return $name;
|
||||
return $name;
|
||||
}
|
||||
function getfirstImage($dirname) {
|
||||
|
||||
function getfirstImage($dirname)
|
||||
{
|
||||
$imageName = false;
|
||||
$ext = array("jpg", "png", "jpeg", "gif", "JPG", "PNG", "GIF", "JPEG");
|
||||
if($handle = opendir($dirname))
|
||||
{
|
||||
while(false !== ($file = readdir($handle)))
|
||||
{
|
||||
if ($handle = opendir($dirname)) {
|
||||
while(false !== ($file = readdir($handle))) {
|
||||
$lastdot = strrpos($file, '.');
|
||||
$extension = substr($file, $lastdot + 1);
|
||||
if ($file[0] != '.' && in_array($extension, $ext)) break;
|
||||
if ($file[0] != '.' && in_array($extension, $ext))
|
||||
break;
|
||||
}
|
||||
$imageName = $file;
|
||||
closedir($handle);
|
||||
}
|
||||
return($imageName);
|
||||
return $imageName;
|
||||
}
|
||||
function readEXIF($file) {
|
||||
|
||||
function readEXIF($file)
|
||||
{
|
||||
$exif_data = "";
|
||||
$exif_idf0 = exif_read_data($file, 'IFD0', 0);
|
||||
$emodel = $exif_idf0['Model'];
|
||||
|
@ -111,26 +105,37 @@ function readEXIF($file) {
|
|||
|
||||
$exif_date = exif_read_data($file, 'IFD0', 0);
|
||||
$edate = $exif_date['DateTime'];
|
||||
if (strlen($emodel) > 0 OR strlen($efocal) > 0 OR strlen($eexposuretime) > 0 OR strlen($efnumber) > 0 OR strlen($eiso) > 0) $exif_data .= "::";
|
||||
if (strlen($emodel) > 0) $exif_data .= "$emodel";
|
||||
if ($efocal > 0) $exif_data .= " | $efocal" . "mm";
|
||||
if (strlen($eexposuretime) > 0) $exif_data .= " | $eexposuretime" . "s";
|
||||
if ($efnumber > 0) $exif_data .= " | f$efnumber";
|
||||
if (strlen($eiso) > 0) $exif_data .= " | ISO $eiso";
|
||||
return($exif_data);
|
||||
}
|
||||
function checkpermissions($file) {
|
||||
global $messages;
|
||||
if (substr(decoct(fileperms($file)), -1, strlen(fileperms($file))) < 4 OR substr(decoct(fileperms($file)), -3,1) < 4) $messages = "At least one file or folder has wrong permissions. Learn how to <a href='http://minigal.dk/faq-reader/items/how-do-i-change-file-permissions-chmod.html' target='_blank'>set file permissions</a>";
|
||||
if (strlen($emodel . $efocal . $eexposuretime . $efnumber . $eiso) > 0)
|
||||
$exif_data .= "::";
|
||||
if (strlen($emodel) > 0)
|
||||
$exif_data .= "$emodel";
|
||||
if ($efocal > 0)
|
||||
$exif_data .= " | $efocal" . "mm";
|
||||
if (strlen($eexposuretime) > 0)
|
||||
$exif_data .= " | $eexposuretime" . "s";
|
||||
if ($efnumber > 0)
|
||||
$exif_data .= " | f$efnumber";
|
||||
if (strlen($eiso) > 0)
|
||||
$exif_data .= " | ISO $eiso";
|
||||
return $exif_data;
|
||||
}
|
||||
|
||||
if (!defined("GALLERY_ROOT")) define("GALLERY_ROOT", "");
|
||||
function checkpermissions($file)
|
||||
{
|
||||
global $messages;
|
||||
if (substr(decoct(fileperms($file)), -1, strlen(fileperms($file))) < 4 OR substr(decoct(fileperms($file)), -3, 1) < 4)
|
||||
$messages = "At least one file or folder has wrong permissions. Learn how to <a href='http://minigal.dk/faq-reader/items/how-do-i-change-file-permissions-chmod.html' target='_blank'>set file permissions</a>";
|
||||
}
|
||||
|
||||
if (!defined("GALLERY_ROOT"))
|
||||
define("GALLERY_ROOT", "");
|
||||
$requestedDir = '';
|
||||
if (!empty($_GET['dir'])) $requestedDir = $_GET['dir'];
|
||||
if (!empty($_GET['dir']))
|
||||
$requestedDir = $_GET['dir'];
|
||||
$thumbdir = rtrim('photos/' . $requestedDir, '/');
|
||||
|
||||
//$thumbdir = str_replace('/..', '', $thumbdir); // Prevent directory traversal attacks.
|
||||
if(strstr($thumbdir, '..') !== FALSE) {
|
||||
if (strstr($thumbdir, '..') !== false) {
|
||||
$requestedDir = '';
|
||||
$thumbdir = rtrim('photos/', '/');
|
||||
}
|
||||
|
@ -142,19 +147,14 @@ $currentdir = GALLERY_ROOT . $thumbdir;
|
|||
//-----------------------
|
||||
$files = array();
|
||||
$dirs = array();
|
||||
if (is_dir($currentdir) && $handle = opendir($currentdir))
|
||||
{
|
||||
while (false !== ($file = readdir($handle)) && !in_array($file, $SkipObjects))
|
||||
{
|
||||
if (is_dir($currentdir) && $handle = opendir($currentdir)) {
|
||||
while (false !== ($file = readdir($handle)) && !in_array($file, $SkipObjects)) {
|
||||
// 1. LOAD FOLDERS
|
||||
if (is_dir($currentdir . "/" . $file))
|
||||
{
|
||||
if ($file != "." && $file != ".." )
|
||||
{
|
||||
if (is_dir($currentdir . "/" . $file)) {
|
||||
if ($file != "." && $file != "..") {
|
||||
checkpermissions($currentdir . "/" . $file); // Check for correct file permission
|
||||
// Set thumbnail to folder.jpg if found:
|
||||
if (file_exists($currentdir. '/' . $file . '/folder.jpg'))
|
||||
{
|
||||
if (file_exists($currentdir. '/' . $file . '/folder.jpg')) {
|
||||
$linkParams = http_build_query(
|
||||
array('dir' => ltrim("$requestedDir/$file", '/')),
|
||||
'',
|
||||
|
@ -227,18 +227,14 @@ $dirs = array();
|
|||
|
||||
// 2. LOAD CAPTIONS
|
||||
$img_captions[''] = '';
|
||||
if (file_exists($currentdir ."/captions.txt"))
|
||||
{
|
||||
if (file_exists($currentdir ."/captions.txt")) {
|
||||
$file_handle = fopen($currentdir ."/captions.txt", "rb");
|
||||
while (!feof($file_handle) )
|
||||
{
|
||||
while (!feof($file_handle)) {
|
||||
$line_of_text = fgets($file_handle);
|
||||
if (empty($line_of_text)) {
|
||||
if (empty($line_of_text))
|
||||
continue;
|
||||
}
|
||||
$parts = explode('/n', $line_of_text);
|
||||
foreach($parts as $img_capts)
|
||||
{
|
||||
foreach($parts as $img_capts) {
|
||||
list($img_filename, $img_caption) = explode('|', $img_capts);
|
||||
$img_captions[$img_filename] = $img_caption;
|
||||
}
|
||||
|
@ -247,27 +243,20 @@ $dirs = array();
|
|||
}
|
||||
|
||||
// 3. LOAD FILES
|
||||
if ($file != "." && $file != ".." && $file != "folder.jpg")
|
||||
{
|
||||
if($display_filename) {
|
||||
if ($file != "." && $file != ".." && $file != "folder.jpg") {
|
||||
if ($display_filename)
|
||||
$filename_caption = "<em>" . padstring($file, $label_max_length) . "</em>";
|
||||
}
|
||||
else {
|
||||
else
|
||||
$filename_caption = "";
|
||||
}
|
||||
// JPG, GIF and PNG
|
||||
if (preg_match("/.jpg$|.gif$|.png$/i", $file))
|
||||
{
|
||||
if (preg_match("/.jpg$|.gif$|.png$/i", $file)) {
|
||||
//Read EXIF
|
||||
if (!array_key_exists($file, $img_captions)) {
|
||||
if ($display_exif == 1)
|
||||
{
|
||||
if ($display_exif == 1) {
|
||||
$exifReaden = readEXIF($currentdir . "/" . $file);
|
||||
//Add to the caption all the EXIF information
|
||||
$img_captions[$file] = $file.$exifReaden;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
//If no EXIF, just use the filename as caption
|
||||
$img_captions[$file] = $file;
|
||||
}
|
||||
|
@ -278,24 +267,18 @@ $dirs = array();
|
|||
// If file is not provided, image filename will be used instead.
|
||||
checkpermissions($currentdir . "/" . $file);
|
||||
|
||||
if (is_file($currentdir.'/'.$file.'.html')) {
|
||||
if (is_file($currentdir.'/'.$file.'.html'))
|
||||
$img_captions[$file] = $file.'::'.htmlspecialchars(file_get_contents($currentdir.'/'.$file.'.html'), ENT_QUOTES);
|
||||
}
|
||||
$linkUrl = str_replace('%2F', '/', rawurlencode("$currentdir/$file"));
|
||||
$imgParams = http_build_query(
|
||||
array(
|
||||
'filename' => "$thumbdir/$file",
|
||||
'size' => $thumb_size
|
||||
),
|
||||
array('filename' => "$thumbdir/$file", 'size' => $thumb_size),
|
||||
'',
|
||||
'&'
|
||||
);
|
||||
'&');
|
||||
$imgUrl = GALLERY_ROOT . "createthumb.php?$imgParams";
|
||||
if ($lazyload) {
|
||||
if ($lazyload)
|
||||
$imgopts = "class=\"b-lazy\" src=data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw== data-src=\"$imgUrl\"";
|
||||
} else {
|
||||
else
|
||||
$imgopts = "src=\"{$imgUrl}\"";
|
||||
}
|
||||
$files[] = array(
|
||||
"name" => $file,
|
||||
"date" => filemtime($currentdir . "/" . $file),
|
||||
|
@ -315,27 +298,25 @@ $dirs = array();
|
|||
if (preg_match("/.ogv$|.mp4$|.mpg$|.mpeg$|.mov$|.avi$|.wmv$|.flv$|.webm$/i", $file)) $extension = "VIDEO"; // video files
|
||||
if (preg_match("/.aiff$|.aif$|.wma$|.aac$|.flac$|.mp3$|.ogg$|.m4a$/i", $file)) $extension = "AUDIO"; // audio files
|
||||
|
||||
|
||||
if ($extension != "")
|
||||
{
|
||||
if ($extension != "") {
|
||||
$files[] = array(
|
||||
"name" => $file,
|
||||
"date" => filemtime($currentdir . "/" . $file),
|
||||
"size" => filesize($currentdir . "/" . $file),
|
||||
"html" => "<li><a href='" . $currentdir . "/" . $file . "' title='$file'><em-pdf>" . padstring($file, 20) . "</em-pdf><span></span><img src='" . GALLERY_ROOT . "images/filetype_" . $extension . ".png' width='$thumb_size' height='$thumb_size' alt='$file' /></a>" . $filename_caption . "</li>");
|
||||
"html" => "<li><a href='$currentdir/$file' title='$file'><em-pdf>" . padstring($file, 20) . "</em-pdf><span></span><img src='" . GALLERY_ROOT . "images/filetype_" . $extension . ".png' width='$thumb_size' height='$thumb_size' alt='$file' /></a>$filename_caption</li>");
|
||||
}
|
||||
}
|
||||
}
|
||||
closedir($handle);
|
||||
} else die("ERROR: Could not open ".htmlspecialchars(stripslashes($currentdir))." for reading!");
|
||||
} else {
|
||||
die("ERROR: Could not open ".htmlspecialchars(stripslashes($currentdir))." for reading!");
|
||||
}
|
||||
|
||||
//-----------------------
|
||||
// SORT FILES AND FOLDERS
|
||||
//-----------------------
|
||||
if (sizeof($dirs) > 0)
|
||||
{
|
||||
foreach ($dirs as $key => $row)
|
||||
{
|
||||
if (sizeof($dirs) > 0) {
|
||||
foreach ($dirs as $key => $row) {
|
||||
if ($row["name"] == "") {
|
||||
unset($dirs[$key]); //Delete empty array entries
|
||||
continue;
|
||||
|
@ -345,10 +326,9 @@ if (sizeof($dirs) > 0)
|
|||
}
|
||||
@array_multisort($$sorting_folders, $sortdir_folders, $name, $sortdir_folders, $dirs);
|
||||
}
|
||||
if (sizeof($files) > 0)
|
||||
{
|
||||
foreach ($files as $key => $row)
|
||||
{
|
||||
|
||||
if (sizeof($files) > 0) {
|
||||
foreach ($files as $key => $row) {
|
||||
if ($row["name"] == "") {
|
||||
unset($files[$key]); //Delete empty array entries
|
||||
continue;
|
||||
|
@ -363,14 +343,14 @@ if (sizeof($files) > 0)
|
|||
//-----------------------
|
||||
// OFFSET DETERMINATION
|
||||
//-----------------------
|
||||
if (!isset($_GET["page"])) $_GET["page"] = 1;
|
||||
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;
|
||||
if ($offset_end > sizeof($dirs) + sizeof($files)) $offset_end = sizeof($dirs) + sizeof($files);
|
||||
if ($offset_end > sizeof($dirs) + sizeof($files))
|
||||
$offset_end = sizeof($dirs) + sizeof($files);
|
||||
|
||||
if ($_GET["page"] == "all" || $lazyload)
|
||||
{
|
||||
if ($_GET["page"] == "all" || $lazyload) {
|
||||
$offset_start = 0;
|
||||
$offset_end = sizeof($dirs) + sizeof($files);
|
||||
}
|
||||
|
@ -378,48 +358,48 @@ if (sizeof($files) > 0)
|
|||
//-----------------------
|
||||
// PAGE NAVIGATION
|
||||
//-----------------------
|
||||
if (!$lazyload && sizeof($dirs) + sizeof($files) > $thumbs_pr_page)
|
||||
{
|
||||
if (!$lazyload && sizeof($dirs) + sizeof($files) > $thumbs_pr_page) {
|
||||
$page_navigation .= "$label_page ";
|
||||
for ($i=1; $i <= ceil((sizeof($files) + sizeof($dirs)) / $thumbs_pr_page); $i++)
|
||||
{
|
||||
for ($i = 1; $i <= ceil((sizeof($files) + sizeof($dirs)) / $thumbs_pr_page); $i++) {
|
||||
if ($_GET["page"] == $i)
|
||||
$page_navigation .= "$i";
|
||||
else
|
||||
$page_navigation .= "<a href='?dir=" . $requestedDir . "&page=" . ($i) . "'>" . $i . "</a>";
|
||||
if ($i != ceil((sizeof($files) + sizeof($dirs)) / $thumbs_pr_page)) $page_navigation .= " | ";
|
||||
if ($i != ceil((sizeof($files) + sizeof($dirs)) / $thumbs_pr_page))
|
||||
$page_navigation .= " | ";
|
||||
}
|
||||
//Insert link to view all images
|
||||
if ($_GET["page"] == "all") $page_navigation .= " | $label_all";
|
||||
else $page_navigation .= " | <a href='?dir=" . $requestedDir . "&page=all'>$label_all</a>";
|
||||
if ($_GET["page"] == "all")
|
||||
$page_navigation .= " | $label_all";
|
||||
else
|
||||
$page_navigation .= " | <a href='?dir=" . $requestedDir . "&page=all'>$label_all</a>";
|
||||
}
|
||||
|
||||
//-----------------------
|
||||
// BREADCRUMB NAVIGATION
|
||||
//-----------------------
|
||||
if ($requestedDir != "")
|
||||
{
|
||||
if ($requestedDir != "") {
|
||||
$breadcrumb_navigation .= "<a href='?dir='>" . $label_home . "</a> $breadcrumb_separator ";
|
||||
$navitems = explode("/", $_REQUEST['dir']);
|
||||
for($i = 0; $i < sizeof($navitems); $i++)
|
||||
{
|
||||
if ($i == sizeof($navitems)-1) $breadcrumb_navigation .= $navitems[$i];
|
||||
else
|
||||
{
|
||||
for ($i = 0; $i < sizeof($navitems); $i++) {
|
||||
if ($i == sizeof($navitems)-1) {
|
||||
$breadcrumb_navigation .= $navitems[$i];
|
||||
} else {
|
||||
$breadcrumb_navigation .= "<a href='?dir=";
|
||||
for ($x = 0; $x <= $i; $x++)
|
||||
{
|
||||
for ($x = 0; $x <= $i; $x++) {
|
||||
$breadcrumb_navigation .= $navitems[$x];
|
||||
if ($x < $i) $breadcrumb_navigation .= "/";
|
||||
if ($x < $i)
|
||||
$breadcrumb_navigation .= "/";
|
||||
}
|
||||
$breadcrumb_navigation .= "'>" . $navitems[$i] . "</a> $breadcrumb_separator ";
|
||||
}
|
||||
}
|
||||
} else $breadcrumb_navigation .= $label_home;
|
||||
} else {
|
||||
$breadcrumb_navigation .= $label_home;
|
||||
}
|
||||
|
||||
//Include hidden links for all images BEFORE current page so lightbox is able to browse images on different pages
|
||||
for ($y = 0; $y < $offset_start - sizeof($dirs); $y++)
|
||||
{
|
||||
for ($y = 0; $y < $offset_start - sizeof($dirs); $y++) {
|
||||
$breadcrumb_navigation .= "<a href='" . $currentdir . "/" . $files[$y]["name"] . "' class='hidden' title='" . $img_captions[$files[$y]["name"]] . "'></a>";
|
||||
}
|
||||
|
||||
|
@ -428,11 +408,11 @@ for ($y = 0; $y < $offset_start - sizeof($dirs); $y++)
|
|||
//-----------------------
|
||||
if (count($dirs) + count($files) == 0) {
|
||||
$thumbnails .= "<li>$label_noimages</li>"; //Display 'no images' text
|
||||
if($currentdir == "photos") $messages = "It looks like you have just installed MiniGal Nano. Please run the <a href='system_check.php'>system check tool</a>";
|
||||
if ($currentdir == "photos")
|
||||
$messages = "It looks like you have just installed MiniGal Nano. Please run the <a href='system_check.php'>system check tool</a>";
|
||||
}
|
||||
$offset_current = $offset_start;
|
||||
for ($x = $offset_start; $x < sizeof($dirs) && $x < $offset_end; $x++)
|
||||
{
|
||||
for ($x = $offset_start; $x < sizeof($dirs) && $x < $offset_end; $x++) {
|
||||
$offset_current++;
|
||||
$thumbnails .= $dirs[$x]["html"];
|
||||
}
|
||||
|
@ -440,19 +420,17 @@ for ($x = $offset_start; $x < sizeof($dirs) && $x < $offset_end; $x++)
|
|||
//-----------------------
|
||||
// DISPLAY FILES
|
||||
//-----------------------
|
||||
for ($i = $offset_start - sizeof($dirs); $i < $offset_end && $offset_current < $offset_end; $i++)
|
||||
{
|
||||
if ($i >= 0)
|
||||
{
|
||||
for ($i = $offset_start - sizeof($dirs); $i < $offset_end && $offset_current < $offset_end; $i++) {
|
||||
if ($i >= 0) {
|
||||
$offset_current++;
|
||||
$thumbnails .= $files[$i]["html"];
|
||||
}
|
||||
}
|
||||
|
||||
//Include hidden links for all images AFTER current page so lightbox is able to browse images on different pages
|
||||
if ($i<0) $i=1;
|
||||
for ($y = $i; $y < sizeof($files); $y++)
|
||||
{
|
||||
if ($i < 0)
|
||||
$i = 1;
|
||||
for ($y = $i; $y < sizeof($files); $y++) {
|
||||
$page_navigation .= "<a href='" . $currentdir . "/" . $files[$y]["name"] . "' class='hidden' title='" . $img_captions[$files[$y]["name"]] . "'></a>";
|
||||
}
|
||||
|
||||
|
@ -465,22 +443,22 @@ $messages = "<div id=\"topbar\">" . $messages . " <a href=\"#\" onclick=\"docume
|
|||
|
||||
// Read folder comment.
|
||||
$comment_filepath = $currentdir . $file . "/comment.html";
|
||||
if (file_exists($comment_filepath))
|
||||
{
|
||||
if (file_exists($comment_filepath)) {
|
||||
$fd = fopen($comment_filepath, "r");
|
||||
$comment = fread($fd, filesize($comment_filepath));
|
||||
fclose($fd);
|
||||
}
|
||||
|
||||
//PROCESS TEMPLATE FILE
|
||||
if(GALLERY_ROOT != "") $templatefile = GALLERY_ROOT . "templates/integrate.html";
|
||||
else $templatefile = "templates/" . $templatefile . ".html";
|
||||
if(!$fd = fopen($templatefile, "r"))
|
||||
{
|
||||
if (GALLERY_ROOT != "")
|
||||
$templatefile = GALLERY_ROOT . "templates/integrate.html";
|
||||
else
|
||||
$templatefile = "templates/" . $templatefile . ".html";
|
||||
|
||||
if (!$fd = fopen($templatefile, "r")) {
|
||||
echo "Template ".htmlspecialchars(stripslashes($templatefile))." not found!";
|
||||
exit();
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$template = fread($fd, filesize ($templatefile));
|
||||
fclose($fd);
|
||||
$template = stripslashes($template);
|
||||
|
@ -498,15 +476,3 @@ if (file_exists($comment_filepath))
|
|||
$template = preg_replace("/<% version %>/", "$version", $template);
|
||||
echo "$template";
|
||||
}
|
||||
|
||||
//-----------------------
|
||||
//Debug stuff
|
||||
//-----------------------
|
||||
/* $mtime = microtime();
|
||||
$mtime = explode(" ",$mtime);
|
||||
$mtime = $mtime[1] + $mtime[0];
|
||||
$endtime = $mtime;
|
||||
$totaltime = ($endtime - $starttime);
|
||||
echo "This page was created in ".$totaltime." seconds";
|
||||
*/
|
||||
?>
|
||||
|
|
Loading…
Reference in a new issue