X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=3e1bcee83de1e7bff495074aa954c0e380145a0c;hp=9cffc58461d73c09d214e29eb7a1ccaa7e24ce6b;hb=33c1f8bce22a28384068c908b909ca7dcd544a1a;hpb=42d1600991af9c3243761c56cf01197dd71fabd7
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 9cffc58..3e1bcee 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -88,6 +88,11 @@ class PHPFSPOT {
exit(1);
}
+ if(!is_writeable($this->cfg->thumb_path)) {
+ print $this->cfg->thumb_path .": 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";
@@ -116,10 +121,10 @@ class PHPFSPOT {
$_SESSION['tag_condition'] = 'or';
if(!isset($_SESSION['sort_order']))
- $_SESSION['sort_order'] = 'date_asc';
+ $_SESSION['sort_order'] = 'date_desc';
- if(!isset($_SESSION['searchfor']))
- $_SESSION['searchfor'] = '';
+ if(!isset($_SESSION['searchfor_tag']))
+ $_SESSION['searchfor_tag'] = '';
// if begin_with is still set but thumbs_per_page is now 0, unset it
if(isset($_SESSION['begin_with']) && $this->cfg->thumbs_per_page == 0)
@@ -143,7 +148,7 @@ class PHPFSPOT {
*/
public function show()
{
- $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
+ $this->tmpl->assign('searchfor_tag', $_SESSION['searchfor_tag']);
$this->tmpl->assign('page_title', $this->cfg->page_title);
$this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
$this->tmpl->assign('template_path', 'themes/'. $this->cfg->theme_name);
@@ -503,7 +508,8 @@ class PHPFSPOT {
$this->tmpl->assign('image_filename', $this->parse_uri($details['uri'], 'filename'));
$this->tmpl->assign('tags', $this->get_photo_tags($photo));
- $this->tmpl->assign('current', $current);
+ $this->tmpl->assign('current_page', $this->getCurrentPage($current, $count));
+ $this->tmpl->assign('current_img', $photo);
if($previous_img) {
$this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
@@ -638,11 +644,14 @@ class PHPFSPOT {
if(!isset($_SESSION['selected_tags']))
$_SESSION['selected_tags'] = Array();
- if(isset($_SESSION['searchfor']))
- unset($_SESSION['searchfor']);
+ if(isset($_SESSION['searchfor_tag']))
+ unset($_SESSION['searchfor_tag']);
if(!in_array($tag, $_SESSION['selected_tags']))
array_push($_SESSION['selected_tags'], $tag);
+
+
+ return "ok";
} // addTag()
@@ -654,8 +663,8 @@ class PHPFSPOT {
*/
public function delTag($tag)
{
- if(isset($_SESSION['searchfor']))
- unset($_SESSION['searchfor']);
+ if(isset($_SESSION['searchfor_tag']))
+ unset($_SESSION['searchfor_tag']);
if(isset($_SESSION['selected_tags'])) {
$key = array_search($tag, $_SESSION['selected_tags']);
@@ -663,6 +672,8 @@ class PHPFSPOT {
sort($_SESSION['selected_tags']);
}
+ return "ok";
+
} // delTag()
/**
@@ -694,17 +705,28 @@ class PHPFSPOT {
/**
* reset tag search
*
- * if any tag search has taken place, reset
- * it now
+ * if any tag search has taken place, reset it now
*/
public function resetTagSearch()
{
- if(isset($_SESSION['searchfor']))
- unset($_SESSION['searchfor']);
+ if(isset($_SESSION['searchfor_tag']))
+ unset($_SESSION['searchfor_tag']);
} // resetTagSearch()
- /**
+ /**
+ * reset name search
+ *
+ * if any name search has taken place, reset it now
+ */
+ public function resetNameSearch()
+ {
+ if(isset($_SESSION['searchfor_name']))
+ unset($_SESSION['searchfor_name']);
+
+ } // resetNameSearch()
+
+ /**
* reset date search
*
* if any date search has taken place, reset
@@ -730,37 +752,59 @@ class PHPFSPOT {
public function getPhotoSelection()
{
$matched_photos = Array();
+ $additional_where_cond = "";
if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
$from_date = $_SESSION['from_date'];
$to_date = $_SESSION['to_date'];
- $additional_where_cond = "
+ $additional_where_cond.= "
p.time>='". $from_date ."'
AND
p.time<='". $to_date ."'
";
}
+ if(isset($_SESSION['searchfor_name'])) {
+ if($this->dbver < 9) {
+ $additional_where_cond.= "
+ (
+ p.name LIKE '%". $_SESSION['searchfor_name'] ."%'
+ OR
+ p.description LIKE '%". $_SESSION['searchfor_name'] ."%'
+ )
+ ";
+ }
+ else {
+ $additional_where_cond.= "
+ (
+ basename(p.uri) LIKE '%". $_SESSION['searchfor_name'] ."%'
+ OR
+ p.description LIKE '%". $_SESSION['searchfor_name'] ."%'
+ )
+ ";
+ }
+ }
+
if(isset($_SESSION['sort_order'])) {
$order_str = $this->get_sort_order();
}
/* return a search result */
- if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
+ if(isset($_SESSION['searchfor_tag']) && $_SESSION['searchfor_tag'] != '') {
$query_str = "
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 tags t
+ ON pt1.tag_id=t.id
INNER JOIN photos p
ON pt1.photo_id=p.id
INNER JOIN tags t2
ON pt2.tag_id=t2.id
- WHERE t1.name LIKE '%". $_SESSION['searchfor'] ."%' ";
+ WHERE t.name LIKE '%". $_SESSION['searchfor_tag'] ."%' ";
- if(isset($additional_where_cond))
+ if(isset($additional_where_cond) && !empty($additional_where_cond))
$query_str.= "AND ". $additional_where_cond ." ";
if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
@@ -797,7 +841,7 @@ class PHPFSPOT {
ON pt1.photo_id=p.id
WHERE pt1.tag_id IN (". $selected .")
";
- if(isset($additional_where_cond))
+ if(isset($additional_where_cond) && !empty($additional_where_cond))
$query_str.= "AND ". $additional_where_cond ." ";
if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
@@ -853,7 +897,7 @@ class PHPFSPOT {
AND pt". ($i+2) .".tag_id=". $_SESSION['selected_tags'][$i] ."
";
}
- if(isset($additional_where_cond))
+ if(isset($additional_where_cond) && !empty($additional_where_cond))
$query_str.= "AND ". $additional_where_cond;
if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
@@ -874,7 +918,7 @@ class PHPFSPOT {
/* return all available photos */
$query_str = "
- SELECT p.id
+ SELECT DISTINCT p.id
FROM photos p
LEFT JOIN photo_tags pt
ON p.id=pt.photo_id
@@ -882,14 +926,14 @@ class PHPFSPOT {
ON pt.tag_id=t.id
";
- if(isset($additional_where_cond))
+ if(isset($additional_where_cond) && !empty($additional_where_cond))
$query_str.= "WHERE ". $additional_where_cond ." ";
if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
- if(isset($additional_where_cond))
- $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags). "')";
- else
- $query_str.= "WHERE t.name IN ('".implode("','",$this->cfg->show_tags). "')";
+ if(isset($additional_where_cond) && !empty($additional_where_cond))
+ $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags). "')";
+ else
+ $query_str.= "WHERE t.name IN ('".implode("','",$this->cfg->show_tags). "')";
}
if(isset($order_str))
@@ -915,15 +959,12 @@ class PHPFSPOT {
$count = count($photos);
- if(isset($_SESSION['begin_with']) && $_SESSION['begin_with'] != "")
- $anchor = $_SESSION['begin_with'];
-
+ /* if all thumbnails should be shown on one page */
if(!isset($this->cfg->thumbs_per_page) || $this->cfg->thumbs_per_page == 0) {
-
$begin_with = 0;
$end_with = $count;
-
}
+ /* thumbnails should be splitted up in several pages */
elseif($this->cfg->thumbs_per_page > 0) {
if(!isset($_SESSION['begin_with']) || $_SESSION['begin_with'] == 0) {
@@ -967,8 +1008,8 @@ class PHPFSPOT {
// +1 for for smarty's selection iteration
$thumbs++;
- if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
- $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
+ if(isset($_SESSION['searchfor_tag']) && $_SESSION['searchfor_tag'] != '')
+ $this->tmpl->assign('searchfor_tag', $_SESSION['searchfor_tag']);
if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
$this->tmpl->assign('from_date', $this->ts2str($_SESSION['from_date']));
@@ -1081,6 +1122,7 @@ class PHPFSPOT {
$this->tmpl->assign('rss_link', $rss_link);
$this->tmpl->assign('count', $count);
$this->tmpl->assign('width', $this->cfg->thumb_width);
+ $this->tmpl->assign('preview_width', $this->cfg->photo_width);
$this->tmpl->assign('thumb_container_width', $this->cfg->thumb_width);
$this->tmpl->assign('thumb_container_height', $this->cfg->thumb_height+20);
$this->tmpl->assign('images', $images);
@@ -1093,8 +1135,14 @@ class PHPFSPOT {
$this->tmpl->show("photo_index.tpl");
- if(isset($anchor))
- print "\n";
+ /* if we are returning to photo index from an photo-view,
+ scroll the window to the last shown photo-thumbnail.
+ after this, unset the last_photo session variable.
+ */
+ if(isset($_SESSION['last_photo'])) {
+ print "\n";
+ unset($_SESSION['last_photo']);
+ }
} // showPhotoIndex()
@@ -1335,6 +1383,7 @@ class PHPFSPOT {
$thumb_sub_path = substr($file_md5, 0, 2);
$thumb_path = $this->cfg->thumb_path ."/". $thumb_sub_path ."/". $resolution ."_". $file_md5;
+ /* if thumbnail-subdirectory does not exist yet, create it */
if(!file_exists(dirname($thumb_path))) {
mkdir(dirname($thumb_path), 0755);
}
@@ -1415,6 +1464,8 @@ class PHPFSPOT {
{
$_SESSION['tag_condition'] = $mode;
+ return "ok";
+
} // setTagCondition()
/**
@@ -1426,31 +1477,48 @@ class PHPFSPOT {
* getPhotoSelection() will then only return the matching
* photos.
*/
- public function startSearch($searchfor, $from = 0, $to = 0)
+ public function startSearch()
{
- $this->get_tags();
+ if(isset($_POST['from']) && $this->isValidDate($_POST['from'])) {
+ $from = $_POST['from'];
+ }
+ if(isset($_POST['to']) && $this->isValidDate($_POST['to'])) {
+ $to = $_POST['to'];
+ }
- $_SESSION['searchfor'] = $searchfor;
+ if(isset($_POST['for_tag']) && is_string($_POST['for_tag'])) {
+ $searchfor_tag = $_POST['for_tag'];
+ $_SESSION['searchfor_tag'] = $_POST['for_tag'];
+ }
- if($from != 0)
+ if(isset($_POST['for_name']) && is_string($_POST['for_name'])) {
+ $searchfor_name = $_POST['for_name'];
+ $_SESSION['searchfor_name'] = $_POST['for_name'];
+ }
+
+ $this->get_tags();
+
+ if(isset($from) && !empty($from))
$_SESSION['from_date'] = strtotime($from ." 00:00:00");
else
unset($_SESSION['from_date']);
- if($to != 0)
+ if(isset($to) && !empty($to))
$_SESSION['to_date'] = strtotime($to ." 23:59:59");
else
unset($_SESSION['to_date']);
- if($searchfor != "") {
+ if(isset($searchfor_tag) && !empty($searchfor_tag)) {
/* new search, reset the current selected tags */
$_SESSION['selected_tags'] = Array();
foreach($this->avail_tags as $tag) {
- if(preg_match('/'. $searchfor .'/i', $this->tags[$tag]))
+ if(preg_match('/'. $searchfor_tag .'/i', $this->tags[$tag]))
array_push($_SESSION['selected_tags'], $tag);
}
}
+ return "ok";
+
} // startSearch()
/**
@@ -2086,6 +2154,7 @@ class PHPFSPOT {
{
if(isset($_SESSION['slideshow_img']))
unset($_SESSION['slideshow_img']);
+
} // resetSlideShow()
/***
@@ -2363,13 +2432,70 @@ class PHPFSPOT {
}
/* check for pending slash on web_path */
- if(!preg_match("/\/$/", $this->web_path))
- $this->web_path.= "/";
+ if(!preg_match("/\/$/", $this->cfg->web_path))
+ $this->cfg->web_path.= "/";
return $this->runtime_error;
} // check_config_options()
+ /**
+ * cleanup phpfspot own database
+ *
+ * When photos are getting delete from F-Spot, there will remain
+ * remain some residues in phpfspot own database. This function
+ * will try to wipe them out.
+ */
+ public function cleanup_phpfspot_db()
+ {
+ $to_delete = Array();
+
+ $result = $this->cfg_db->db_query("
+ SELECT img_idx
+ FROM images
+ ORDER BY img_idx ASC
+ ");
+
+ while($row = $this->cfg_db->db_fetch_object($result)) {
+ if(!$this->db->db_fetchSingleRow("
+ SELECT id
+ FROM photos
+ WHERE id='". $row['img_idx'] ."'")) {
+
+ array_push($to_delete, $row['img_idx'], ',');
+ }
+ }
+
+ print count($to_delete) ." unnecessary objects will be removed from phpfspot's database.\n";
+
+ $this->cfg_db->db_exec("
+ DELETE FROM images
+ WHERE img_idx IN (". implode($to_delete) .")
+ ");
+
+ } // cleanup_phpfspot_db()
+
+ /**
+ * return first image of the page, the $current photo
+ * lies in.
+ *
+ * this function is used to find out the first photo of the
+ * current page, in which the $current photo lies. this is
+ * used to display the correct photo, when calling showPhotoIndex()
+ * from showImage()
+ */
+ private function getCurrentPage($current, $max)
+ {
+ if(isset($this->cfg->thumbs_per_page) && !empty($this->cfg->thumbs_per_page)) {
+ for($page_start = 0; $page_start <= $max; $page_start+=$this->cfg->thumbs_per_page) {
+ if($current >= $page_start && $current < ($page_start+$this->cfg->thumbs_per_page))
+ return $page_start;
+ }
+ }
+ return 0;
+
+ } // getCurrentPage()
+
} // class PHPFSPOT
?>