X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=391589a591d11c2068a34a87d36845b5c12a58d6;hp=cf0fa25686073478295144508e1b2e9eb5ac2718;hb=f805e292a7f3048bd0c7305b0bc4d92ad90d3407;hpb=02fa42f4fa425887713b1df57ed17a48f2b83c6e
diff --git a/phpfspot.class.php b/phpfspot.class.php
index cf0fa25..391589a 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -16,6 +16,11 @@ class PHPFSPOT {
public function __construct()
{
+ /* Check necessary requirements */
+ if(!$this->checkRequirements()) {
+ exit(1);
+ }
+
$this->cfg = new PHPFSPOT_CFG;
$this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
@@ -47,8 +52,19 @@ class PHPFSPOT {
$this->tmpl->assign('searchfor', $_SESSION['searchfor']);
$this->tmpl->assign('page_title', $this->cfg->page_title);
$this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
+
+ switch($_GET['mode']) {
+ case 'showpi':
+ if(isset($_GET['tags'])) {
+ $_SESSION['selected_tags'] = split(',', $_GET['tags']);
+ }
+ break;
+ }
+
+ $this->tmpl->assign('content_page', 'welcome.tpl');
$this->tmpl->show("index.tpl");
+
} // show()
private function get_tags()
@@ -117,25 +133,47 @@ class PHPFSPOT {
}
}
-
$details = $this->get_photo_details($photo);
- $meta = $this->get_meta_informations($this->translate_path($details['directory_path']) ."/". $details['name']);
- $info = getimagesize($this->translate_path($details['directory_path']) ."/thumbs/". $this->cfg->photo_width ."_". $details['name']);
+ $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
+ $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->tmpl->assign('description', $details['description']);
- $this->tmpl->assign('image_name', $details['name']);
+ if(!is_readable($orig_path)) {
+ print "Photo ". $orig_path ." is not readable for user ". get_current_user() ."
\n";
+ }
- $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('image_url', 'phpfspot_img.php?idx='. $photo ."&width=". $this->cfg->photo_width);
- $this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
+ /* If the thumbnail doesn't exist yet, try to create it */
+ if(!file_exists($thumb_path)) {
+ $this->gen_thumb($photo, true);
+ }
- $this->tmpl->assign('tags', $this->get_photo_tags($photo));
+ $meta = $this->get_meta_informations($orig_path);
+
+ if(file_exists($thumb_path)) {
+
+ $info = getimagesize($thumb_path);
+
+ $this->tmpl->assign('description', $details['description']);
+ $this->tmpl->assign('image_name', $details['name']);
+
+ $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('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));
+ }
+ else {
+ print "Can't open file ". $thumb_path ."\n";
+ }
if($previous_img) {
$this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
@@ -154,8 +192,10 @@ class PHPFSPOT {
$result = $this->db->db_query("
SELECT tag_id as id, count(tag_id) as quantity
FROM photo_tags
+ INNER JOIN tags t
+ ON t.id = tag_id
GROUP BY tag_id
- ORDER BY tag_id ASC
+ ORDER BY t.name ASC
");
$tags = Array();
@@ -196,7 +236,7 @@ class PHPFSPOT {
// uncomment if you want sizes in whole %:
$size = ceil($size);
- print "". $this->tags[$key] ." ";
+ print "". $this->tags[$key] .", ";
}
@@ -264,7 +304,7 @@ class PHPFSPOT {
}
/* return according the selected tags */
- if(isset($_SESSION['selected_tags'])) {
+ if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) {
$selected = "";
foreach($_SESSION['selected_tags'] as $tag)
$selected.= $tag .",";
@@ -338,18 +378,41 @@ class PHPFSPOT {
$count = count($photos);
+ if(!$_SESSION['begin_with'] || $_SESSION['begin_with'] == 0)
+ $begin_with = 0;
+ else
+ $begin_with = $_SESSION['begin_with'];
+
+ if($this->cfg->rows_per_page == 0)
+ $end_with = $count;
+ else
+ $end_with = $begin_with + ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
+
+
$rows = 0;
$cols = 0;
$images[$rows] = Array();
+ $img_height[$rows] = Array();
+ $img_width[$rows] = Array();
- for($i = 0; $i < $count; $i++) {
+ for($i = $begin_with; $i < $end_with; $i++) {
$images[$rows][$cols] = $photos[$i];
+ $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->thumb_width ."_". $this->getMD5($photos[$i]);
+
+ if(file_exists($thumb_path)) {
+ $info = getimagesize($thumb_path);
+ $img_width[$rows][$cols] = $info[0];
+ $img_height[$rows][$cols] = $info[1];
+ }
+
if($cols == $this->cfg->thumbs_per_row-1) {
$cols = 0;
$rows++;
$images[$rows] = Array();
+ $img_width[$rows] = Array();
+ $img_height[$rows] = Array();
}
else {
$cols++;
@@ -362,9 +425,28 @@ class PHPFSPOT {
if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
$this->tmpl->assign('searchfor', $_SESSION['searchfor']);
+ if($this->cfg->rows_per_page != 0) {
+ $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);
+
+ if($begin_with != 0)
+ $this->tmpl->assign("previous_url", "javascript:showPhotoIndex(". $previous_start .");");
+ if($end_with < $count)
+ $this->tmpl->assign("next_url", "javascript:showPhotoIndex(". $next_start .");");
+ }
+
+ $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;
+
+ $this->tmpl->assign('extern_link', $extern_link);
$this->tmpl->assign('count', $count);
$this->tmpl->assign('width', $this->cfg->thumb_width);
$this->tmpl->assign('images', $images);
+ $this->tmpl->assign('img_width', $img_width);
+ $this->tmpl->assign('img_height', $img_height);
$this->tmpl->assign('rows', $rows);
$this->tmpl->assign('columns', $this->cfg->thumbs_per_row);
$this->tmpl->show("photo_index.tpl");
@@ -380,13 +462,24 @@ class PHPFSPOT {
$direction = "bubbleimg_down";
$details = $this->get_photo_details($photo);
+ $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
$image_url = "phpfspot_img.php?idx=". $photo ."&width=". $this->cfg->bubble_width;
- $filesize = filesize($this->translate_path($details['directory_path']) ."/". $details['name']);
+ $filesize = filesize($orig_path);
$filesize = rand($filesize/1024, 2);
- $img = getimagesize($this->translate_path($details['directory_path']) ."/". $details['name']);
+ if(!file_exists($orig_path)) {
+ print "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";
+ return;
+ }
+
+ $img = getimagesize($orig_path);
$this->tmpl->assign('file_size', $filesize);
$this->tmpl->assign('width', $img[0]);
@@ -406,9 +499,12 @@ class PHPFSPOT {
} // showCredits()
- public function create_thumbnail($image, $width)
+ public function create_thumbnail($orig_image, $thumb_image, $width)
{
- $meta = $this->get_meta_informations($image);
+ if(!file_exists($orig_image))
+ return false;
+
+ $meta = $this->get_meta_informations($orig_image);
$rotate = 0;
$flip = false;
@@ -416,104 +512,85 @@ class PHPFSPOT {
switch($meta['Orientation']) {
case 1:
- $rotate = 0;
- $flip = false;
- break;
-
+ $rotate = 0; $flip = false; break;
case 2:
- $rotate = 0;
- $flip = true;
- break;
-
+ $rotate = 0; $flip = true; break;
case 3:
- $rotate = 180;
- $flip = false;
- break;
-
+ $rotate = 180; $flip = false; break;
case 4:
- $rotate = 180;
- $flip = true;
- break;
-
+ $rotate = 180; $flip = true; break;
case 5:
- $rotate = 90;
- $flip = true;
- break;
-
+ $rotate = 90; $flip = true; break;
case 6:
- $rotate = 90;
- $flip = false;
- break;
-
+ $rotate = 90; $flip = false; break;
case 7:
- $rotate = 270;
- $flip = true;
- break;
-
+ $rotate = 270; $flip = true; break;
case 8:
- $rotate = 270;
- $flip = false;
- break;
+ $rotate = 270; $flip = false; break;
}
- $src_img = @imagecreatefromjpeg($image);
+ $src_img = @imagecreatefromjpeg($orig_image);
- if($src_img)
- {
- /* grabs the height and width */
- $new_w = imagesx($src_img);
- $new_h = imagesy($src_img);
+ if(!$src_img) {
+ print "Can't load image from ". $orig_image ."\n";
+ return false;
+ }
- // If requested width is more then the actual image width,
- // do not generate a thumbnail
+ /* grabs the height and width */
+ $new_w = imagesx($src_img);
+ $new_h = imagesy($src_img);
- if($width >= $new_w) {
- imagedestroy($src_img);
- return;
- }
+ // If requested width is more then the actual image width,
+ // do not generate a thumbnail
- /* calculates aspect ratio */
- $aspect_ratio = $new_h / $new_w;
+ if($width >= $new_w) {
+ imagedestroy($src_img);
+ return true;
+ }
- /* sets new size */
- $new_w = $width;
- $new_h = abs($new_w * $aspect_ratio);
+ /* calculates aspect ratio */
+ $aspect_ratio = $new_h / $new_w;
- /* creates new image of that size */
- $dst_img = imagecreatetruecolor($new_w,$new_h);
+ /* sets new size */
+ $new_w = $width;
+ $new_h = abs($new_w * $aspect_ratio);
- imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255));
+ /* creates new image of that size */
+ $dst_img = imagecreatetruecolor($new_w, $new_h);
- /* 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));
+ imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255));
- /* needs the image to be flipped horizontal? */
- if($flip) {
- print "(FLIP)";
- $image = $dst_img;
- for($x = 0; $x < $new_w; $x++) {
- imagecopy($dst_img, $image, $x, 0, $w - $x - 1, 0, 1, $h);
- }
- }
+ /* 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));
- if($rotate) {
- print "(ROTATE)";
- $dst_img = $this->rotateImage($dst_img, $rotate);
+ /* needs the image to be flipped horizontal? */
+ if($flip) {
+ print "(FLIP)";
+ $image = $dst_img;
+ for($x = 0; $x < $new_w; $x++) {
+ imagecopy($dst_img, $image, $x, 0, $w - $x - 1, 0, 1, $h);
}
+ }
- /* write down new generated file */
+ if($rotate) {
+ print "(ROTATE)";
+ $dst_img = $this->rotateImage($dst_img, $rotate);
+ }
- if(!file_exists(dirname($image) ."/thumbs"))
- mkdir(dirname($image) ."/thumbs");
+ /* write down new generated file */
+ $result = imagejpeg($dst_img, $thumb_image, 75);
- $newfile = dirname($image) ."/thumbs/". $width ."_". basename($image);
- imagejpeg($dst_img, $newfile, 75);
+ /* free your mind */
+ imagedestroy($dst_img);
+ imagedestroy($src_img);
- /* free your mind */
- imagedestroy($dst_img);
- imagedestroy($src_img);
+ if($result === false) {
+ print "Can't write thumbnail ". $thumb_image ."\n";
+ return false;
}
+ return true;
+
} // create_thumbnail()
public function get_meta_informations($file)
@@ -536,52 +613,68 @@ class PHPFSPOT {
} // check_config_table
- public function gen_thumbs($idx = 0, $fromcmd = 0)
+ /**
+ * Generates a thumbnail from photo idx
+ *
+ * This function will generate JPEG thumbnails from provided F-Spot photo
+ * indizes.
+ *
+ * 1. Check if all thumbnail generations (width) are already in place and
+ * readable
+ * 2. Check if the md5sum of the original file has changed
+ * 3. Generate the thumbnails if needed
+ */
+ public function gen_thumb($idx = 0, $force = 0)
{
- if(!$idx) {
- /* get all available photos */
- $all = $this->getPhotoSelection();
- }
- else
- $all = Array($idx);
-
- foreach($all as $photo) {
+ $error = 0;
- $details = $this->get_photo_details($photo);
+ $resolutions = Array(
+ $this->cfg->thumb_width,
+ $this->cfg->bubble_width,
+ $this->cfg->photo_width,
+ );
- $full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
- $file_md5 = md5_file($full_path);
+ /* get details from F-Spot's database */
+ $details = $this->get_photo_details($idx);
- if($fromcmd) print "Image [". $photo ."] ". $details['name'] ." Thumbnails:";
+ /* calculate file MD5 sum */
+ $full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
+ $file_md5 = md5_file($full_path);
- /* if the file hasn't changed there is no need to regen the thumb */
- if($file_md5 == $this->getMD5($photo)) {
- if($fromcmd) print " file has not changed - skipping\n";
- continue;
- }
+ $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:");
+
+ foreach($resolutions as $resolution) {
- /* set the new/changed MD5 sum for the current photo */
- $this->setMD5($photo, $file_md5);
+ $thumb_path = $this->cfg->base_path ."/thumbs/". $resolution ."_". $file_md5;
- $resolutions = Array(
- $this->cfg->thumb_width,
- $this->cfg->bubble_width,
- $this->cfg->photo_width
- );
+ /* if the thumbnail file doesn't exist, create it */
+ if(!file_exists($thumb_path)) {
- /* create thumbnails for the requested resolutions */
- foreach($resolutions as $resolution) {
- if($fromcmd) print " ". $resolution ."px";
- $this->create_thumbnail($full_path, $resolution);
+ $this->_debug(" ". $resolution ."px");
+ if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
+ $error = 1;
}
- if($fromcmd) print "\n";
+ /* if the file hasn't changed there is no need to regen the thumb */
+ elseif($file_md5 != $this->getMD5($idx) || $force) {
+
+ $this->_debug(" ". $resolution ."px");
+ if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
+ $error = 1;
+
+ }
+ }
+ /* set the new/changed MD5 sum for the current photo */
+ if(!$error) {
+ $this->setMD5($idx, $file_md5);
}
- } // gen_thumbs()
+ $this->_debug("\n");
+
+ } // gen_thumb()
- private function getMD5($idx)
+ public function getMD5($idx)
{
$result = $this->cfg_db->db_query("
SELECT img_md5
@@ -612,11 +705,17 @@ class PHPFSPOT {
} // setTagCondition()
- public function startSearch($searchfor)
+ public function startTagSearch($searchfor)
{
$_SESSION['searchfor'] = $searchfor;
+ $_SESSION['selected_tags'] = Array();
- } // startSearch()
+ foreach($this->avail_tags as $tag) {
+ if(preg_match('/'. $searchfor .'/i', $this->tags[$tag]))
+ array_push($_SESSION['selected_tags'], $tag);
+ }
+
+ } // startTagSearch()
private function rotateImage($img, $degrees)
{
@@ -707,6 +806,68 @@ class PHPFSPOT {
} // get_photo_tags()
+ public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
+ {
+ if (strlen($color) != 6)
+ $color = 000000;
+
+ $int = hexdec($color);
+ $h = imagefontheight($font);
+ $fw = imagefontwidth($font);
+ $txt = explode("\n", wordwrap($txt, ($w / $fw), "\n"));
+ $lines = count($txt);
+ $im = imagecreate($w, (($h * $lines) + ($lines * $space)));
+ $bg = imagecolorallocate($im, 255, 255, 255);
+ $color = imagecolorallocate($im, 0xFF & ($int >> 0x10), 0xFF & ($int >> 0x8), 0xFF & $int);
+ $y = 0;
+
+ foreach ($txt as $text) {
+ $x = (($w - ($fw * strlen($text))) / 2);
+ imagestring($im, $font, $x, $y, $text, $color);
+ $y += ($h + $space);
+ }
+
+ Header("Content-type: image/png");
+ ImagePng($im);
+
+ } // showTextImage()
+
+ private function checkRequirements()
+ {
+ if(!function_exists("imagecreatefromjpeg")) {
+ print "PHP GD library extension is missing
\n";
+ $missing = true;
+ }
+
+ if(!function_exists("sqlite3_open")) {
+ print "PHP SQLite3 library extension is missing
\n";
+ $missing = true;
+ }
+
+ /* Check for HTML_AJAX PEAR package, lent from Horde project */
+ ini_set('track_errors', 1);
+ @include 'HTML/AJAX/Server.php';
+ if(isset($php_errormsg)) {
+ print "PEAR HTML_AJAX package is missing
\n";
+ $missing = true;
+ }
+ ini_restore('track_errors');
+
+ if(isset($missing))
+ return false;
+
+ return true;
+
+ } // checkRequirements()
+
+ private function _debug($text)
+ {
+ if($this->fromcmd) {
+ print $text;
+ }
+
+ } // _debug()
+
}
?>