/* 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 ↑',
/******* 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";
}
/* 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);
}
/* 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 */
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'] = '';
$_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';
}
$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
else
{
$result = $this->db->db_query("
- SELECT id,name
+ SELECT id as id,name as name
FROM tags
ORDER BY sort_priority ASC
");
} // 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.= "
";
}
- 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
/**
* 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
*/
/**
* 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()
/**
* 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
* @return string
*/
public function translate_path($path)
- {
- return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path);
+ {
+ if($this->cfg->enable_replace_path == true)
+ return str_replace(
+ $this->cfg->path_replace_from,
+ $this->cfg->path_replace_to, $path);
+
+ return $path;
} // translate_path
}
$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 */
$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);
}
$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");
// 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])) {
- 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 .";\">". $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 .";\">". $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>, ";
+ }
}
}
if(isset($_SESSION['current_photo']))
unset($_SESSION['current_photo']);
+ if(isset($_SESSION['current_version']))
+ unset($_SESSION['current_version']);
+
} // resetPhotoView();
/**
* @return array
*/
public function getPhotoSelection()
- {
+ {
$matched_photos = Array();
$additional_where_cond = "";
/* 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
/* 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
*/
$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)) {
/* 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
}
$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;
- $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]);
+ /* 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]);
- $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']);
$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");
* 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 ."'
+ )
+ ");
}
- } // check_config_table
+ /* 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
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");
+ 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;
+
+ 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()
* @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()
} // 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 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
$missing = true;
}
+ if($this->cfg->db_access == "pdo") {
+ if(array_search("sqlite", PDO::getAvailableDrivers()) === false) {
+ print "PDO SQLite3 driver is missing<br />\n";
+ $missing = true;
+ }
+ }
+
/* Check for HTML_AJAX PEAR package, lent from Horde project */
ini_set('track_errors', 1);
@include_once 'HTML/AJAX/Server.php';
print "PEAR Console_Getopt package is missing<br />\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<br />\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<br />\n";
switch($this->cfg->logging) {
default:
case 'display':
- print "<img src=\"resources/green_info.png\" alt=\"warning\" />\n";
- print $text ."<br />\n";
+ if(isset($this->fromcmd))
+ print $text ."\n";
+ else {
+ print "<img src=\"resources/green_info.png\" alt=\"warning\" />\n";
+ print $text ."<br />\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;
}
* @param integer $month
* @param integer $day
*/
- public function get_calendar_matrix($year = 0, $month = 0, $day = 0)
+ public function get_calendar_matrix($userdate)
{
- if (!isset($year)) $year = date('Y');
- if (!isset($month)) $month = date('m');
- if (!isset($day)) $day = date('d');
+ if(($userdate = strtotime($userdate)) === false) {
+ $year = date('Y');
+ $month = date('m');
+ $day = date('d');
+ }
+ else {
+ $date = new Date();
+ $date->setDate($userdate);
+
+ $year = $date->getYear();
+ $month = $date->getMonth();
+ $day = $date->getDay();
+ }
+
$rows = 1;
$cols = 1;
$matrix = Array();
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();
$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() )
/**
* 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
} // 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
return " ORDER BY p.rating ASC, t.name ASC";
break;
case 'rate_desc':
- return " ORDER BY p.rating DESC, t.name DESC";
+ return " ORDER BY p.rating DESC, t.name ASC";
break;
}
$all = Array();
$query_str = "
- SELECT p.id
+ SELECT p.id as id
FROM photos p
";
{
$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);
* @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
. "/"
if(!isset($this->cfg->thumbs_per_page))
$this->_error("Please set \$thumbs_per_page in phpfspot_cfg");
- if(!isset($this->cfg->path_replace_from) || $this->cfg->path_replace_from == "")
- $this->_error("Please set \$path_replace_from in phpfspot_cfg");
+ if(!isset($this->cfg->enable_replace_path))
+ $this->_error("Please set \$enable_replace_path in phpfspot_cfg");
- if(!isset($this->cfg->path_replace_to) || $this->cfg->path_replace_to == "")
- $this->_error("Please set \$path_replace_to in phpfspot_cfg");
+ if($this->cfg->enable_replace_path == true) {
+ if(!isset($this->cfg->path_replace_from) || $this->cfg->path_replace_from == "")
+ $this->_error("Please set \$path_replace_from in phpfspot_cfg");
+
+ if(!isset($this->cfg->path_replace_to) || $this->cfg->path_replace_to == "")
+ $this->_error("Please set \$path_replace_to in phpfspot_cfg");
+ }
if(!isset($this->cfg->hide_tags))
$this->_error("Please set \$hide_tags in phpfspot_cfg");
$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'] ."'")) {
public function get_tag_name($idx)
{
if($result = $this->db->db_fetchSingleRow("
- SELECT name
+ SELECT name as name
FROM tags
WHERE
id LIKE '". $idx ."'")) {
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;
} // 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
?>
projects / phpfspot.git / blobdiff