X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=15697ad78fd73df8bcdf325ac0f2de191318c2a0;hp=a51164830fcff2de589a07bc6abd94c4cd973f9f;hb=ba2bd867f7c0d549761efd0677abdea919212b99;hpb=e9903870bf7c89c1013a9502282a7b66b139b0e3 diff --git a/phpfspot.class.php b/phpfspot.class.php index a511648..15697ad 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -23,7 +23,6 @@ require_once "phpfspot_cfg.php"; require_once "phpfspot_db.php"; -require_once "phpfspot_tmpl.php"; class PHPFSPOT { @@ -43,28 +42,38 @@ class PHPFSPOT { */ public function __construct() { + $this->cfg = new PHPFSPOT_CFG; + + /* set application name and version information */ + $this->cfg->product = "phpfspot"; + $this->cfg->version = "1.1"; + /* Check necessary requirements */ if(!$this->checkRequirements()) { exit(1); } - $this->cfg = new PHPFSPOT_CFG; - - $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db); + $this->db = new PHPFSPOT_DB($this, $this->cfg->fspot_db); if(!is_writeable(dirname($this->cfg->phpfspot_db))) { print dirname($this->cfg->phpfspot_db) .": directory is not writeable!"; exit(1); } - $this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db); + $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 */ + 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->tmpl = new PHPFSPOT_TMPL($this); $this->get_tags(); @@ -145,6 +154,19 @@ class PHPFSPOT { $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'])) @@ -163,7 +185,7 @@ class PHPFSPOT { * * 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. * @@ -185,13 +207,23 @@ class PHPFSPOT { $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++; } @@ -206,12 +238,36 @@ class PHPFSPOT { */ 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 ( + "; + foreach($this->cfg->show_tags as $tag) { + $query_str.= "'". $tag ."',"; + } + $query_str = substr($query_str, 0, strlen($query_str)-1); + $query_str.= ")"; + } + else { + $query_str.= " + WHERE p.id='". $idx ."' + "; + } + + $result = $this->db->db_query($query_str); return $this->db->db_fetch_object($result); } // get_photo_details @@ -448,7 +504,9 @@ class PHPFSPOT { // uncomment if you want sizes in whole %: $size = ceil($size); - $output.= "". $this->tags[$key] .", "; + if(isset($this->tags[$key])) { + $output.= "". $this->tags[$key] .", "; + } } @@ -606,6 +664,15 @@ class PHPFSPOT { 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 ("; + foreach($this->cfg->show_tags as $tag) { + $query_str.= "'". $tag ."',"; + } + $query_str = substr($query_str, 0, strlen($query_str)-1) . ")"; + } + if(isset($order_str)) $query_str.= $order_str; @@ -625,14 +692,25 @@ class PHPFSPOT { 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 ("; + foreach($this->cfg->show_tags as $tag) { + $query_str.= "'". $tag ."',"; + } + $query_str = substr($query_str, 0, strlen($query_str)-1) . ")"; + } + if(isset($order_str)) $query_str.= $order_str; } @@ -658,6 +736,13 @@ class PHPFSPOT { 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) ." @@ -676,8 +761,18 @@ class PHPFSPOT { } 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 ("; + foreach($this->cfg->show_tags as $tag) { + $query_str.= "'". $tag ."',"; + } + $query_str = substr($query_str, 0, strlen($query_str)-1) . ")"; + } + if(isset($order_str)) $query_str.= $order_str; + } $result = $this->db->db_query($query_str); @@ -693,9 +788,20 @@ class PHPFSPOT { 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 ("; + foreach($this->cfg->show_tags as $tag) { + $query_str.= "'". $tag ."',"; + } + $query_str = substr($query_str, 0, strlen($query_str)-1) . ")"; + } + if(isset($order_str)) $query_str.= $order_str; @@ -885,11 +991,14 @@ class PHPFSPOT { $current_tags = $this->getCurrentTags(); $extern_link = "index.php?mode=showpi"; + $rss_link = "index.php?mode=rss"; if($current_tags != "") { $extern_link.= "&tags=". $current_tags; + $rss_link.= "&tags=". $current_tags; } if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { $extern_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']); + $rss_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']); } $export_link = "index.php?mode=export"; @@ -898,6 +1007,7 @@ class PHPFSPOT { $this->tmpl->assign('extern_link', $extern_link); $this->tmpl->assign('slideshow_link', $slideshow_link); $this->tmpl->assign('export_link', $export_link); + $this->tmpl->assign('rss_link', $rss_link); $this->tmpl->assign('count', $count); $this->tmpl->assign('width', $this->cfg->thumb_width); $this->tmpl->assign('images', $images); @@ -1139,12 +1249,12 @@ class PHPFSPOT { $file_md5 = md5_file($full_path); - $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:"); + $this->_debug("Image [". $idx ."] ". $this->shrink_text($details['name'], 20) ." Thumbnails:"); 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); @@ -1393,7 +1503,7 @@ class PHPFSPOT { $missing = true; } - if(!function_exists("sqlite3_open")) { + if($this->cfg->db_access == "native" && !function_exists("sqlite3_open")) { print "PHP SQLite3 library extension is missing
\n"; $missing = true; } @@ -1564,14 +1674,9 @@ class PHPFSPOT { $pictures = $this->getPhotoSelection(); $current_tags = $this->getCurrentTags(); - if(!isset($_SERVER['HTTPS'])) $protocol = "http"; - else $protocol = "https"; - - $server_name = $_SERVER['SERVER_NAME']; - foreach($pictures as $picture) { - $orig_url = $protocol ."://". $server_name . $this->cfg->web_path ."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; } @@ -1579,7 +1684,7 @@ class PHPFSPOT { $orig_url.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date']; } - $thumb_url = $protocol ."://". $server_name . $this->cfg->web_path ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width; + $thumb_url = $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width; switch($mode) { @@ -1603,6 +1708,74 @@ class PHPFSPOT { } // getExport() + /** + * output RSS feed + */ + public function getRSSFeed() + { + Header("Content-type: text/xml; charset=utf-8"); + print "\n"; +?> + + + phpfspot + phpfspot RSS feed + get_phpfspot_url()); ?> + + phpfspot +getPhotoSelection(); + $current_tags = $this->getCurrentTags(); + + foreach($pictures as $picture) { + + $orig_url = $this->get_phpfspot_url() ."index.php?mode=showp&id=". $picture; + if($current_tags != "") { + $orig_url.= "&tags=". $current_tags; + } + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { + $orig_url.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date']; + } + + $details = $this->get_photo_details($picture); + + $thumb_url = $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $picture ."&width=". $this->cfg->thumb_width; + $thumb_html = htmlspecialchars(" + +
+". $details['description']); + + $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name']; + $meta = $this->get_meta_informations($orig_path); + $meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($orig_path); + +?> + + <?php print htmlspecialchars($details['name']); ?> + + + + + + + + + + + +cfg->web_path ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width; + return $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width; } // getNextSlideShowImage() @@ -1746,11 +1915,7 @@ class PHPFSPOT { else $_SESSION['slideshow_img']--; - $server_name = $_SERVER['SERVER_NAME']; - if(!isset($_SERVER['HTTPS'])) $protocol = "http"; - else $protocol = "https"; - - return $protocol ."://". $server_name . $this->cfg->web_path ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width; + return $this->get_phpfspot_url() ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width; } // getPrevSlideShowImage() @@ -1833,8 +1998,8 @@ class PHPFSPOT { public function get_thumb_path($width, $photo) { $sub_path = substr($this->getMD5($photo), 0, 2); - return $this->cfg->base_path - . "/thumbs/" + return $this->cfg->thumb_path + . "/" . $sub_path . "/" . $width @@ -1843,6 +2008,59 @@ class PHPFSPOT { } // get_thumb_path() + /** + * returns server's virtual host name + */ + private function get_server_name() + { + return $_SERVER['SERVER_NAME']; + } // get_server_name() + + /** + * returns type of webprotocol which is + * currently used + */ + private function get_web_protocol() + { + if(!isset($_SERVER['HTTPS'])) + return "http"; + else + return "https"; + } // get_web_protocol() + + /** + * return url to this phpfspot installation + */ + private function get_phpfspot_url() + { + 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() + } ?>