/* 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 ↑',
/* 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);
}
");
}
+ /* get F-Spot database version */
$this->dbver = $this->getFspotDBVersion();
if(!is_writeable($this->cfg->base_path ."/templates_c")) {
/* Check if directory where the database file is stored is writeable */
if(!is_writeable(dirname($this->cfg->phpfspot_db))) {
- print dirname($this->cfg->phpfspot_db) .": directory is not writeable for user ". $this->getuid() ."\n";
+ 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);
}
/* Check if database file is writeable */
if(!is_writeable($this->cfg->phpfspot_db)) {
- print $this->cfg->phpfspot_db ." is not writeable for user ". $this->getuid() ."\n";
+ 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);
}
}
/* 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();
+ $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();
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'] = '';
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()
$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'];
$_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';
}
}
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':
}
}
+ /* 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);
+ /* 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('from_date', $this->get_calendar('from'));
- $this->tmpl->assign('to_date', $this->get_calendar('to'));
- $this->tmpl->assign('content_page', 'welcome.tpl');
+ $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()
$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
} // 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
";
}
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, p.uri, p.time, p.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
+ ";
+ }
}
- /* 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.= "
";
}
- 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 */
+ if($version_idx > 0) {
+
+ /* 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
} // 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.= "<img id=\"rate_from_". $i ."\" src=\"";
+
+ if(isset($_SESSION['rate_from']) && $i <= $_SESSION['rate_from'])
+ $bar.= $this->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.= "<br />\n";
+
+ for($i = 1; $i <= 5; $i++) {
+
+ $bar.= "<img id=\"rate_to_". $i ."\" src=\"";
+
+ if(isset($_SESSION['rate_to']) && $i <= $_SESSION['rate_to'])
+ $bar.= $this->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
}
$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!<br />\n");
/* If the thumbnail doesn't exist yet, try to create it */
if(!file_exists($thumb_path)) {
$this->gen_thumb($photo, true);
- $thumb_path = $this->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 */
$info = getimagesize($orig_path);
/* get EXIF information if JPEG */
- if($info['mime'] == "image/jpeg") {
+ if(isset($info['mime']) && $info['mime'] == "image/jpeg") {
$meta = $this->get_meta_informations($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";
$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('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);
- $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);
+ 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->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);
+ }
+
$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($previous_img) {
- $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
+ 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->register_function("photo_version_select_list", array(&$this, "smarty_photo_version_select_list"), false);
- $this->tmpl->show("single_photo.tpl");
+ return $this->tmpl->fetch("single_photo.tpl");
} // showPhoto()
// 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;
// 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;
$b = '88';
if(isset($this->tags[$key])) {
- $output.= "<a href=\"javascript:Tags('add', ". $key .");\" class=\"tag\" style=\"font-size: ". $size ."%; color: #". $r.$g.$b .";\">". $this->tags[$key] ."</a>, ";
+ if($this->is_user_friendly_url()) {
+ $output.= "<a href=\"". $this->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] ."</a>, ";
+ }
+ else {
+ $output.= "<a href=\"". $this->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] ."</a>, ";
+ }
}
-
}
$output = substr($output, 0, strlen($output)-2);
- print $output;
+ return $output;
} // getAvailableTags()
break;
case 'img':
$output.= "
- <div style=\"display: table-cell;\">
- <div style=\"display: table-row; text-align: center;\">
- <a href=\"javascript:Tags('del', ". $tag .");\" title=\"". $this->tags[$tag] ."\">
- <img src=\"phpfspot_img.php?tagidx=". $tag ."\" />
- </a>
- </div>
- <div style=\"display: table-row; text-align: center;\">
- <a href=\"javascript:Tags('del', ". $tag .");\" title=\"". $this->tags[$tag] ."\">
- <img src=\"resources/underbar.png\" />
- </a>
- </div>
+ <div class=\"tagresulttag\">
+ <a href=\"javascript:Tags('del', ". $tag .");\" title=\"". $this->tags[$tag] ."\">
+ <img src=\"". $this->cfg->web_path ."/phpfspot_img.php?tagidx=". $tag ."\" />
+ </a>
</div>
";
break;
} // resetTags()
/**
- * returns the value for the autocomplet tag-search
+ * returns the value for the autocomplete tag-search
* @return string
*/
public function get_xml_tag_list()
if(isset($_SESSION['current_photo']))
unset($_SESSION['current_photo']);
+ if(isset($_SESSION['current_version']))
+ unset($_SESSION['current_version']);
+
} // resetPhotoView();
/**
/**
* 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()
{
} // 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
*
}
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.= "
(
}
}
+ /* 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();
}
ON pt2.tag_id=t2.id
WHERE t.name LIKE '%". $_SESSION['searchfor_tag'] ."%' ";
- if(isset($additional_where_cond) && !empty($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)) {
ON pt1.photo_id=p.id
WHERE pt1.tag_id IN (". $selected .")
";
- if(isset($additional_where_cond) && !empty($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)) {
AND pt". ($i+2) .".tag_id=". $_SESSION['selected_tags'][$i] ."
";
}
- if(isset($additional_where_cond) && !empty($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)) {
ON pt.tag_id=t.id
";
- if(isset($additional_where_cond) && !empty($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)) {
- if(isset($additional_where_cond) && !empty($additional_where_cond))
+ 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). "')";
*
* 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);
$img_name[$thumbs] = Array();
$img_fullname[$thumbs] = Array();
$img_title = Array();
+ $img_rating = Array();
for($i = $begin_with; $i < $end_with; $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]);
+ $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);
else
$style = "";
- $select = "<a href=\"javascript:showPhotoIndex(". (($i*$photo_per_page)-$photo_per_page) .");\"";
+ $start_with = ($i*$photo_per_page)-$photo_per_page;
+
+ if($this->is_user_friendly_url()) {
+ $select = "<a href=\"". $this->cfg->web_path ."/tag/205/". $start_with ."\"";
+ }
+ else {
+ $select = "<a href=\"". $this->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 ."</a> ";
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 != "") {
$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'));
- $this->tmpl->show("photo_index.tpl");
+ $result = $this->tmpl->fetch("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'])) {
- print "<script language=\"JavaScript\">moveToThumb(". $_SESSION['last_photo'] .");</script>\n";
+ $result.= "<script language=\"JavaScript\">moveToThumb(". $_SESSION['last_photo'] .");</script>\n";
unset($_SESSION['last_photo']);
}
+ return $result;
+
} // showPhotoIndex()
/**
$flip_hori = false;
$flip_vert = false;
- switch($meta['Orientation']) {
- case 1: /* top, left */
- /* nothing to do */ break;
- case 2: /* top, right */
- $rotate = 0; $flip_hori = true; break;
- case 3: /* bottom, left */
- $rotate = 180; break;
- case 4: /* bottom, right */
- $flip_vert = true; break;
- case 5: /* left side, top */
- $rotate = 90; $flip_vert = true; break;
- case 6: /* right side, top */
- $rotate = 90; break;
- case 7: /* left side, bottom */
- $rotate = 270; $flip_vert = true; break;
- case 8: /* right side, bottom */
- $rotate = 270; break;
+ 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);
* 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
public function gen_thumb($idx = 0, $force = 0, $overwrite = false)
{
$error = 0;
+ $versions = Array(0);
$resolutions = Array(
$this->cfg->thumb_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'));
+
+ if(!file_exists($full_path)) {
+ $this->_error("File ". $full_path ." does not exist\n");
+ 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'])) {
+ /* 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);
+ $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;
- $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()
* @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()
*/
public function startSearch()
{
- if(isset($_POST['from']) && $this->isValidDate($_POST['from'])) {
- $from = $_POST['from'];
+ /* date search */
+ 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 */
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'])) {
- $searchfor_name = $_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();
- 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']);
} // 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
*
private function _debug($text)
{
- if($this->fromcmd) {
+ if(isset($this->fromcmd)) {
print $text;
}
error_log($text);
break;
case 'logfile':
- error_log($text, 3, $his->cfg->log_file);
+ error_log($text, 3, $this->cfg->log_file);
break;
}
} // _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 = "<input type=\"text\" size=\"3\" id=\"". $mode ."year\" value=\"". $year ."\"";
- if(!isset($_SESSION[$mode .'_date']))
- $output.= " disabled=\"disabled\"";
- $output.= " />\n";
- $output.= "<input type=\"text\" size=\"1\" id=\"". $mode ."month\" value=\"". $month ."\"";
- if(!isset($_SESSION[$mode .'_date']))
- $output.= " disabled=\"disabled\"";
- $output.= " />\n";
- $output.= "<input type=\"text\" size=\"1\" id=\"". $mode ."day\" value=\"". $day ."\"";
+ $output = "<input type=\"text\" size=\"15\" id=\"date_". $mode ."\" value=\"". $date ."\"";
if(!isset($_SESSION[$mode .'_date']))
$output.= " disabled=\"disabled\"";
$output.= " />\n";
return $output;
- } // get_calendar()
+ } // get_date_text_field()
/**
* output calendar matrix
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;
}
$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) {
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;
}
$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("
<a href=\"". $orig_url ."\"><img src=\"". $thumb_url ."\" /></a>
<br>
$orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
/* get EXIF information if JPEG */
- if($details['mime'] == "image/jpeg") {
+ if(isset($details['mime']) && $details['mime'] == "image/jpeg") {
$meta = $this->get_meta_informations($orig_path);
}
- $meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($orig_path);
-
?>
<item>
<title><?php print htmlspecialchars($this->parse_uri($details['uri'], 'filename')); ?></title>
<link><?php print htmlspecialchars($orig_url); ?></link>
<guid><?php print htmlspecialchars($orig_url); ?></guid>
- <dc:date.Taken><?php print strftime("%Y-%m-%dT%H:%M:%S+00:00", $meta_date); ?></dc:date.Taken>
+ <dc:date.Taken><?php print strftime("%Y-%m-%dT%H:%M:%S+00:00", $details['time']); ?></dc:date.Taken>
<description>
<?php print $thumb_html; ?>
</description>
- <pubDate><?php print strftime("%a, %d %b %Y %T %z", $meta_date); ?></pubDate>
+ <pubDate><?php print strftime("%a, %d %b %Y %T %z", $details['time']); ?></pubDate>
</item>
<?php
/**
- * return all selected tags as one string
+ * get all selected tags
+ *
+ * This function will return all selected tags as one string, seperated
+ * by a comma.
* @return array
*/
private function getCurrentTags()
/**
* return the current photo
*/
- public function getCurrentPhoto()
+ public function get_current_photo()
{
if(isset($_SESSION['current_photo'])) {
- print $_SESSION['current_photo'];
+ return $_SESSION['current_photo'];
}
- } // getCurrentPhoto()
+
+ return NULL;
+
+ } // get_current_photo()
+
+ /**
+ * current selected photo version
+ *
+ * this function returns the current selected photo version
+ * from the session variables.
+ *
+ * @return int
+ */
+ public function get_current_version()
+ {
+ /* if current version is set, return it, if the photo really has that version */
+ if(isset($_SESSION['current_version']) && is_numeric($_SESSION['current_version']))
+ return $_SESSION['current_version'];
+
+ return false;
+
+ } // get_current_version()
+
+ /**
+ * returns latest available photo version
+ *
+ * this function returns the latested available version
+ * for the requested photo.
+ *
+ * @return int
+ */
+ public function get_latest_version($photo_idx)
+ {
+ /* try to get the lasted version for the current photo */
+ if($versions = $this->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
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";
return "showpi";
}
- return "nothing special";
-
} // whatToDo()
/**
} // 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 = "<option value=\"0\">Original</option>";
+ $versions = $this->get_photo_versions($params['photo']);
+
+ foreach($versions as $version) {
+
+ $output.= "<option value=\"". $version ."\"";
+ if($version == $params['current']) {
+ $output.= " selected=\"selected\"";
+ }
+ $output.= ">". $this->get_photo_version_name($params['photo'], $version) ."</option>";
+ }
+
+ return $output;
+
+ } // smarty_photo_version_select_list()
+
/**
* returns a select-dropdown box to select photo index sort parameters
* @param array $params
case 'tags_desc':
return " ORDER BY t.name DESC ,p.time ASC";
break;
+ case 'rate_asc':
+ return " ORDER BY p.rating ASC, t.name ASC";
+ break;
+ case 'rate_desc':
+ return " ORDER BY p.rating DESC, t.name ASC";
+ break;
}
} // get_sort_order()
else
$_SESSION['slideshow_img']++;
- return $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width;
+ if($this->is_user_friendly_url()) {
+ return $this->get_phpfspot_url() ."/photo/". $all_photos[$_SESSION['slideshow_img']] ."/". $this->cfg->photo_width;
+ }
+
+ return $this->get_phpfspot_url() ."/phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width;
} // getNextSlideShowImage()
else
$_SESSION['slideshow_img']--;
- return $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width;
+ if($this->is_user_friendly_url()) {
+ return $this->get_phpfspot_url() ."/photo/". $all_photos[$_SESSION['slideshow_img']] ."/". $this->cfg->photo_width;
+ }
+
+ return $this->get_phpfspot_url() ."/phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width;
} // getPrevSlideShowImage()
{
$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";
}
- $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)."')
- ";
+ else {
+ $query_str = "
+ SELECT
+ p.id
+ FROM
+ photos p
+ INNER JOIN photo_tags pt
+ ON p.id=pt.photo_id
+ WHERE
+ pt.tag_id LIKE '". $tagidx ."'";
}
$result = $this->db->db_query($query_str);
*/
private function ts2str($timestamp)
{
- return strftime("%Y-%m-%d", $timestamp);
+ if(!empty($timestamp) && is_numeric($timestamp))
+ return strftime("%Y-%m-%d", $timestamp);
+
} // ts2str()
/**
* @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
. "/"
private function get_phpfspot_url()
{
return $this->get_web_protocol() ."://". $this->get_server_name() . $this->cfg->web_path;
+
} // get_phpfspot_url()
/**
}
- /* check for pending slash on web_path */
- if(!preg_match("/\/$/", $this->cfg->web_path))
- $this->cfg->web_path.= "/";
+ /* remove trailing slash, if set */
+ if($this->cfg->web_path == "/")
+ $this->cfg->web_path = "";
+ elseif(preg_match('/\/$/', $this->cfg->web_path))
+ $this->cfg->web_path = preg_replace('/\/$/', '', $this->cfg->web_path);
return $this->runtime_error;
*/
public function get_mime_info($file)
{
- $details = getimagesize($orig_image);
+ $details = getimagesize($file);
/* if getimagesize() returns empty, try at least to find out the
mime type.
} // get_tag_name()
+ /**
+ * parse user friendly url which got rewritten by the websever
+ * @param string $request_uri
+ * @return string
+ */
+ private function parse_user_friendly_url($request_uri)
+ {
+ if(preg_match('/\/photoview\/|\/photo\/|\/tag\//', $request_uri)) {
+
+ $options = explode('/', $request_uri);
+
+ switch($options[1]) {
+ case 'photoview':
+ if(is_numeric($options[2])) {
+ $this->session_cleanup();
+ //unset($_SESSION['start_action']);
+ //unset($_SESSION['selected_tags']);
+ $_GET['mode'] = 'showp';
+ return $this->showPhoto($options[2]);
+ }
+ 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;
+ $img->showImg($options[2], $width, $version);
+ }
+ exit;
+ break;
+ case 'tag':
+ if(is_numeric($options[2])) {
+ $this->session_cleanup();
+ $_GET['tags'] = $options[2];
+ $_SESSION['selected_tags'] = Array($options[2]);
+ if(isset($options[3]) && is_numeric($options[3]))
+ $_SESSION['begin_with'] = $options[3];
+ return $this->showPhotoIndex();
+ }
+ break;
+ }
+ }
+
+ } // parse_user_friendly_url()
+
+ /**
+ * check if user-friendly-urls are enabled
+ *
+ * this function will return true, if the config option
+ * $user_friendly_url has been set. Otherwise false.
+ * @return boolean
+ */
+ private function is_user_friendly_url()
+ {
+ if(isset($this->cfg->user_friendly_url) && $this->cfg->user_friendly_url)
+ return true;
+
+ return false;
+
+ } // is_user_friendly_url()
+
+ /**
+ * session cleanup
+ *
+ * this function will cleanup user's session information
+ */
+ private function session_cleanup()
+ {
+ unset($_SESSION['begin_with']);
+ $this->resetDateSearch();
+ $this->resetPhotoView();
+ $this->resetTagSearch();
+ $this->resetNameSearch();
+ $this->resetDateSearch();
+ $this->resetTags();
+
+ } // 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
+ 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
?>
projects / phpfspot.git / blobdiff