X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=b82fbeef01d5333f4d2477591c1a6e6f257ab4d5;hp=204c8a7374f4c687ba88ebb2e96d149943f98c7e;hb=b654689c263f6ce32c9d2ea01a3d04b2448532c3;hpb=8f56c03f5e097d31ba940e6f97f65e0e23ae3861 diff --git a/phpfspot.class.php b/phpfspot.class.php index 204c8a7..b82fbee 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -1,5 +1,26 @@ cfg = new PHPFSPOT_CFG; $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db); + + if(!is_writeable(dirname($this->cfg->phpfspot_db))) { + print dirname($this->cfg->phpfspot_db) .": directory is not writeable!"; + exit(1); + } + $this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db); + if(!is_writeable($this->cfg->phpfspot_db)) { + print $this->cfg->phpfspot_db ." is not writeable for user ". $this->getuid() ."\n"; + exit(1); + } $this->check_config_table(); + $this->tmpl = new PHPFSPOT_TMPL($this); $this->get_tags(); @@ -36,6 +74,9 @@ class PHPFSPOT { if(!isset($_SESSION['tag_condition'])) $_SESSION['tag_condition'] = 'or'; + if(!isset($_SESSION['sort_order'])) + $_SESSION['sort_order'] = 'date_asc'; + if(!isset($_SESSION['searchfor'])) $_SESSION['searchfor'] = ''; @@ -50,29 +91,86 @@ class PHPFSPOT { } // __destruct() + /** + * show - generate html output + * + * this function can be called after the constructor has + * prepared everyhing. it will load the index.tpl smarty + * template. if necessary it will registere pre-selects + * (photo index, photo, tag search, date search) into + * users session. + */ 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']); + $this->tmpl->assign('template_path', 'themes/'. $this->cfg->theme_name); + + $_SESSION['start_action'] = $_GET['mode']; switch($_GET['mode']) { case 'showpi': if(isset($_GET['tags'])) { - $_SESSION['selected_tags'] = split(',', $_GET['tags']); + $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']); + } + if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) { + $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00"); + } + if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) { + $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59"); + } + break; + case 'showp': + if(isset($_GET['tags'])) { + $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']); + $_SESSION['start_action'] = 'showp'; + } + if(isset($_GET['id']) && is_numeric($_GET['id'])) { + $_SESSION['current_photo'] = $_GET['id']; + $_SESSION['start_action'] = 'showp'; } + if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) { + $_SESSION['from_date'] = strtotime($_GET['from_date']); + } + if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) { + $_SESSION['to_date'] = strtotime($_GET['to_date']); + } + break; + case 'export': + $this->tmpl->show("export.tpl"); + return; + break; + case 'slideshow': + $this->tmpl->show("slideshow.tpl"); + return; break; } + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) + $this->tmpl->assign('date_search_enabled', true); + + $this->tmpl->assign('from_date', $this->get_calendar('from')); + $this->tmpl->assign('to_date', $this->get_calendar('to')); + $this->tmpl->assign('sort_field', $this->get_sort_field()); $this->tmpl->assign('content_page', 'welcome.tpl'); $this->tmpl->show("index.tpl"); - } // show() + /** + * get_tags - grab all tags of f-spot's database + * + * this function will get all available tags from + * the f-spot database and store them within two + * arrays within this clase for later usage. in + * fact, if the user requests (hide_tags) it will + * opt-out some of them. + * + * this function is getting called once by show() + */ private function get_tags() { - $this->avail_tags = Array(); $count = 0; @@ -100,6 +198,12 @@ class PHPFSPOT { } // get_tags() + /** + * extract all photo details + * + * retrieve all available details from f-spot's + * database and return them as object + */ public function get_photo_details($idx) { $result = $this->db->db_query(" @@ -112,24 +216,62 @@ class PHPFSPOT { } // get_photo_details + /** + * returns aligned photo names + * + * this function returns aligned (length) names for + * an specific photo. If the length of the name exceeds + * $limit the name will be shrinked (...) + */ + 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() + + /** + * translate f-spoth photo path + * + * as the full-qualified path recorded in the f-spot database + * is usally not the same as on the webserver, this function + * will replace the path with that one specified in the cfg + */ public function translate_path($path, $width = 0) { return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path); } // translate_path + /** + * control HTML ouput for a single photo + * + * this function provides all the necessary information + * for the single photo template. + */ public function showPhoto($photo) { + /* get all photos from the current photo selection */ $all_photos = $this->getPhotoSelection(); $count = count($all_photos); for($i = 0; $i < $count; $i++) { - if($get_next) { + // $get_next will be set, when the photo which has to + // be displayed has been found - this means that the + // next available is in fact the NEXT image (for the + // navigation icons) + if(isset($get_next)) { $next_img = $all_photos[$i]; break; } + /* the next photo is our NEXT photo */ if($all_photos[$i] == $photo) { $get_next = 1; } @@ -143,29 +285,55 @@ class PHPFSPOT { } $details = $this->get_photo_details($photo); + + if(!$details) { + print "error"; + return; + } + $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)) { - $this->_warning("Photo ". $orig_path ." does not exist!
\n"); + $this->_error("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"); + $this->_error("Photo ". $orig_path ." is not readable for user ". $this->getuid() ."
\n"); } /* If the thumbnail doesn't exist yet, try to create it */ if(!file_exists($thumb_path)) { $this->gen_thumb($photo, true); + $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo); } + /* get f-spot database meta information */ $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_res = isset($meta['ExifImageWidth']) ? $meta['ExifImageWidth'] ."x". $meta['ExifImageLength'] : "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"; + $extern_link = "index.php?mode=showp&id=". $photo; + $current_tags = $this->getCurrentTags(); + if($current_tags != "") { + $extern_link.= "&tags=". $current_tags; + } + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { + $extern_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']); + } + + $this->tmpl->assign('extern_link', $extern_link); + if(file_exists($thumb_path)) { $info = getimagesize($thumb_path); @@ -187,23 +355,38 @@ class PHPFSPOT { $this->tmpl->assign('current', $current); } else { - $this->_warning("Can't open file ". $thumb_path ."\n"); + $this->_error("Can't open file ". $thumb_path ."\n"); + return; } 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->assign('photo_number', $i); + $this->tmpl->assign('photo_count', count($all_photos)); $this->tmpl->show("single_photo.tpl"); } // showPhoto() + /** + * all available tags and tag cloud + * + * this function outputs all available tags (time ordered) + * and in addition output them as tag cloud (tags which have + * many photos will appears more then others) + */ public function getAvailableTags() { + $output = ""; + $result = $this->db->db_query(" SELECT tag_id as id, count(tag_id) as quantity FROM photo_tags @@ -251,25 +434,45 @@ class PHPFSPOT { // uncomment if you want sizes in whole %: $size = ceil($size); - print "". $this->tags[$key] .", "; + $output.= "". $this->tags[$key] .", "; } + $output = substr($output, 0, strlen($output)-2); + print $output; + } // getAvailableTags() + /** + * output all selected tags + * + * this function output all tags which have been selected + * by the user. the selected tags are stored in the + * session-variable $_SESSION['selected_tags'] + */ 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() + /** + * add tag to users session variable + * + * this function will add the specified to users current + * tag selection. if a date search has been made before + * it will be now cleared + */ public function addTag($tag) { if(!isset($_SESSION['selected_tags'])) @@ -280,6 +483,12 @@ class PHPFSPOT { } // addTag() + /** + * remove tag to users session variable + * + * this function removes the specified tag from + * users current tag selection + */ public function delTag($tag) { if(isset($_SESSION['selected_tags'])) { @@ -290,38 +499,107 @@ class PHPFSPOT { } // delTag() + /** + * reset tag selection + * + * if there is any tag selection, it will be + * deleted now + */ public function resetTags() { - unset($_SESSION['selected_tags']); + if(isset($_SESSION['selected_tags'])) + unset($_SESSION['selected_tags']); } // resetTags() + /** + * reset single photo + * + * if a specific photo was requested (external link) + * unset the session variable now + */ + public function resetPhotoView() + { + if(isset($_SESSION['current_photo'])) + unset($_SESSION['current_photo']); + + } // resetPhotoView(); + + /** + * reset tag search + * + * if any tag search has taken place, reset + * it now + */ public function resetTagSearch() { - unset($_SESSION['searchfor']); + if(isset($_SESSION['searchfor'])) + unset($_SESSION['searchfor']); } // resetTagSearch() + /** + * reset date search + * + * if any date search has taken place, reset + * it now + */ + public function resetDateSearch() + { + if(isset($_SESSION['from_date'])) + unset($_SESSION['from_date']); + if(isset($_SESSION['to_date'])) + unset($_SESSION['to_date']); + + } // resetDateSearch(); + + /** + * return all photo according selection + * + * this function returns all photos based on + * the tag-selection, tag- or date-search. + * the tag-search also has to take care of AND + * and OR conjunctions + */ public function getPhotoSelection() { - $tagged_photos = Array(); + $matched_photos = Array(); + + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { + $from_date = $_SESSION['from_date']; + $to_date = $_SESSION['to_date']; + $additional_where_cond = " + p.time>='". $from_date ."' + AND + p.time<='". $to_date ."' + "; + } + + if(isset($_SESSION['sort_order'])) { + $order_str = $this->get_sort_order(); + } /* return a search result */ if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') { - $result = $this->db->db_query(" + $query_str = " SELECT DISTINCT photo_id FROM photo_tags pt INNER JOIN photos p ON p.id=pt.photo_id INNER JOIN tags t ON pt.tag_id=t.id - WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%' - ORDER BY p.time ASC - "); + WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'"; + + if(isset($additional_where_cond)) + $query_str.= "AND ". $additional_where_cond ." "; + if(isset($order_str)) + $query_str.= $order_str; + + $result = $this->db->db_query($query_str); while($row = $this->db->db_fetch_object($result)) { - array_push($tagged_photos, $row['photo_id']); + array_push($matched_photos, $row['photo_id']); } - return $tagged_photos; + return $matched_photos; } /* return according the selected tags */ @@ -332,17 +610,26 @@ class PHPFSPOT { $selected = substr($selected, 0, strlen($selected)-1); if($_SESSION['tag_condition'] == 'or') { - $result = $this->db->db_query(" + $query_str = " 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 - "); + "; + if(isset($additional_where_cond)) + $query_str.= "AND ". $additional_where_cond ." "; + if(isset($order_str)) + $query_str.= $order_str; } 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 ... @@ -363,36 +650,55 @@ class PHPFSPOT { ON pt1.photo_id=pt". ($i+2) .".photo_id "; } + $query_str.= " + INNER JOIN photos p + ON pt1.photo_id=p.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); + if(isset($additional_where_cond)) + $query_str.= "AND ". $additional_where_cond; + if(isset($order_str)) + $query_str.= $order_str; } + $result = $this->db->db_query($query_str); while($row = $this->db->db_fetch_object($result)) { - array_push($tagged_photos, $row['photo_id']); + array_push($matched_photos, $row['photo_id']); } - return $tagged_photos; + return $matched_photos; } /* return all available photos */ - $result = $this->db->db_query(" + $query_str = " SELECT DISTINCT photo_id FROM photo_tags pt INNER JOIN photos p ON p.id=pt.photo_id - ORDER BY p.time ASC - "); + "; + if(isset($additional_where_cond)) + $query_str.= "WHERE ". $additional_where_cond ." "; + if(isset($order_str)) + $query_str.= $order_str; + + $result = $this->db->db_query($query_str); while($row = $this->db->db_fetch_object($result)) { - array_push($tagged_photos, $row['photo_id']); + array_push($matched_photos, $row['photo_id']); } - return $tagged_photos; + return $matched_photos; } // getPhotoSelection() + /** + * control HTML ouput for photo index + * + * this function provides all the necessary information + * for the photo index template. + */ public function showPhotoIndex() { $photos = $this->getPhotoSelection(); @@ -439,11 +745,15 @@ class PHPFSPOT { $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]); @@ -471,6 +781,16 @@ class PHPFSPOT { if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') $this->tmpl->assign('searchfor', $_SESSION['searchfor']); + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { + $this->tmpl->assign('from_date', $this->ts2str($_SESSION['from_date'])); + $this->tmpl->assign('to_date', $this->ts2str($_SESSION['to_date'])); + } + + if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) { + $this->tmpl->assign('tag_result', 1); + } + + /* do we have to display the page selector ? */ if($this->cfg->rows_per_page != 0) { /* calculate the page switchers */ @@ -482,29 +802,25 @@ class PHPFSPOT { 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); + /* get the current selected page */ if($begin_with == 0) { $current_page = 1; - } - else { + } else { $current_page = 0; for($i = $begin_with; $i >= 0; $i-=$photo_per_page) { $current_page++; } } + $dotdot_made = 0; + for($i = 1; $i <= $last_page; $i++) { if($current_page == $i) - $style = "style=\"font-size: 125%;\""; + $style = "style=\"font-size: 125%; text-decoration: underline;\""; elseif($current_page-1 == $i || $current_page+1 == $i) $style = "style=\"font-size: 105%;\""; elseif(($current_page-5 >= $i) && ($i != 1) || @@ -513,11 +829,38 @@ class PHPFSPOT { else $style = ""; - $page_select.= " "; + $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; + $dotdot_made = 0; + continue; + + } + } + if(!$dotdot_made) { + $page_select.= "......... "; + $dotdot_made = 1; + } } /* only show the page selector if we have more then one page */ @@ -525,25 +868,30 @@ class PHPFSPOT { $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"; + + $current_tags = $this->getCurrentTags(); + $extern_link = "index.php?mode=showpi"; if($current_tags != "") { $extern_link.= "&tags=". $current_tags; } + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { + $extern_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']); + } + + $export_link = "index.php?mode=export"; + $slideshow_link = "index.php?mode=slideshow"; $this->tmpl->assign('extern_link', $extern_link); + $this->tmpl->assign('slideshow_link', $slideshow_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); @@ -554,43 +902,9 @@ class PHPFSPOT { } // 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)) { - $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]); - $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() - + /** + * show credit template + */ public function showCredits() { $this->tmpl->assign('version', $this->cfg->version); @@ -599,10 +913,19 @@ class PHPFSPOT { } // showCredits() + /** + * create_thumbnails for the requested width + * + * this function creates image thumbnails of $orig_image + * stored as $thumb_image. It will check if the image is + * in a supported format, if necessary rotate the image + * (based on EXIF orientation meta headers) and re-sizing. + */ public function create_thumbnail($orig_image, $thumb_image, $width) { - if(!file_exists($orig_image)) + if(!file_exists($orig_image)) { return false; + } $details = getimagesize($orig_image); @@ -617,21 +940,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; } @@ -647,13 +970,23 @@ class PHPFSPOT { $cur_height = imagesy($src_img); // If requested width is more then the actual image width, - // do not generate a thumbnail + // do not generate a thumbnail, instead safe the original + // as thumbnail but with lower quality if($width >= $cur_width) { + $result = imagejpeg($src_img, $thumb_image, 75); 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 = $cur_height / $cur_width; @@ -675,6 +1008,14 @@ class PHPFSPOT { // 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 */ @@ -683,7 +1024,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) { @@ -715,12 +1056,22 @@ class PHPFSPOT { } // create_thumbnail() + /** + * return all exif meta data from the file + */ public function get_meta_informations($file) { return exif_read_data($file); } // get_meta_informations() + /** + * create phpfspot own sqlite database + * + * this function creates phpfspots own sqlite database + * if it does not exist yet. this own is used to store + * some necessary informations (md5 sum's, ...). + */ public function check_config_table() { // if the config table doesn't exist yet, create it @@ -752,8 +1103,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 */ @@ -763,12 +1114,12 @@ class PHPFSPOT { $full_path = $this->translate_path($details['directory_path']) ."/". $details['name']; if(!file_exists($full_path)) { - $this->_warning("File ". $full_path ." does not exist\n"); + $this->_error("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"); + $this->_error("File ". $full_path ." is not readable for ". $this->getuid() ."\n"); return; } @@ -787,7 +1138,6 @@ class PHPFSPOT { 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) { @@ -807,6 +1157,12 @@ class PHPFSPOT { } // gen_thumb() + /** + * returns stored md5 sum for a specific photo + * + * this function queries the phpfspot database for a + * stored MD5 checksum of the specified photo + */ public function getMD5($idx) { $result = $this->cfg_db->db_query(" @@ -823,6 +1179,9 @@ class PHPFSPOT { } // getMD5() + /** + * set MD5 sum for the specific photo + */ private function setMD5($idx, $md5) { $result = $this->cfg_db->db_exec(" @@ -832,30 +1191,62 @@ class PHPFSPOT { } // setMD5() + /** + * store current tag condition + * + * this function stores the current tag condition + * (AND or OR) in the users session variables + */ public function setTagCondition($mode) { $_SESSION['tag_condition'] = $mode; } // setTagCondition() - public function startTagSearch($searchfor) + /** + * invoke tag & date search + * + * this function will return all matching tags and store + * them in the session variable selected_tags. furthermore + * it also handles the date search. + * getPhotoSelection() will then only return the matching + * photos. + */ + public function startSearch($searchfor, $sort_order, $from = 0, $to = 0) { $_SESSION['searchfor'] = $searchfor; - $_SESSION['selected_tags'] = Array(); + $_SESSION['sort_order'] = $sort_order; + if($from != 0) + $_SESSION['from_date'] = strtotime($from); + else + unset($_SESSION['from_date']); + if($to != 0) + $_SESSION['to_date'] = strtotime($to); + else + unset($_SESSION['to_date']); - foreach($this->avail_tags as $tag) { - if(preg_match('/'. $searchfor .'/i', $this->tags[$tag])) - array_push($_SESSION['selected_tags'], $tag); + if($searchfor != "") { + /* new search, reset the current selected tags */ + $_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() + } // startSearch() + /** + * rotate image + * + * this function rotates the image according the + * specified angel. + */ private function rotateImage($img, $degrees) { - if(function_exists("imagerotate")) + if(function_exists("imagerotate")) { $img = imagerotate($img, $degrees, 0); - else - { + } else { function imagerotate($src_img, $angle) { $src_x = imagesx($src_img); @@ -905,7 +1296,9 @@ class PHPFSPOT { } break; - default: $rotate = $src_img; + default: + $rotate = $src_img; + break; }; return $rotate; @@ -920,6 +1313,9 @@ class PHPFSPOT { } // rotateImage() + /** + * return all assigned tags for the specified photo + */ private function get_photo_tags($idx) { $result = $this->db->db_query(" @@ -939,6 +1335,9 @@ class PHPFSPOT { } // get_photo_tags() + /** + * create on-the-fly images with text within + */ public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300) { if (strlen($color) != 6) @@ -965,6 +1364,9 @@ class PHPFSPOT { } // showTextImage() + /** + * check if all requirements are met + */ private function checkRequirements() { if(!function_exists("imagecreatefromjpeg")) { @@ -980,10 +1382,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)) @@ -1001,6 +1408,9 @@ class PHPFSPOT { } // _debug() + /** + * check if specified MIME type is supported + */ public function checkifImageSupported($mime) { if(in_array($mime, Array("image/jpeg"))) @@ -1010,12 +1420,393 @@ class PHPFSPOT { } // checkifImageSupported() - public function _warning($text) + public function _error($text) + { + switch($this->cfg->logging) { + case 'display': + print "\"warning\"\n"; + print $text; + break; + case 'errorlog': + error_log($text); + break; + case 'logfile': + error_log($text, 3, $his->cfg->log_file); + break; + } + + } // _error() + + /** + * output calendard input fields + */ + private function get_calendar($mode) + { + $year = $_SESSION[$mode .'_date'] ? date("Y", $_SESSION[$mode .'_date']) : date("Y"); + $month = $_SESSION[$mode .'_date'] ? date("m", $_SESSION[$mode .'_date']) : date("m"); + $day = $_SESSION[$mode .'_date'] ? date("d", $_SESSION[$mode .'_date']) : date("d"); + + $output = "prevMonth(true); + $prev = "javascript:setMonth(". date('Y',$prevStamp) .", ". date('n',$prevStamp) .", ". date('j',$prevStamp) .");"; + $nextStamp = $month->nextMonth(true); + $next = "javascript:setMonth(". date('Y',$nextStamp) .", ". date('n',$nextStamp) .", ". date('j',$nextStamp) .");"; + + $selectedDays = array ( + new Calendar_Day($year,$month,$day), + new Calendar_Day($year,12,25), + ); + + // Build the days in the month + $month->build($selectedDays); + + $this->tmpl->assign('current_month', date('F Y',$month->getTimeStamp())); + $this->tmpl->assign('prev_month', $prev); + $this->tmpl->assign('next_month', $next); + + while ( $day = $month->fetch() ) { + + if(!isset($matrix[$rows])) + $matrix[$rows] = Array(); + + $string = ""; + + $dayStamp = $day->thisDay(true); + $link = "javascript:setCalendarDate(". date('Y',$dayStamp) .", ". date('n',$dayStamp).", ". date('j',$dayStamp) .");"; + + // isFirst() to find start of week + if ( $day->isFirst() ) + $string.= "\n"; + + if ( $day->isSelected() ) { + $string.= "".$day->thisDay()."\n"; + } else if ( $day->isEmpty() ) { + $string.= " \n"; + } else { + $string.= "".$day->thisDay()."\n"; + } + + // isLast() to find end of week + if ( $day->isLast() ) + $string.= "\n"; + + $matrix[$rows][$cols] = $string; + + $cols++; + + if($cols > 7) { + $cols = 1; + $rows++; + } + } + + $this->tmpl->assign('matrix', $matrix); + $this->tmpl->assign('rows', $rows); + $this->tmpl->show("calendar.tpl"); + + } // get_calendar_matrix() + + /** + * output export page + */ + 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; + } + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { + $orig_url.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date']; + } + + $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; + + case 'MoinMoinList': + // " * [%pictureurl% %thumbnailurl%]" + print " " . htmlspecialchars("* [".$orig_url." ".$thumb_url."&fake=1.jpg]") ."
\n"; + break; + } + + } + + } // getExport() + + /** + * return all selected tags as one string + */ + private function getCurrentTags() { - print "\"warning\"\n"; - print $text; + $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() - } // _warning() + /** + * return the current photo + */ + public function getCurrentPhoto() + { + if(isset($_SESSION['current_photo'])) { + print $_SESSION['current_photo']; + } + } // getCurrentPhoto() + + /** + * tells the client browser what to do + * + * this function is getting called via AJAX by the + * client browsers. it will tell them what they have + * to do next. This is necessary for directly jumping + * into photo index or single photo view when the are + * requested with specific URLs + */ + public function whatToDo() + { + if(isset($_SESSION['current_photo']) && $_SESSION['start_action'] == 'showp') { + return "show_photo"; + } + elseif(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) { + return "showpi_tags"; + } + elseif(isset($_SESSION['start_action']) && $_SESSION['start_action'] == 'showpi') { + return "showpi"; + } + + return "nothing special"; + + } // whatToDo() + + /** + * return the current process-user + */ + private function getuid() + { + if($uid = posix_getuid()) { + if($user = posix_getpwuid($uid)) { + return $user['name']; + } + } + + return 'n/a'; + + } // getuid() + + /** + * returns a select-dropdown box to select photo index sort parameters + */ + private function get_sort_field() + { + $output = ""; + return $output; + + } // get_sort_field() + + /** + * returns the currently selected sort order + */ + private function get_sort_order() + { + switch($_SESSION['sort_order']) { + case 'date_asc': + return " ORDER BY p.time ASC"; + break; + case 'date_desc': + return " ORDER BY p.time DESC"; + break; + case 'name_asc': + return " ORDER BY p.name ASC"; + break; + case 'name_desc': + return " ORDER BY p.name DESC"; + break; + } + + } // get_sort_order() + + /*** + * return the next to be shown slide show image + * + * this function returns the URL of the next image + * in the slideshow sequence. + */ + public function getNextSlideShowImage() + { + $all_photos = $this->getPhotoSelection(); + + if(!isset($_SESSION['slideshow_img']) || $_SESSION['slideshow_img'] == count($all_photos)-1) + $_SESSION['slideshow_img'] = 0; + else + $_SESSION['slideshow_img']++; + + $server_name = $_SERVER['SERVER_NAME']; + if(!isset($_SERVER['HTTPS'])) $protocol = "http"; + else $protocol = "https"; + + return $protocol ."://". $server_name . $this->cfg->web_path ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width; + + } // getNextSlideShowImage() + + /*** + * return the previous to be shown slide show image + * + * this function returns the URL of the previous image + * in the slideshow sequence. + */ + public function getPrevSlideShowImage() + { + $all_photos = $this->getPhotoSelection(); + + if(!isset($_SESSION['slideshow_img']) || $_SESSION['slideshow_img'] == 0) + $_SESSION['slideshow_img'] = 0; + else + $_SESSION['slideshow_img']--; + + $server_name = $_SERVER['SERVER_NAME']; + if(!isset($_SERVER['HTTPS'])) $protocol = "http"; + else $protocol = "https"; + + return $protocol ."://". $server_name . $this->cfg->web_path ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width; + + } // getPrevSlideShowImage() + + public function resetSlideShow() + { + if(isset($_SESSION['slideshow_img'])) + unset($_SESSION['slideshow_img']); + } // resetSlideShow() + + /*** + * get random photo + * + * this function will get all photos from the fspot + * database and randomly return ONE entry + * + * saddly there is yet no sqlite3 function which returns + * the bulk result in array, so we have to fill up our + * own here. + */ + public function get_random_photo() + { + $all = Array(); + + $result = $this->db->db_query(" + SELECT id + FROM photos + "); + + while($row = $this->db->db_fetch_object($result)) { + array_push($all, $row['id']); + } + + return $all[array_rand($all)]; + + } // get_random_photo() + + /** + * validates provided date + * + * this function validates if the provided date + * contains a valid date and will return true + * if it is. + */ + public function isValidDate($date_str) + { + $timestamp = strtotime($date_str); + + if(is_numeric($timestamp)) + return true; + + return false; + + } // isValidDate() + + /** + * timestamp to string conversion + */ + private function ts2str($timestamp) + { + return strftime("%Y-%m-%d", $timestamp); + } // ts2str() + + private function extractTags($tags_str) + { + $not_validated = split(',', $_GET['tags']); + $validated = array(); + + foreach($not_validated as $tag) { + if(is_numeric($tag)) + array_push($validated, $tag); + } + + return $validated; + + } // extractTags() }