X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=c14274212bc1cc29fe98428bb3c4781888c496a3;hp=fb54eb6cf87258fa7dd9401308919b8b9976a2e0;hb=7258a4139baaaace3ce9bbeeeab8a20da1b12ff7;hpb=eda7f279dc8d78633480e3cc9a8a2018606787fe;ds=sidebyside
diff --git a/phpfspot.class.php b/phpfspot.class.php
index fb54eb6..c142742 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) {
@@ -432,6 +437,8 @@ class PHPFSPOT {
$this->tmpl->assign('searchfor', $_SESSION['searchfor']);
if($this->cfg->rows_per_page != 0) {
+
+ /* calculate the page switchers */
$previous_start = $begin_with - ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
$next_start = $begin_with + ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
@@ -439,6 +446,47 @@ class PHPFSPOT {
$this->tmpl->assign("previous_url", "javascript:showPhotoIndex(". $previous_start .");");
if($end_with < $count)
$this->tmpl->assign("next_url", "javascript:showPhotoIndex(". $next_start .");");
+
+ /* page selector */
+ $photo_per_page = $this->cfg->rows_per_page * $this->cfg->thumbs_per_row;
+
+ /* until 6 pages we show the selector from 1-6
+ everything large will be
+ 1 ... 2 3 4 (5) 6 7 ... 9
+ */
+ $last_page = ceil($count / $photo_per_page);
+
+ if($begin_with == 0) {
+ $current_page = 1;
+ }
+ else {
+ $current_page = 0;
+ for($i = $begin_with; $i >= 0; $i-=$photo_per_page) {
+ $current_page++;
+ }
+ }
+
+ for($i = 1; $i <= $last_page; $i++) {
+
+
+ if($current_page == $i)
+ $style = "style=\"font-size: 125%;\"";
+ elseif($current_page-1 == $i || $current_page+1 == $i)
+ $style = "style=\"font-size: 105%;\"";
+ elseif(($current_page-5 >= $i) && ($i != 1) ||
+ ($current_page+5 <= $i) && ($i != $last_page))
+ $style = "style=\"font-size: 75%;\"";
+ else
+ $style = "";
+
+ $page_select.= "". $i ." ";
+
+ }
+
+ $this->tmpl->assign('page_selector', $page_select);
}
$current_tags = "";
@@ -479,12 +527,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;
}
@@ -516,7 +564,7 @@ class PHPFSPOT {
$details = getimagesize($orig_image);
/* check if original photo is a support image type */
- if(!$this->parent->checkifImageSupported($details['mime']))
+ if(!$this->checkifImageSupported($details['mime']))
return false;
$meta = $this->get_meta_informations($orig_image);
@@ -654,6 +702,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:");
@@ -892,6 +951,13 @@ class PHPFSPOT {
} // checkifImageSupported()
+ public function _warning($text)
+ {
+ print "\n";
+ print $text;
+
+ } // _warning()
+
}
?>