X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=92a0199a339bdbe89c949e6a2a6d4289a2a81121;hp=e15f8e5e9aa66af354e943a80b1f9488ec7558f5;hb=873c2c27c91e4d64fd2ec3f07e3de47caf8e076b;hpb=c7e18357997a370d30d53d800c8e7d3f34d695ef
diff --git a/phpfspot.class.php b/phpfspot.class.php
index e15f8e5..92a0199 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -16,10 +16,14 @@ class PHPFSPOT {
public function __construct()
{
- $this->cfg = new PHPFSPOT_CFG;
+ /* Check necessary requirements */
+ if(!$this->checkRequirements()) {
+ exit(1);
+ }
- $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
+ $this->cfg = new PHPFSPOT_CFG;
+ $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();
@@ -35,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()
@@ -47,12 +55,26 @@ 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']);
+ $this->tmpl->assign('from_date', $this->get_calendar());
+ $this->tmpl->assign('to_date', $this->get_calendar());
+
+ 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()
{
+
$this->avail_tags = Array();
$count = 0;
@@ -92,6 +114,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);
@@ -101,41 +139,81 @@ 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;
+ }
+ }
$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);
- $this->tmpl->assign('description', $details['description']);
- $this->tmpl->assign('image_name', $details['name']);
+ if(!file_exists($orig_path)) {
+ $this->_warning("Photo ". $orig_path ." does not exist!
\n");
+ }
+
+ if(!is_readable($orig_path)) {
+ $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, true);
+ }
+
+ $meta = $this->get_meta_informations($orig_path);
+
+ /* If EXIF data are available, use them */
+ if(isset($meta['ExifImageWidth'])) {
+ $meta_res = $meta['ExifImageWidth'] ."x". $meta['ExifImageLength'];
+ } else {
+ $info = getimagesize($orig_path);
+ $meta_res = $info[0] ."x". $info[1];
+ }
- $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);
+ $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_size = isset($meta['FileSize']) ? round($meta['FileSize']/1024, 1) ."kbyte" : "n/a";
- $this->tmpl->assign('tags', $this->get_photo_tags($photo));
+ 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', $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 {
+ $this->_warning("Can't open file ". $thumb_path ."\n");
+ }
if($previous_img) {
$this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
@@ -154,8 +232,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 +276,7 @@ class PHPFSPOT {
// uncomment if you want sizes in whole %:
$size = ceil($size);
- print "". $this->tags[$key] ." ";
+ print "". $this->tags[$key] .", ";
}
@@ -241,6 +321,12 @@ class PHPFSPOT {
} // resetTags()
+ public function resetTagSearch()
+ {
+ unset($_SESSION['searchfor']);
+
+ } // resetTagSearch()
+
public function getPhotoSelection()
{
$tagged_photos = Array();
@@ -264,7 +350,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 +424,68 @@ class PHPFSPOT {
$count = count($photos);
+ if(isset($_SESSION['begin_with']) && $_SESSION['begin_with'] != "")
+ $anchor = $_SESSION['begin_with'];
+
+ if(!isset($this->cfg->rows_per_page) || $this->cfg->rows_per_page == 0) {
+
+ $begin_with = 0;
+ $end_with = $count;
+
+ }
+ 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;
$cols = 0;
$images[$rows] = Array();
+ $img_height[$rows] = Array();
+ $img_width[$rows] = Array();
+ $img_id[$rows] = Array();
+ $img_name[$rows] = Array();
- for($i = 0; $i < $count; $i++) {
+ 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]);
+
+ 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,13 +498,87 @@ class PHPFSPOT {
if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
$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);
+
+ 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 .");");
+
+ /* 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 = "";
+ 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);
$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('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()
@@ -380,13 +590,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)) {
+ $this->_warning("Photo ". $orig_path ." does not exist!
\n");
+ return;
+ }
+
+ if(!is_readable($orig_path)) {
+ $this->_warning("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,114 +627,136 @@ 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;
+
+ $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;
$flip = false;
switch($meta['Orientation']) {
- case 1:
- $rotate = 0;
- $flip = false;
- break;
-
- case 2:
- $rotate = 0;
- $flip = true;
- break;
-
- case 3:
- $rotate = 180;
- $flip = false;
- break;
-
- case 4:
- $rotate = 180;
- $flip = true;
- break;
-
- case 5:
- $rotate = 90;
- $flip = true;
- break;
-
- case 6:
- $rotate = 90;
- $flip = false;
- break;
+ case 1: /* top, left */
+ $rotate = 0; $flip = false; break;
+ case 2: /* top, right */
+ $rotate = 0; $flip = true; break;
+ case 3: /* bottom, left */
+ $rotate = 180; $flip = false; break;
+ case 4: /* bottom, right */
+ $rotate = 180; $flip = true; break;
+ case 5: /* left side, top */
+ $rotate = 90; $flip = true; break;
+ case 6: /* right side, top */
+ $rotate = 90; $flip = false; break;
+ case 7: /* left side, bottom */
+ $rotate = 270; $flip = true; break;
+ case 8: /* right side, bottom */
+ $rotate = 270; $flip = false; break;
+ }
- case 7:
- $rotate = 270;
- $flip = true;
- break;
+ $src_img = @imagecreatefromjpeg($orig_image);
- case 8:
- $rotate = 270;
- $flip = false;
- break;
+ if(!$src_img) {
+ print "Can't load image from ". $orig_image ."\n";
+ return false;
}
- $src_img = @imagecreatefromjpeg($image);
+ /* grabs the height and width */
+ $cur_width = imagesx($src_img);
+ $cur_height = imagesy($src_img);
- if($src_img)
- {
- /* grabs the height and width */
- $new_w = imagesx($src_img);
- $new_h = imagesy($src_img);
+ // If requested width is more then the actual image width,
+ // do not generate a thumbnail
- // If requested width is more then the actual image width,
- // do not generate a thumbnail
+ if($width >= $cur_width) {
+ imagedestroy($src_img);
+ return true;
+ }
- if($width >= $new_w) {
- imagedestroy($src_img);
- return;
- }
+ // 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;
+ /* calculates aspect ratio */
+ $aspect_ratio = $cur_height / $cur_width;
- /* sets new size */
+ /* sets new size */
+ 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);
-
- 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) {
+ $this->_debug("(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 +779,79 @@ 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();
+ $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'];
+
+ if(!file_exists($full_path)) {
+ $this->_warning("File ". $full_path ." does not exist\n");
+ return;
}
- else
- $all = Array($idx);
-
- foreach($all as $photo) {
- $details = $this->get_photo_details($photo);
+ if(!is_readable($full_path)) {
+ $this->_warning("File ". $full_path ." is not readable for ". get_current_user() ."\n");
+ return;
+ }
- $full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
- $file_md5 = md5_file($full_path);
+ $file_md5 = md5_file($full_path);
- if($fromcmd) print "Image ". $details['name'] ." Thumbnails:";
+ $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:");
- /* 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;
- }
+ 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 +882,17 @@ class PHPFSPOT {
} // setTagCondition()
- public function startSearch($searchfor)
+ public function startTagSearch($searchfor)
{
$_SESSION['searchfor'] = $searchfor;
+ $_SESSION['selected_tags'] = Array();
+
+ foreach($this->avail_tags as $tag) {
+ if(preg_match('/'. $searchfor .'/i', $this->tags[$tag]))
+ array_push($_SESSION['selected_tags'], $tag);
+ }
- } // startSearch()
+ } // startTagSearch()
private function rotateImage($img, $degrees)
{
@@ -707,6 +983,121 @@ 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_once 'HTML/AJAX/Server.php';
+ if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) {
+ print "PEAR HTML_AJAX package is missing
\n";
+ $missing = true;
+ }
+ @include_once 'Calendar/Calendar.php';
+ if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) {
+ print "PEAR Calendar 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()
+
+ 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()
+
+ private function get_calendar()
+ {
+// require_once CALENDAR_ROOT.'Year.php';
+// require_once CALENDAR_ROOT.'Month.php';
+// require_once CALENDAR_ROOT.'Day.php';
+
+// $Year = new Calendar_Year();
+// $Month = new Calendar_Month();
+// $Day = new Calendar_Day();
+
+ $output = "\n";
+
+ $output.= "\n";
+
+ $output.= "\n";
+
+ return $output;
+
+ } // get_calendar()
+
}
?>