X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=1423f988f5c63ec2fa7b98aa0ad9155be776c64e;hp=df984cb9bc076ecdbe686a48d19ad87eebae32c5;hb=ea36e81b91c8689ae44d413eca4697d1993ac30b;hpb=c74587e30a28f01a2c7134cc254964baf8a7fa10 diff --git a/phpfspot.class.php b/phpfspot.class.php index df984cb..1423f98 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -122,7 +122,8 @@ class PHPFSPOT { /* set application name and version information */ $this->cfg->product = "phpfspot"; - $this->cfg->version = "1.5"; + $this->cfg->version = "1.7"; + $this->cfg->db_version = 2; $this->sort_orders= array( 'date_asc' => 'Date ↑', @@ -140,6 +141,12 @@ class PHPFSPOT { /******* 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 "Error: ". $this->cfg->fspot_db ." is not writeable for user ". $this->getuid() .".\n"; @@ -182,7 +189,7 @@ class PHPFSPOT { } /* Check if database file is writeable */ - if(!is_writeable($this->cfg->phpfspot_db)) { + 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); @@ -200,12 +207,13 @@ class PHPFSPOT { } /* Check if some tables need to be created */ - $this->check_config_table(); + $this->check_phpfspot_db(); /* overload Smarty class with our own template handler */ require_once "phpfspot_tmpl.php"; $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 */ @@ -227,8 +235,9 @@ 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_desc'; + $_SESSION['sort_order'] = $this->cfg->sort_order; if(!isset($_SESSION['searchfor_tag'])) $_SESSION['searchfor_tag'] = ''; @@ -292,6 +301,8 @@ 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'; } @@ -344,8 +355,8 @@ class PHPFSPOT { } $this->tmpl->register_function("sort_select_list", array(&$this, "smarty_sort_select_list"), false); - $this->tmpl->assign('search_from_date', $this->get_calendar('from')); - $this->tmpl->assign('search_to_date', $this->get_calendar('to')); + $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()); @@ -391,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 @@ -413,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 "); @@ -449,39 +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 { /* till F-Spot version 0.4.1 */ if($this->dbver < 11) { $query_str = " - SELECT p.id, p.uri, p.time, p.description - FROM photos p + 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, p.uri, p.time, p.description, p.rating - FROM photos p + 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.= " @@ -498,28 +538,55 @@ 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 @@ -540,11 +607,11 @@ class PHPFSPOT { /** * get photo rating level * - * this function will return the integer-based rating - * level of the photo. This can only be done, if the F-Spot - * database is at a specific level. If rating value can not - * be found, zero will be returned indicating no rating value - * is available. + * 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 */ @@ -562,8 +629,8 @@ class PHPFSPOT { /** * get rate-search bars * - * this function will return the rating-bars for the - * search field. + * this function will return the rating-bars for the search field. + * * @return string */ public function get_rate_search() @@ -609,9 +676,9 @@ class PHPFSPOT { /** * 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 @@ -686,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"); @@ -701,7 +777,7 @@ 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 mime-type, height and width from the original photo */ @@ -719,7 +795,6 @@ class PHPFSPOT { $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"; @@ -747,17 +822,17 @@ class PHPFSPOT { $this->tmpl->assign('width', $info_thumb[0]); $this->tmpl->assign('height', $info_thumb[1]); - $this->tmpl->assign('ExifMadeOn', $meta_date); + $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); + $this->tmpl->assign('image_url', '/photo/'. $photo ."/". $this->cfg->photo_width .'/'. $version); $this->tmpl->assign('image_url_full', '/photo/'. $photo); } else { - $this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&width=". $this->cfg->photo_width); + $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); } @@ -781,6 +856,14 @@ class PHPFSPOT { $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->register_function("photo_version_select_list", array(&$this, "smarty_photo_version_select_list"), false); return $this->tmpl->fetch("single_photo.tpl"); @@ -841,6 +924,9 @@ class PHPFSPOT { // 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; @@ -849,7 +935,7 @@ class PHPFSPOT { // 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; @@ -859,10 +945,20 @@ class PHPFSPOT { $b = '88'; if(isset($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 .";\">". $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 .";\">". $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] .", "; + } } } @@ -1047,6 +1143,9 @@ class PHPFSPOT { if(isset($_SESSION['current_photo'])) unset($_SESSION['current_photo']); + if(isset($_SESSION['current_version'])) + unset($_SESSION['current_version']); + } // resetPhotoView(); /** @@ -1111,7 +1210,7 @@ class PHPFSPOT { * @return array */ public function getPhotoSelection() - { + { $matched_photos = Array(); $additional_where_cond = ""; @@ -1177,8 +1276,10 @@ class PHPFSPOT { /* return a search result */ 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 t @@ -1216,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 @@ -1255,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)) { @@ -1303,8 +1408,10 @@ class PHPFSPOT { /* return all available photos */ $query_str = " - SELECT DISTINCT p.id - FROM photos p + SELECT DISTINCT + p.id as id + FROM + photos p LEFT JOIN photo_tags pt ON p.id=pt.photo_id LEFT JOIN tags t @@ -1365,40 +1472,45 @@ class PHPFSPOT { } $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(); - $img_rating = Array(); for($i = $begin_with; $i < $end_with; $i++) { - if(isset($photos[$i])) { + if(!isset($photos[$i])) + continue; + + /* 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(); + } - $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]); + $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]); - $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $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(file_exists($thumb_path)) { - $info = getimagesize($thumb_path); + /* 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]; } - $thumbs++; - } + } + $thumbs++; } - // +1 for for smarty's selection iteration - $thumbs++; - if(isset($_SESSION['searchfor_tag']) && $_SESSION['searchfor_tag'] != '') $this->tmpl->assign('searchfor_tag', $_SESSION['searchfor_tag']); @@ -1523,16 +1635,20 @@ class PHPFSPOT { $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('img_rating', $img_rating); - $this->tmpl->assign('thumbs', $thumbs); $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"); @@ -1820,25 +1936,133 @@ 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) ) - "); + "); } - } // check_config_table + 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_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 @@ -1851,6 +2075,7 @@ class PHPFSPOT { public function gen_thumb($idx = 0, $force = 0, $overwrite = false) { $error = 0; + $versions = Array(0); $resolutions = Array( $this->cfg->thumb_width, @@ -1859,110 +2084,125 @@ class PHPFSPOT { 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')); - $this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:"); + if(!file_exists($full_path)) { + $this->_error("File ". $full_path ." does not exist"); + return; + } - /* 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'])) { + if(!is_readable($full_path)) { + $this->_error("File ". $full_path ." is not readable for ". $this->getuid() ."\n"); + return; + } - $ppm_path = preg_replace('/\.nef$/i', '.ppm', $full_path); + $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'])) { + + $ppm_path = preg_replace('/\.nef$/i', '.ppm', $full_path); + + /* 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); + } + + /* for now we handle the PPM instead of the NEF */ + $full_path = $ppm_path; - /* 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); } - /* for now we handle the PPM instead of the NEF */ - $full_path = $ppm_path; + $file_md5 = md5_file($full_path); + $changes = false; - } + foreach($resolutions as $resolution) { - $file_md5 = md5_file($full_path); - $changes = false; + $generate_it = 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; + + /* if thumbnail-subdirectory does not exist yet, create it */ + if(!file_exists(dirname($thumb_path))) { + mkdir(dirname($thumb_path), 0755); + } - $thumb_sub_path = substr($file_md5, 0, 2); - $thumb_path = $this->cfg->thumb_path ."/". $thumb_sub_path ."/". $resolution ."_". $file_md5; + /* 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; + } - /* if thumbnail-subdirectory does not exist yet, create it */ - if(!file_exists(dirname($thumb_path))) { - mkdir(dirname($thumb_path), 0755); - } + if($generate_it || $overwrite) { - /* if the thumbnail file doesn't exist, create it */ - if(!file_exists($thumb_path)) { - $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; - } + $this->_debug(" ". $resolution ."px"); + if(!$this->create_thumbnail($full_path, $thumb_path, $resolution)) + $error = 1; - if($generate_it || $overwrite) { + $changes = true; + } + } - $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; + + if($img = $this->cfg_db->db_fetch_object($result)) + return $img['img_md5']; - $img = $this->cfg_db->db_fetch_object($result); - return $img['img_md5']; + return NULL; } // getMD5() @@ -1971,11 +2211,16 @@ class PHPFSPOT { * @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() @@ -2009,11 +2254,11 @@ class PHPFSPOT { public function startSearch() { /* date search */ - if(isset($_POST['from']) && $this->isValidDate($_POST['from'])) { - $from = $_POST['from']; + if(isset($_POST['date_from']) && $this->isValidDate($_POST['date_from'])) { + $date_from = $_POST['date_from']; } - if(isset($_POST['to']) && $this->isValidDate($_POST['to'])) { - $to = $_POST['to']; + if(isset($_POST['date_to']) && $this->isValidDate($_POST['date_to'])) { + $date_to = $_POST['date_to']; } /* tag-name search */ @@ -2049,13 +2294,13 @@ class PHPFSPOT { $this->get_tags(); - if(isset($from) && !empty($from)) - $_SESSION['from_date'] = strtotime($from ." 00:00:00"); + if(isset($date_from) && !empty($date_from)) + $_SESSION['from_date'] = strtotime($date_from ." 00:00:00"); else unset($_SESSION['from_date']); - if(isset($to) && !empty($to)) - $_SESSION['to_date'] = strtotime($to ." 23:59:59"); + if(isset($date_to) && !empty($date_to)) + $_SESSION['to_date'] = strtotime($date_to ." 23:59:59"); else unset($_SESSION['to_date']); @@ -2091,6 +2336,25 @@ class PHPFSPOT { } // 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 * @@ -2211,7 +2475,7 @@ class PHPFSPOT { 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 @@ -2349,14 +2613,18 @@ class PHPFSPOT { switch($this->cfg->logging) { default: case 'display': - print "\"warning\"\n"; - print $text ."
\n"; + 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; } @@ -2365,32 +2633,31 @@ class PHPFSPOT { } // _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 = "get_meta_informations($orig_path); } - $meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($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 @@ -2668,6 +2973,37 @@ class PHPFSPOT { } // getuid() + /** + * 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 + */ + public function smarty_photo_version_select_list($params, &$smarty) + { + if(!isset($params['photo']) || !isset($params['current'])) + return NULL; + + $output = ""; + $versions = $this->get_photo_versions($params['photo']); + + foreach($versions as $version) { + + $output.= ""; + } + + return $output; + + } // smarty_photo_version_select_list() + /** * returns a select-dropdown box to select photo index sort parameters * @param array $params @@ -2726,10 +3062,10 @@ class PHPFSPOT { return " ORDER BY t.name DESC ,p.time ASC"; break; case 'rate_asc': - return " ORDER BY t.name ASC, p.rating ASC"; + return " ORDER BY p.rating ASC, t.name ASC"; break; case 'rate_desc': - return " ORDER BY t.name DESC, p.rating DESC"; + return " ORDER BY p.rating DESC, t.name ASC"; break; } @@ -2806,7 +3142,7 @@ class PHPFSPOT { $all = Array(); $query_str = " - SELECT p.id + SELECT p.id as id FROM photos p "; @@ -2848,30 +3184,36 @@ class PHPFSPOT { { $all = Array(); - $query_str = " - SELECT p.id - FROM photos p - INNER JOIN photo_tags pt - ON p.id=pt.photo_id - "; - if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { $query_str.= " - INNER JOIN tags t - ON pt.tag_id=t.id - "; + SELECT + DISTINCT pt1.photo_id as id + 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 + pt1.tag_id LIKE '". $tagidx ."' + AND + t2.name IN ('".implode("','",$this->cfg->show_tags)."') + ORDER BY + t1.sort_priority ASC"; + } + else { + $query_str = " + SELECT + p.id as id + FROM + photos p + INNER JOIN photo_tags pt + ON p.id=pt.photo_id + WHERE + pt.tag_id LIKE '". $tagidx ."'"; } - $query_str.= " - WHERE - pt.tag_id LIKE '". $tagidx ."' - "; - - /*if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { - $query_str.= " - AND - t.name IN ('".implode("','",$this->cfg->show_tags)."') - "; - }*/ $result = $this->db->db_query($query_str); @@ -2940,9 +3282,9 @@ class PHPFSPOT { * @param integer $photo * @return string */ - public function get_thumb_path($width, $photo) + public function get_thumb_path($width, $photo_idx, $version_idx) { - $md5 = $this->getMD5($photo); + $md5 = $this->getMD5($photo_idx, $version_idx); $sub_path = substr($md5, 0, 2); return $this->cfg->thumb_path . "/" @@ -3197,14 +3539,14 @@ class PHPFSPOT { $to_delete = Array(); $result = $this->cfg_db->db_query(" - SELECT img_idx + SELECT img_idx as 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 + SELECT id as id FROM photos WHERE id='". $row['img_idx'] ."'")) { @@ -3283,7 +3625,7 @@ class PHPFSPOT { public function get_tag_name($idx) { if($result = $this->db->db_fetchSingleRow(" - SELECT name + SELECT name as name FROM tags WHERE id LIKE '". $idx ."'")) { @@ -3319,12 +3661,15 @@ class PHPFSPOT { break; case 'photo': if(is_numeric($options[2])) { + $width = NULL; + $version = NULL; + if(isset($options[3]) && is_numeric($options[3])) + $width = $options[3]; + if(isset($options[4]) && is_numeric($options[4])) + $version = $options[4]; require_once "phpfspot_img.php"; $img = new PHPFSPOT_IMG; - if(isset($options[3]) && is_numeric($options[3])) - $img->showImg($options[2], $options[3]); - else - $img->showImg($options[2]); + $img->showImg($options[2], $width, $version); } exit; break; @@ -3376,6 +3721,132 @@ class PHPFSPOT { } // session_cleanup() + /** + * get database version + * + * this function queries the meta table + * and returns the current database version. + * + * @return integer + */ + public function get_db_version() + { + if($row = $this->cfg_db->db_fetchSingleRow(" + SELECT meta_value as meta_value + FROM + meta + WHERE + meta_key LIKE 'phpfspot Database Version' + ")) { + + return $row['meta_value']; + + } + + return 0; + + } // get_db_version() + + /** + * get photo versions + * + * this function returns an array of all available + * alterntaive versions of the provided photo id. + * has alternative photo versions available + * + * @param int $idx + * @return array + */ + public function get_photo_versions($idx) + { + $versions = Array(); + + $result = $this->db->db_query(" + SELECT + version_id + FROM + photo_versions + WHERE + photo_id LIKE '". $idx ."'"); + + while($row = $this->cfg_db->db_fetch_object($result)) { + array_push($versions, $row['version_id']); + } + + return $versions; + + } // get_photo_versions() + + /** + * check for invalid version of photo + * + * this function validates the provided photo-id and version-id + * + * @param int $photo_idx + * @param int $version_idx + * @return bool + */ + public function is_valid_version($photo_idx, $version_idx) + { + /* the original version is always valid */ + if($version_idx == 0) + return true; + + if($versions = $this->get_photo_versions($photo_idx)) { + if(in_array($version_idx, $versions)) + return true; + } + + return false; + + } // is_valid_version() + + /** + * get photo version name + * + * this function returns the name of the version + * identified by the photo-id and version-id. + * + * @param int $photo_idx + * @param int $version_idx + * @return string + */ + public function get_photo_version_name($photo_idx, $version_idx) + { + if($row = $this->db->db_fetchSingleRow(" + SELECT + name + FROM + photo_versions + WHERE + photo_id LIKE '". $photo_idx ."' + AND + version_id LIKE '". $version_idx ."'")) { + + return $row['name']; + + } + + return false; + + } // get_photo_version_name() + + /** + */ + public function is_valid_width($image_width) + { + if(in_array($image_width, + Array($this->cfg->thumb_width, + $this->cfg->photo_width, + $this->cfg->mini_width, + 30))) + + return true; + + return false; + + } // is_valid_width() + } // class PHPFSPOT ?>