X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=4b304a1275435ae83536041fd5eb1fa84def8e84;hp=33f3b5b8938acafc30041874265c70d5e71ff398;hb=fb5a16a9495b3438584cd0ab47ea1d1c0ce26995;hpb=b7f5e6235288878a71e7df1bf586e9352096f74a
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 33f3b5b..4b304a1 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -23,8 +23,7 @@ class PHPFSPOT {
$this->cfg = new PHPFSPOT_CFG;
- $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
-
+ $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
$this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db);
$this->check_config_table();
@@ -40,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()
@@ -69,6 +72,7 @@ class PHPFSPOT {
private function get_tags()
{
+
$this->avail_tags = Array();
$count = 0;
@@ -108,6 +112,22 @@ class PHPFSPOT {
} // get_photo_details
+ public function getPhotoName($idx)
+ {
+ if($details = $this->get_photo_details($idx)) {
+
+ $name = $details['name'];
+
+ if(strlen($name) > 15) {
+ $name = substr($name, 0, 10) ."...". substr($name, -10);
+ }
+
+ return $name;
+
+ }
+
+ } // getPhotoName()
+
public function translate_path($path, $width = 0)
{
return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path);
@@ -117,19 +137,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,20 +163,25 @@ 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 */
if(!file_exists($thumb_path)) {
- $this->gen_thumb($photo, 0, 1);
+ $this->gen_thumb($photo, true);
}
$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 +191,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) {
@@ -281,6 +312,12 @@ class PHPFSPOT {
} // resetTags()
+ public function resetTagSearch()
+ {
+ unset($_SESSION['searchfor']);
+
+ } // resetTagSearch()
+
public function getPhotoSelection()
{
$tagged_photos = Array();
@@ -378,15 +415,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;
@@ -394,10 +454,14 @@ class PHPFSPOT {
$images[$rows] = Array();
$img_height[$rows] = Array();
$img_width[$rows] = Array();
+ $img_id[$rows] = Array();
+ $img_name[$rows] = Array();
for($i = $begin_with; $i < $end_with; $i++) {
$images[$rows][$cols] = $photos[$i];
+ $img_id[$rows][$cols] = $i;
+ $img_name[$rows][$cols] = $this->getPhotoName($photos[$i]);
$thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->thumb_width ."_". $this->getMD5($photos[$i]);
@@ -426,6 +490,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);
@@ -433,13 +499,61 @@ 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 = "";
- 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;
+ 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";
+ if($current_tags != "") {
+ $extern_link.= "&tags=". $current_tags;
+ }
$this->tmpl->assign('extern_link', $extern_link);
$this->tmpl->assign('count', $count);
@@ -447,10 +561,15 @@ 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('img_name', $img_name);
$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()
@@ -470,12 +589,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 +623,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;
@@ -511,21 +636,21 @@ class PHPFSPOT {
switch($meta['Orientation']) {
- case 1:
+ case 1: /* top, left */
$rotate = 0; $flip = false; break;
- case 2:
+ case 2: /* top, right */
$rotate = 0; $flip = true; break;
- case 3:
+ case 3: /* bottom, left */
$rotate = 180; $flip = false; break;
- case 4:
+ case 4: /* bottom, right */
$rotate = 180; $flip = true; break;
- case 5:
+ case 5: /* left side, top */
$rotate = 90; $flip = true; break;
- case 6:
+ case 6: /* right side, top */
$rotate = 90; $flip = false; break;
- case 7:
+ case 7: /* left side, bottom */
$rotate = 270; $flip = true; break;
- case 8:
+ case 8: /* right side, bottom */
$rotate = 270; $flip = false; break;
}
@@ -537,23 +662,55 @@ 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;
}
+ // If the image will be rotate because EXIF orientation said so
+ // 'virtually rotate' the image for further calculations
+ if($rotate == 90 || $rotate == 270) {
+ $tmp = $cur_width;
+ $cur_width = $cur_height;
+ $cur_height = $tmp;
+ }
+
/* 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);
+
+ // If the image will be rotate because EXIF orientation said so
+ // now 'virtually rotate' back the image for the image manipulation
+ if($rotate == 90 || $rotate == 270) {
+ $tmp = $new_w;
+ $new_w = $new_h;
+ $new_h = $tmp;
+ }
+ }
/* creates new image of that size */
$dst_img = imagecreatetruecolor($new_w, $new_h);
@@ -561,7 +718,7 @@ class PHPFSPOT {
imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255));
/* copies resized portion of original image into new image */
- imagecopyresampled($dst_img,$src_img,0,0,0,0,$new_w,$new_h,imagesx($src_img),imagesy($src_img));
+ imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $new_w, $new_h, imagesx($src_img), imagesy($src_img));
/* needs the image to be flipped horizontal? */
if($flip) {
@@ -573,7 +730,7 @@ class PHPFSPOT {
}
if($rotate) {
- print "(ROTATE)";
+ $this->_debug("(ROTATE)");
$dst_img = $this->rotateImage($dst_img, $rotate);
}
@@ -624,21 +781,35 @@ class PHPFSPOT {
* 2. Check if the md5sum of the original file has changed
* 3. Generate the thumbnails if needed
*/
- public function gen_thumb($idx = 0, $fromcmd = 0, $force = 0)
+ public function gen_thumb($idx = 0, $force = 0)
{
+ $error = 0;
+
$resolutions = Array(
$this->cfg->thumb_width,
$this->cfg->bubble_width,
$this->cfg->photo_width,
);
+ /* get details from F-Spot's database */
$details = $this->get_photo_details($idx);
+
+ /* calculate file MD5 sum */
$full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
- $file_md5 = md5_file($full_path);
- if($fromcmd) print "Image [". $idx ."] ". $details['name'] ." Thumbnails:";
+ 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);
- $error = 0;
+ $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:");
foreach($resolutions as $resolution) {
@@ -647,16 +818,15 @@ class PHPFSPOT {
/* if the thumbnail file doesn't exist, create it */
if(!file_exists($thumb_path)) {
- if($fromcmd) print " ". $resolution ."px";
+ $this->_debug(" ". $resolution ."px");
if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
$error = 1;
-
}
/* if the file hasn't changed there is no need to regen the thumb */
elseif($file_md5 != $this->getMD5($idx) || $force) {
- if($fromcmd) print " ". $resolution ."px";
+ $this->_debug(" ". $resolution ."px");
if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
$error = 1;
@@ -664,10 +834,11 @@ class PHPFSPOT {
}
/* set the new/changed MD5 sum for the current photo */
- if(!$error)
+ if(!$error) {
$this->setMD5($idx, $file_md5);
+ }
- if($fromcmd) print "\n";
+ $this->_debug("\n");
} // gen_thumb()
@@ -843,7 +1014,7 @@ class PHPFSPOT {
/* Check for HTML_AJAX PEAR package, lent from Horde project */
ini_set('track_errors', 1);
- @include 'HTML/AJAX/Server.php';
+ @include_once 'HTML/AJAX/Server.php';
if(isset($php_errormsg)) {
print "PEAR HTML_AJAX package is missing
\n";
$missing = true;
@@ -856,7 +1027,30 @@ class PHPFSPOT {
return true;
} // checkRequirements()
-
+
+ private function _debug($text)
+ {
+ if($this->fromcmd) {
+ print $text;
+ }
+
+ } // _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()
}