X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=7b11595bd47c85e59489027bd8e73dd2ef2f6c30;hp=e052f3c08e206e75e9e66ba3ca0a9149daccabac;hb=f02f5af73dc6dea8e56824edba0fa187a19ac54f;hpb=6c6ffd19fb0b2f9a150fd0064597b3d3da9fe1e5
diff --git a/phpfspot.class.php b/phpfspot.class.php
index e052f3c..7b11595 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -138,11 +138,11 @@ class PHPFSPOT {
$thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo);
if(!file_exists($orig_path)) {
- print "Photo ". $orig_path ." does not exist!
\n";
+ $this->_warning("Photo ". $orig_path ." does not exist!
\n");
}
if(!is_readable($orig_path)) {
- print "Photo ". $orig_path ." is not readable for user ". get_current_user() ."
\n";
+ $this->_warning("Photo ". $orig_path ." is not readable for user ". get_current_user() ."
\n");
}
/* If the thumbnail doesn't exist yet, try to create it */
@@ -152,6 +152,11 @@ class PHPFSPOT {
$meta = $this->get_meta_informations($orig_path);
+ $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_res = isset($meta['ExifImageWidth']) ? $meta['ExifImageWidth'] ."x". $meta['ExifImageLength'] : "n/a";
+ $meta_size = isset($meta['FileSize']) ? round($meta['FileSize']/1024, 1) ."kbyte" : "n/a";
+
if(file_exists($thumb_path)) {
$info = getimagesize($thumb_path);
@@ -161,10 +166,10 @@ class PHPFSPOT {
$this->tmpl->assign('width', $info[0]);
$this->tmpl->assign('height', $info[1]);
- $this->tmpl->assign('ExifMadeOn', strftime("%a %x %X", $meta['FileDateTime']));
- $this->tmpl->assign('ExifMadeWith', $meta['Make'] ." ". $meta['Model']);
- $this->tmpl->assign('ExifOrigResolution', $meta['ExifImageWidth'] ."x". $meta['ExifImageLength']);
- $this->tmpl->assign('ExifFileSize', round($meta['FileSize']/1024, 1));
+ $this->tmpl->assign('ExifMadeOn', $meta_date);
+ $this->tmpl->assign('ExifMadeWith', $meta_make);
+ $this->tmpl->assign('ExifOrigResolution', $meta_res);
+ $this->tmpl->assign('ExifFileSize', $meta_size);
$this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&width=". $this->cfg->photo_width);
$this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
@@ -172,7 +177,7 @@ class PHPFSPOT {
$this->tmpl->assign('tags', $this->get_photo_tags($photo));
}
else {
- print "Can't open file ". $thumb_path ."\n";
+ $this->_warning("Can't open file ". $thumb_path ."\n");
}
if($previous_img) {
@@ -281,6 +286,12 @@ class PHPFSPOT {
} // resetTags()
+ public function resetTagSearch()
+ {
+ unset($_SESSION['searchfor']);
+
+ } // resetTagSearch()
+
public function getPhotoSelection()
{
$tagged_photos = Array();
@@ -436,9 +447,12 @@ class PHPFSPOT {
}
$current_tags = "";
- foreach($_SESSION['selected_tags'] as $tag)
- $current_tags.= $tag .",";
- $current_tags = substr($current_tags, 0, strlen($current_tags)-1);
+ if($_SESSION['selected_tags'] != "") {
+ foreach($_SESSION['selected_tags'] as $tag)
+ $current_tags.= $tag .",";
+ $current_tags = substr($current_tags, 0, strlen($current_tags)-1);
+ }
+
$extern_link = "http://". $_SERVER['SERVER_NAME'] ."/index.php?mode=showpi&tags=". $current_tags;
$this->tmpl->assign('extern_link', $extern_link);
@@ -470,12 +484,12 @@ class PHPFSPOT {
$filesize = rand($filesize/1024, 2);
if(!file_exists($orig_path)) {
- print "Photo ". $orig_path ." does not exist!
\n";
+ $this->_warning("Photo ". $orig_path ." does not exist!
\n");
return;
}
if(!is_readable($orig_path)) {
- print "Photo ". $orig_path ." is not readable for user ". get_current_user() ."
\n";
+ $this->_warning("Photo ". $orig_path ." is not readable for user ". get_current_user() ."
\n");
return;
}
@@ -504,6 +518,12 @@ class PHPFSPOT {
if(!file_exists($orig_image))
return false;
+ $details = getimagesize($orig_image);
+
+ /* check if original photo is a support image type */
+ if(!$this->checkifImageSupported($details['mime']))
+ return false;
+
$meta = $this->get_meta_informations($orig_image);
$rotate = 0;
@@ -639,6 +659,17 @@ class PHPFSPOT {
/* calculate file MD5 sum */
$full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
+
+ if(!file_exists($full_path)) {
+ $this->_warning("File ". $full_path ." does not exist\n");
+ return;
+ }
+
+ if(!is_readable($full_path)) {
+ $this->_warning("File ". $full_path ." is not readable for ". get_current_user() ."\n");
+ return;
+ }
+
$file_md5 = md5_file($full_path);
$this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:");
@@ -868,6 +899,22 @@ class PHPFSPOT {
} // _debug()
+ public function checkifImageSupported($mime)
+ {
+ if(in_array($mime, Array("image/jpeg")))
+ return true;
+
+ return false;
+
+ } // checkifImageSupported()
+
+ public function _warning($text)
+ {
+ print "\n";
+ print $text;
+
+ } // _warning()
+
}
?>