X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=phpfspot.class.php;h=89f924d04d21ea56fc376894d60d0301d8373bc0;hb=a8265bdc6dae2cac67d7ef6d6eefc6b7aeb38c1f;hp=b3ad278458a350089ae2ea5ac6e09107e1d9be0b;hpb=18ecb83988277922d2743ace52b3ee4a74f35952;p=phpfspot.git diff --git a/phpfspot.class.php b/phpfspot.class.php index b3ad278..89f924d 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 @@ -24,18 +25,79 @@ require_once "phpfspot_cfg.php"; require_once "phpfspot_db.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; + + /** + * 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 + * class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver) * * this function will be called on class construct * and will check requirements, loads configuration, @@ -43,51 +105,125 @@ 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.2"; + $this->cfg->version = "1.7"; + $this->cfg->db_version = 2; + + $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->db = new PHPFSPOT_DB($this, $this->cfg->fspot_db); + /******* Opening F-Spot's sqlite database *********/ + + /* Check if database file exists and is readable */ + if(!file_exists($this->cfg->fspot_db) || !is_readable($this->cfg->fspot_db)) { + print "Error: ". $this->cfg->fspot_db ." does not exist or is not readable for user ". $this->getuid() .".\n"; + exit(1); + } + + /* 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"; + print "Error: ". $this->cfg->fspot_db ." is not writeable for user ". $this->getuid() .".\n"; + print "Please fix permissions so phpfspot can create indices within the F-Spot database to" + ." speed up some database operations.\n"; exit(1); } - $this->dbver = $this->getFspotDBVersion(); + /* open the database */ + $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 for user ". $this->getuid() ."\n"; - exit(1); + /* 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 ."' + "); } + /* get F-Spot database version */ + $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); } - $this->cfg_db = new PHPFSPOT_DB($this, $this->cfg->phpfspot_db); - if(!is_writeable($this->cfg->phpfspot_db)) { - print $this->cfg->phpfspot_db ." is not writeable for user ". $this->getuid() ."\n"; + if(!is_writeable($this->cfg->thumb_path)) { + print $this->cfg->thumb_path .": directory is not writeable for user ". $this->getuid() ."\n"; exit(1); } - $this->check_config_table(); + /******* 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 "Error: ". dirname($this->cfg->phpfspot_db) .": directory is not writeable for user ". $this->getuid() .".\n"; + print "Please fix permissions so phpfspot can create its own sqlite database to store some settings.\n"; + exit(1); + } - /* include Smarty template engine */ - if(!$this->check_readable($this->cfg->smarty_path .'/libs/Smarty.class.php')) { + /* Check if database file is writeable */ + if(file_exists($this->cfg->phpfspot_db) && !is_writeable($this->cfg->phpfspot_db)) { + print "Error: ". $this->cfg->phpfspot_db ." is not writeable for user ". $this->getuid() .".\n"; + print "Please fix permissions so phpfspot can create its own sqlite database to store some settings.\n"; exit(1); } - require $this->cfg->smarty_path .'/libs/Smarty.class.php'; - /* overload Smarty class if our own template handler */ + + /* 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_phpfspot_db(); + + /* overload Smarty class with our own template handler */ require_once "phpfspot_tmpl.php"; - $this->tmpl = new PHPFSPOT_TMPL($this); + $this->tmpl = new PHPFSPOT_TMPL(); + + /* pre-set some template variables */ + $this->tmpl->assign('web_path', $this->cfg->web_path); + + /* Starting with F-Spot 0.4.2, the rating-feature was available */ + if($this->dbver > 10) { + $this->tmpl->assign('has_rating', true); + $this->sort_orders = array_merge($this->sort_orders, array( + 'rate_asc' => 'Rate ↑', + 'rate_desc' => 'Rate ↓', + )); + } /* check if all necessary indices exist */ $this->checkDbIndices(); @@ -99,16 +235,22 @@ class PHPFSPOT { if(!isset($_SESSION['tag_condition'])) $_SESSION['tag_condition'] = 'or'; + /* if sort-order has not been set yet, get the one specified in the config */ if(!isset($_SESSION['sort_order'])) - $_SESSION['sort_order'] = 'date_asc'; + $_SESSION['sort_order'] = $this->cfg->sort_order; - 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']); + // if user-friendly-url's are enabled, set also a flag for the template handler + if($this->is_user_friendly_url()) { + $this->tmpl->assign('user_friendly_url', 'true'); + } + } // __construct() public function __destruct() @@ -127,11 +269,16 @@ 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); + /* parse URL */ + if($this->is_user_friendly_url()) { + $content = $this->parse_user_friendly_url($_SERVER['REQUEST_URI']); + } + if(isset($_GET['mode'])) { $_SESSION['start_action'] = $_GET['mode']; @@ -154,22 +301,28 @@ class PHPFSPOT { $_SESSION['start_action'] = 'showp'; } if(isset($_GET['id']) && is_numeric($_GET['id'])) { + if($_SESSION['current_photo'] != $_GET['id']) + unset($_SESSION['current_version']); $_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']); + $_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']); + $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59"); } break; case 'export': - $this->tmpl->show("export.tpl"); + /* fetch export template */ + print $this->tmpl->fetch("export.tpl"); + /* no further execution necessary. */ return; break; case 'slideshow': - $this->tmpl->show("slideshow.tpl"); + /* fetch slideshow template */ + print $this->tmpl->show("slideshow.tpl"); + /* no further execution necessary. */ return; break; case 'rss': @@ -188,13 +341,47 @@ class PHPFSPOT { } } + /* if date-search variables are registered in the session, set the check + for "consider date-range" in the html output + */ if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) $this->tmpl->assign('date_search_enabled', true); - $this->tmpl->assign('from_date', $this->get_calendar('from')); - $this->tmpl->assign('to_date', $this->get_calendar('to')); - $this->tmpl->assign('sort_field', $this->get_sort_field()); - $this->tmpl->assign('content_page', 'welcome.tpl'); + /* if rate-search variables are registered in the session, set the check + for "consider rate-range" in the html output + */ + if(isset($_SESSION['rate_from']) && isset($_SESSION['rate_to'])) { + $this->tmpl->assign('rate_search_enabled', true); + } + + $this->tmpl->register_function("sort_select_list", array(&$this, "smarty_sort_select_list"), false); + $this->tmpl->assign('search_from_date', $this->get_date_text_field('from')); + $this->tmpl->assign('search_to_date', $this->get_date_text_field('to')); + + $this->tmpl->assign('preset_selected_tags', $this->getSelectedTags()); + $this->tmpl->assign('preset_available_tags', $this->getAvailableTags()); + $this->tmpl->assign('rate_search', $this->get_rate_search()); + + /* if no site-content has been set yet... */ + if(!isset($content)) { + /* if tags are already selected, we can immediately display photo-index */ + if((isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags']) && + isset($_SESSION['start_action']) && $_SESSION['start_action'] != 'showp') || + (isset($_SESSION['start_action']) && $_SESSION['start_action'] == 'showpi')) + $this->tmpl->assign('initial_content', $this->showPhotoIndex()); + else { + /* if a photo is already selected, we can immediately display single-photo */ + if(isset($_SESSION['current_photo']) && !empty($_SESSION['current_photo'])) + $this->tmpl->assign('initial_content', $this->showPhoto($_SESSION['current_photo'])); + else { + /* ok, then let us show the welcome page... */ + $this->tmpl->assign('initial_content', $this->tmpl->fetch('welcome.tpl')); + } + } + } + else + $this->tmpl->assign('initial_content', $content); + $this->tmpl->show("index.tpl"); } // show() @@ -215,11 +402,16 @@ class PHPFSPOT { $this->avail_tags = Array(); $count = 0; + /* if show_tags has been set in the configuration (only show photos + which are tagged by these tags) they following will take care, + that only these other tags are displayed where the photo is also + tagged with one of show_tags. + */ if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { $query_str=" SELECT DISTINCT t1.id as id, t1.name as name - FROM + FROM photo_tags pt1 INNER JOIN photo_tags pt2 ON pt1.photo_id=pt2.photo_id @@ -237,7 +429,7 @@ class PHPFSPOT { else { $result = $this->db->db_query(" - SELECT id,name + SELECT id as id,name as name FROM tags ORDER BY sort_priority ASC "); @@ -273,28 +465,63 @@ class PHPFSPOT { } // get_tags() /** - * extract all photo details + * get all photo details from F-Spot database * - * retrieve all available details from f-spot's - * database and return them as object + * this function queries the F-Spot database for all available + * details of the requested photo. It returns them as a object. + * + * Furthermore it takes care of the photo version to be requested. + * If photo version is not yet, it queries information for the + * original photo. + * + * @param integer $idx + * @return object|null */ - public function get_photo_details($idx) + public function get_photo_details($idx, $version_idx = NULL) { + /* ~ F-Spot version 0.3.x */ if($this->dbver < 9) { $query_str = " - SELECT p.id, p.name, p.time, p.directory_path, p.description - FROM photos p + SELECT + p.id as id, + p.name as name, + p.time as time, + p.directory_path as directory_path, + p.description as description + FROM + photos p "; } else { - $query_str = " - SELECT p.id, p.uri, p.time, p.description - FROM photos p - "; + /* till F-Spot version 0.4.1 */ + if($this->dbver < 11) { + $query_str = " + SELECT + p.id as id, + p.uri as uri, + p.time as time, + p.description as description + FROM + photos p + "; + } + else { + /* rating value got introduced */ + $query_str = " + SELECT + p.id as id, + p.uri as uri, + p.time as time, + p.description as description, + p.rating as rating + FROM + photos p + "; + } } - /* if show_tags is set, only return details for photos which - are specified to be shown + /* if show_tags is set, only return details of photos which are + tagged with a tag that has been specified to be shown. */ if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { $query_str.= " @@ -311,28 +538,58 @@ class PHPFSPOT { "; } - if($result = $this->db->db_query($query_str)) { - - $row = $this->db->db_fetch_object($result); + if($row = $this->db->db_fetchSingleRow($query_str)) { + /* before F-Spot db version 9 there was no uri column but + seperated fields for directory_path and name (= filename). + */ if($this->dbver < 9) { $row['uri'] = "file://". $row['directory_path'] ."/". $row['name']; } + /* if version-idx has not yet been set, get the latest photo version */ + if(!isset($version_idx) || !$this->is_valid_version($idx, $version_idx)) + $version_idx = $this->get_latest_version($idx); + + /* if an alternative version has been requested. But we + support this only for F-Spot database versions from + v9. + */ + if($version_idx > 0 && $this->dbver >= 9) { + /* check for alternative versions */ + if($version = $this->db->db_fetchSingleRow(" + SELECT + version_id, name, uri + FROM + photo_versions + WHERE + photo_id LIKE '". $idx ."' + AND + version_id LIKE '". $version_idx ."'")) { + + $row['name'] = $version['name']; + $row['uri'] = $version['uri']; + } + } + return $row; } - + return null; - } // get_photo_details + } // 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 (...) + * this function returns aligned (length) names for a specific photo. + * If the length of the name exceeds $limit the name will bei + * shrinked (...). + * + * @param integer $idx + * @param integer $limit + * @return string|null */ public function getPhotoName($idx, $limit = 0) { @@ -347,12 +604,84 @@ class PHPFSPOT { } // getPhotoName() + /** + * get photo rating level + * + * this function will return the integer-based rating level of a + * photo. This can only be done, if the F-Spot database is at a + * specific version. If rating value can not be found, zero will + * be returned indicating no rating value is available. + * + * @param integer idx + * @return integer + */ + public function get_photo_rating($idx) + { + if($detail = $this->get_photo_details($idx)) { + if(isset($detail['rating'])) + return $detail['rating']; + } + + return 0; + + } // get_photo_rating() + + /** + * get rate-search bars + * + * this function will return the rating-bars for the search field. + * + * @return string + */ + public function get_rate_search() + { + $bar = ""; + + for($i = 1; $i <= 5; $i++) { + + $bar.= "cfg->web_path ."/resources/star.png"; + else + $bar.= $this->cfg->web_path ."/resources/empty_rate.png"; + + $bar.= "\" + onmouseover=\"show_rate('from', ". $i .");\" + onmouseout=\"reset_rate('from');\" + onclick=\"set_rate('from', ". $i .")\" />"; + } + + $bar.= "
\n"; + + for($i = 1; $i <= 5; $i++) { + + $bar.= "cfg->web_path ."/resources/star.png"; + else + $bar.= $this->cfg->web_path ."/resources/empty_rate.png"; + + $bar.= "\" + onmouseover=\"show_rate('to', ". $i .");\" + onmouseout=\"reset_rate('to');\" + onclick=\"set_rate('to', ". $i .");\" />"; + } + + return $bar; + + } // get_rate_search() + /** * 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 "..." + * If the length of the name exceeds $limit, text will be shortend + * and inner content will be replaced with "...". + * + * @param string $ext + * @param integer $limit + * @return string */ private function shrink_text($text, $limit) { @@ -370,8 +699,10 @@ class PHPFSPOT { * 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); @@ -382,6 +713,7 @@ class PHPFSPOT { * * this function provides all the necessary information * for the single photo template. + * @param integer photo */ public function showPhoto($photo) { @@ -421,7 +753,16 @@ class PHPFSPOT { } $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath')); - $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo); + + /* if current version is already set, use it */ + if($this->get_current_version() !== false) + $version = $this->get_current_version(); + + /* if version not set yet, we assume to display the latest version */ + if(!isset($version) || !$this->is_valid_version($photo, $version)) + $version = $this->get_latest_version($photo); + + $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo, $version); if(!file_exists($orig_path)) { $this->_error("Photo ". $orig_path ." does not exist!
\n"); @@ -436,21 +777,24 @@ 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->get_thumb_path($this->cfg->photo_width, $photo); + $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo, $version); } - /* 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(isset($info['mime']) && $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]; } - $meta_date = isset($meta['FileDateTime']) ? strftime("%a %x %X", $meta['FileDateTime']) : "n/a"; $meta_make = isset($meta['Make']) ? $meta['Make'] ." / ". $meta['Model'] : "n/a"; $meta_size = isset($meta['FileSize']) ? round($meta['FileSize']/1024, 1) ."kbyte" : "n/a"; @@ -465,45 +809,63 @@ class PHPFSPOT { $this->tmpl->assign('extern_link', $extern_link); - if(file_exists($thumb_path)) { - - $info = getimagesize($thumb_path); + if(!file_exists($thumb_path)) { + $this->_error("Can't open file ". $thumb_path ."\n"); + return; + } - $this->tmpl->assign('description', $details['description']); - $this->tmpl->assign('image_name', $this->parse_uri($details['uri'], 'filename')); + $info_thumb = getimagesize($thumb_path); - $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('description', $details['description']); + $this->tmpl->assign('image_name', $this->parse_uri($details['uri'], 'filename')); + $this->tmpl->assign('image_rating', $this->get_photo_rating($photo)); - $this->tmpl->assign('tags', $this->get_photo_tags($photo)); - $this->tmpl->assign('current', $current); + $this->tmpl->assign('width', $info_thumb[0]); + $this->tmpl->assign('height', $info_thumb[1]); + $this->tmpl->assign('ExifMadeOn', strftime("%a %x %X", $details['time'])); + $this->tmpl->assign('ExifMadeWith', $meta_make); + $this->tmpl->assign('ExifOrigResolution', $meta_res); + $this->tmpl->assign('ExifFileSize', $meta_size); + + if($this->is_user_friendly_url()) { + $this->tmpl->assign('image_url', '/photo/'. $photo ."/". $this->cfg->photo_width .'/'. $version); + $this->tmpl->assign('image_url_full', '/photo/'. $photo); } else { - $this->_error("Can't open file ". $thumb_path ."\n"); - return; + $this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&width=". $this->cfg->photo_width ."&version=". $version); + $this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo); } - if($previous_img) { - $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");"); + $this->tmpl->assign('image_filename', $this->parse_uri($details['uri'], 'filename')); + + $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(isset($previous_img)) { + $this->tmpl->assign('previous_url', "javascript:showPhoto(". $previous_img .");"); $this->tmpl->assign('prev_img', $previous_img); } - if($next_img) { - $this->tmpl->assign('next_url', "javascript:showImage(". $next_img .");"); + if(isset($next_img)) { + $this->tmpl->assign('next_url', "javascript:showPhoto(". $next_img .");"); $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)); + $this->tmpl->assign('photo', $photo); + $this->tmpl->assign('version', $version); + + /* if the photo as alternative versions, set a flag for the template */ + if($this->get_photo_versions($photo)) + $this->tmpl->assign('has_versions', true); - $this->tmpl->show("single_photo.tpl"); + $this->tmpl->register_function("photo_version_select_list", array(&$this, "smarty_photo_version_select_list"), false); + + return $this->tmpl->fetch("single_photo.tpl"); } // showPhoto() @@ -516,6 +878,7 @@ class PHPFSPOT { */ public function getAvailableTags() { + /* retrive tags from database */ $this->get_tags(); $output = ""; @@ -539,6 +902,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)); @@ -552,29 +919,51 @@ 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) { + /* has the currently processed tag already been added to + the selected tag list? if so, ignore it here... + */ 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 %: + // uncomment if you want sizes in whole %: $size = ceil($size); + $color = $min_sat + ($value - $min_qty) * $step_sat; + + $r = '44'; + $g = dechex($color); + $b = '88'; + if(isset($this->tags[$key])) { - $output.= "". $this->tags[$key] .", "; + if($this->is_user_friendly_url()) { + $output.= "cfg->web_path ."/tag/". $key ."\" + onclick=\"Tags('add', ". $key ."); return false;\" + class=\"tag\" + style=\"font-size: ". $size ."%; color: #". $r.$g.$b .";\" + title=\"Tag ". $this->tags[$key] .", ". $tags[$key] ." picture(s)\">". $this->tags[$key] .", "; + } + else { + $output.= "cfg->web_path ."/index.php?mode=showpi\" + onclick=\"Tags('add', ". $key ."); return false;\" + class=\"tag\" + style=\"font-size: ". $size ."%; color: #". $r.$g.$b .";\" + title=\"Tag ". $this->tags[$key] .", ". $tags[$key] ." picture(s)\">". $this->tags[$key] .", "; + } } - } $output = substr($output, 0, strlen($output)-2); - print $output; + return $output; } // getAvailableTags() @@ -584,22 +973,45 @@ 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() + public function getSelectedTags($type = 'link') { + /* retrive tags from database */ $this->get_tags(); $output = ""; + foreach($this->avail_tags as $tag) { // return all selected tags if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags'])) { - $output.= "". $this->tags[$tag] .", "; + + switch($type) { + default: + case 'link': + $output.= "". $this->tags[$tag] .", "; + break; + case 'img': + $output.= " +
+ tags[$tag] ."\"> + cfg->web_path ."/phpfspot_img.php?tagidx=". $tag ."\" /> + +
+ "; + break; + } } } - $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() @@ -609,14 +1021,26 @@ 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']); + + // has the user requested to hide this tag, and still someone, + // somehow tries to add it, don't allow this. + if(!isset($this->cfg->hide_tags) && + in_array($this->get_tag_name($tag), $this->cfg->hide_tags)) + return "ok"; + if(!in_array($tag, $_SESSION['selected_tags'])) array_push($_SESSION['selected_tags'], $tag); + + return "ok"; } // addTag() @@ -625,15 +1049,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() /** @@ -649,6 +1080,58 @@ class PHPFSPOT { } // resetTags() + /** + * returns the value for the autocomplete 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 * @@ -660,26 +1143,39 @@ class PHPFSPOT { if(isset($_SESSION['current_photo'])) unset($_SESSION['current_photo']); + if(isset($_SESSION['current_version'])) + unset($_SESSION['current_version']); + } // resetPhotoView(); /** * 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 - * it now + * if any date search has taken place, reset it now. */ public function resetDateSearch() { @@ -690,6 +1186,20 @@ class PHPFSPOT { } // resetDateSearch(); + /** + * reset rate search + * + * if any rate search has taken place, reset it now. + */ + public function resetRateSearch() + { + if(isset($_SESSION['rate_from'])) + unset($_SESSION['rate_from']); + if(isset($_SESSION['rate_to'])) + unset($_SESSION['rate_to']); + + } // resetRateSearch(); + /** * return all photo according selection * @@ -697,41 +1207,90 @@ 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'])) { + + /* check for previous conditions. if so add 'AND' */ + if(!empty($additional_where_cond)) { + $additional_where_cond.= " AND "; + } + + 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'] ."%' + ) + "; + } + } + + /* limit result based on rate-search */ + if(isset($_SESSION['rate_from']) && isset($_SESSION['rate_to'])) { + + if($this->dbver > 10) { + + /* check for previous conditions. if so add 'AND' */ + if(!empty($additional_where_cond)) { + $additional_where_cond.= " AND "; + } + + $additional_where_cond.= " + p.rating >= ". $_SESSION['rate_from'] ." + AND + p.rating <= ". $_SESSION['rate_to'] ." + "; + } + } + 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 pt1.photo_id - FROM photo_tags pt1 + SELECT DISTINCT + pt1.photo_id as photo_id + FROM + photo_tags pt1 INNER JOIN photo_tags pt2 ON pt1.photo_id=pt2.photo_id - INNER JOIN tags t1 - ON pt1.tag_id=t1.id + INNER JOIN tags t + 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 t1.name LIKE '%". $_SESSION['searchfor'] ."%' "; + WHERE t.name LIKE '%". $_SESSION['searchfor_tag'] ."%' "; - if(isset($additional_where_cond)) + if(!empty($additional_where_cond)) $query_str.= "AND ". $additional_where_cond ." "; if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { @@ -758,8 +1317,10 @@ class PHPFSPOT { /* photo has to match at least on of the selected tags */ if($_SESSION['tag_condition'] == 'or') { $query_str = " - SELECT DISTINCT pt1.photo_id - FROM photo_tags pt1 + SELECT DISTINCT + pt1.photo_id as photo_id + FROM + photo_tags pt1 INNER JOIN photo_tags pt2 ON pt1.photo_id=pt2.photo_id INNER JOIN tags t @@ -768,7 +1329,7 @@ class PHPFSPOT { ON pt1.photo_id=p.id WHERE pt1.tag_id IN (". $selected .") "; - if(isset($additional_where_cond)) + if(!empty($additional_where_cond)) $query_str.= "AND ". $additional_where_cond ." "; if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { @@ -797,8 +1358,10 @@ class PHPFSPOT { */ $query_str = " - SELECT DISTINCT pt1.photo_id - FROM photo_tags pt1 + SELECT DISTINCT + pt1.photo_id as photo_id + FROM + photo_tags pt1 "; if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { @@ -824,7 +1387,7 @@ class PHPFSPOT { AND pt". ($i+2) .".tag_id=". $_SESSION['selected_tags'][$i] ." "; } - if(isset($additional_where_cond)) + if(!empty($additional_where_cond)) $query_str.= "AND ". $additional_where_cond; if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { @@ -845,18 +1408,24 @@ class PHPFSPOT { /* return all available photos */ $query_str = " - SELECT DISTINCT photo_id - FROM photo_tags pt - INNER JOIN photos p + SELECT DISTINCT + p.id as id + FROM + photos p + LEFT JOIN photo_tags pt ON p.id=pt.photo_id - INNER JOIN tags t + LEFT JOIN tags t ON pt.tag_id=t.id "; - if(isset($additional_where_cond)) + + if(!empty($additional_where_cond)) $query_str.= "WHERE ". $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(!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)) @@ -864,7 +1433,7 @@ class PHPFSPOT { $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; @@ -875,92 +1444,75 @@ class PHPFSPOT { * * this function provides all the necessary information * for the photo index template. + * @return string */ public function showPhotoIndex() { $photos = $this->getPhotoSelection(); + $current_tags = $this->getCurrentTags(); $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(!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(); - $img_title = Array(); + $thumbs = 0; for($i = $begin_with; $i < $end_with; $i++) { - if(isset($photos[$i])) { + if(!isset($photos[$i])) + continue; - $images[$rows][$cols] = $photos[$i]; - $img_id[$rows][$cols] = $i; - $img_name[$rows][$cols] = htmlspecialchars($this->getPhotoName($photos[$i], 15)); - $img_title[$rows][$cols] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0)); - - $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i]); - - if(file_exists($thumb_path)) { - $info = getimagesize($thumb_path); - $img_width[$rows][$cols] = $info[0]; - $img_height[$rows][$cols] = $info[1]; - } + /* on first run, initalize all used variables */ + if($thumbs == 0) { + $images = Array(); + $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(); + $img_rating = Array(); + } - if($cols == $this->cfg->thumbs_per_row-1) { - $cols = 0; - $rows++; - $images[$rows] = Array(); - $img_width[$rows] = Array(); - $img_height[$rows] = Array(); + $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)); + $img_rating[$thumbs] = $this->get_photo_rating($photos[$i]); + + /* get local path of the thumbnail image to be displayed */ + $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i], $this->get_latest_version($photos[$i])); + + /* if the image exist and is readable, extract some details */ + if(file_exists($thumb_path) && is_readable($thumb_path)) { + if($info = getimagesize($thumb_path) !== false) { + $img_width[$thumbs] = $info[0]; + $img_height[$thumbs] = $info[1]; } - else { - $cols++; - } - } + } + $thumbs++; } - // +1 for for smarty's selection iteration - $rows++; - - 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'])); @@ -972,20 +1524,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 */ @@ -1012,7 +1564,16 @@ class PHPFSPOT { else $style = ""; - $select = "is_user_friendly_url()) { + $select = "cfg->web_path ."/tag/205/". $start_with ."\""; + } + else { + $select = "cfg->web_path ."/index.php?mode=showpi tags=". $current_tags ." begin_with=". $begin_with ."\""; + } + $select.= " onclick=\"showPhotoIndex(". $start_with ."); return false;\""; + if($style != "") $select.= $style; $select.= ">". $i ." "; @@ -1050,9 +1611,7 @@ class PHPFSPOT { if($last_page > 1) $this->tmpl->assign('page_selector', $page_select); } - - $current_tags = $this->getCurrentTags(); $extern_link = "index.php?mode=showpi"; $rss_link = "index.php?mode=rss"; if($current_tags != "") { @@ -1073,19 +1632,36 @@ class PHPFSPOT { $this->tmpl->assign('rss_link', $rss_link); $this->tmpl->assign('count', $count); $this->tmpl->assign('width', $this->cfg->thumb_width); - $this->tmpl->assign('images', $images); - $this->tmpl->assign('img_width', $img_width); - $this->tmpl->assign('img_height', $img_height); - $this->tmpl->assign('img_id', $img_id); - $this->tmpl->assign('img_name', $img_name); - $this->tmpl->assign('img_title', $img_title); - $this->tmpl->assign('rows', $rows); - $this->tmpl->assign('columns', $this->cfg->thumbs_per_row); + $this->tmpl->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('selected_tags', $this->getSelectedTags('img')); + // +1 for for smarty's selection iteration + $this->tmpl->assign('thumbs', $thumbs+1); + + if($thumbs > 0) { + $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('img_rating', $img_rating); + } + + $result = $this->tmpl->fetch("photo_index.tpl"); - $this->tmpl->show("photo_index.tpl"); + /* 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'])) { + $result.= "\n"; + unset($_SESSION['last_photo']); + } - if(isset($anchor)) - print "\n"; + return $result; } // showPhotoIndex() @@ -1102,12 +1678,16 @@ class PHPFSPOT { } // showCredits() /** - * create_thumbnails for the requested width + * 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. + * @param string $orig_image + * @param string $thumb_image + * @param integer $width + * @return boolean */ public function create_thumbnail($orig_image, $thumb_image, $width) { @@ -1115,56 +1695,104 @@ class PHPFSPOT { return false; } - $details = getimagesize($orig_image); - + $mime = $this->get_mime_info($orig_image); + /* check if original photo is a support image type */ - if(!$this->checkifImageSupported($details['mime'])) + if(!$this->checkifImageSupported($mime)) return false; - $meta = $this->get_meta_informations($orig_image); + switch($mime) { + + case 'image/jpeg': + + $meta = $this->get_meta_informations($orig_image); + + $rotate = 0; + $flip_hori = false; + $flip_vert = false; + + if(isset($meta['Orientation'])) { + 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; + } + } + + $src_img = @imagecreatefromjpeg($orig_image); + $handler = "gd"; + break; - $rotate = 0; - $flip = false; + case 'image/png': - switch($meta['Orientation']) { + $src_img = @imagecreatefrompng($orig_image); + $handler = "gd"; + break; - 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; - } + case 'image/x-portable-pixmap': - $src_img = @imagecreatefromjpeg($orig_image); + $src_img = new Imagick($orig_image); + $handler = "imagick"; + break; + + } - if(!$src_img) { + if(!isset($src_img) || empty($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); + switch($handler) { - // 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 + case 'gd': + + /* 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; + } + break; + + case 'imagick': + + $cur_width = $src_img->getImageWidth(); + $cur_height = $src_img->getImageHeight(); + + // 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) { + $src_img->setCompressionQuality(75); + $src_img->setImageFormat('jpeg'); + $src_img->writeImage($thumb_image); + $src_img->clear(); + $src_img->destroy(); + return true; + } + break; - if($width >= $cur_width) { - $result = imagejpeg($src_img, $thumb_image, 75); - imagedestroy($src_img); - return true; } // If the image will be rotate because EXIF orientation said so @@ -1206,46 +1834,94 @@ class PHPFSPOT { } } - /* creates new image of that size */ - $dst_img = imagecreatetruecolor($new_w, $new_h); + switch($handler) { - imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255)); + case 'gd': - /* 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)); + + /* 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'); + } - /* write down new generated file */ - $result = imagejpeg($dst_img, $thumb_image, 75); + if($rotate) { + $this->_debug("(ROTATE)"); + $dst_img = $this->rotateImage($dst_img, $rotate); + } - /* free your mind */ - imagedestroy($dst_img); - imagedestroy($src_img); + /* write down new generated file */ + $result = imagejpeg($dst_img, $thumb_image, 75); - if($result === false) { - print "Can't write thumbnail ". $thumb_image ."\n"; - return false; - } + /* free your mind */ + imagedestroy($dst_img); + imagedestroy($src_img); - return true; + if($result === false) { + print "Can't write thumbnail ". $thumb_image ."\n"; + return false; + } + + return true; + + break; + + case 'imagick': + + $src_img->resizeImage($new_w, $new_h, Imagick::FILTER_LANCZOS, 1); + + /* needs the image to be flipped horizontal? */ + if($flip_hori) { + $this->_debug("(FLIP)"); + $src_img->rotateImage(new ImagickPixel(), 90); + $src_img->flipImage(); + $src_img->rotateImage(new ImagickPixel(), -90); + } + /* needs the image to be flipped vertical? */ + if($flip_vert) { + $this->_debug("(FLIP)"); + $src_img->flipImage(); + } + + if($rotate) { + $this->_debug("(ROTATE)"); + $src_img->rotateImage(new ImagickPixel(), $rotate); + } + + $src_img->setCompressionQuality(75); + $src_img->setImageFormat('jpeg'); + + if(!$src_img->writeImage($thumb_image)) { + print "Can't write thumbnail ". $thumb_image ."\n"; + return false; + } + + $src_img->clear(); + $src_img->destroy(); + return true; + + break; + + } } // create_thumbnail() /** * return all exif meta data from the file + * @param string $file + * @return array */ public function get_meta_informations($file) { @@ -1260,135 +1936,291 @@ class PHPFSPOT { * if it does not exist yet. this own is used to store * some necessary informations (md5 sum's, ...). */ - public function check_config_table() + public function check_phpfspot_db() { // if the config table doesn't exist yet, create it if(!$this->cfg_db->db_check_table_exists("images")) { $this->cfg_db->db_exec(" CREATE TABLE images ( - img_idx int primary key, - img_md5 varchar(32) + img_idx int, + img_version_idx int, + img_md5 varchar(32), + UNIQUE(img_idx, img_version_idx) + ) + "); + } + + if(!$this->cfg_db->db_check_table_exists("meta")) { + $this->cfg_db->db_exec(" + CREATE TABLE meta ( + meta_key varchar(255), + meta_value varchar(255) + ) + "); + + /* db_version was added with phpfspot 1.7, before changes + on the phpfspot database where not necessary. + */ + + $this->cfg_db->db_exec(" + INSERT INTO meta ( + meta_key, meta_value + ) VALUES ( + 'phpfspot Database Version', + '". $this->cfg->db_version ."' + ) + "); + } + + /* if version <= 2 and column img_version_idx does not exist yet */ + if($this->get_db_version() <= 2 && + !$this->cfg_db->db_check_column_exists("images", "img_version_idx")) { + + if(!$this->cfg_db->db_start_transaction()) + die("Can not start database transaction"); + + $result = $this->cfg_db->db_exec(" + CREATE TEMPORARY TABLE images_temp ( + img_idx int, + img_version_idx int, + img_md5 varchar(32), + UNIQUE(img_idx, img_version_idx) + ) + "); + + if(!$result) { + $this->cfg_db->db_rollback_transaction(); + die("Upgrade failed - transaction rollback"); + } + + $result = $this->cfg_db->db_exec(" + INSERT INTO images_temp + SELECT + img_idx, + 0, + img_md5 + FROM images + "); + + if(!$result) { + $this->cfg_db->db_rollback_transaction(); + die("Upgrade failed - transaction rollback"); + } + + $result = $this->cfg_db->db_exec(" + DROP TABLE images + "); + + if(!$result) { + $this->cfg_db->db_rollback_transaction(); + die("Upgrade failed - transaction rollback"); + } + + $result = $this->cfg_db->db_exec(" + CREATE TABLE images ( + img_idx int, + img_version_idx int, + img_md5 varchar(32), + UNIQUE(img_idx, img_version_idx) ) - "); + "); + + if(!$result) { + $this->cfg_db->db_rollback_transaction(); + die("Upgrade failed - transaction rollback"); + } + + $result = $this->cfg_db->db_exec(" + INSERT INTO images + SELECT * + FROM images_temp + "); + + if(!$result) { + $this->cfg_db->db_rollback_transaction(); + die("Upgrade failed - transaction rollback"); + } + + $result = $this->cfg_db->db_exec(" + DROP TABLE images_temp + "); + + if(!$result) { + $this->cfg_db->db_rollback_transaction(); + die("Upgrade failed - transaction rollback"); + } + + if(!$this->cfg_db->db_commit_transaction()) + die("Can not commit database transaction"); + } - } // check_config_table + } // check_phpfspot_db /** - * Generates a thumbnail from photo idx + * generates thumbnails * - * This function will generate JPEG thumbnails from provided F-Spot photo - * indizes. + * This function generates JPEG thumbnails from + * provided F-Spot photo indize and its alternative + * versions. * * 1. Check if all thumbnail generations (width) are already in place and * 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; + $versions = Array(0); $resolutions = Array( $this->cfg->thumb_width, $this->cfg->photo_width, $this->cfg->mini_width, + 30, ); - /* get details from F-Spot's database */ - $details = $this->get_photo_details($idx); + if($alt_versions = $this->get_photo_versions($idx)) + $versions = array_merge($versions, $alt_versions); - /* calculate file MD5 sum */ - $full_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath')); + foreach($versions as $version) { - if(!file_exists($full_path)) { - $this->_error("File ". $full_path ." does not exist\n"); - return; - } + /* get details from F-Spot's database */ + $details = $this->get_photo_details($idx, $version); - if(!is_readable($full_path)) { - $this->_error("File ". $full_path ." is not readable for ". $this->getuid() ."\n"); - return; - } + /* calculate file MD5 sum */ + $full_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath')); - $file_md5 = md5_file($full_path); + if(!file_exists($full_path)) { + $this->_error("File ". $full_path ." does not exist"); + return; + } + + if(!is_readable($full_path)) { + $this->_error("File ". $full_path ." is not readable for ". $this->getuid() ."\n"); + return; + } + + $this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:"); - $this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:"); + /* If Nikon NEF format, we need to treat it another way */ + if(isset($this->cfg->dcraw_bin) && + file_exists($this->cfg->dcraw_bin) && + is_executable($this->cfg->dcraw_bin) && + preg_match('/\.nef$/i', $details['uri'])) { - $changes = false; + $ppm_path = preg_replace('/\.nef$/i', '.ppm', $full_path); - foreach($resolutions as $resolution) { + /* if PPM file does not exist, let dcraw convert it from NEF */ + if(!file_exists($ppm_path)) { + system($this->cfg->dcraw_bin ." -a ". $full_path); + } - $thumb_sub_path = substr($file_md5, 0, 2); - $thumb_path = $this->cfg->thumb_path ."/". $thumb_sub_path ."/". $resolution ."_". $file_md5; + /* for now we handle the PPM instead of the NEF */ + $full_path = $ppm_path; - 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)) { + $file_md5 = md5_file($full_path); + $changes = false; + + foreach($resolutions as $resolution) { + + $generate_it = false; + + $thumb_sub_path = substr($file_md5, 0, 2); + $thumb_path = $this->cfg->thumb_path ."/". $thumb_sub_path ."/". $resolution ."_". $file_md5; - $this->_debug(" ". $resolution ."px"); - if(!$this->create_thumbnail($full_path, $thumb_path, $resolution)) - $error = 1; + /* 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) || $force) { + $generate_it = true; + } + elseif($file_md5 != $this->getMD5($idx, $version)) { + $generate_it = true; + } - $changes = true; + if($generate_it || $overwrite) { + + $this->_debug(" ". $resolution ."px"); + if(!$this->create_thumbnail($full_path, $thumb_path, $resolution)) + $error = 1; + + $changes = true; + } } - /* if the file hasn't changed there is no need to regen the thumb */ - elseif($file_md5 != $this->getMD5($idx) || $force) { - $this->_debug(" ". $resolution ."px"); - if(!$this->create_thumbnail($full_path, $thumb_path, $resolution)) - $error = 1; + if(!$changes) { + $this->_debug(" already exist"); + } - $changes = true; + /* set the new/changed MD5 sum for the current photo */ + if(!$error) { + $this->setMD5($idx, $file_md5, $version); } - } - if(!$changes) { - $this->_debug(" already exist"); - } + $this->_debug("\n"); - /* set the new/changed MD5 sum for the current photo */ - if(!$error) { - $this->setMD5($idx, $file_md5); } - $this->_debug("\n"); - } // 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 + * this function queries the phpfspot database for a stored MD5 + * checksum of the specified photo. It also takes care of the + * requested photo version - original or alternative photo. + * + * @param integer $idx + * @return string|null */ - public function getMD5($idx) + public function getMD5($idx, $version_idx = 0) { $result = $this->cfg_db->db_query(" - SELECT img_md5 - FROM images - WHERE img_idx='". $idx ."' + SELECT + img_md5 + FROM + images + WHERE + img_idx='". $idx ."' + AND + img_version_idx='". $version_idx ."' "); if(!$result) - return 0; + return NULL; - $img = $this->cfg_db->db_fetch_object($result); - return $img['img_md5']; + if($img = $this->cfg_db->db_fetch_object($result)) + return $img['img_md5']; + + return NULL; } // getMD5() /** * set MD5 sum for the specific photo + * @param integer $idx + * @param string $md5 */ - private function setMD5($idx, $md5) + private function setMD5($idx, $md5, $version_idx = 0) { $result = $this->cfg_db->db_exec(" - REPLACE INTO images (img_idx, img_md5) - VALUES ('". $idx ."', '". $md5 ."') + INSERT OR REPLACE INTO images ( + img_idx, img_version_idx, img_md5 + ) VALUES ( + '". $idx ."', + '". $version_idx ."', + '". $md5 ."' + ) "); } // setMD5() @@ -1398,11 +2230,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() /** @@ -1413,38 +2249,120 @@ 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() { + /* date search */ + if(isset($_POST['date_from']) && $this->isValidDate($_POST['date_from'])) { + $date_from = $_POST['date_from']; + } + if(isset($_POST['date_to']) && $this->isValidDate($_POST['date_to'])) { + $date_to = $_POST['date_to']; + } + + /* tag-name search */ + if(isset($_POST['for_tag']) && is_string($_POST['for_tag'])) { + $searchfor_tag = $_POST['for_tag']; + $_SESSION['searchfor_tag'] = $_POST['for_tag']; + } + else { + unset($_SESSION['searchfor_tag']); + } + + /* file-name search */ + if(isset($_POST['for_name']) && is_string($_POST['for_name'])) { + $_SESSION['searchfor_name'] = $_POST['for_name']; + } + else { + unset($_SESSION['searchfor_name']); + } + + /* rate-search */ + if(isset($_POST['rate_from']) && is_numeric($_POST['rate_from'])) { + + $_SESSION['rate_from'] = $_POST['rate_from']; + + if(isset($_POST['rate_to']) && is_numeric($_POST['rate_to'])) { + $_SESSION['rate_to'] = $_POST['rate_to']; + } + } + else { + /* delete any previously set value */ + unset($_SESSION['rate_to'], $_SESSION['rate_from']); + } + $this->get_tags(); - $_SESSION['searchfor'] = $searchfor; - $_SESSION['sort_order'] = $sort_order; - if($from != 0) - $_SESSION['from_date'] = strtotime($from); + if(isset($date_from) && !empty($date_from)) + $_SESSION['from_date'] = strtotime($date_from ." 00:00:00"); else unset($_SESSION['from_date']); - if($to != 0) - $_SESSION['to_date'] = strtotime($to); + + if(isset($date_to) && !empty($date_to)) + $_SESSION['to_date'] = strtotime($date_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() + + /** + * update photo version in session variable + * + * this function is invoked by RPC and will set the requested + * photo version in the session variable. + * @param string $photo_version + * @return string + */ + public function update_photo_version($photo_idx, $photo_version) + { + if($this->is_valid_version($photo_idx, $photo_version)) { + $_SESSION['current_version'] = $photo_version; + return "ok"; + } + + return "incorrect photo version provided"; + + } // update_photo_version() + /** * rotate image * * this function rotates the image according the * specified angel. + * @param string $img + * @param integer $degress + * @return image */ private function rotateImage($img, $degrees) { @@ -1517,13 +2435,47 @@ 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) { $result = $this->db->db_query(" - SELECT t.id, t.name + SELECT t.id as id, t.name as name FROM tags t INNER JOIN photo_tags pt ON t.id=pt.tag_id @@ -1532,8 +2484,11 @@ class PHPFSPOT { $tags = Array(); - while($row = $this->db->db_fetch_object($result)) + while($row = $this->db->db_fetch_object($result)) { + if(isset($this->cfg->hide_tags) && in_array($row['name'], $this->cfg->hide_tags)) + continue; $tags[$row['id']] = $row['name']; + } return $tags; @@ -1541,6 +2496,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) { @@ -1570,8 +2530,9 @@ 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"; @@ -1595,6 +2556,21 @@ 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 'Date.php'; + if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) { + print "PEAR Date 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)) @@ -1602,11 +2578,11 @@ class PHPFSPOT { return true; - } // checkRequirements() + } // check_requirements() private function _debug($text) { - if($this->fromcmd) { + if(isset($this->fromcmd)) { print $text; } @@ -1614,67 +2590,102 @@ 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"))) + $supported_types = Array( + "image/jpeg", + "image/png", + "image/x-portable-pixmap", + "image/tiff" + ); + + if(in_array($mime, $supported_types)) 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; + if(isset($this->fromcmd)) + print $text ."\n"; + else { + print "\"warning\"\n"; + print $text ."
\n"; + } break; case 'errorlog': error_log($text); break; case 'logfile': - error_log($text, 3, $his->cfg->log_file); + error_log($text, 3, $this->cfg->log_file); break; } + $this->runtime_error = true; + } // _error() /** - * output calendard input fields + * get calendar input-text fields + * + * this function returns a text-field used for the data selection. + * Either it will be filled with the current date or, if available, + * filled with the date user entered previously. + * + * @param string $mode + * @return string */ - private function get_calendar($mode) + private function get_date_text_field($mode) { - $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"); + $date = isset($_SESSION[$mode .'_date']) ? date("Y", $_SESSION[$mode .'_date']) : date("Y"); + $date.= "-"; + $date.= isset($_SESSION[$mode .'_date']) ? date("m", $_SESSION[$mode .'_date']) : date("m"); + $date.= "-"; + $date.= isset($_SESSION[$mode .'_date']) ? date("d", $_SESSION[$mode .'_date']) : date("d"); - $output = "setDate($userdate); + + $year = $date->getYear(); + $month = $date->getMonth(); + $day = $date->getDay(); + } + $rows = 1; $cols = 1; $matrix = Array(); @@ -1683,27 +2694,26 @@ class PHPFSPOT { require_once CALENDAR_ROOT.'Day.php'; // Build the month - $month = new Calendar_Month_Weekdays($year,$month); + $month_cal = new Calendar_Month_Weekdays($year,$month); // Create links - $prevStamp = $month->prevMonth(true); + $prevStamp = $month_cal->prevMonth(true); $prev = "javascript:setMonth(". date('Y',$prevStamp) .", ". date('n',$prevStamp) .", ". date('j',$prevStamp) .");"; - $nextStamp = $month->nextMonth(true); + $nextStamp = $month_cal->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); + $month_cal->build($selectedDays); - $this->tmpl->assign('current_month', date('F Y',$month->getTimeStamp())); + $this->tmpl->assign('current_month', date('F Y',$month_cal->getTimeStamp())); $this->tmpl->assign('prev_month', $prev); $this->tmpl->assign('next_month', $next); - while ( $day = $month->fetch() ) { + while ( $day = $month_cal->fetch() ) { if(!isset($matrix[$rows])) $matrix[$rows] = Array(); @@ -1711,7 +2721,13 @@ class PHPFSPOT { $string = ""; $dayStamp = $day->thisDay(true); - $link = "javascript:setCalendarDate(". date('Y',$dayStamp) .", ". date('n',$dayStamp).", ". date('j',$dayStamp) .");"; + $link = "javascript:setCalendarDate('" + . date('Y',$dayStamp) + . "-" + . date('m',$dayStamp) + . "-" + . date('d',$dayStamp) + ."');"; // isFirst() to find start of week if ( $day->isFirst() ) @@ -1747,6 +2763,7 @@ class PHPFSPOT { /** * output export page + * @param string $mode */ public function getExport($mode) { @@ -1755,7 +2772,7 @@ class PHPFSPOT { foreach($pictures as $picture) { - $orig_url = $this->get_phpfspot_url() ."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; } @@ -1763,7 +2780,12 @@ class PHPFSPOT { $orig_url.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date']; } - $thumb_url = $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width; + if($this->is_user_friendly_url()) { + $thumb_url = $this->get_phpfspot_url() ."/photo/". $picture ."/". $this->cfg->thumb_width; + } + else { + $thumb_url = $this->get_phpfspot_url() ."/phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width; + } switch($mode) { @@ -1812,7 +2834,7 @@ class PHPFSPOT { foreach($pictures as $picture) { - $orig_url = $this->get_phpfspot_url() ."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; } @@ -1822,26 +2844,35 @@ class PHPFSPOT { $details = $this->get_photo_details($picture); - $thumb_url = $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width; + if($this->is_user_friendly_url()) { + $thumb_url = $this->get_phpfspot_url() ."/photo/". $picture ."/". $this->cfg->thumb_width; + } + else { + $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')); - $meta = $this->get_meta_informations($orig_path); - $meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($orig_path); + + /* get EXIF information if JPEG */ + if(isset($details['mime']) && $details['mime'] == "image/jpeg") { + $meta = $this->get_meta_informations($orig_path); + } ?> <?php print htmlspecialchars($this->parse_uri($details['uri'], 'filename')); ?> - + - + get_photo_versions($photo_idx)) + return $versions[count($versions)-1]; + + /* if no alternative version were found, return original version */ + return 0; + + } // get_current_version() /** * tells the client browser what to do @@ -1888,11 +2963,11 @@ class PHPFSPOT { * to do next. This is necessary for directly jumping * into photo index or single photo view when the are * requested with specific URLs + * @return string */ public function whatToDo() { if(isset($_SESSION['current_photo']) && $_SESSION['start_action'] == 'showp') { - return "show_photo"; } elseif(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) { return "showpi_tags"; @@ -1901,12 +2976,11 @@ class PHPFSPOT { return "showpi"; } - return "nothing special"; - } // whatToDo() /** * return the current process-user + * @return string */ private function getuid() { @@ -1921,25 +2995,61 @@ class PHPFSPOT { } // getuid() /** - * returns a select-dropdown box to select photo index sort parameters + * photo version select list + * + * this function returns a HTML select list (drop down) + * to select a alternative photo version of the original photo. + * + * @param array $params + * @param smarty $smarty + * @return string */ - private function get_sort_field() + public function smarty_photo_version_select_list($params, &$smarty) { - $output = ""; + return $output; - } // get_sort_field() + } // smarty_photo_version_select_list() + + /** + * returns a select-dropdown box to select photo index sort parameters + * @param array $params + * @param smarty $smarty + * @return string + */ + public function smarty_sort_select_list($params, &$smarty) + { + $output = ""; + + foreach($this->sort_orders as $key => $value) { + $output.= "