*/
public function __construct()
{
+ $this->cfg = new PHPFSPOT_CFG;
+
+ /* set application name and version information */
+ $this->cfg->product = "phpfspot";
+ $this->cfg->version = "1.2";
+
/* Check necessary requirements */
if(!$this->checkRequirements()) {
exit(1);
}
- $this->cfg = new PHPFSPOT_CFG;
-
$this->db = new PHPFSPOT_DB($this, $this->cfg->fspot_db);
if(!is_writeable(dirname($this->cfg->phpfspot_db))) {
$this->check_config_table();
/* include Smarty template engine */
+ if(!$this->check_readable($this->cfg->smarty_path .'/libs/Smarty.class.php')) {
+ exit(1);
+ }
require $this->cfg->smarty_path .'/libs/Smarty.class.php';
/* overload Smarty class if our own template handler */
require_once "phpfspot_tmpl.php";
*
* this function will get all available tags from
* the f-spot database and store them within two
- * arrays within this clase for later usage. in
+ * arrays within this class for later usage. in
* fact, if the user requests (hide_tags) it will
* opt-out some of them.
*
$tag_id = $row['id'];
$tag_name = $row['name'];
- /* check if config requests to ignore this tag */
+ /* if the user has specified to ignore this tag in phpfspot's
+ configuration, ignore it here so it does not get added to
+ the tag list.
+ */
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(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;
-
$count++;
}
*/
public function get_photo_details($idx)
{
- $result = $this->db->db_query("
- SELECT *
- FROM photos
- WHERE id='". $idx ."'
- ");
-
+ $query_str = "
+ SELECT p.id, p.name, p.time, p.directory_path, p.description
+ FROM photos p
+ ";
+
+ /* if show_tags is set, only return details for photos which
+ are specified to be shown
+ */
+ if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+ $query_str.= "
+ INNER JOIN photo_tags pt
+ ON p.id=pt.photo_id
+ INNER JOIN tags t
+ ON pt.tag_id=t.id
+ WHERE p.id='". $idx ."'
+ AND t.name IN ('".implode("','",$this->cfg->show_tags)."')";
+ }
+ else {
+ $query_str.= "
+ WHERE p.id='". $idx ."'
+ ";
+ }
+
+ $result = $this->db->db_query($query_str);
return $this->db->db_fetch_object($result);
} // get_photo_details
// uncomment if you want sizes in whole %:
$size = ceil($size);
- $output.= "<a href=\"javascript:Tags('add', ". $key .");\" class=\"tag\" style=\"font-size: ". $size ."%;\">". $this->tags[$key] ."</a>, ";
+ if(isset($this->tags[$key])) {
+ $output.= "<a href=\"javascript:Tags('add', ". $key .");\" class=\"tag\" style=\"font-size: ". $size ."%;\">". $this->tags[$key] ."</a>, ";
+ }
}
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)."')";
+ }
+
if(isset($order_str))
$query_str.= $order_str;
if($_SESSION['tag_condition'] == 'or') {
$query_str = "
- SELECT DISTINCT photo_id
+ SELECT DISTINCT pt.photo_id
FROM photo_tags pt
INNER JOIN photos p
ON p.id=pt.photo_id
+ INNER JOIN tags t
+ ON pt.tag_id=t.id
WHERE pt.tag_id IN (". $selected .")
";
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)."')";
+ }
+
if(isset($order_str))
$query_str.= $order_str;
}
FROM photo_tags pt1
";
+ if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+ $query_str.= "
+ INNER JOIN tags t
+ ON pt1.tag_id=t.id
+ ";
+ }
+
for($i = 0; $i < count($_SESSION['selected_tags']); $i++) {
$query_str.= "
INNER JOIN photo_tags pt". ($i+2) ."
}
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). "')";
+ }
+
if(isset($order_str))
$query_str.= $order_str;
+
}
$result = $this->db->db_query($query_str);
FROM photo_tags pt
INNER JOIN photos p
ON p.id=pt.photo_id
+ INNER JOIN tags t
+ ON pt.tag_id=t.id
";
if(isset($additional_where_cond))
$query_str.= "WHERE ". $additional_where_cond ." ";
+
+ if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+ $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags). "')";
+ }
+
if(isset($order_str))
$query_str.= $order_str;
foreach($resolutions as $resolution) {
$thumb_sub_path = substr($file_md5, 0, 2);
- $thumb_path = $this->cfg->base_path ."/thumbs/". $thumb_sub_path ."/". $resolution ."_". $file_md5;
+ $thumb_path = $this->cfg->thumb_path ."/". $thumb_sub_path ."/". $resolution ."_". $file_md5;
if(!file_exists(dirname($thumb_path))) {
mkdir(dirname($thumb_path), 0755);
<description>
<?php print $thumb_html; ?>
</description>
- <pubDate><?php print strftime("%a, %d %b %Y %T %z"); ?></pubDate>
+ <pubDate><?php print strftime("%a, %d %b %Y %T %z", $meta_date); ?></pubDate>
</item>
<?php
*/
public function get_thumb_path($width, $photo)
{
- $sub_path = substr($this->getMD5($photo), 0, 2);
- return $this->cfg->base_path
- . "/thumbs/"
+ $md5 = $this->getMD5($photo);
+ $sub_path = substr($md5, 0, 2);
+ return $this->cfg->thumb_path
+ . "/"
. $sub_path
. "/"
. $width
. "_"
- . $this->getMD5($photo);
+ . $md5;
} // get_thumb_path()
{
return $this->get_web_protocol() ."://". $this->get_server_name() . $this->cfg->web_path;
} // get_phpfspot_url()
+
+ /**
+ * check file exists and is readable
+ *
+ * returns true, if everything is ok, otherwise false
+ * if $silent is not set, this function will output and
+ * error message
+ */
+ private function check_readable($file, $silent = null)
+ {
+ if(!file_exists($file)) {
+ if(!isset($silent))
+ print "File \"". $file ."\" does not exist.\n";
+ return false;
+ }
+
+ if(!is_readable($file)) {
+ if(!isset($silent))
+ print "File \"". $file ."\" is not reachable for user ". $this->getuid() ."\n";
+ return false;
+ }
+
+ return true;
+
+ } // check_readable()
}
projects / phpfspot.git / blobdiff