var $tmpl;
var $tags;
var $avail_tags;
+ private $dbver;
/**
* class constructor
}
$this->db = new PHPFSPOT_DB($this, $this->cfg->fspot_db);
-
+ if(!is_writeable($this->cfg->fspot_db)) {
+ print $this->cfg->fspot_db ." is not writeable for user ". $this->getuid() ."\n";
+ exit(1);
+ }
+
+ $this->dbver = $this->getFspotDBVersion();
+
if(!is_writeable(dirname($this->cfg->phpfspot_db))) {
- print dirname($this->cfg->phpfspot_db) .": directory is not writeable!";
+ print dirname($this->cfg->phpfspot_db) .": directory is not writeable for user ". $this->getuid() ."\n";
exit(1);
}
-
+
+ if(!is_writeable($this->cfg->base_path ."/templates_c")) {
+ print $this->cfg->base_path ."/templates_c: directory is not writeable for user ". $this->getuid() ."\n";
+ exit(1);
+ }
+
$this->cfg_db = new PHPFSPOT_DB($this, $this->cfg->phpfspot_db);
if(!is_writeable($this->cfg->phpfspot_db)) {
print $this->cfg->phpfspot_db ." is not writeable for user ". $this->getuid() ."\n";
exit(1);
}
+
$this->check_config_table();
/* include Smarty template engine */
require_once "phpfspot_tmpl.php";
$this->tmpl = new PHPFSPOT_TMPL($this);
- $this->get_tags();
+ /* check if all necessary indices exist */
+ $this->checkDbIndices();
- session_start();
+ /* if session is not yet started, do it now */
+ if(session_id() == "")
+ session_start();
if(!isset($_SESSION['tag_condition']))
$_SESSION['tag_condition'] = 'or';
$this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
$this->tmpl->assign('template_path', 'themes/'. $this->cfg->theme_name);
- $_SESSION['start_action'] = $_GET['mode'];
+ if(isset($_GET['mode'])) {
- switch($_GET['mode']) {
- case 'showpi':
- if(isset($_GET['tags'])) {
- $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
- }
- if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
- $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00");
- }
- if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
- $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59");
- }
- break;
- case 'showp':
- if(isset($_GET['tags'])) {
- $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
- $_SESSION['start_action'] = 'showp';
- }
- if(isset($_GET['id']) && is_numeric($_GET['id'])) {
- $_SESSION['current_photo'] = $_GET['id'];
- $_SESSION['start_action'] = 'showp';
- }
- if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
- $_SESSION['from_date'] = strtotime($_GET['from_date']);
- }
- if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
- $_SESSION['to_date'] = strtotime($_GET['to_date']);
- }
- break;
- case 'export':
- $this->tmpl->show("export.tpl");
- return;
- break;
- case 'slideshow':
- $this->tmpl->show("slideshow.tpl");
- return;
- break;
- case 'rss':
- if(isset($_GET['tags'])) {
- $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
- }
- if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
- $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00");
- }
- if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
- $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59");
- }
- $this->getRSSFeed();
- return;
- break;
+ $_SESSION['start_action'] = $_GET['mode'];
+
+ switch($_GET['mode']) {
+ case 'showpi':
+ if(isset($_GET['tags'])) {
+ $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
+ }
+ if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
+ $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00");
+ }
+ if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
+ $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59");
+ }
+ break;
+ case 'showp':
+ if(isset($_GET['tags'])) {
+ $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
+ $_SESSION['start_action'] = 'showp';
+ }
+ if(isset($_GET['id']) && is_numeric($_GET['id'])) {
+ $_SESSION['current_photo'] = $_GET['id'];
+ $_SESSION['start_action'] = 'showp';
+ }
+ if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
+ $_SESSION['from_date'] = strtotime($_GET['from_date']);
+ }
+ if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
+ $_SESSION['to_date'] = strtotime($_GET['to_date']);
+ }
+ break;
+ case 'export':
+ $this->tmpl->show("export.tpl");
+ return;
+ break;
+ case 'slideshow':
+ $this->tmpl->show("slideshow.tpl");
+ return;
+ break;
+ case 'rss':
+ if(isset($_GET['tags'])) {
+ $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
+ }
+ if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
+ $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00");
+ }
+ if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
+ $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59");
+ }
+ $this->getRSSFeed();
+ return;
+ break;
+ }
}
if(isset($_SESSION['from_date']) && isset($_SESSION['to_date']))
$this->avail_tags = Array();
$count = 0;
- $result = $this->db->db_query("
- SELECT id,name
- FROM tags
- ORDER BY sort_priority ASC
- ");
+ if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+ $query_str="
+ SELECT
+ DISTINCT t1.id as id, t1.name as name
+ FROM
+ photo_tags pt1
+ INNER JOIN photo_tags
+ pt2 ON pt1.photo_id=pt2.photo_id
+ INNER JOIN tags t1
+ ON t1.id=pt1.tag_id
+ INNER JOIN tags t2
+ ON t2.id=pt2.tag_id
+ WHERE
+ t2.name IN ('".implode("','",$this->cfg->show_tags)."')
+ ORDER BY
+ t1.sort_priority ASC";
+
+ $result = $this->db->db_query($query_str);
+ }
+ else
+ {
+ $result = $this->db->db_query("
+ SELECT id,name
+ FROM tags
+ ORDER BY sort_priority ASC
+ ");
+ }
while($row = $this->db->db_fetch_object($result)) {
if(in_array($row['name'], $this->cfg->hide_tags))
continue;
- /* if the user has specified to only show certain tags which
- are specified in phpfspot's configuration, ignore all others
- so they will not be added to the tag list.
- */
+ /* if you include the following if-clause and the user has specified
+ to only show certain tags which are specified in phpfspot's
+ configuration, ignore all others so they will not be added to the
+ tag list.
if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags) &&
!in_array($row['name'], $this->cfg->show_tags))
continue;
+ */
$this->tags[$tag_id] = $tag_name;
$this->avail_tags[$count] = $tag_id;
*/
public function get_photo_details($idx)
{
- $query_str = "
- SELECT p.id, p.name, p.time, p.directory_path, p.description
- FROM photos p
- ";
+ if($this->dbver < 9) {
+ $query_str = "
+ SELECT p.id, p.name, p.time, p.directory_path, p.description
+ FROM photos p
+ ";
+ }
+ else {
+ $query_str = "
+ SELECT p.id, p.uri, p.time, p.description
+ FROM photos p
+ ";
+ }
/* if show_tags is set, only return details for photos which
are specified to be shown
";
}
- $result = $this->db->db_query($query_str);
- return $this->db->db_fetch_object($result);
+ if($result = $this->db->db_query($query_str)) {
+
+ $row = $this->db->db_fetch_object($result);
+
+ if($this->dbver < 9) {
+ $row['uri'] = "file://". $row['directory_path'] ."/". $row['name'];
+ }
+
+ return $row;
+
+ }
+
+ return null;
} // get_photo_details
public function getPhotoName($idx, $limit = 0)
{
if($details = $this->get_photo_details($idx)) {
- $name = $this->shrink_text($details['name'], $limit);
- return $name;
+ if($long_name = $this->parse_uri($details['uri'], 'filename')) {
+ $name = $this->shrink_text($long_name, $limit);
+ return $name;
+ }
}
+ return null;
+
} // getPhotoName()
/**
return;
}
- $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
+ $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
$thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo);
if(!file_exists($orig_path)) {
$this->_error("Photo ". $orig_path ." does not exist!<br />\n");
+ return;
}
if(!is_readable($orig_path)) {
$this->_error("Photo ". $orig_path ." is not readable for user ". $this->getuid() ."<br />\n");
+ return;
}
/* If the thumbnail doesn't exist yet, try to create it */
$info = getimagesize($thumb_path);
$this->tmpl->assign('description', $details['description']);
- $this->tmpl->assign('image_name', $details['name']);
+ $this->tmpl->assign('image_name', $this->parse_uri($details['uri'], 'filename'));
$this->tmpl->assign('width', $info[0]);
$this->tmpl->assign('height', $info[1]);
*/
public function getAvailableTags()
{
+ $this->get_tags();
+
$output = "";
$result = $this->db->db_query("
*/
public function getSelectedTags()
{
+ $this->get_tags();
+
$output = "";
foreach($this->avail_tags as $tag)
{
/* return a search result */
if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
$query_str = "
- SELECT DISTINCT photo_id
- FROM photo_tags pt
+ SELECT DISTINCT pt1.photo_id
+ FROM photo_tags pt1
+ INNER JOIN photo_tags pt2
+ ON pt1.photo_id=pt2.photo_id
+ INNER JOIN tags t1
+ ON pt1.tag_id=t1.id
INNER JOIN photos p
- ON p.id=pt.photo_id
- INNER JOIN tags t
- ON pt.tag_id=t.id
- WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'";
+ ON pt1.photo_id=p.id
+ INNER JOIN tags t2
+ ON pt2.tag_id=t2.id
+ WHERE t1.name LIKE '%". $_SESSION['searchfor'] ."%' ";
if(isset($additional_where_cond))
$query_str.= "AND ". $additional_where_cond ." ";
if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
- $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags)."')";
+ $query_str.= "AND t2.name IN ('".implode("','",$this->cfg->show_tags)."')";
}
if(isset($order_str))
$selected.= $tag .",";
$selected = substr($selected, 0, strlen($selected)-1);
+ /* photo has to match at least on of the selected tags */
if($_SESSION['tag_condition'] == 'or') {
$query_str = "
- SELECT DISTINCT pt.photo_id
- FROM photo_tags pt
- INNER JOIN photos p
- ON p.id=pt.photo_id
+ SELECT DISTINCT pt1.photo_id
+ FROM photo_tags pt1
+ INNER JOIN photo_tags pt2
+ ON pt1.photo_id=pt2.photo_id
INNER JOIN tags t
- ON pt.tag_id=t.id
- WHERE pt.tag_id IN (". $selected .")
+ ON pt2.tag_id=t.id
+ INNER JOIN photos p
+ ON pt1.photo_id=p.id
+ WHERE pt1.tag_id IN (". $selected .")
";
if(isset($additional_where_cond))
$query_str.= "AND ". $additional_where_cond ." ";
if(isset($order_str))
$query_str.= $order_str;
}
+ /* photo has to match all selected tags */
elseif($_SESSION['tag_condition'] == 'and') {
if(count($_SESSION['selected_tags']) >= 32) {
INNER JOIN photos p
ON pt1.photo_id=p.id
";
- $query_str.= "WHERE pt1.tag_id=". $_SESSION['selected_tags'][0];
+ $query_str.= "WHERE pt2.tag_id=". $_SESSION['selected_tags'][0]." ";
for($i = 1; $i < count($_SESSION['selected_tags']); $i++) {
$query_str.= "
- AND pt". ($i+1) .".tag_id=". $_SESSION['selected_tags'][$i] ."
+ AND pt". ($i+2) .".tag_id=". $_SESSION['selected_tags'][$i] ."
";
}
if(isset($additional_where_cond))
}
elseif($this->cfg->rows_per_page > 0) {
- if(!$_SESSION['begin_with'] || $_SESSION['begin_with'] == 0)
+ if(!isset($_SESSION['begin_with']) || $_SESSION['begin_with'] == 0) {
$begin_with = 0;
+ }
else {
$begin_with = $_SESSION['begin_with'];
for($i = $begin_with; $i < $end_with; $i++) {
- $images[$rows][$cols] = $photos[$i];
- $img_id[$rows][$cols] = $i;
- $img_name[$rows][$cols] = htmlspecialchars($this->getPhotoName($photos[$i], 15));
- $img_title[$rows][$cols] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0));
+ if(isset($photos[$i])) {
- $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i]);
+ $images[$rows][$cols] = $photos[$i];
+ $img_id[$rows][$cols] = $i;
+ $img_name[$rows][$cols] = htmlspecialchars($this->getPhotoName($photos[$i], 15));
+ $img_title[$rows][$cols] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0));
- if(file_exists($thumb_path)) {
- $info = getimagesize($thumb_path);
- $img_width[$rows][$cols] = $info[0];
- $img_height[$rows][$cols] = $info[1];
- }
+ $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i]);
- if($cols == $this->cfg->thumbs_per_row-1) {
- $cols = 0;
- $rows++;
- $images[$rows] = Array();
- $img_width[$rows] = Array();
- $img_height[$rows] = Array();
- }
- else {
- $cols++;
- }
- }
+ if(file_exists($thumb_path)) {
+ $info = getimagesize($thumb_path);
+ $img_width[$rows][$cols] = $info[0];
+ $img_height[$rows][$cols] = $info[1];
+ }
+
+ if($cols == $this->cfg->thumbs_per_row-1) {
+ $cols = 0;
+ $rows++;
+ $images[$rows] = Array();
+ $img_width[$rows] = Array();
+ $img_height[$rows] = Array();
+ }
+ else {
+ $cols++;
+ }
+ }
+ }
// +1 for for smarty's selection iteration
$rows++;
/* do we have to display the page selector ? */
if($this->cfg->rows_per_page != 0) {
+
+ $page_select = "";
/* calculate the page switchers */
$previous_start = $begin_with - ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
{
$this->tmpl->assign('version', $this->cfg->version);
$this->tmpl->assign('product', $this->cfg->product);
+ $this->tmpl->assign('db_version', $this->dbver);
$this->tmpl->show("credits.tpl");
} // showCredits()
$details = $this->get_photo_details($idx);
/* calculate file MD5 sum */
- $full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
+ $full_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
if(!file_exists($full_path)) {
$this->_error("File ". $full_path ." does not exist\n");
$file_md5 = md5_file($full_path);
- $this->_debug("Image [". $idx ."] ". $this->shrink_text($details['name'], 20) ." Thumbnails:");
+ $this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:");
+
+ $changes = false;
foreach($resolutions as $resolution) {
$this->_debug(" ". $resolution ."px");
if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
$error = 1;
+
+ $changes = true;
}
/* if the file hasn't changed there is no need to regen the thumb */
elseif($file_md5 != $this->getMD5($idx) || $force) {
if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
$error = 1;
+ $changes = true;
}
}
+ if(!$changes) {
+ $this->_debug(" already exist");
+ }
+
/* set the new/changed MD5 sum for the current photo */
if(!$error) {
$this->setMD5($idx, $file_md5);
*/
public function startSearch($searchfor, $sort_order, $from = 0, $to = 0)
{
+ $this->get_tags();
+
$_SESSION['searchfor'] = $searchfor;
$_SESSION['sort_order'] = $sort_order;
if($from != 0)
*/
private function get_calendar($mode)
{
- $year = $_SESSION[$mode .'_date'] ? date("Y", $_SESSION[$mode .'_date']) : date("Y");
- $month = $_SESSION[$mode .'_date'] ? date("m", $_SESSION[$mode .'_date']) : date("m");
- $day = $_SESSION[$mode .'_date'] ? date("d", $_SESSION[$mode .'_date']) : date("d");
+ $year = isset($_SESSION[$mode .'_date']) ? date("Y", $_SESSION[$mode .'_date']) : date("Y");
+ $month = isset($_SESSION[$mode .'_date']) ? date("m", $_SESSION[$mode .'_date']) : date("m");
+ $day = isset($_SESSION[$mode .'_date']) ? date("d", $_SESSION[$mode .'_date']) : date("d");
$output = "<input type=\"text\" size=\"3\" id=\"". $mode ."year\" value=\"". $year ."\"";
- if(!isset($_SESSION[$mode .'_date'])) $output.= " disabled=\"disabled\"";
+ 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\"";
+ if(!isset($_SESSION[$mode .'_date']))
+ $output.= " disabled=\"disabled\"";
$output.= " />\n";
$output.= "<input type=\"text\" size=\"1\" id=\"". $mode ."day\" value=\"". $day ."\"";
- if(!isset($_SESSION[$mode .'_date'])) $output.= " disabled=\"disabled\"";
+ if(!isset($_SESSION[$mode .'_date']))
+ $output.= " disabled=\"disabled\"";
$output.= " />\n";
+
return $output;
} // get_calendar()
<br>
". $details['description']);
- $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
+ $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
$meta = $this->get_meta_informations($orig_path);
$meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($orig_path);
?>
<item>
- <title><?php print htmlspecialchars($details['name']); ?></title>
+ <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>
private function getCurrentTags()
{
$current_tags = "";
- if($_SESSION['selected_tags'] != "") {
+ if(isset($_SESSION['selected_tags']) && $_SESSION['selected_tags'] != "") {
foreach($_SESSION['selected_tags'] as $tag)
$current_tags.= $tag .",";
$current_tags = substr($current_tags, 0, strlen($current_tags)-1);
return " ORDER BY p.time DESC";
break;
case 'name_asc':
- return " ORDER BY p.name ASC";
+ if($this->dbver < 9) {
+ return " ORDER BY p.name ASC";
+ }
+ else {
+ return " ORDER BY basename(p.uri) ASC";
+ }
break;
case 'name_desc':
- return " ORDER BY p.name DESC";
+ if($this->dbver < 9) {
+ return " ORDER BY p.name DESC";
+ }
+ else {
+ return " ORDER BY basename(p.uri) DESC";
+ }
break;
}
} // check_readable()
-}
+ /**
+ * check if all needed indices are present
+ *
+ * this function checks, if some needed indices are already
+ * present, or if not, create them on the fly. they are
+ * necessary to speed up some queries like that one look for
+ * all tags, when show_tags is specified in the configuration.
+ */
+ private function checkDbIndices()
+ {
+ $result = $this->db->db_exec("
+ CREATE INDEX IF NOT EXISTS
+ phototag
+ ON
+ photo_tags
+ (photo_id, tag_id)
+ ");
+
+ } // checkDbIndices()
+
+ /**
+ * retrive F-Spot database version
+ *
+ * this function will return the F-Spot database version number
+ * It is stored within the sqlite3 database in the table meta
+ */
+ public function getFspotDBVersion()
+ {
+ if($result = $this->db->db_fetchSingleRow("
+ SELECT data as version
+ FROM meta
+ WHERE
+ name LIKE 'F-Spot Database Version'
+ "))
+ return $result['version'];
+
+ return null;
+
+ } // getFspotDBVersion()
+
+ /**
+ * parse the provided URI and will returned the
+ * requested chunk
+ */
+ public function parse_uri($uri, $mode)
+ {
+ if(($components = parse_url($uri)) !== false) {
+
+ switch($mode) {
+ case 'filename':
+ return basename($components['path']);
+ break;
+ case 'dirname':
+ return dirname($components['path']);
+ break;
+ case 'fullpath':
+ return $components['path'];
+ break;
+ }
+ }
+
+ return $uri;
+
+ } // parse_uri()
+
+} // class PHPFSPOT
?>