X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=ffb511d97361df9c475132a27bb0c9e4cc6d7f99;hp=579054d6ebd70a18caba3abd46612723c6e5474f;hb=758887b79c875b31b86d427e27f515e2c3d2a257;hpb=a63f899582afffadbabfdf422489b7937f0e6a1e diff --git a/phpfspot.class.php b/phpfspot.class.php index 579054d..ffb511d 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -1,5 +1,26 @@ tmpl->assign('searchfor', $_SESSION['searchfor']); @@ -95,20 +135,34 @@ class PHPFSPOT { $this->tmpl->show("export.tpl"); return; break; - + case 'slideshow': + $this->tmpl->show("slideshow.tpl"); + return; + break; } $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; @@ -136,6 +190,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(" @@ -148,6 +208,13 @@ 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)) { @@ -160,24 +227,43 @@ class PHPFSPOT { } // 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; } @@ -191,6 +277,12 @@ 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); @@ -205,8 +297,10 @@ class PHPFSPOT { /* 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 */ @@ -218,11 +312,11 @@ class PHPFSPOT { } $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_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; + $current_tags = $this->getCurrentTags(); if($current_tags != "") { $extern_link.= "&tags=". $current_tags; } @@ -254,6 +348,7 @@ class PHPFSPOT { } else { $this->_warning("Can't open file ". $thumb_path ."\n"); + return; } if($previous_img) { @@ -266,13 +361,24 @@ class PHPFSPOT { $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 @@ -320,12 +426,22 @@ 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 = ""; @@ -342,11 +458,15 @@ class PHPFSPOT { } // 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 the result of a date search are displayed, reset them - $this->resetDateSearch(); - if(!isset($_SESSION['selected_tags'])) $_SESSION['selected_tags'] = Array(); @@ -355,6 +475,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'])) { @@ -365,6 +491,12 @@ class PHPFSPOT { } // delTag() + /** + * reset tag selection + * + * if there is any tag selection, it will be + * deleted now + */ public function resetTags() { if(isset($_SESSION['selected_tags'])) @@ -372,6 +504,12 @@ class PHPFSPOT { } // 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'])) @@ -379,6 +517,12 @@ class PHPFSPOT { } // resetPhotoView(); + /** + * reset tag search + * + * if any tag search has taken place, reset + * it now + */ public function resetTagSearch() { if(isset($_SESSION['searchfor'])) @@ -386,6 +530,12 @@ class PHPFSPOT { } // resetTagSearch() + /** + * reset date search + * + * if any date search has taken place, reset + * it now + */ public function resetDateSearch() { if(isset($_SESSION['from_date'])) @@ -395,22 +545,49 @@ class PHPFSPOT { } // 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() { $matched_photos = Array(); + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { + $from_date = strtotime($_SESSION['from_date']); + $to_date = strtotime($_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($matched_photos, $row['photo_id']); } @@ -425,14 +602,17 @@ 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') { @@ -462,49 +642,42 @@ 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($matched_photos, $row['photo_id']); } return $matched_photos; } - if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { - $from_date = strtotime($_SESSION['from_date']); - $to_date = strtotime($_SESSION['to_date']); - $result = $this->db->db_query(" - SELECT DISTINCT photo_id - FROM photo_tags pt - INNER JOIN photos p - ON p.id=pt.photo_id - WHERE - time>='". $from_date ."' - AND - time<='". $to_date ."' - ORDER BY p.time ASC - "); - while($row = $this->db->db_fetch_object($result)) { - array_push($matched_photos, $row['photo_id']); - } - 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($matched_photos, $row['photo_id']); } @@ -512,6 +685,12 @@ class PHPFSPOT { } // 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(); @@ -594,6 +773,15 @@ 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', $_SESSION['from_date']); + $this->tmpl->assign('to_date', $_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) { @@ -619,6 +807,8 @@ class PHPFSPOT { } } + $dotdot_made = 0; + for($i = 1; $i <= $last_page; $i++) { if($current_page == $i) @@ -653,12 +843,16 @@ class PHPFSPOT { $i == $current_page+3 || $i == $current_page+2 || $i == $current_page+1 /* three after */) { $page_select.= $select; + $dotdot_made = 0; continue; } } - $page_select.= "."; + if(!$dotdot_made) { + $page_select.= "......... "; + $dotdot_made = 1; + } } /* only show the page selector if we have more then one page */ @@ -677,8 +871,10 @@ class PHPFSPOT { } $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); @@ -698,6 +894,9 @@ class PHPFSPOT { } // showPhotoIndex() + /** + * show credit template + */ public function showCredits() { $this->tmpl->assign('version', $this->cfg->version); @@ -706,10 +905,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); @@ -754,9 +962,11 @@ 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; } @@ -838,12 +1048,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 @@ -910,7 +1130,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) { @@ -930,6 +1149,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(" @@ -946,6 +1171,9 @@ class PHPFSPOT { } // getMD5() + /** + * set MD5 sum for the specific photo + */ private function setMD5($idx, $md5) { $result = $this->cfg_db->db_exec(" @@ -955,38 +1183,55 @@ 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, $from, $to, $sort_order) { $_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); - } - - $this->resetDateSearch(); - - } // startTagSearch() - - public function startDateSearch($from, $to) - { $_SESSION['from_date'] = $from; $_SESSION['to_date'] = $to; - } + $_SESSION['sort_order'] = $sort_order; + + 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); + } + } + } // 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); @@ -1036,7 +1281,9 @@ class PHPFSPOT { } break; - default: $rotate = $src_img; + default: + $rotate = $src_img; + break; }; return $rotate; @@ -1051,6 +1298,9 @@ class PHPFSPOT { } // rotateImage() + /** + * return all assigned tags for the specified photo + */ private function get_photo_tags($idx) { $result = $this->db->db_query(" @@ -1070,6 +1320,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) @@ -1096,6 +1349,9 @@ class PHPFSPOT { } // showTextImage() + /** + * check if all requirements are met + */ private function checkRequirements() { if(!function_exists("imagecreatefromjpeg")) { @@ -1137,6 +1393,9 @@ class PHPFSPOT { } // _debug() + /** + * check if specified MIME type is supported + */ public function checkifImageSupported($mime) { if(in_array($mime, Array("image/jpeg"))) @@ -1153,19 +1412,31 @@ class PHPFSPOT { } // _warning() + /** + * output calendard input fields + */ private function get_calendar($mode) { $year = $_SESSION[$mode .'_date'] ? date("Y", strtotime($_SESSION[$mode .'_date'])) : date("Y"); $month = $_SESSION[$mode .'_date'] ? date("m", strtotime($_SESSION[$mode .'_date'])) : date("m"); $day = $_SESSION[$mode .'_date'] ? date("d", strtotime($_SESSION[$mode .'_date'])) : date("d"); - $output = "\n"; - $output.= "\n"; - $output.= "\n"; + $output = "getPhotoSelection(); @@ -1281,6 +1554,9 @@ class PHPFSPOT { } // getExport() + /** + * return all selected tags as one string + */ private function getCurrentTags() { $current_tags = ""; @@ -1293,6 +1569,9 @@ class PHPFSPOT { } // getCurrentTags() + /** + * return the current photo + */ public function getCurrentPhoto() { if(isset($_SESSION['current_photo'])) { @@ -1300,17 +1579,24 @@ class PHPFSPOT { } } // 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['selected_tags']) && !empty($_SESSION['selected_tags'])) { - return "showpi_tags"; - } - elseif(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { - return "showpi_date"; - } - elseif(isset($_SESSION['current_photo'])) { + if(isset($_SESSION['current_photo']) && $_SESSION['start_action'] == 'showp') { return "show_photo"; } + elseif((isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) || + (isset($_SESSION['from_date']) && isset($_SESSION['to_date']))) { + return "showpi"; + } elseif(isset($_SESSION['start_action']) && $_SESSION['start_action'] == 'showpi') { return "showpi"; } @@ -1319,6 +1605,9 @@ class PHPFSPOT { } // whatToDo() + /** + * return the current process-user + */ private function getuid() { if($uid = posix_getuid()) { @@ -1331,6 +1620,96 @@ class PHPFSPOT { } // 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() + + 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() + + 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[0]); + } + + return array_rand($all); + + } // get_random_photo() + } ?>