Knah-Tsaeb/Minigalnano
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

index.php caption fixes

Browse source 
-> ignoring empty lines in captions.txt that caused crashes
+ using captions.txt over EXIF and file name
This commit is contained in:
Lucas Cimon 2014-07-15 23:52:12 +02:00
parent 4bf3c2a22e
commit c38eb0e9c0
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
index.php
View file

@ -211,6 +211,9 @@ if (file_exists($currentdir ."/captions.txt"))
while (!feof($file_handle) ) while (!feof($file_handle) )
{ {
$line_of_text = fgets($file_handle); $line_of_text = fgets($file_handle);
if (empty($line_of_text)) {
continue;
}
$parts = explode('/n', $line_of_text); $parts = explode('/n', $line_of_text);
foreach($parts as $img_capts) foreach($parts as $img_capts)
{ {
@ -228,16 +231,18 @@ if (file_exists($currentdir ."/captions.txt"))
if (preg_match("/.jpg$|.gif$|.png$/i", $file)) if (preg_match("/.jpg$|.gif$|.png$/i", $file))
{ {
//Read EXIF //Read EXIF
if ($display_exif == 1) if (!array_key_exists($file, $img_captions)) {
{ if ($display_exif == 1)
$exifReaden= readEXIF($currentdir . "/" . $file); {
//Add to the caption all the EXIF information $exifReaden= readEXIF($currentdir . "/" . $file);
$img_captions[$file] = $file.$exifReaden; //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; //If no EXIF, just use the filename as caption
$img_captions[$file] = $file;
}
} }
// Read the optionnal image title and caption in html file (image.jpg --> image.jpg.html) // Read the optionnal image title and caption in html file (image.jpg --> image.jpg.html)
// Format: title::caption // Format: title::caption