X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=23f0c5462c466621614c15e1e989df6deff8e46c;hp=cc1c8736aafda15ea11ca47c34985a3e52d8181c;hb=d52a300c17f28ab64deb3dc32d425af503030058;hpb=6a54409eb044948947f409466a734764670c0027 diff --git a/phpfspot.class.php b/phpfspot.class.php index cc1c873..23f0c54 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -32,6 +32,7 @@ class PHPFSPOT { var $tmpl; var $tags; var $avail_tags; + private $dbver; /** * class constructor @@ -42,25 +43,41 @@ 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"; + /* 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(); + 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 */ @@ -72,9 +89,12 @@ class PHPFSPOT { 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'; @@ -112,57 +132,60 @@ 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'] = $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'])) @@ -181,7 +204,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. * @@ -192,24 +215,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++; } @@ -224,13 +280,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 @@ -244,10 +337,14 @@ class PHPFSPOT { 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() /** @@ -323,7 +420,7 @@ class PHPFSPOT { 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)) { @@ -371,7 +468,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]); @@ -417,6 +514,8 @@ class PHPFSPOT { */ public function getAvailableTags() { + $this->get_tags(); + $output = ""; $result = $this->db->db_query(" @@ -466,7 +565,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] .", "; + } } @@ -484,6 +585,8 @@ class PHPFSPOT { */ public function getSelectedTags() { + $this->get_tags(); + $output = ""; foreach($this->avail_tags as $tag) { @@ -614,16 +717,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; @@ -641,19 +753,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) { @@ -676,6 +799,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) ." @@ -686,16 +816,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); @@ -711,9 +847,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; @@ -945,6 +1088,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() @@ -1147,7 +1291,7 @@ 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->_error("File ". $full_path ." does not exist\n"); @@ -1161,7 +1305,9 @@ class PHPFSPOT { $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) { @@ -1178,6 +1324,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) { @@ -1186,9 +1334,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); @@ -1255,6 +1408,8 @@ class PHPFSPOT { */ public function startSearch($searchfor, $sort_order, $from = 0, $to = 0) { + $this->get_tags(); + $_SESSION['searchfor'] = $searchfor; $_SESSION['sort_order'] = $sort_order; if($from != 0) @@ -1483,19 +1638,23 @@ class PHPFSPOT { */ 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 = " ". $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); ?> - <?php print htmlspecialchars($details['name']); ?> + <?php print htmlspecialchars($this->parse_uri($details['uri'], 'filename')); ?> - + getMD5($photo), 0, 2); + $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() @@ -1973,6 +2133,71 @@ class PHPFSPOT { } // 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 ?>