X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=8fe0f77e40824092049fa1b7eb0864cd7a05ab71;hp=89cf0b8bfe56b92f6235fcaebe727d9e3b46c5e8;hb=856af471b7a6025f1438f09ff0d701dd78fd99ea;hpb=6f67421bdbf2c4c92600e1553e855244bdb71ccf diff --git a/phpfspot.class.php b/phpfspot.class.php index 89cf0b8..8fe0f77 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -12,7 +12,6 @@ class PHPFSPOT { var $tmpl; var $tags; var $avail_tags; - var $current_tags; public function __construct() { @@ -39,6 +38,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() @@ -51,6 +54,8 @@ 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': @@ -58,6 +63,19 @@ class PHPFSPOT { $_SESSION['selected_tags'] = split(',', $_GET['tags']); } break; + case 'showp': + if(isset($_GET['tags'])) { + $_SESSION['selected_tags'] = split(',', $_GET['tags']); + } + if(isset($_GET['id'])) { + $_SESSION['current_photo'] = $_GET['id']; + } + break; + case 'export': + $this->tmpl->show("export.tpl"); + return; + break; + } $this->tmpl->assign('content_page', 'welcome.tpl'); @@ -108,6 +126,18 @@ class PHPFSPOT { } // get_photo_details + public function getPhotoName($idx, $limit = 0) + { + if($details = $this->get_photo_details($idx)) { + $name = $details['name']; + if($limit != 0 && strlen($name) > $limit) { + $name = substr($name, 0, $limit-5) ."...". substr($name, -($limit-5)); + } + 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 +147,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 +173,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 +187,26 @@ class PHPFSPOT { $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]; + } + + $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"; + + $current_tags = $this->getCurrentTags(); + $extern_link = "index.php?mode=showp&id=". $photo; + if($current_tags != "") { + $extern_link.= "&tags=". $current_tags; + } + + $this->tmpl->assign('extern_link', $extern_link); + if(file_exists($thumb_path)) { $info = getimagesize($thumb_path); @@ -161,27 +216,31 @@ 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) { $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");"); + $this->tmpl->assign('prev_img', $previous_img); } if($next_img) { $this->tmpl->assign('next_url', "javascript:showImage(". $next_img .");"); + $this->tmpl->assign('next_img', $next_img); } + $this->tmpl->assign('mini_width', $this->cfg->mini_width); $this->tmpl->show("single_photo.tpl"); @@ -244,15 +303,18 @@ class PHPFSPOT { public function getSelectedTags() { + $output = ""; foreach($this->avail_tags as $tag) { // return all selected tags if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags'])) { - print "". $this->tags[$tag] ." "; + $output.= "". $this->tags[$tag] .", "; } - } + $output = substr($output, 0, strlen($output)-2); + print $output; + } // getSelectedTags() public function addTag($tag) @@ -281,6 +343,12 @@ class PHPFSPOT { } // resetTags() + public function resetPhotoView() + { + unset($_SESSION['current_photo']); + + } // resetPhotoView(); + public function resetTagSearch() { unset($_SESSION['searchfor']); @@ -328,6 +396,12 @@ class PHPFSPOT { } elseif($_SESSION['tag_condition'] == 'and') { + if(count($_SESSION['selected_tags']) >= 32) { + print "A SQLite limit of 32 tables within a JOIN SELECT avoids to
\n"; + print "evaluate your tag selection. Please remove some tags from your selection.\n"; + return Array(); + } + /* Join together a table looking like pt1.photo_id pt1.tag_id pt2.photo_id pt2.tag_id ... @@ -384,15 +458,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(!isset($this->cfg->rows_per_page) || $this->cfg->rows_per_page == 0) { - if($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 +497,16 @@ class PHPFSPOT { $images[$rows] = Array(); $img_height[$rows] = Array(); $img_width[$rows] = Array(); + $img_id[$rows] = Array(); + $img_name[$rows] = Array(); + $img_title = Array(); for($i = $begin_with; $i < $end_with; $i++) { $images[$rows][$cols] = $photos[$i]; + $img_id[$rows][$cols] = $i; + $img_name[$rows][$cols] = htmlspecialchars($this->getPhotoName($photos[$i], 15)); + $img_title[$rows][$cols] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0)); $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->thumb_width ."_". $this->getMD5($photos[$i]); @@ -431,7 +534,10 @@ class PHPFSPOT { if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') $this->tmpl->assign('searchfor', $_SESSION['searchfor']); + /* do we have to display the page selector ? */ 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,67 +545,96 @@ class PHPFSPOT { $this->tmpl->assign("previous_url", "javascript:showPhotoIndex(". $previous_start .");"); if($end_with < $count) $this->tmpl->assign("next_url", "javascript:showPhotoIndex(". $next_start .");"); + + $photo_per_page = $this->cfg->rows_per_page * $this->cfg->thumbs_per_row; + $last_page = ceil($count / $photo_per_page); + + /* get the current selected 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 = ""; + + $select = " "; + + // until 9 pages we show the selector from 1-9 + if($last_page <= 9) { + $page_select.= $select; + continue; + } else { + if($i == 1 /* first page */ || + $i == $last_page /* last page */ || + $i == $current_page /* current page */ || + $i == ceil($last_page * 0.25) /* first quater */ || + $i == ceil($last_page * 0.5) /* half */ || + $i == ceil($last_page * 0.75) /* third quater */ || + (in_array($i, array(1,2,3,4,5,6)) && $current_page <= 4) /* the first 6 */ || + (in_array($i, array($last_page, $last_page-1, $last_page-2, $last_page-3, $last_page-4, $last_page-5)) && $current_page >= $last_page-4) /* the last 6 */ || + $i == $current_page-3 || $i == $current_page-2 || $i == $current_page-1 /* three before */ || + $i == $current_page+3 || $i == $current_page+2 || $i == $current_page+1 /* three after */) { + + $page_select.= $select; + continue; + + } + } + + $page_select.= "."; + } + + /* 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); + + $current_tags = $this->getCurrentTags(); + $extern_link = "index.php?mode=showpi"; + if($current_tags != "") { + $extern_link.= "&tags=". $current_tags; } - $extern_link = "http://". $_SERVER['SERVER_NAME'] ."/index.php?mode=showpi&tags=". $current_tags; + $export_link = "index.php?mode=export"; $this->tmpl->assign('extern_link', $extern_link); + $this->tmpl->assign('export_link', $export_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('img_title', $img_title); $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() - public function showBubbleDetails($photo, $direction) - { - if($direction == "up") - $direction = "bubbleimg_up"; - else - $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($orig_path); - $filesize = rand($filesize/1024, 2); - - 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]); - $this->tmpl->assign('height', $img[1]); - $this->tmpl->assign('file_name', $details['name']); - $this->tmpl->assign('image_id', $direction); - $this->tmpl->assign('image_url', $image_url); - $this->tmpl->show("bubble_details.tpl"); - - } // showBubbleDetails() - public function showCredits() { $this->tmpl->assign('version', $this->cfg->version); @@ -513,6 +648,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; @@ -520,21 +661,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; } @@ -546,23 +687,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); @@ -570,7 +743,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) { @@ -582,7 +755,7 @@ class PHPFSPOT { } if($rotate) { - print "(ROTATE)"; + $this->_debug("(ROTATE)"); $dst_img = $this->rotateImage($dst_img, $rotate); } @@ -639,8 +812,8 @@ class PHPFSPOT { $resolutions = Array( $this->cfg->thumb_width, - $this->cfg->bubble_width, $this->cfg->photo_width, + $this->cfg->mini_width, ); /* get details from F-Spot's database */ @@ -648,6 +821,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:"); @@ -856,10 +1040,15 @@ class PHPFSPOT { /* 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)) { + 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)) @@ -877,6 +1066,109 @@ class PHPFSPOT { } // _debug() + public function checkifImageSupported($mime) + { + if(in_array($mime, Array("image/jpeg"))) + return true; + + return false; + + } // checkifImageSupported() + + public function _warning($text) + { + print "\"warning\"\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() + + public function getExport($mode) + { + $pictures = $this->getPhotoSelection(); + $current_tags = $this->getCurrentTags(); + + if(!isset($_SERVER['HTTPS'])) $protocol = "http"; + else $protocol = "https"; + + $server_name = $_SERVER['SERVER_NAME']; + + foreach($pictures as $picture) { + + $orig_url = $protocol ."://". $server_name . $this->cfg->web_path ."index.php?mode=showp&id=". $picture; + if($current_tags != "") { + $orig_url.= "&tags=". $current_tags; + } + + $thumb_url = $protocol ."://". $server_name . $this->cfg->web_path ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width; + + switch($mode) { + + case 'HTML': + // + print htmlspecialchars("") ."
\n"; + break; + + case 'MoinMoin': + // [%pictureurl% %thumbnailurl%] + print htmlspecialchars(" * [".$orig_url." ".$thumb_url."&fake=1.jpg]") ."
\n"; + break; + } + + } + + } // getExport() + + private function getCurrentTags() + { + $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); + } + return $current_tags; + + } // getCurrentTags() + + public function getCurrentPhoto() + { + if(isset($_SESSION['current_photo'])) { + print $_SESSION['current_photo']; + } + } // getCurrentPhoto() + } ?>