X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=eb2312bf709a9b5ff0302d4538fa18480e6c2a1b;hp=e0a87a567e184ac83174bc222eee0745dc4ddc61;hb=5aacb6d86fa943c66ee94eb603887bb40e034ec5;hpb=f32fe065bf1569d42d4e8921bc0cab0aa98ef782;ds=sidebyside diff --git a/phpfspot.class.php b/phpfspot.class.php index e0a87a5..eb2312b 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -2,8 +2,9 @@ /*************************************************************************** * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,19 +24,80 @@ require_once "phpfspot_cfg.php"; require_once "phpfspot_db.php"; -require_once "phpfspot_tmpl.php"; +/** + * PHPFSPOT main class + * + * this class contains the most functions which will to the major + * work for phpfspot. + * + * @package phpfspot + */ class PHPFSPOT { + /** + * phpfspot configuration + * @access public + * @see PHPFSPOT_CFG() + * @var PHPFSPOT_CFG + */ var $cfg; + + /** + * SQLite database handle to f-spot database + * @see PHPFSPOT_DB() + * @access public + * @var PHPFSPOT_DB + */ var $db; + + /** + * SQLite database handle to phpfspot database + * @see PHPFSPOT_DB() + * @access public + * @var PHPFSPOT_DB + */ var $cfg_db; + + /** + * Smarty template engine + * @link http://smarty.php.net smarty.php.net + * @see PHPFSPOT_TMPL() + * @access public + * @var PHPFSPOT_TMPL + */ var $tmpl; + + /** + * full tag - list + * @access public + * @var array + */ var $tags; + + /** + * list of available, not-selected, tags + * @access public + * @var array + */ var $avail_tags; /** - * class constructor + * true if runtime error occued + * @access private + * @var boolean + */ + private $runtime_error = false; + + /** + * F-Spot database version + * @access private + * @var integer + */ + private $dbver; + + /** + * class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver) * * this function will be called on class construct * and will check requirements, loads configuration, @@ -43,45 +105,120 @@ class PHPFSPOT { */ public function __construct() { + /** + * register PHPFSPOT class global + * + * @global PHPFSPOT $GLOBALS['phpfspot'] + * @name $phpfspot + */ + $GLOBALS['phpfspot'] =& $this; + + $this->cfg = new PHPFSPOT_CFG; + + /* verify config settings */ + if($this->check_config_options()) { + exit(1); + } + + /* set application name and version information */ + $this->cfg->product = "phpfspot"; + $this->cfg->version = "1.4"; + + $this->sort_orders= array( + 'date_asc' => 'Date ↑', + 'date_desc' => 'Date ↓', + 'name_asc' => 'Name ↑', + 'name_desc' => 'Name ↓', + 'tags_asc' => 'Tags ↑', + 'tags_desc' => 'Tags ↓', + ); + /* Check necessary requirements */ - if(!$this->checkRequirements()) { + if(!$this->check_requirements()) { exit(1); } - $this->cfg = new PHPFSPOT_CFG; + /******* Opening F-Spot's sqlite database *********/ - $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db); - + /* Check if database file is writeable */ + if(!is_writeable($this->cfg->fspot_db)) { + print $this->cfg->fspot_db ." is not writeable for user ". $this->getuid() ."\n"; + exit(1); + } + + /* open the database */ + $this->db = new PHPFSPOT_DB($this, $this->cfg->fspot_db); + + /* change sqlite temp directory, if requested */ + if(isset($this->cfg->sqlite_temp_dir)) { + $this->db->db_exec(" + PRAGMA + temp_store_directory = '". $this->cfg->sqlite_temp_dir ."' + "); + } + + $this->dbver = $this->getFspotDBVersion(); + + if(!is_writeable($this->cfg->base_path ."/templates_c")) { + print $this->cfg->base_path ."/templates_c: directory is not writeable for user ". $this->getuid() ."\n"; + exit(1); + } + + if(!is_writeable($this->cfg->thumb_path)) { + print $this->cfg->thumb_path .": directory is not writeable for user ". $this->getuid() ."\n"; + exit(1); + } + + /******* Opening phpfspot's sqlite database *********/ + + /* Check if directory where the database file is stored is writeable */ if(!is_writeable(dirname($this->cfg->phpfspot_db))) { - print dirname($this->cfg->phpfspot_db) .": directory is not writeable!"; + print dirname($this->cfg->phpfspot_db) .": directory is not writeable for user ". $this->getuid() ."\n"; exit(1); } - - $this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db); + + /* Check if database file is writeable */ 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(); + /* open the database */ + $this->cfg_db = new PHPFSPOT_DB($this, $this->cfg->phpfspot_db); + + /* change sqlite temp directory, if requested */ + if(isset($this->cfg->sqlite_temp_dir)) { + $this->cfg_db->db_exec(" + PRAGMA + temp_store_directory = '". $this->cfg->sqlite_temp_dir ."' + "); + } + + /* Check if some tables need to be created */ + $this->check_config_table(); - $this->tmpl = new PHPFSPOT_TMPL($this); + /* overload Smarty class with our own template handler */ + require_once "phpfspot_tmpl.php"; + $this->tmpl = new PHPFSPOT_TMPL(); - $this->get_tags(); + /* check if all necessary indices exist */ + $this->checkDbIndices(); - session_start(); + /* if session is not yet started, do it now */ + if(session_id() == "") + session_start(); if(!isset($_SESSION['tag_condition'])) $_SESSION['tag_condition'] = 'or'; if(!isset($_SESSION['sort_order'])) - $_SESSION['sort_order'] = 'date_asc'; + $_SESSION['sort_order'] = 'date_desc'; - if(!isset($_SESSION['searchfor'])) - $_SESSION['searchfor'] = ''; + if(!isset($_SESSION['searchfor_tag'])) + $_SESSION['searchfor_tag'] = ''; - // 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) + // if begin_with is still set but thumbs_per_page is now 0, unset it + if(isset($_SESSION['begin_with']) && $this->cfg->thumbs_per_page == 0) unset($_SESSION['begin_with']); } // __construct() @@ -102,57 +239,73 @@ class PHPFSPOT { */ public function show() { - $this->tmpl->assign('searchfor', $_SESSION['searchfor']); + $this->tmpl->assign('searchfor_tag', $_SESSION['searchfor_tag']); $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']; + if(isset($_GET['mode'])) { - switch($_GET['mode']) { - case 'showpi': - if(isset($_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']); - } - if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) { - $_SESSION['to_date'] = strtotime($_GET['to_date']); - } - 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; + $_SESSION['start_action'] = $_GET['mode']; + + switch($_GET['mode']) { + case 'showpi': + if(isset($_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'] ." 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 'export': + $this->tmpl->show("export.tpl"); + return; + break; + case 'slideshow': + $this->tmpl->show("slideshow.tpl"); + return; + break; + case 'rss': + if(isset($_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"); + } + $this->getRSSFeed(); + return; + break; + } } if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) $this->tmpl->assign('date_search_enabled', true); + $this->tmpl->register_function("sort_select_list", array(&$this, "smarty_sort_select_list"), false); $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"); @@ -163,7 +316,7 @@ class PHPFSPOT { * * 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 + * arrays within this class for later usage. in * fact, if the user requests (hide_tags) it will * opt-out some of them. * @@ -174,24 +327,57 @@ class PHPFSPOT { $this->avail_tags = Array(); $count = 0; - $result = $this->db->db_query(" - SELECT id,name - FROM tags - ORDER BY sort_priority ASC - "); + if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { + $query_str=" + SELECT + DISTINCT t1.id as id, t1.name as name + FROM + photo_tags pt1 + INNER JOIN photo_tags + pt2 ON pt1.photo_id=pt2.photo_id + INNER JOIN tags t1 + ON t1.id=pt1.tag_id + INNER JOIN tags t2 + ON t2.id=pt2.tag_id + WHERE + t2.name IN ('".implode("','",$this->cfg->show_tags)."') + ORDER BY + t1.sort_priority ASC"; + + $result = $this->db->db_query($query_str); + } + else + { + $result = $this->db->db_query(" + SELECT id,name + FROM tags + ORDER BY sort_priority ASC + "); + } while($row = $this->db->db_fetch_object($result)) { $tag_id = $row['id']; $tag_name = $row['name']; - /* check if config requests to ignore this tag */ + /* if the user has specified to ignore this tag in phpfspot's + configuration, ignore it here so it does not get added to + the tag list. + */ if(in_array($row['name'], $this->cfg->hide_tags)) continue; + /* if you include the following if-clause and the user has specified + to only show certain tags which are specified in phpfspot's + configuration, ignore all others so they will not be added to the + tag list. + if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags) && + !in_array($row['name'], $this->cfg->show_tags)) + continue; + */ + $this->tags[$tag_id] = $tag_name; $this->avail_tags[$count] = $tag_id; - $count++; } @@ -203,16 +389,55 @@ class PHPFSPOT { * * retrieve all available details from f-spot's * database and return them as object + * @param integer $idx + * @return object|null */ public function get_photo_details($idx) { - $result = $this->db->db_query(" - SELECT * - FROM photos - WHERE id='". $idx ."' - "); - - return $this->db->db_fetch_object($result); + if($this->dbver < 9) { + $query_str = " + SELECT p.id, p.name, p.time, p.directory_path, p.description + FROM photos p + "; + } + else { + $query_str = " + SELECT p.id, p.uri, p.time, p.description + FROM photos p + "; + } + + /* if show_tags is set, only return details for photos which + are specified to be shown + */ + if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { + $query_str.= " + INNER JOIN photo_tags pt + ON p.id=pt.photo_id + INNER JOIN tags t + ON pt.tag_id=t.id + WHERE p.id='". $idx ."' + AND t.name IN ('".implode("','",$this->cfg->show_tags)."')"; + } + else { + $query_str.= " + WHERE p.id='". $idx ."' + "; + } + + if($result = $this->db->db_query($query_str)) { + + $row = $this->db->db_fetch_object($result); + + if($this->dbver < 9) { + $row['uri'] = "file://". $row['directory_path'] ."/". $row['name']; + } + + return $row; + + } + + return null; } // get_photo_details @@ -222,27 +447,53 @@ class PHPFSPOT { * this function returns aligned (length) names for * an specific photo. If the length of the name exceeds * $limit the name will be shrinked (...) + * @param integer $idx + * @param integer $limit + * @return string|null */ 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)); + if($long_name = $this->parse_uri($details['uri'], 'filename')) { + $name = $this->shrink_text($long_name, $limit); + return $name; } - return $name; } + return null; + } // getPhotoName() + /** + * shrink text according provided limit + * + * If the length of the name exceeds $limit the + * text will be shortend and some content in between + * will be replaced with "..." + * @param string $ext + * @param integer $limit + * @return string + */ + private function shrink_text($text, $limit) + { + if($limit != 0 && strlen($text) > $limit) { + $text = substr($text, 0, $limit-5) ."...". substr($text, -($limit-5)); + } + + return $text; + + } // shrink_text(); + /** * 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 + * @param string $path + * @return string */ - public function translate_path($path, $width = 0) + public function translate_path($path) { return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path); @@ -253,6 +504,7 @@ class PHPFSPOT { * * this function provides all the necessary information * for the single photo template. + * @param integer photo */ public function showPhoto($photo) { @@ -291,31 +543,37 @@ class PHPFSPOT { 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); + $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath')); + $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo); if(!file_exists($orig_path)) { $this->_error("Photo ". $orig_path ." does not exist!
\n"); + return; } if(!is_readable($orig_path)) { $this->_error("Photo ". $orig_path ." is not readable for user ". $this->getuid() ."
\n"); + return; } /* 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); + $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo); } - /* get f-spot database meta information */ - $meta = $this->get_meta_informations($orig_path); + /* get mime-type, height and width from the original photo */ + $info = getimagesize($orig_path); + + /* get EXIF information if JPEG */ + if($info['mime'] == "image/jpeg") { + $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]; } @@ -334,30 +592,30 @@ class PHPFSPOT { $this->tmpl->assign('extern_link', $extern_link); - if(file_exists($thumb_path)) { + if(!file_exists($thumb_path)) { + $this->_error("Can't open file ". $thumb_path ."\n"); + return; + } - $info = getimagesize($thumb_path); + $info_thumb = getimagesize($thumb_path); - $this->tmpl->assign('description', $details['description']); - $this->tmpl->assign('image_name', $details['name']); + $this->tmpl->assign('description', $details['description']); + $this->tmpl->assign('image_name', $this->parse_uri($details['uri'], 'filename')); - $this->tmpl->assign('width', $info[0]); - $this->tmpl->assign('height', $info[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('width', $info_thumb[0]); + $this->tmpl->assign('height', $info_thumb[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('image_filename', $this->parse_uri($details['uri'], 'filename')); - $this->tmpl->assign('tags', $this->get_photo_tags($photo)); - $this->tmpl->assign('current', $current); - } - else { - $this->_error("Can't open file ". $thumb_path ."\n"); - return; - } + $this->tmpl->assign('tags', $this->get_photo_tags($photo)); + $this->tmpl->assign('current_page', $this->getCurrentPage($current, $count)); + $this->tmpl->assign('current_img', $photo); if($previous_img) { $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");"); @@ -369,6 +627,7 @@ class PHPFSPOT { $this->tmpl->assign('next_img', $next_img); } $this->tmpl->assign('mini_width', $this->cfg->mini_width); + $this->tmpl->assign('photo_width', $this->cfg->photo_width); $this->tmpl->assign('photo_number', $i); $this->tmpl->assign('photo_count', count($all_photos)); @@ -385,6 +644,9 @@ class PHPFSPOT { */ public function getAvailableTags() { + /* retrive tags from database */ + $this->get_tags(); + $output = ""; $result = $this->db->db_query(" @@ -406,6 +668,10 @@ class PHPFSPOT { $max_size = 125; // max font size in % $min_size = 75; // min font size in % + // color + $max_sat = hexdec('cc'); + $min_sat = hexdec('44'); + // get the largest and smallest array values $max_qty = max(array_values($tags)); $min_qty = min(array_values($tags)); @@ -419,6 +685,7 @@ class PHPFSPOT { // determine the font-size increment // this is the increase per tag quantity (times used) $step = ($max_size - $min_size)/($spread); + $step_sat = ($max_sat - $min_sat)/($spread); // loop through our tag array foreach ($tags as $key => $value) { @@ -426,15 +693,23 @@ class PHPFSPOT { if(isset($_SESSION['selected_tags']) && in_array($key, $_SESSION['selected_tags'])) continue; - // calculate CSS font-size - // find the $value in excess of $min_qty - // multiply by the font-size increment ($size) - // and add the $min_size set above + // calculate CSS font-size + // find the $value in excess of $min_qty + // multiply by the font-size increment ($size) + // and add the $min_size set above $size = $min_size + (($value - $min_qty) * $step); // uncomment if you want sizes in whole %: $size = ceil($size); - $output.= "". $this->tags[$key] .", "; + $color = $min_sat + ($value - $min_qty) * $step_sat; + + $r = '44'; + $g = dechex($color); + $b = '88'; + + if(isset($this->tags[$key])) { + $output.= "". $this->tags[$key] .", "; + } } @@ -449,10 +724,15 @@ class PHPFSPOT { * this function output all tags which have been selected * by the user. the selected tags are stored in the * session-variable $_SESSION['selected_tags'] + * @return string */ public function getSelectedTags() { + /* retrive tags from database */ + $this->get_tags(); + $output = ""; + foreach($this->avail_tags as $tag) { // return all selected tags @@ -461,8 +741,13 @@ class PHPFSPOT { } } - $output = substr($output, 0, strlen($output)-2); - print $output; + if($output != "") { + $output = substr($output, 0, strlen($output)-2); + return $output; + } + else { + return "no tags selected"; + } } // getSelectedTags() @@ -472,14 +757,21 @@ class PHPFSPOT { * this function will add the specified to users current * tag selection. if a date search has been made before * it will be now cleared + * @return string */ public function addTag($tag) { if(!isset($_SESSION['selected_tags'])) $_SESSION['selected_tags'] = Array(); + if(isset($_SESSION['searchfor_tag'])) + unset($_SESSION['searchfor_tag']); + if(!in_array($tag, $_SESSION['selected_tags'])) array_push($_SESSION['selected_tags'], $tag); + + + return "ok"; } // addTag() @@ -488,15 +780,22 @@ class PHPFSPOT { * * this function removes the specified tag from * users current tag selection + * @param string $tag + * @return string */ public function delTag($tag) { + if(isset($_SESSION['searchfor_tag'])) + unset($_SESSION['searchfor_tag']); + if(isset($_SESSION['selected_tags'])) { $key = array_search($tag, $_SESSION['selected_tags']); unset($_SESSION['selected_tags'][$key]); sort($_SESSION['selected_tags']); } + return "ok"; + } // delTag() /** @@ -512,6 +811,58 @@ class PHPFSPOT { } // resetTags() + /** + * returns the value for the autocomplet tag-search + * @return string + */ + public function get_xml_tag_list() + { + if(!isset($_GET['search']) || !is_string($_GET['search'])) + $_GET['search'] = ''; + + $length = 15; + $i = 1; + + /* retrive tags from database */ + $this->get_tags(); + + $matched_tags = Array(); + + header("Content-Type: text/xml"); + + $string = "\n"; + $string.= "\n"; + + foreach($this->avail_tags as $tag) + { + if(!empty($_GET['search']) && + preg_match("/". $_GET['search'] ."/i", $this->tags[$tag]) && + count($matched_tags) < $length) { + + $count = $this->get_num_photos($tag); + + if($count == 1) { + $string.= " ". $this->tags[$tag] ."\n"; + } + else { + $string.= " ". $this->tags[$tag] ."\n"; + + } + $i++; + } + + /* if we have collected enough items, break out */ + if(count($matched_tags) >= $length) + break; + } + + $string.= "\n"; + + return $string; + + } // get_xml_tag_list() + + /** * reset single photo * @@ -528,17 +879,28 @@ class PHPFSPOT { /** * reset tag search * - * if any tag search has taken place, reset - * it now + * if any tag search has taken place, reset it now */ public function resetTagSearch() { - if(isset($_SESSION['searchfor'])) - unset($_SESSION['searchfor']); + if(isset($_SESSION['searchfor_tag'])) + unset($_SESSION['searchfor_tag']); } // resetTagSearch() - /** + /** + * reset name search + * + * if any name search has taken place, reset it now + */ + public function resetNameSearch() + { + if(isset($_SESSION['searchfor_name'])) + unset($_SESSION['searchfor_name']); + + } // resetNameSearch() + + /** * reset date search * * if any date search has taken place, reset @@ -560,38 +922,70 @@ class PHPFSPOT { * the tag-selection, tag- or date-search. * the tag-search also has to take care of AND * and OR conjunctions + * @return array */ public function getPhotoSelection() { $matched_photos = Array(); + $additional_where_cond = ""; if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { $from_date = $_SESSION['from_date']; $to_date = $_SESSION['to_date']; - $additional_where_cond = " + $additional_where_cond.= " p.time>='". $from_date ."' AND p.time<='". $to_date ."' "; } + if(isset($_SESSION['searchfor_name'])) { + if($this->dbver < 9) { + $additional_where_cond.= " + ( + p.name LIKE '%". $_SESSION['searchfor_name'] ."%' + OR + p.description LIKE '%". $_SESSION['searchfor_name'] ."%' + ) + "; + } + else { + $additional_where_cond.= " + ( + basename(p.uri) LIKE '%". $_SESSION['searchfor_name'] ."%' + OR + p.description LIKE '%". $_SESSION['searchfor_name'] ."%' + ) + "; + } + } + if(isset($_SESSION['sort_order'])) { $order_str = $this->get_sort_order(); } /* return a search result */ - if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') { + if(isset($_SESSION['searchfor_tag']) && $_SESSION['searchfor_tag'] != '') { $query_str = " - SELECT DISTINCT photo_id - FROM photo_tags pt - INNER JOIN photos p - ON p.id=pt.photo_id + SELECT DISTINCT pt1.photo_id + FROM photo_tags pt1 + INNER JOIN photo_tags pt2 + ON pt1.photo_id=pt2.photo_id INNER JOIN tags t - ON pt.tag_id=t.id - WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'"; + ON pt1.tag_id=t.id + INNER JOIN photos p + ON pt1.photo_id=p.id + INNER JOIN tags t2 + ON pt2.tag_id=t2.id + WHERE t.name LIKE '%". $_SESSION['searchfor_tag'] ."%' "; - if(isset($additional_where_cond)) + if(isset($additional_where_cond) && !empty($additional_where_cond)) $query_str.= "AND ". $additional_where_cond ." "; + + if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { + $query_str.= "AND t2.name IN ('".implode("','",$this->cfg->show_tags)."')"; + } + if(isset($order_str)) $query_str.= $order_str; @@ -609,19 +1003,30 @@ class PHPFSPOT { $selected.= $tag .","; $selected = substr($selected, 0, strlen($selected)-1); + /* photo has to match at least on of the selected tags */ if($_SESSION['tag_condition'] == 'or') { $query_str = " - SELECT DISTINCT photo_id - FROM photo_tags pt + SELECT DISTINCT pt1.photo_id + FROM photo_tags pt1 + INNER JOIN photo_tags pt2 + ON pt1.photo_id=pt2.photo_id + INNER JOIN tags t + ON pt2.tag_id=t.id INNER JOIN photos p - ON p.id=pt.photo_id - WHERE pt.tag_id IN (". $selected .") + ON pt1.photo_id=p.id + WHERE pt1.tag_id IN (". $selected .") "; - if(isset($additional_where_cond)) + if(isset($additional_where_cond) && !empty($additional_where_cond)) $query_str.= "AND ". $additional_where_cond ." "; + + if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { + $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags)."')"; + } + if(isset($order_str)) $query_str.= $order_str; } + /* photo has to match all selected tags */ elseif($_SESSION['tag_condition'] == 'and') { if(count($_SESSION['selected_tags']) >= 32) { @@ -644,6 +1049,13 @@ class PHPFSPOT { FROM photo_tags pt1 "; + if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { + $query_str.= " + INNER JOIN tags t + ON pt1.tag_id=t.id + "; + } + for($i = 0; $i < count($_SESSION['selected_tags']); $i++) { $query_str.= " INNER JOIN photo_tags pt". ($i+2) ." @@ -654,16 +1066,22 @@ class PHPFSPOT { INNER JOIN photos p ON pt1.photo_id=p.id "; - $query_str.= "WHERE pt1.tag_id=". $_SESSION['selected_tags'][0]; + $query_str.= "WHERE pt2.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] ." + AND pt". ($i+2) .".tag_id=". $_SESSION['selected_tags'][$i] ." "; } - if(isset($additional_where_cond)) + if(isset($additional_where_cond) && !empty($additional_where_cond)) $query_str.= "AND ". $additional_where_cond; + + if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { + $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags). "')"; + } + if(isset($order_str)) $query_str.= $order_str; + } $result = $this->db->db_query($query_str); @@ -675,19 +1093,30 @@ class PHPFSPOT { /* return all available photos */ $query_str = " - SELECT DISTINCT photo_id - FROM photo_tags pt - INNER JOIN photos p + SELECT DISTINCT p.id + FROM photos p + LEFT JOIN photo_tags pt ON p.id=pt.photo_id + LEFT JOIN tags t + ON pt.tag_id=t.id "; - if(isset($additional_where_cond)) + + if(isset($additional_where_cond) && !empty($additional_where_cond)) $query_str.= "WHERE ". $additional_where_cond ." "; + + if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { + if(isset($additional_where_cond) && !empty($additional_where_cond)) + $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags). "')"; + else + $query_str.= "WHERE t.name IN ('".implode("','",$this->cfg->show_tags). "')"; + } + 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']); + array_push($matched_photos, $row['id']); } return $matched_photos; @@ -705,81 +1134,59 @@ class PHPFSPOT { $count = count($photos); - 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 all thumbnails should be shown on one page */ + if(!isset($this->cfg->thumbs_per_page) || $this->cfg->thumbs_per_page == 0) { $begin_with = 0; $end_with = $count; - } - elseif($this->cfg->rows_per_page > 0) { + /* thumbnails should be splitted up in several pages */ + elseif($this->cfg->thumbs_per_page > 0) { - if(!$_SESSION['begin_with'] || $_SESSION['begin_with'] == 0) + if(!isset($_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); + $end_with = $begin_with + $this->cfg->thumbs_per_page; } - - $rows = 0; - $cols = 0; - $images[$rows] = Array(); - $img_height[$rows] = Array(); - $img_width[$rows] = Array(); - $img_id[$rows] = Array(); - $img_name[$rows] = Array(); + $thumbs = 0; + $images[$thumbs] = Array(); + $img_height[$thumbs] = Array(); + $img_width[$thumbs] = Array(); + $img_id[$thumbs] = Array(); + $img_name[$thumbs] = Array(); + $img_fullname[$thumbs] = 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)); + if(isset($photos[$i])) { - $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->thumb_width ."_". $this->getMD5($photos[$i]); + $images[$thumbs] = $photos[$i]; + $img_id[$thumbs] = $i; + $img_name[$thumbs] = htmlspecialchars($this->getPhotoName($photos[$i], 15)); + $img_fullname[$thumbs] = htmlspecialchars($this->getPhotoName($photos[$i], 0)); + $img_title[$thumbs] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0)); - if(file_exists($thumb_path)) { - $info = getimagesize($thumb_path); - $img_width[$rows][$cols] = $info[0]; - $img_height[$rows][$cols] = $info[1]; - } + $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i]); - if($cols == $this->cfg->thumbs_per_row-1) { - $cols = 0; - $rows++; - $images[$rows] = Array(); - $img_width[$rows] = Array(); - $img_height[$rows] = Array(); - } - else { - $cols++; - } - } + if(file_exists($thumb_path)) { + $info = getimagesize($thumb_path); + $img_width[$thumbs] = $info[0]; + $img_height[$thumbs] = $info[1]; + } + $thumbs++; + } + } // +1 for for smarty's selection iteration - $rows++; + $thumbs++; - if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') - $this->tmpl->assign('searchfor', $_SESSION['searchfor']); + if(isset($_SESSION['searchfor_tag']) && $_SESSION['searchfor_tag'] != '') + $this->tmpl->assign('searchfor_tag', $_SESSION['searchfor_tag']); if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { $this->tmpl->assign('from_date', $this->ts2str($_SESSION['from_date'])); @@ -791,18 +1198,20 @@ class PHPFSPOT { } /* do we have to display the page selector ? */ - if($this->cfg->rows_per_page != 0) { + if($this->cfg->thumbs_per_page != 0) { + + $page_select = ""; /* 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); + $previous_start = $begin_with - $this->cfg->thumbs_per_page; + $next_start = $begin_with + $this->cfg->thumbs_per_page; if($begin_with != 0) $this->tmpl->assign("previous_url", "javascript:showPhotoIndex(". $previous_start .");"); if($end_with < $count) $this->tmpl->assign("next_url", "javascript:showPhotoIndex(". $next_start .");"); - $photo_per_page = $this->cfg->rows_per_page * $this->cfg->thumbs_per_row; + $photo_per_page = $this->cfg->thumbs_per_page; $last_page = ceil($count / $photo_per_page); /* get the current selected page */ @@ -871,11 +1280,14 @@ class PHPFSPOT { $current_tags = $this->getCurrentTags(); $extern_link = "index.php?mode=showpi"; + $rss_link = "index.php?mode=rss"; if($current_tags != "") { $extern_link.= "&tags=". $current_tags; + $rss_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']); + $rss_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']); } $export_link = "index.php?mode=export"; @@ -884,21 +1296,31 @@ class PHPFSPOT { $this->tmpl->assign('extern_link', $extern_link); $this->tmpl->assign('slideshow_link', $slideshow_link); $this->tmpl->assign('export_link', $export_link); + $this->tmpl->assign('rss_link', $rss_link); $this->tmpl->assign('count', $count); $this->tmpl->assign('width', $this->cfg->thumb_width); + $this->tmpl->assign('preview_width', $this->cfg->photo_width); + $this->tmpl->assign('thumb_container_width', $this->cfg->thumb_width); + $this->tmpl->assign('thumb_container_height', $this->cfg->thumb_height+20); $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_fullname', $img_fullname); $this->tmpl->assign('img_title', $img_title); - $this->tmpl->assign('rows', $rows); - $this->tmpl->assign('columns', $this->cfg->thumbs_per_row); + $this->tmpl->assign('thumbs', $thumbs); $this->tmpl->show("photo_index.tpl"); - if(isset($anchor)) - print "\n"; + /* if we are returning to photo index from an photo-view, + scroll the window to the last shown photo-thumbnail. + after this, unset the last_photo session variable. + */ + if(isset($_SESSION['last_photo'])) { + print "\n"; + unset($_SESSION['last_photo']); + } } // showPhotoIndex() @@ -909,6 +1331,7 @@ class PHPFSPOT { { $this->tmpl->assign('version', $this->cfg->version); $this->tmpl->assign('product', $this->cfg->product); + $this->tmpl->assign('db_version', $this->dbver); $this->tmpl->show("credits.tpl"); } // showCredits() @@ -920,6 +1343,10 @@ class PHPFSPOT { * 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. + * @param string $orig_image + * @param string $thumb_image + * @param integer $width + * @return boolean */ public function create_thumbnail($orig_image, $thumb_image, $width) { @@ -933,131 +1360,171 @@ class PHPFSPOT { if(!$this->checkifImageSupported($details['mime'])) return false; - $meta = $this->get_meta_informations($orig_image); + switch($details['mime']) { + + case 'image/jpeg': + + $meta = $this->get_meta_informations($orig_image); + + $rotate = 0; + $flip_hori = false; + $flip_vert = false; + + switch($meta['Orientation']) { + case 1: /* top, left */ + /* nothing to do */ break; + case 2: /* top, right */ + $rotate = 0; $flip_hori = true; break; + case 3: /* bottom, left */ + $rotate = 180; break; + case 4: /* bottom, right */ + $flip_vert = true; break; + case 5: /* left side, top */ + $rotate = 90; $flip_vert = true; break; + case 6: /* right side, top */ + $rotate = 90; break; + case 7: /* left side, bottom */ + $rotate = 270; $flip_vert = true; break; + case 8: /* right side, bottom */ + $rotate = 270; break; + } - $rotate = 0; - $flip = false; + $src_img = @imagecreatefromjpeg($orig_image); + $handler = "gd"; + break; - switch($meta['Orientation']) { + case 'image/png': - case 1: /* top, left */ - $rotate = 0; $flip = false; break; - case 2: /* top, right */ - $rotate = 0; $flip = true; break; - case 3: /* bottom, left */ - $rotate = 180; $flip = false; break; - case 4: /* bottom, right */ - $rotate = 180; $flip = true; break; - case 5: /* left side, top */ - $rotate = 90; $flip = true; break; - case 6: /* right side, top */ - $rotate = 90; $flip = false; break; - case 7: /* left side, bottom */ - $rotate = 270; $flip = true; break; - case 8: /* right side, bottom */ - $rotate = 270; $flip = false; break; - } + $src_img = @imagecreatefrompng($orig_image); + $handler = "gd"; + break; - $src_img = @imagecreatefromjpeg($orig_image); + case 'image/tiff': + + $src_img = new Imagick($orig_image); + print_r($src_img->queryFormats()); + + $handler = "imagick"; + exit(1); + break; - if(!$src_img) { - print "Can't load image from ". $orig_image ."\n"; - return false; } - /* grabs the height and width */ - $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, instead safe the original - // as thumbnail but with lower quality + switch($handler) { - if($width >= $cur_width) { - $result = imagejpeg($src_img, $thumb_image, 75); - imagedestroy($src_img); - return true; - } + case 'gd': - // 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; - } + if(!isset($src_img) || empty($src_img)) { + print "Can't load image from ". $orig_image ."\n"; + return false; + } - /* calculates aspect ratio */ - $aspect_ratio = $cur_height / $cur_width; + /* grabs the height and width */ + $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, instead safe the original + // as thumbnail but with lower quality. But if the image + // is to heigh too, then we still have to resize it. + if($width >= $cur_width && $cur_height < $this->cfg->thumb_height) { + $result = imagejpeg($src_img, $thumb_image, 75); + imagedestroy($src_img); + return true; + } - /* sets new size */ - 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; - } - } + // 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; + } - /* creates new image of that size */ - $dst_img = imagecreatetruecolor($new_w, $new_h); + /* calculates aspect ratio */ + $aspect_ratio = $cur_height / $cur_width; - imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255)); + /* sets new size */ + 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; + } + } - /* 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)); + /* creates new image of that size */ + $dst_img = imagecreatetruecolor($new_w, $new_h); - /* needs the image to be flipped horizontal? */ - if($flip) { - print "(FLIP)"; - $image = $dst_img; - for($x = 0; $x < $new_w; $x++) { - imagecopy($dst_img, $image, $x, 0, $w - $x - 1, 0, 1, $h); - } - } + imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255)); - if($rotate) { - $this->_debug("(ROTATE)"); - $dst_img = $this->rotateImage($dst_img, $rotate); - } + /* 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)); - /* write down new generated file */ - $result = imagejpeg($dst_img, $thumb_image, 75); + /* needs the image to be flipped horizontal? */ + if($flip_hori) { + $this->_debug("(FLIP)"); + $dst_img = $this->flipImage($dst_img, 'hori'); + } + /* needs the image to be flipped vertical? */ + if($flip_vert) { + $this->_debug("(FLIP)"); + $dst_img = $this->flipImage($dst_img, 'vert'); + } - /* free your mind */ - imagedestroy($dst_img); - imagedestroy($src_img); + if($rotate) { + $this->_debug("(ROTATE)"); + $dst_img = $this->rotateImage($dst_img, $rotate); + } - if($result === false) { - print "Can't write thumbnail ". $thumb_image ."\n"; - return false; - } + /* write down new generated file */ + $result = imagejpeg($dst_img, $thumb_image, 75); - return true; + /* free your mind */ + imagedestroy($dst_img); + imagedestroy($src_img); + + if($result === false) { + print "Can't write thumbnail ". $thumb_image ."\n"; + return false; + } + + return true; + + break; + + case 'imagick': + + break; + + } } // create_thumbnail() /** * return all exif meta data from the file + * @param string $file + * @return array */ public function get_meta_informations($file) { @@ -1096,8 +1563,11 @@ class PHPFSPOT { * readable * 2. Check if the md5sum of the original file has changed * 3. Generate the thumbnails if needed + * @param integer $idx + * @param integer $force + * @param boolean $overwrite */ - public function gen_thumb($idx = 0, $force = 0) + public function gen_thumb($idx = 0, $force = 0, $overwrite = false) { $error = 0; @@ -1111,7 +1581,7 @@ class PHPFSPOT { $details = $this->get_photo_details($idx); /* calculate file MD5 sum */ - $full_path = $this->translate_path($details['directory_path']) ."/". $details['name']; + $full_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath')); if(!file_exists($full_path)) { $this->_error("File ". $full_path ." does not exist\n"); @@ -1125,29 +1595,45 @@ class PHPFSPOT { $file_md5 = md5_file($full_path); - $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:"); + $this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:"); + + $changes = false; foreach($resolutions as $resolution) { + + $generate_it = false; - $thumb_path = $this->cfg->base_path ."/thumbs/". $resolution ."_". $file_md5; + $thumb_sub_path = substr($file_md5, 0, 2); + $thumb_path = $this->cfg->thumb_path ."/". $thumb_sub_path ."/". $resolution ."_". $file_md5; + + /* if thumbnail-subdirectory does not exist yet, create it */ + if(!file_exists(dirname($thumb_path))) { + mkdir(dirname($thumb_path), 0755); + } /* if the thumbnail file doesn't exist, create it */ if(!file_exists($thumb_path)) { - - $this->_debug(" ". $resolution ."px"); - if(!$this->create_thumbnail($full_path, $thumb_path, $resolution)) - $error = 1; + $generate_it = true; } /* if the file hasn't changed there is no need to regen the thumb */ elseif($file_md5 != $this->getMD5($idx) || $force) { + $generate_it = true; + } + + if($generate_it || $overwrite) { $this->_debug(" ". $resolution ."px"); if(!$this->create_thumbnail($full_path, $thumb_path, $resolution)) $error = 1; + $changes = true; } } + if(!$changes) { + $this->_debug(" already exist"); + } + /* set the new/changed MD5 sum for the current photo */ if(!$error) { $this->setMD5($idx, $file_md5); @@ -1162,6 +1648,8 @@ class PHPFSPOT { * * this function queries the phpfspot database for a * stored MD5 checksum of the specified photo + * @param integer $idx + * @return string|null */ public function getMD5($idx) { @@ -1181,6 +1669,8 @@ class PHPFSPOT { /** * set MD5 sum for the specific photo + * @param integer $idx + * @param string $md5 */ private function setMD5($idx, $md5) { @@ -1196,11 +1686,15 @@ class PHPFSPOT { * * this function stores the current tag condition * (AND or OR) in the users session variables + * @param string $mode + * @return string */ public function setTagCondition($mode) { $_SESSION['tag_condition'] = $mode; + return "ok"; + } // setTagCondition() /** @@ -1211,36 +1705,79 @@ class PHPFSPOT { * it also handles the date search. * getPhotoSelection() will then only return the matching * photos. + * @return string */ - public function startSearch($searchfor, $sort_order, $from = 0, $to = 0) + public function startSearch() { - $_SESSION['searchfor'] = $searchfor; - $_SESSION['sort_order'] = $sort_order; - if($from != 0) - $_SESSION['from_date'] = strtotime($from); + if(isset($_POST['from']) && $this->isValidDate($_POST['from'])) { + $from = $_POST['from']; + } + if(isset($_POST['to']) && $this->isValidDate($_POST['to'])) { + $to = $_POST['to']; + } + + if(isset($_POST['for_tag']) && is_string($_POST['for_tag'])) { + $searchfor_tag = $_POST['for_tag']; + $_SESSION['searchfor_tag'] = $_POST['for_tag']; + } + + if(isset($_POST['for_name']) && is_string($_POST['for_name'])) { + $searchfor_name = $_POST['for_name']; + $_SESSION['searchfor_name'] = $_POST['for_name']; + } + + $this->get_tags(); + + if(isset($from) && !empty($from)) + $_SESSION['from_date'] = strtotime($from ." 00:00:00"); else unset($_SESSION['from_date']); - if($to != 0) - $_SESSION['to_date'] = strtotime($to); + + if(isset($to) && !empty($to)) + $_SESSION['to_date'] = strtotime($to ." 23:59:59"); else unset($_SESSION['to_date']); - if($searchfor != "") { + if(isset($searchfor_tag) && !empty($searchfor_tag)) { /* 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])) + if(preg_match('/'. $searchfor_tag .'/i', $this->tags[$tag])) array_push($_SESSION['selected_tags'], $tag); } } + return "ok"; + } // startSearch() + /** + * updates sort order in session variable + * + * this function is invoked by RPC and will sort the requested + * sort order in the session variable. + * @param string $sort_order + * @return string + */ + public function updateSortOrder($order) + { + if(isset($this->sort_orders[$order])) { + $_SESSION['sort_order'] = $order; + return "ok"; + } + + return "unkown error"; + + } // updateSortOrder() + /** * rotate image * * this function rotates the image according the * specified angel. + * @param string $img + * @param integer $degress + * @return image */ private function rotateImage($img, $degrees) { @@ -1313,8 +1850,42 @@ class PHPFSPOT { } // rotateImage() + /** + * returns flipped image + * + * this function will return an either horizontal or + * vertical flipped truecolor image. + * @param string $image + * @param string $mode + * @return image + */ + private function flipImage($image, $mode) + { + $w = imagesx($image); + $h = imagesy($image); + $flipped = imagecreatetruecolor($w, $h); + + switch($mode) { + case 'vert': + for ($y = 0; $y < $h; $y++) { + imagecopy($flipped, $image, 0, $y, 0, $h - $y - 1, $w, 1); + } + break; + case 'hori': + for ($x = 0; $x < $w; $x++) { + imagecopy($flipped, $image, $x, 0, $w - $x - 1, 0, 1, $h); + } + break; + } + + return $flipped; + + } // flipImage() + /** * return all assigned tags for the specified photo + * @param integer $idx + * @return array */ private function get_photo_tags($idx) { @@ -1337,6 +1908,11 @@ class PHPFSPOT { /** * create on-the-fly images with text within + * @param string $txt + * @param string $color + * @param integer $space + * @param integer $font + * @param integer $w */ public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300) { @@ -1366,15 +1942,16 @@ class PHPFSPOT { /** * check if all requirements are met + * @return boolean */ - private function checkRequirements() + private function check_requirements() { if(!function_exists("imagecreatefromjpeg")) { print "PHP GD library extension is missing
\n"; $missing = true; } - if(!function_exists("sqlite3_open")) { + if($this->cfg->db_access == "native" && !function_exists("sqlite3_open")) { print "PHP SQLite3 library extension is missing
\n"; $missing = true; } @@ -1391,6 +1968,16 @@ class PHPFSPOT { print "PEAR Calendar package is missing
\n"; $missing = true; } + @include_once 'Console/Getopt.php'; + if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) { + print "PEAR Console_Getopt package is missing
\n"; + $missing = true; + } + @include_once $this->cfg->smarty_path .'/libs/Smarty.class.php'; + if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) { + print "Smarty template engine can not be found in ". $this->cfg->smarty_path ."/libs/Smarty.class.php
\n"; + $missing = true; + } ini_restore('track_errors'); if(isset($missing)) @@ -1398,7 +1985,7 @@ class PHPFSPOT { return true; - } // checkRequirements() + } // check_requirements() private function _debug($text) { @@ -1410,22 +1997,29 @@ class PHPFSPOT { /** * check if specified MIME type is supported + * @param string $mime + * @return boolean */ public function checkifImageSupported($mime) { - if(in_array($mime, Array("image/jpeg"))) + if(in_array($mime, Array("image/jpeg", "image/png", "image/tiff"))) return true; return false; } // checkifImageSupported() + /** + * output error text + * @param string $text + */ public function _error($text) { switch($this->cfg->logging) { + default: case 'display': print "\"warning\"\n"; - print $text; + print $text ."
\n"; break; case 'errorlog': error_log($text); @@ -1435,32 +2029,43 @@ class PHPFSPOT { break; } + $this->runtime_error = true; + } // _error() /** * output calendard input fields + * @param string $mode + * @return string */ 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"); + $year = isset($_SESSION[$mode .'_date']) ? date("Y", $_SESSION[$mode .'_date']) : date("Y"); + $month = isset($_SESSION[$mode .'_date']) ? date("m", $_SESSION[$mode .'_date']) : date("m"); + $day = isset($_SESSION[$mode .'_date']) ? date("d", $_SESSION[$mode .'_date']) : date("d"); $output = "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; + $orig_url = $this->get_phpfspot_url() ."index.php?mode=showp&id=". $picture; if($current_tags != "") { $orig_url.= "&tags=". $current_tags; } @@ -1560,7 +2161,7 @@ class PHPFSPOT { $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; + $thumb_url = $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width; switch($mode) { @@ -1584,13 +2185,87 @@ class PHPFSPOT { } // getExport() + /** + * output RSS feed + */ + public function getRSSFeed() + { + Header("Content-type: text/xml; charset=utf-8"); + print "\n"; +?> + + + phpfspot + phpfspot RSS feed + get_phpfspot_url()); ?> + + phpfspot +getPhotoSelection(); + $current_tags = $this->getCurrentTags(); + + foreach($pictures as $picture) { + + $orig_url = $this->get_phpfspot_url() ."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']; + } + + $details = $this->get_photo_details($picture); + + $thumb_url = $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width; + $thumb_html = htmlspecialchars(" + +
+". $details['description']); + + $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath')); + + /* get EXIF information if JPEG */ + if($details['mime'] == "image/jpeg") { + $meta = $this->get_meta_informations($orig_path); + } + + $meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($orig_path); + +?> + + <?php print htmlspecialchars($this->parse_uri($details['uri'], 'filename')); ?> + + + + + + + + + + + +"; - foreach(array('date_asc', 'date_desc', 'name_asc', 'name_desc') as $sort_order) { - $output.= ""; } - $output.= ""; + return $output; - } // get_sort_field() + } // smarty_sort_select_list() /** * returns the currently selected sort order + * @return string */ private function get_sort_order() { @@ -1681,21 +2362,38 @@ class PHPFSPOT { return " ORDER BY p.time DESC"; break; case 'name_asc': - return " ORDER BY p.name ASC"; + if($this->dbver < 9) { + return " ORDER BY p.name ASC"; + } + else { + return " ORDER BY basename(p.uri) ASC"; + } break; case 'name_desc': - return " ORDER BY p.name DESC"; + if($this->dbver < 9) { + return " ORDER BY p.name DESC"; + } + else { + return " ORDER BY basename(p.uri) DESC"; + } + break; + case 'tags_asc': + return " ORDER BY t.name ASC ,p.time ASC"; + break; + case 'tags_desc': + return " ORDER BY t.name DESC ,p.time ASC"; 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. - */ + /** + * return the next to be shown slide show image + * + * this function returns the URL of the next image + * in the slideshow sequence. + * @return string + */ public function getNextSlideShowImage() { $all_photos = $this->getPhotoSelection(); @@ -1705,20 +2403,17 @@ class PHPFSPOT { 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; + return $this->get_phpfspot_url() ."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. - */ + /** + * return the previous to be shown slide show image + * + * this function returns the URL of the previous image + * in the slideshow sequence. + * @return string + */ public function getPrevSlideShowImage() { $all_photos = $this->getPhotoSelection(); @@ -1728,11 +2423,7 @@ class PHPFSPOT { 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; + return $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width; } // getPrevSlideShowImage() @@ -1740,18 +2431,20 @@ class PHPFSPOT { { 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. - */ + /** + * 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. + * @return array + */ public function get_random_photo() { $all = Array(); @@ -1775,6 +2468,8 @@ class PHPFSPOT { * this function validates if the provided date * contains a valid date and will return true * if it is. + * @param string $date_str + * @return boolean */ public function isValidDate($date_str) { @@ -1789,15 +2484,22 @@ class PHPFSPOT { /** * timestamp to string conversion + * @param integer $timestamp + * @return string */ private function ts2str($timestamp) { return strftime("%Y-%m-%d", $timestamp); } // ts2str() + /** + * extract tag-names from $_GET['tags'] + * @param string $tags_str + * @return string + */ private function extractTags($tags_str) { - $not_validated = split(',', $_GET['tags']); + $not_validated = split(',', $tags_str); $validated = array(); foreach($not_validated as $tag) { @@ -1809,6 +2511,314 @@ class PHPFSPOT { } // extractTags() -} + /** + * returns the full path to a thumbnail + * @param integer $width + * @param integer $photo + * @return string + */ + public function get_thumb_path($width, $photo) + { + $md5 = $this->getMD5($photo); + $sub_path = substr($md5, 0, 2); + return $this->cfg->thumb_path + . "/" + . $sub_path + . "/" + . $width + . "_" + . $md5; + + } // get_thumb_path() + + /** + * returns server's virtual host name + * @return string + */ + private function get_server_name() + { + return $_SERVER['SERVER_NAME']; + } // get_server_name() + + /** + * returns type of webprotocol which is currently used + * @return string + */ + private function get_web_protocol() + { + if(!isset($_SERVER['HTTPS'])) + return "http"; + else + return "https"; + } // get_web_protocol() + + /** + * return url to this phpfspot installation + * @return string + */ + private function get_phpfspot_url() + { + return $this->get_web_protocol() ."://". $this->get_server_name() . $this->cfg->web_path; + } // get_phpfspot_url() + + /** + * returns the number of photos which are tagged with $tag_id + * @param integer $tag_id + * @return integer + */ + public function get_num_photos($tag_id) + { + if($result = $this->db->db_fetchSingleRow(" + SELECT count(*) as number + FROM photo_tags + WHERE + tag_id LIKE '". $tag_id ."'")) { + + return $result['number']; + + } + + return 0; + + } // get_num_photos() + + /** + * check file exists and is readable + * + * returns true, if everything is ok, otherwise false + * if $silent is not set, this function will output and + * error message + * @param string $file + * @param boolean $silent + * @return boolean + */ + private function check_readable($file, $silent = null) + { + if(!file_exists($file)) { + if(!isset($silent)) + print "File \"". $file ."\" does not exist.\n"; + return false; + } + + if(!is_readable($file)) { + if(!isset($silent)) + print "File \"". $file ."\" is not reachable for user ". $this->getuid() ."\n"; + return false; + } + + return true; + + } // check_readable() + + /** + * check if all needed indices are present + * + * this function checks, if some needed indices are already + * present, or if not, create them on the fly. they are + * necessary to speed up some queries like that one look for + * all tags, when show_tags is specified in the configuration. + */ + private function checkDbIndices() + { + $result = $this->db->db_exec(" + CREATE INDEX IF NOT EXISTS + phototag + ON + photo_tags + (photo_id, tag_id) + "); + + } // checkDbIndices() + + /** + * retrive F-Spot database version + * + * this function will return the F-Spot database version number + * It is stored within the sqlite3 database in the table meta + * @return string|null + */ + public function getFspotDBVersion() + { + if($result = $this->db->db_fetchSingleRow(" + SELECT data as version + FROM meta + WHERE + name LIKE 'F-Spot Database Version' + ")) + return $result['version']; + + return null; + + } // getFspotDBVersion() + + /** + * parse the provided URI and will returned the requested chunk + * @param string $uri + * @param string $mode + * @return string + */ + public function parse_uri($uri, $mode) + { + if(($components = parse_url($uri)) !== false) { + + switch($mode) { + case 'filename': + return basename($components['path']); + break; + case 'dirname': + return dirname($components['path']); + break; + case 'fullpath': + return $components['path']; + break; + } + } + + return $uri; + + } // parse_uri() + + /** + * validate config options + * + * this function checks if all necessary configuration options are + * specified and set. + * @return boolean + */ + private function check_config_options() + { + if(!isset($this->cfg->page_title) || $this->cfg->page_title == "") + $this->_error("Please set \$page_title in phpfspot_cfg"); + + if(!isset($this->cfg->base_path) || $this->cfg->base_path == "") + $this->_error("Please set \$base_path in phpfspot_cfg"); + + if(!isset($this->cfg->web_path) || $this->cfg->web_path == "") + $this->_error("Please set \$web_path in phpfspot_cfg"); + + if(!isset($this->cfg->thumb_path) || $this->cfg->thumb_path == "") + $this->_error("Please set \$thumb_path in phpfspot_cfg"); + + if(!isset($this->cfg->smarty_path) || $this->cfg->smarty_path == "") + $this->_error("Please set \$smarty_path in phpfspot_cfg"); + + if(!isset($this->cfg->fspot_db) || $this->cfg->fspot_db == "") + $this->_error("Please set \$fspot_db in phpfspot_cfg"); + + if(!isset($this->cfg->db_access) || $this->cfg->db_access == "") + $this->_error("Please set \$db_access in phpfspot_cfg"); + + if(!isset($this->cfg->phpfspot_db) || $this->cfg->phpfspot_db == "") + $this->_error("Please set \$phpfspot_db in phpfspot_cfg"); + + if(!isset($this->cfg->thumb_width) || $this->cfg->thumb_width == "") + $this->_error("Please set \$thumb_width in phpfspot_cfg"); + + if(!isset($this->cfg->thumb_height) || $this->cfg->thumb_height == "") + $this->_error("Please set \$thumb_height in phpfspot_cfg"); + + if(!isset($this->cfg->photo_width) || $this->cfg->photo_width == "") + $this->_error("Please set \$photo_width in phpfspot_cfg"); + + if(!isset($this->cfg->mini_width) || $this->cfg->mini_width == "") + $this->_error("Please set \$mini_width in phpfspot_cfg"); + + if(!isset($this->cfg->thumbs_per_page)) + $this->_error("Please set \$thumbs_per_page in phpfspot_cfg"); + + if(!isset($this->cfg->path_replace_from) || $this->cfg->path_replace_from == "") + $this->_error("Please set \$path_replace_from in phpfspot_cfg"); + + if(!isset($this->cfg->path_replace_to) || $this->cfg->path_replace_to == "") + $this->_error("Please set \$path_replace_to in phpfspot_cfg"); + + if(!isset($this->cfg->hide_tags)) + $this->_error("Please set \$hide_tags in phpfspot_cfg"); + + if(!isset($this->cfg->theme_name)) + $this->_error("Please set \$theme_name in phpfspot_cfg"); + + if(!isset($this->cfg->logging)) + $this->_error("Please set \$logging in phpfspot_cfg"); + + if(isset($this->cfg->logging) && $this->cfg->logging == 'logfile') { + + if(!isset($this->cfg->log_file)) + $this->_error("Please set \$log_file because you set logging = log_file in phpfspot_cfg"); + + if(!is_writeable($this->cfg->log_file)) + $this->_error("The specified \$log_file ". $log_file ." is not writeable!"); + + } + + /* check for pending slash on web_path */ + if(!preg_match("/\/$/", $this->cfg->web_path)) + $this->cfg->web_path.= "/"; + + return $this->runtime_error; + + } // check_config_options() + + /** + * cleanup phpfspot own database + * + * When photos are getting delete from F-Spot, there will remain + * remain some residues in phpfspot own database. This function + * will try to wipe them out. + */ + public function cleanup_phpfspot_db() + { + $to_delete = Array(); + + $result = $this->cfg_db->db_query(" + SELECT img_idx + FROM images + ORDER BY img_idx ASC + "); + + while($row = $this->cfg_db->db_fetch_object($result)) { + if(!$this->db->db_fetchSingleRow(" + SELECT id + FROM photos + WHERE id='". $row['img_idx'] ."'")) { + + array_push($to_delete, $row['img_idx'], ','); + } + } + + print count($to_delete) ." unnecessary objects will be removed from phpfspot's database.\n"; + + $this->cfg_db->db_exec(" + DELETE FROM images + WHERE img_idx IN (". implode($to_delete) .") + "); + + } // cleanup_phpfspot_db() + + /** + * return first image of the page, the $current photo + * lies in. + * + * this function is used to find out the first photo of the + * current page, in which the $current photo lies. this is + * used to display the correct photo, when calling showPhotoIndex() + * from showImage() + * @param integer $current + * @param integer $max + * @return integer + */ + private function getCurrentPage($current, $max) + { + if(isset($this->cfg->thumbs_per_page) && !empty($this->cfg->thumbs_per_page)) { + for($page_start = 0; $page_start <= $max; $page_start+=$this->cfg->thumbs_per_page) { + if($current >= $page_start && $current < ($page_start+$this->cfg->thumbs_per_page)) + return $page_start; + } + } + return 0; + + } // getCurrentPage() + +} // class PHPFSPOT ?>