X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=191e06627f9e8dfc9f13e27877eb2387763d7bbe;hp=a936eecba35b32eaa7c1822707f2e73f2cd60ebd;hb=c26d80a67fa286d3b4dba0422fdc5a784741f1f1;hpb=e1117268a48440364cc10191a40eee45b8f514bd diff --git a/phpfspot.class.php b/phpfspot.class.php index a936eec..191e066 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -27,6 +27,14 @@ class PHPFSPOT { $this->get_tags(); + session_start(); + + if(!isset($_SESSION['tag_condition'])) + $_SESSION['tag_condition'] = 'or'; + + if(!isset($_SESSION['searchfor'])) + $_SESSION['searchfor'] = ''; + } // __construct() public function __destruct() @@ -36,9 +44,22 @@ class PHPFSPOT { public function show() { + $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() @@ -57,6 +78,10 @@ class PHPFSPOT { $tag_id = $row['id']; $tag_name = $row['name']; + /* check if config requests to ignore this tag */ + if(in_array($row['name'], $this->cfg->hide_tags)) + continue; + $this->tags[$tag_id] = $tag_name; $this->avail_tags[$count] = $tag_id; @@ -86,7 +111,7 @@ class PHPFSPOT { public function showPhoto($photo) { - $all_photos = $this->getAllTagPhotos(); + $all_photos = $this->getPhotoSelection(); foreach($all_photos as $all_photo) { @@ -103,18 +128,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"; + } + + if(!is_readable($orig_path)) { + print "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); + } + + $meta = $this->get_meta_informations($orig_path); + + if(file_exists($thumb_path)) { - $this->tmpl->assign('width', $info[0]); - $this->tmpl->assign('height', $info[1]); - $this->tmpl->assign('c_date', $meta['DateTime']); - $this->tmpl->assign('madewith', $meta['Make'] ." ". $meta['Model']); - $this->tmpl->assign('image_name', $details['name']); - $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); + $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 .");"); @@ -130,13 +184,54 @@ class PHPFSPOT { public function getAvailableTags() { - foreach($this->avail_tags as $tag) - { - if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags'])) + $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 t.name ASC + "); + + $tags = Array(); + + while($row = $this->db->db_fetch_object($result)) { + $tags[$row['id']] = $row['quantity']; + } + + // change these font sizes if you will + $max_size = 125; // max font size in % + $min_size = 75; // min font size in % + + // get the largest and smallest array values + $max_qty = max(array_values($tags)); + $min_qty = min(array_values($tags)); + + // find the range of values + $spread = $max_qty - $min_qty; + if (0 == $spread) { // we don't want to divide by zero + $spread = 1; + } + + // determine the font-size increment + // this is the increase per tag quantity (times used) + $step = ($max_size - $min_size)/($spread); + + // loop through our tag array + foreach ($tags as $key => $value) { + + if(isset($_SESSION['selected_tags']) && in_array($key, $_SESSION['selected_tags'])) continue; - // return all available (= not selected) tags - print "". $this->tags[$tag] ." "; + // calculate CSS font-size + // find the $value in excess of $min_qty + // multiply by the font-size increment ($size) + // and add the $min_size set above + $size = $min_size + (($value - $min_qty) * $step); + // uncomment if you want sizes in whole %: + $size = ceil($size); + + print "". $this->tags[$key] .", "; } @@ -148,7 +243,7 @@ class PHPFSPOT { { // return all selected tags if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags'])) { - print "". $this->tags[$tag] ." "; + print "". $this->tags[$tag] ." "; } } @@ -160,7 +255,8 @@ class PHPFSPOT { if(!isset($_SESSION['selected_tags'])) $_SESSION['selected_tags'] = Array(); - array_push($_SESSION['selected_tags'], $tag); + if(!in_array($tag, $_SESSION['selected_tags'])) + array_push($_SESSION['selected_tags'], $tag); } // addTag() @@ -169,6 +265,7 @@ class PHPFSPOT { if(isset($_SESSION['selected_tags'])) { $key = array_search($tag, $_SESSION['selected_tags']); unset($_SESSION['selected_tags'][$key]); + sort($_SESSION['selected_tags']); } } // delTag() @@ -179,59 +276,138 @@ class PHPFSPOT { } // resetTags() - public function getAllTagPhotos() + public function getPhotoSelection() { $tagged_photos = Array(); - if(isset($_SESSION['selected_tags'])) { - $selected = ""; - foreach($_SESSION['selected_tags'] as $tag) - $selected.= $tag .","; - $selected = substr($selected, 0, strlen($selected)-1); + /* return a search result */ + if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') { $result = $this->db->db_query(" SELECT DISTINCT photo_id FROM photo_tags pt INNER JOIN photos p ON p.id=pt.photo_id - WHERE pt.tag_id IN (". $selected .") - ORDER BY p.time ASC + INNER JOIN tags t + ON pt.tag_id=t.id + WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%' + ORDER BY p.time ASC "); + while($row = $this->db->db_fetch_object($result)) { + array_push($tagged_photos, $row['photo_id']); + } + return $tagged_photos; } - else { - $result = $this->db->db_query(" - SELECT DISTINCT photo_id - FROM photo_tags pt - INNER JOIN photos p - ON p.id=pt.photo_id - ORDER BY p.time ASC - "); + + /* return according the selected tags */ + if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) { + $selected = ""; + foreach($_SESSION['selected_tags'] as $tag) + $selected.= $tag .","; + $selected = substr($selected, 0, strlen($selected)-1); + + if($_SESSION['tag_condition'] == 'or') { + $result = $this->db->db_query(" + SELECT DISTINCT photo_id + FROM photo_tags pt + INNER JOIN photos p + ON p.id=pt.photo_id + WHERE pt.tag_id IN (". $selected .") + ORDER BY p.time ASC + "); + } + elseif($_SESSION['tag_condition'] == 'and') { + + /* Join together a table looking like + + pt1.photo_id pt1.tag_id pt2.photo_id pt2.tag_id ... + + so the query can quickly return all images matching the + selected tags in an AND condition + + */ + + $query_str = " + SELECT DISTINCT pt1.photo_id + FROM photo_tags pt1 + "; + + for($i = 0; $i < count($_SESSION['selected_tags']); $i++) { + $query_str.= " + INNER JOIN photo_tags pt". ($i+2) ." + ON pt1.photo_id=pt". ($i+2) .".photo_id + "; + } + $query_str.= "WHERE pt1.tag_id=". $_SESSION['selected_tags'][0]; + for($i = 1; $i < count($_SESSION['selected_tags']); $i++) { + $query_str.= " + AND pt". ($i+1) .".tag_id=". $_SESSION['selected_tags'][$i] ." + "; + } + $result = $this->db->db_query($query_str); + } + + while($row = $this->db->db_fetch_object($result)) { + array_push($tagged_photos, $row['photo_id']); + } + return $tagged_photos; } + /* return all available photos */ + $result = $this->db->db_query(" + SELECT DISTINCT photo_id + FROM photo_tags pt + INNER JOIN photos p + ON p.id=pt.photo_id + ORDER BY p.time ASC + "); while($row = $this->db->db_fetch_object($result)) { array_push($tagged_photos, $row['photo_id']); } - return $tagged_photos; - } // getAllTagPhotos() + } // getPhotoSelection() public function showPhotoIndex() { - $photos = $this->getAllTagPhotos(); + $photos = $this->getPhotoSelection(); + $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++; @@ -241,11 +417,31 @@ class PHPFSPOT { // +1 for for smarty's selection iteration $rows++; - //$images.= "
\n"; + 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"); @@ -261,13 +457,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=200"; + $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]); @@ -287,61 +494,102 @@ class PHPFSPOT { } // showCredits() - public function resize_image($image, $width) + public function create_thumbnail($orig_image, $thumb_image, $width) { - // if thumbnail already exists, don't recreate it - if(file_exists(dirname($image) ."/thumbs/". $width ."_". basename($image))) - return; + if(!file_exists($orig_image)) + 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 7: + $rotate = 270; $flip = true; break; + case 8: + $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)); - /* write down new generated file */ + /* 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(!file_exists(dirname($image) ."/thumbs")) - mkdir(dirname($image) ."/thumbs"); + /* 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); + } + } - $newfile = dirname($image) ."/thumbs/". $width ."_". basename($image); - imagejpeg($dst_img, $newfile, 75); + if($rotate) { + print "(ROTATE)"; + $dst_img = $this->rotateImage($dst_img, $rotate); + } - /* free your mind */ - imagedestroy($dst_img); - imagedestroy($src_img); + /* write down new generated file */ + $result = imagejpeg($dst_img, $thumb_image, 75); + + /* free your mind */ + imagedestroy($dst_img); + imagedestroy($src_img); + + if($result === false) { + print "Can't write thumbnail ". $thumb_image ."\n"; + return false; } - } // resize_image() + return true; + + } // create_thumbnail() public function get_meta_informations($file) { - return exif_read_data($file); } // get_meta_informations() @@ -360,40 +608,65 @@ class PHPFSPOT { } // check_config_table - public function gen_thumbs($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, $fromcmd = 0, $force = 0) { - /* get all available photos */ - $all = $this->getAllTagPhotos(); - foreach($all as $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); + $details = $this->get_photo_details($idx); + $full_path = $this->translate_path($details['directory_path']) ."/". $details['name']; + $file_md5 = md5_file($full_path); - $details = $this->get_photo_details($photo); - if($fromcmd) print "Image ". $details['name'] ." Thumbnails:"; + if($fromcmd) print "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; - } + $error = 0; + + 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; + + /* if the thumbnail file doesn't exist, create it */ + if(!file_exists($thumb_path)) { - /* create thumbnails for the requested resolutions */ - foreach(Array($this->cfg->thumb_width, $this->cfg->photo_width) as $resolution) { if($fromcmd) print " ". $resolution ."px"; - $this->resize_image($full_path, $resolution); + 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) { + + if($fromcmd) print " ". $resolution ."px"; + if(!$this->create_thumbnail($full_path, $thumb_path, $resolution)) + $error = 1; + } } - } // gen_thumbs() + /* set the new/changed MD5 sum for the current photo */ + if(!$error) + $this->setMD5($idx, $file_md5); + + if($fromcmd) print "\n"; - private function getMD5($idx) + } // gen_thumb() + + public function getMD5($idx) { $result = $this->cfg_db->db_query(" SELECT img_md5 @@ -418,6 +691,139 @@ class PHPFSPOT { } // setMD5() + public function setTagCondition($mode) + { + $_SESSION['tag_condition'] = $mode; + + } // setTagCondition() + + 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); + } + + } // startTagSearch() + + private function rotateImage($img, $degrees) + { + if(function_exists("imagerotate")) + $img = imagerotate($img, $degrees, 0); + else + { + function imagerotate($src_img, $angle) + { + $src_x = imagesx($src_img); + $src_y = imagesy($src_img); + if ($angle == 180) { + $dest_x = $src_x; + $dest_y = $src_y; + } + elseif ($src_x <= $src_y) { + $dest_x = $src_y; + $dest_y = $src_x; + } + elseif ($src_x >= $src_y) { + $dest_x = $src_y; + $dest_y = $src_x; + } + + $rotate=imagecreatetruecolor($dest_x,$dest_y); + imagealphablending($rotate, false); + + switch ($angle) { + + case 90: + for ($y = 0; $y < ($src_y); $y++) { + for ($x = 0; $x < ($src_x); $x++) { + $color = imagecolorat($src_img, $x, $y); + imagesetpixel($rotate, $dest_x - $y - 1, $x, $color); + } + } + break; + + case 270: + for ($y = 0; $y < ($src_y); $y++) { + for ($x = 0; $x < ($src_x); $x++) { + $color = imagecolorat($src_img, $x, $y); + imagesetpixel($rotate, $y, $dest_y - $x - 1, $color); + } + } + break; + + case 180: + for ($y = 0; $y < ($src_y); $y++) { + for ($x = 0; $x < ($src_x); $x++) { + $color = imagecolorat($src_img, $x, $y); + imagesetpixel($rotate, $dest_x - $x - 1, $dest_y - $y - 1, $color); + } + } + break; + + default: $rotate = $src_img; + }; + + return $rotate; + + } + + $img = imagerotate($img, $degrees); + + } + + return $img; + + } // rotateImage() + + private function get_photo_tags($idx) + { + $result = $this->db->db_query(" + SELECT t.id, t.name + FROM tags t + INNER JOIN photo_tags pt + ON t.id=pt.tag_id + WHERE pt.photo_id='". $idx ."' + "); + + $tags = Array(); + + while($row = $this->db->db_fetch_object($result)) + $tags[$row['id']] = $row['name']; + + return $tags; + + } // get_photo_tags() + + 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() + } ?>