X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=9d159ff3ff02e09d46c374d50a0a23d1ccb89d87;hp=fb54eb6cf87258fa7dd9401308919b8b9976a2e0;hb=4b243ea6dcf859c392ec52aad66a580c99fe2bb0;hpb=eda7f279dc8d78633480e3cc9a8a2018606787fe
diff --git a/phpfspot.class.php b/phpfspot.class.php
index fb54eb6..9d159ff 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -39,6 +39,10 @@ class PHPFSPOT {
if(!isset($_SESSION['searchfor']))
$_SESSION['searchfor'] = '';
+ // if begin_with is still set but rows_per_page is now 0, unset it
+ if(isset($_SESSION['begin_with']) && $this->cfg->rows_per_page == 0)
+ unset($_SESSION['begin_with']);
+
} // __construct()
public function __destruct()
@@ -117,19 +121,24 @@ class PHPFSPOT {
public function showPhoto($photo)
{
$all_photos = $this->getPhotoSelection();
+ $count = count($all_photos);
- foreach($all_photos as $all_photo) {
+ for($i = 0; $i < $count; $i++) {
if($get_next) {
- $next_img = $all_photo;
+ $next_img = $all_photos[$i];
break;
}
- if($all_photo == $photo) {
+ if($all_photos[$i] == $photo) {
$get_next = 1;
}
else {
- $previous_img = $all_photo;
+ $previous_img = $all_photos[$i];
+ }
+
+ if($photo == $all_photos[$i]) {
+ $current = $i;
}
}
@@ -138,11 +147,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 +161,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,18 +175,19 @@ 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);
$this->tmpl->assign('tags', $this->get_photo_tags($photo));
+ $this->tmpl->assign('current', $current);
}
else {
- print "Can't open file ". $thumb_path ."\n";
+ $this->_warning("Can't open file ". $thumb_path ."\n");
}
if($previous_img) {
@@ -384,15 +399,38 @@ class PHPFSPOT {
$count = count($photos);
- if(!$_SESSION['begin_with'] || $_SESSION['begin_with'] == 0)
- $begin_with = 0;
- else
- $begin_with = $_SESSION['begin_with'];
+ if(isset($_SESSION['begin_with']) && $_SESSION['begin_with'] != "")
+ $anchor = $_SESSION['begin_with'];
- if($this->cfg->rows_per_page == 0)
+ if(!isset($this->cfg->rows_per_page) || $this->cfg->rows_per_page == 0) {
+
+ $begin_with = 0;
$end_with = $count;
- else
+
+ }
+ elseif($this->cfg->rows_per_page > 0) {
+
+ if(!$_SESSION['begin_with'] || $_SESSION['begin_with'] == 0)
+ $begin_with = 0;
+ else {
+
+ $begin_with = $_SESSION['begin_with'];
+
+ // verify $begin_with - perhaps the thumbs-per-rows or
+ // rows-per-page variables have changed or the jump back
+ // from a photo wasn't exact - so calculate the real new
+ // starting point
+ $multiplicator = $this->cfg->rows_per_page * $this->cfg->thumbs_per_row;
+ for($i = 0; $i <= $count; $i+=$multiplicator) {
+ if($begin_with >= $i && $begin_with < $i+$multiplicator) {
+ $begin_with = $i;
+ break;
+ }
+ }
+ }
+
$end_with = $begin_with + ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
+ }
$rows = 0;
@@ -400,10 +438,12 @@ class PHPFSPOT {
$images[$rows] = Array();
$img_height[$rows] = Array();
$img_width[$rows] = Array();
+ $img_id[$rows] = Array();
for($i = $begin_with; $i < $end_with; $i++) {
$images[$rows][$cols] = $photos[$i];
+ $img_id[$rows][$cols] = $i;
$thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->thumb_width ."_". $this->getMD5($photos[$i]);
@@ -432,6 +472,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 +481,48 @@ 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 ." ";
+
+ }
+
+ /* only show the page selector if we have more then one page */
+ if($last_page > 1)
+ $this->tmpl->assign('page_selector', $page_select);
}
$current_tags = "";
@@ -456,10 +540,14 @@ class PHPFSPOT {
$this->tmpl->assign('images', $images);
$this->tmpl->assign('img_width', $img_width);
$this->tmpl->assign('img_height', $img_height);
+ $this->tmpl->assign('img_id', $img_id);
$this->tmpl->assign('rows', $rows);
$this->tmpl->assign('columns', $this->cfg->thumbs_per_row);
+
$this->tmpl->show("photo_index.tpl");
+ if(isset($anchor))
+ print "\n";
} // showPhotoIndex()
@@ -479,12 +567,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 +604,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);
@@ -552,23 +640,39 @@ class PHPFSPOT {
}
/* grabs the height and width */
- $new_w = imagesx($src_img);
- $new_h = imagesy($src_img);
+ $cur_width = imagesx($src_img);
+ $cur_height = imagesy($src_img);
// If requested width is more then the actual image width,
// do not generate a thumbnail
- if($width >= $new_w) {
+ if($width >= $cur_width) {
imagedestroy($src_img);
return true;
}
/* calculates aspect ratio */
- $aspect_ratio = $new_h / $new_w;
+ $aspect_ratio = $cur_height / $cur_width;
/* sets new size */
- $new_w = $width;
- $new_h = abs($new_w * $aspect_ratio);
+ if($aspect_ratio < 1) {
+ $new_w = $width;
+ $new_h = abs($new_w * $aspect_ratio);
+ } else {
+ /* 'virtually' rotate the image and calculate it's ratio */
+ $tmp_w = $cur_height;
+ $tmp_h = $cur_width;
+ /* now get the ratio from the 'rotated' image */
+ $tmp_ratio = $tmp_h/$tmp_w;
+ /* now calculate the new dimensions */
+ $tmp_w = $width;
+ $tmp_h = abs($tmp_w * $tmp_ratio);
+
+ // now that we know, how high they photo should be, if it
+ // gets rotated, use this high to scale the image
+ $new_h = $tmp_h;
+ $new_w = abs($new_h / $aspect_ratio);
+ }
/* creates new image of that size */
$dst_img = imagecreatetruecolor($new_w, $new_h);
@@ -588,7 +692,7 @@ class PHPFSPOT {
}
if($rotate) {
- print "(ROTATE)";
+ $this->_debug("(ROTATE)");
$dst_img = $this->rotateImage($dst_img, $rotate);
}
@@ -654,6 +758,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 +1007,13 @@ class PHPFSPOT {
} // checkifImageSupported()
+ public function _warning($text)
+ {
+ print "\n";
+ print $text;
+
+ } // _warning()
+
}
?>