X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=63a913937d8ac5eac60352bd724805e5e924de8b;hp=067606572f0b32e1b98bc20646f4ccf59c70cd16;hb=e54956dad7e0632849db2a92eb7ceff88b52247d;hpb=5078667542f9770ca4c9ffce771a776c66d6d3e8 diff --git a/phpfspot.class.php b/phpfspot.class.php index 0676065..63a9139 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 { @@ -33,6 +32,7 @@ class PHPFSPOT { var $tmpl; var $tags; var $avail_tags; + private $dbver; /** * class constructor @@ -43,33 +43,65 @@ class PHPFSPOT { */ public function __construct() { + $this->cfg = new PHPFSPOT_CFG; + + /* set application name and version information */ + $this->cfg->product = "phpfspot"; + $this->cfg->version = "1.2"; + + $this->sort_orders= array( + 'date_asc' => 'Date ↑', + 'date_desc' => 'Date ↓', + 'name_asc' => 'Name ↑', + 'name_desc' => 'Name ↓' + ); + /* 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($this->cfg->fspot_db)) { + print $this->cfg->fspot_db ." is not writeable for user ". $this->getuid() ."\n"; + exit(1); + } + + $this->dbver = $this->getFspotDBVersion(); - $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!"; + print dirname($this->cfg->phpfspot_db) .": 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->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(); + $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(); + /* 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'; @@ -107,53 +139,71 @@ class PHPFSPOT { $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'] = split(',', $_GET['tags']); - } - if(isset($_GET['from_date'])) { - $_SESSION['from_date'] = $_GET['from_date']; - } - if(isset($_GET['to_date'])) { - $_SESSION['to_date'] = $_GET['to_date']; - } - break; - case 'showp': - if(isset($_GET['tags'])) { - $_SESSION['selected_tags'] = split(',', $_GET['tags']); - $_SESSION['start_action'] = 'showp'; - } - if(isset($_GET['id'])) { - $_SESSION['current_photo'] = $_GET['id']; - $_SESSION['start_action'] = 'showp'; - } - if(isset($_GET['from_date'])) { - $_SESSION['from_date'] = $_GET['from_date']; - } - if(isset($_GET['to_date'])) { - $_SESSION['to_date'] = $_GET['to_date']; - } - break; - case 'export': - $this->tmpl->show("export.tpl"); - return; - break; - case 'slideshow': - $this->tmpl->show("slideshow.tpl"); - 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->tmpl->assign('date_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('sort_field', $this->get_sort_field()); $this->tmpl->assign('content_page', 'welcome.tpl'); $this->tmpl->show("index.tpl"); - } // show() /** @@ -161,7 +211,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. * @@ -172,24 +222,57 @@ class PHPFSPOT { $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)) { $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 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; - $count++; } @@ -204,13 +287,50 @@ class PHPFSPOT { */ public function get_photo_details($idx) { - $result = $this->db->db_query(" - SELECT * - FROM photos - WHERE id='". $idx ."' - "); - - return $this->db->db_fetch_object($result); + 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 + */ + 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 ."' + "; + } + + 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 @@ -224,15 +344,33 @@ class PHPFSPOT { public function getPhotoName($idx, $limit = 0) { if($details = $this->get_photo_details($idx)) { - $name = $details['name']; - if($limit != 0 && strlen($name) > $limit) { - $name = substr($name, 0, $limit-5) ."...". substr($name, -($limit-5)); + if($long_name = $this->parse_uri($details['uri'], 'filename')) { + $name = $this->shrink_text($long_name, $limit); + return $name; } - return $name; } + return null; + } // getPhotoName() + /** + * 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 "..." + */ + private function shrink_text($text, $limit) + { + if($limit != 0 && strlen($text) > $limit) { + $text = substr($text, 0, $limit-5) ."...". substr($text, -($limit-5)); + } + + return $text; + + } // shrink_text(); + /** * translate f-spoth photo path * @@ -289,21 +427,23 @@ class PHPFSPOT { return; } - $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name']; - $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo); + $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->_warning("Photo ". $orig_path ." does not exist!
\n"); + $this->_error("Photo ". $orig_path ." does not exist!
\n"); + return; } if(!is_readable($orig_path)) { - $this->_warning("Photo ". $orig_path ." is not readable for user ". $this->getuid() ."
\n"); + $this->_error("Photo ". $orig_path ." is not readable for user ". $this->getuid() ."
\n"); + return; } /* If the thumbnail doesn't exist yet, try to create it */ if(!file_exists($thumb_path)) { $this->gen_thumb($photo, true); - $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo); + $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo); } /* get f-spot database meta information */ @@ -327,7 +467,7 @@ class PHPFSPOT { $extern_link.= "&tags=". $current_tags; } if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { - $extern_link.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date']; + $extern_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']); } $this->tmpl->assign('extern_link', $extern_link); @@ -337,7 +477,7 @@ class PHPFSPOT { $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]); @@ -353,7 +493,7 @@ class PHPFSPOT { $this->tmpl->assign('current', $current); } else { - $this->_warning("Can't open file ". $thumb_path ."\n"); + $this->_error("Can't open file ". $thumb_path ."\n"); return; } @@ -383,6 +523,9 @@ class PHPFSPOT { */ public function getAvailableTags() { + /* retrive tags from database */ + $this->get_tags(); + $output = ""; $result = $this->db->db_query(" @@ -424,15 +567,17 @@ class PHPFSPOT { if(isset($_SESSION['selected_tags']) && in_array($key, $_SESSION['selected_tags'])) continue; - // calculate CSS font-size - // find the $value in excess of $min_qty - // multiply by the font-size increment ($size) - // and add the $min_size set above + // calculate CSS font-size + // find the $value in excess of $min_qty + // 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 %: $size = ceil($size); - $output.= "". $this->tags[$key] .", "; + if(isset($this->tags[$key])) { + $output.= "". $this->tags[$key] .", "; + } } @@ -450,7 +595,11 @@ class PHPFSPOT { */ public function getSelectedTags() { + /* retrive tags from database */ + $this->get_tags(); + $output = ""; + foreach($this->avail_tags as $tag) { // return all selected tags @@ -459,8 +608,13 @@ class PHPFSPOT { } } - $output = substr($output, 0, strlen($output)-2); - print $output; + if($output != "") { + $output = substr($output, 0, strlen($output)-2); + return $output; + } + else { + return "no tags selected"; + } } // getSelectedTags() @@ -476,6 +630,9 @@ class PHPFSPOT { if(!isset($_SESSION['selected_tags'])) $_SESSION['selected_tags'] = Array(); + if(isset($_SESSION['searchfor'])) + unset($_SESSION['searchfor']); + if(!in_array($tag, $_SESSION['selected_tags'])) array_push($_SESSION['selected_tags'], $tag); @@ -489,6 +646,9 @@ class PHPFSPOT { */ public function delTag($tag) { + if(isset($_SESSION['searchfor'])) + unset($_SESSION['searchfor']); + if(isset($_SESSION['selected_tags'])) { $key = array_search($tag, $_SESSION['selected_tags']); unset($_SESSION['selected_tags'][$key]); @@ -564,8 +724,8 @@ class PHPFSPOT { $matched_photos = Array(); if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { - $from_date = strtotime($_SESSION['from_date']); - $to_date = strtotime($_SESSION['to_date']); + $from_date = $_SESSION['from_date']; + $to_date = $_SESSION['to_date']; $additional_where_cond = " p.time>='". $from_date ."' AND @@ -580,16 +740,25 @@ class PHPFSPOT { /* 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 t2.name IN ('".implode("','",$this->cfg->show_tags)."')"; + } + if(isset($order_str)) $query_str.= $order_str; @@ -607,19 +776,30 @@ class PHPFSPOT { $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 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 t + ON pt2.tag_id=t.id INNER JOIN photos p - ON p.id=pt.photo_id - WHERE pt.tag_id IN (". $selected .") + 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($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; } + /* photo has to match all selected tags */ elseif($_SESSION['tag_condition'] == 'and') { if(count($_SESSION['selected_tags']) >= 32) { @@ -642,6 +822,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) ." @@ -652,16 +839,22 @@ class PHPFSPOT { 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)) $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); @@ -677,9 +870,16 @@ 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 ('".implode("','",$this->cfg->show_tags). "')"; + } + if(isset($order_str)) $query_str.= $order_str; @@ -714,8 +914,9 @@ class PHPFSPOT { } 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']; @@ -748,30 +949,33 @@ class PHPFSPOT { 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->cfg->base_path ."/thumbs/". $this->cfg->thumb_width ."_". $this->getMD5($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++; @@ -780,8 +984,8 @@ class PHPFSPOT { $this->tmpl->assign('searchfor', $_SESSION['searchfor']); if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { - $this->tmpl->assign('from_date', $_SESSION['from_date']); - $this->tmpl->assign('to_date', $_SESSION['to_date']); + $this->tmpl->assign('from_date', $this->ts2str($_SESSION['from_date'])); + $this->tmpl->assign('to_date', $this->ts2str($_SESSION['to_date'])); } if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) { @@ -790,6 +994,8 @@ class PHPFSPOT { /* 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); @@ -818,7 +1024,7 @@ class PHPFSPOT { for($i = 1; $i <= $last_page; $i++) { if($current_page == $i) - $style = "style=\"font-size: 125%;\""; + $style = "style=\"font-size: 125%; text-decoration: underline;\""; elseif($current_page-1 == $i || $current_page+1 == $i) $style = "style=\"font-size: 105%;\""; elseif(($current_page-5 >= $i) && ($i != 1) || @@ -869,11 +1075,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=". $_SESSION['from_date'] ."&to_date=". $_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"; @@ -882,6 +1091,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); @@ -907,6 +1117,7 @@ class PHPFSPOT { { $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() @@ -969,9 +1180,9 @@ class PHPFSPOT { // If requested width is more then the actual image width, // do not generate a thumbnail, instead safe the original - // as thumbnail but with lower quality - - if($width >= $cur_width) { + // as thumbnail but with lower quality. But if the image + // is to heigh too, then we still have to resize it. + if($width >= $cur_width && $cur_height < $this->cfg->thumb_height) { $result = imagejpeg($src_img, $thumb_image, 75); imagedestroy($src_img); return true; @@ -1109,25 +1320,32 @@ class PHPFSPOT { $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->_warning("File ". $full_path ." does not exist\n"); + $this->_error("File ". $full_path ." does not exist\n"); return; } if(!is_readable($full_path)) { - $this->_warning("File ". $full_path ." is not readable for ". $this->getuid() ."\n"); + $this->_error("File ". $full_path ." is not readable for ". $this->getuid() ."\n"); return; } $file_md5 = md5_file($full_path); - $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:"); + $this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:"); + + $changes = false; foreach($resolutions as $resolution) { - $thumb_path = $this->cfg->base_path ."/thumbs/". $resolution ."_". $file_md5; + $thumb_sub_path = substr($file_md5, 0, 2); + $thumb_path = $this->cfg->thumb_path ."/". $thumb_sub_path ."/". $resolution ."_". $file_md5; + + if(!file_exists(dirname($thumb_path))) { + mkdir(dirname($thumb_path), 0755); + } /* if the thumbnail file doesn't exist, create it */ if(!file_exists($thumb_path)) { @@ -1135,6 +1353,8 @@ class PHPFSPOT { $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) { @@ -1143,9 +1363,14 @@ class PHPFSPOT { 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); @@ -1210,12 +1435,19 @@ class PHPFSPOT { * getPhotoSelection() will then only return the matching * photos. */ - public function startSearch($searchfor, $from, $to, $sort_order) + public function startSearch($searchfor, $from = 0, $to = 0) { + $this->get_tags(); + $_SESSION['searchfor'] = $searchfor; - $_SESSION['from_date'] = $from; - $_SESSION['to_date'] = $to; - $_SESSION['sort_order'] = $sort_order; + if($from != 0) + $_SESSION['from_date'] = strtotime($from); + else + unset($_SESSION['from_date']); + if($to != 0) + $_SESSION['to_date'] = strtotime($to); + else + unset($_SESSION['to_date']); if($searchfor != "") { /* new search, reset the current selected tags */ @@ -1225,8 +1457,26 @@ class PHPFSPOT { array_push($_SESSION['selected_tags'], $tag); } } + } // startSearch() + /** + * updates sort order in session variable + * + * this function is invoked by RPC and will sort the requested + * sort order in the session variable. + */ + public function updateSortOrder($order) + { + if(isset($this->sort_orders[$order])) { + $_SESSION['sort_order'] = $order; + return "ok"; + } + + return "unkown error"; + + } // updateSortOrder() + /** * rotate image * @@ -1365,7 +1615,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; } @@ -1411,7 +1661,7 @@ class PHPFSPOT { } // checkifImageSupported() - public function _warning($text) + public function _error($text) { switch($this->cfg->logging) { case 'display': @@ -1426,26 +1676,30 @@ class PHPFSPOT { break; } - } // _warning() + } // _error() /** * output calendard input fields */ private function get_calendar($mode) { - $year = $_SESSION[$mode .'_date'] ? date("Y", strtotime($_SESSION[$mode .'_date'])) : date("Y"); - $month = $_SESSION[$mode .'_date'] ? date("m", strtotime($_SESSION[$mode .'_date'])) : date("m"); - $day = $_SESSION[$mode .'_date'] ? date("d", strtotime($_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 = "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; } @@ -1551,7 +1800,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) { @@ -1575,13 +1824,81 @@ 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($this->parse_uri($details['uri'], 'fullpath')); + $meta = $this->get_meta_informations($orig_path); + $meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($orig_path); + +?> + + <?php print htmlspecialchars($this->parse_uri($details['uri'], 'filename')); ?> + + + + + + + + + + + +"; - foreach(array('date_asc', 'date_desc', 'name_asc', 'name_desc') as $sort_order) { - $output.= ""; } - $output.= ""; + return $output; - } // get_sort_field() + } // smarty_sort_select_list() /** * returns the currently selected sort order @@ -1672,10 +1989,20 @@ class PHPFSPOT { 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; } @@ -1696,11 +2023,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; } // getNextSlideShowImage() @@ -1719,11 +2042,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() @@ -1760,6 +2079,181 @@ class PHPFSPOT { } // get_random_photo() -} + /** + * validates provided date + * + * this function validates if the provided date + * contains a valid date and will return true + * if it is. + */ + public function isValidDate($date_str) + { + $timestamp = strtotime($date_str); + + if(is_numeric($timestamp)) + return true; + + return false; + + } // isValidDate() + + /** + * timestamp to string conversion + */ + private function ts2str($timestamp) + { + return strftime("%Y-%m-%d", $timestamp); + } // ts2str() + + private function extractTags($tags_str) + { + $not_validated = split(',', $_GET['tags']); + $validated = array(); + + foreach($not_validated as $tag) { + if(is_numeric($tag)) + array_push($validated, $tag); + } + + return $validated; + + } // extractTags() + + /** + * returns the full path to a thumbnail + */ + public function get_thumb_path($width, $photo) + { + $md5 = $this->getMD5($photo); + $sub_path = substr($md5, 0, 2); + return $this->cfg->thumb_path + . "/" + . $sub_path + . "/" + . $width + . "_" + . $md5; + + } // 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() + + /** + * 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 ?>