X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=2e491c5f4e4af4e2da07fa26ab98ded6faeb8c81;hp=5e25f21b81d446d3c1097b630a44b40ba7ae978c;hb=350ffa92282e6b5adf3dc2b854fbb2255c845b8e;hpb=99b313d1ae233bc46374a6ba435447b5f7b669af diff --git a/phpfspot.class.php b/phpfspot.class.php index 5e25f21..2e491c5 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); $this->check_config_table(); @@ -49,44 +83,78 @@ 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('from_date', $this->get_calendar()); - $this->tmpl->assign('to_date', $this->get_calendar()); + + $_SESSION['start_action'] = $_GET['mode']; switch($_GET['mode']) { case 'showpi': if(isset($_GET['tags'])) { $_SESSION['selected_tags'] = split(',', $_GET['tags']); } + if(isset($_GET['from_date'])) { + $_SESSION['from_date'] = $_GET['from_date']; + } + if(isset($_GET['to_date'])) { + $_SESSION['to_date'] = $_GET['to_date']; + } break; case 'showp': if(isset($_GET['tags'])) { $_SESSION['selected_tags'] = split(',', $_GET['tags']); + $_SESSION['start_action'] = 'showp'; } if(isset($_GET['id'])) { $_SESSION['current_photo'] = $_GET['id']; + $_SESSION['start_action'] = 'showp'; + } + if(isset($_GET['from_date'])) { + $_SESSION['from_date'] = $_GET['from_date']; + } + if(isset($_GET['to_date'])) { + $_SESSION['to_date'] = $_GET['to_date']; } break; case 'export': $this->tmpl->show("export.tpl"); return; break; - } + $this->tmpl->assign('from_date', $this->get_calendar('from')); + $this->tmpl->assign('to_date', $this->get_calendar('to')); $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; @@ -114,6 +182,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(" @@ -126,6 +200,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)) { @@ -138,24 +219,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; } @@ -169,6 +269,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); @@ -177,14 +283,16 @@ class PHPFSPOT { } if(!is_readable($orig_path)) { - $this->_warning("Photo ". $orig_path ." is not readable for user ". get_current_user() ."
\n"); + $this->_warning("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 */ @@ -199,11 +307,14 @@ class PHPFSPOT { $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; } + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { + $extern_link.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date']; + } $this->tmpl->assign('extern_link', $extern_link); @@ -229,6 +340,7 @@ class PHPFSPOT { } else { $this->_warning("Can't open file ". $thumb_path ."\n"); + return; } if($previous_img) { @@ -246,8 +358,17 @@ class PHPFSPOT { } // 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 @@ -295,12 +416,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 = ""; @@ -317,8 +448,18 @@ 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(); @@ -327,6 +468,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'])) { @@ -337,27 +484,71 @@ 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() { - unset($_SESSION['current_photo']); + 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(); /* return a search result */ if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') { @@ -372,9 +563,9 @@ class PHPFSPOT { ORDER BY p.time ASC "); 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 */ @@ -432,11 +623,31 @@ class PHPFSPOT { } 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; } + 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(" SELECT DISTINCT photo_id @@ -446,12 +657,18 @@ class PHPFSPOT { ORDER BY p.time ASC "); 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(); @@ -612,6 +829,9 @@ class PHPFSPOT { if($current_tags != "") { $extern_link.= "&tags=". $current_tags; } + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { + $extern_link.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date']; + } $export_link = "index.php?mode=export"; @@ -635,43 +855,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); @@ -680,10 +866,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); @@ -728,9 +923,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; } @@ -812,12 +1009,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 @@ -849,7 +1056,6 @@ class PHPFSPOT { $resolutions = Array( $this->cfg->thumb_width, - $this->cfg->bubble_width, $this->cfg->photo_width, $this->cfg->mini_width, ); @@ -866,7 +1072,7 @@ class PHPFSPOT { } if(!is_readable($full_path)) { - $this->_warning("File ". $full_path ." is not readable for ". get_current_user() ."\n"); + $this->_warning("File ". $full_path ." is not readable for ". $this->getuid() ."\n"); return; } @@ -885,7 +1091,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) { @@ -905,6 +1110,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(" @@ -921,6 +1132,9 @@ class PHPFSPOT { } // getMD5() + /** + * set MD5 sum for the specific photo + */ private function setMD5($idx, $md5) { $result = $this->cfg_db->db_exec(" @@ -930,12 +1144,26 @@ 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() + /** + * invoke tag search + * + * this function will return all matching tags and store + * them in the session variable selected_tags. + * getPhotoSelection() will then only return the matching + * photos. + */ public function startTagSearch($searchfor) { $_SESSION['searchfor'] = $searchfor; @@ -946,14 +1174,34 @@ class PHPFSPOT { array_push($_SESSION['selected_tags'], $tag); } + $this->resetDateSearch(); + } // startTagSearch() + /** + * invoke date search + * + * this function in fact does nothing then only setting + * the from- and to-date in the users session variables. + * the result is generated by getPhotoSelection(). + */ + public function startDateSearch($from, $to) + { + $_SESSION['from_date'] = $from; + $_SESSION['to_date'] = $to; + } + + /** + * 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); @@ -1003,7 +1251,9 @@ class PHPFSPOT { } break; - default: $rotate = $src_img; + default: + $rotate = $src_img; + break; }; return $rotate; @@ -1018,6 +1268,9 @@ class PHPFSPOT { } // rotateImage() + /** + * return all assigned tags for the specified photo + */ private function get_photo_tags($idx) { $result = $this->db->db_query(" @@ -1037,6 +1290,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) @@ -1063,6 +1319,9 @@ class PHPFSPOT { } // showTextImage() + /** + * check if all requirements are met + */ private function checkRequirements() { if(!function_exists("imagecreatefromjpeg")) { @@ -1104,6 +1363,9 @@ class PHPFSPOT { } // _debug() + /** + * check if specified MIME type is supported + */ public function checkifImageSupported($mime) { if(in_array($mime, Array("image/jpeg"))) @@ -1120,38 +1382,103 @@ class PHPFSPOT { } // _warning() - private function get_calendar() + /** + * output calendard input fields + */ + private function get_calendar($mode) { -// require_once CALENDAR_ROOT.'Year.php'; -// require_once CALENDAR_ROOT.'Month.php'; -// require_once CALENDAR_ROOT.'Day.php'; + $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"); -// $Year = new Calendar_Year(); -// $Month = new Calendar_Month(); -// $Day = new Calendar_Day(); + $output = "\n"; + $output.= "\n"; + $output.= "\n"; + return $output; - $output = "\n"; + } // get_calendar() - $output.= "\n"; + /** + * output calendar matrix + */ + public function get_calendar_matrix($year = 0, $month = 0, $day = 0) + { + if (!isset($year)) $year = date('Y'); + if (!isset($month)) $month = date('m'); + if (!isset($day)) $day = date('d'); + $rows = 1; + $cols = 1; + $matrix = Array(); + + require_once CALENDAR_ROOT.'Month/Weekdays.php'; + require_once CALENDAR_ROOT.'Day.php'; + + // Build the month + $month = new Calendar_Month_Weekdays($year,$month); + + // Create links + $prevStamp = $month->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); - $output.= "\n"; - return $output; + $this->tmpl->assign('matrix', $matrix); + $this->tmpl->assign('rows', $rows); + $this->tmpl->show("calendar.tpl"); - } // get_calendar() + } // get_calendar_matrix() + /** + * output export page + */ public function getExport($mode) { $pictures = $this->getPhotoSelection(); @@ -1168,6 +1495,9 @@ class PHPFSPOT { 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; @@ -1188,6 +1518,9 @@ class PHPFSPOT { } // getExport() + /** + * return all selected tags as one string + */ private function getCurrentTags() { $current_tags = ""; @@ -1200,6 +1533,9 @@ class PHPFSPOT { } // getCurrentTags() + /** + * return the current photo + */ public function getCurrentPhoto() { if(isset($_SESSION['current_photo'])) { @@ -1207,6 +1543,49 @@ 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'])) { + return "show_photo"; + } + 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() + } ?>