X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=b82fbeef01d5333f4d2477591c1a6e6f257ab4d5;hp=00c84dbd9884e4d074972ea6fd8f5c589b192514;hb=b654689c263f6ce32c9d2ea01a3d04b2448532c3;hpb=0a5ca001b9b7a676d6c7671e7fb016110137cd04
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 00c84db..b82fbee 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -1,5 +1,26 @@
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->tmpl = new PHPFSPOT_TMPL($this);
$this->get_tags();
@@ -41,6 +74,9 @@ class PHPFSPOT {
if(!isset($_SESSION['tag_condition']))
$_SESSION['tag_condition'] = 'or';
+ if(!isset($_SESSION['sort_order']))
+ $_SESSION['sort_order'] = 'date_asc';
+
if(!isset($_SESSION['searchfor']))
$_SESSION['searchfor'] = '';
@@ -55,60 +91,86 @@ class PHPFSPOT {
} // __destruct()
+ /**
+ * show - generate html output
+ *
+ * this function can be called after the constructor has
+ * prepared everyhing. it will load the index.tpl smarty
+ * template. if necessary it will registere pre-selects
+ * (photo index, photo, tag search, date search) into
+ * users session.
+ */
public function show()
{
$this->tmpl->assign('searchfor', $_SESSION['searchfor']);
$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);
$_SESSION['start_action'] = $_GET['mode'];
switch($_GET['mode']) {
case 'showpi':
if(isset($_GET['tags'])) {
- $_SESSION['selected_tags'] = split(',', $_GET['tags']);
+ $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
}
- if(isset($_GET['from_date'])) {
- $_SESSION['from_date'] = $_GET['from_date'];
+ 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'])) {
- $_SESSION['to_date'] = $_GET['to_date'];
+ 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'] = split(',', $_GET['tags']);
+ $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
$_SESSION['start_action'] = 'showp';
}
- if(isset($_GET['id'])) {
+ if(isset($_GET['id']) && is_numeric($_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['from_date']) && $this->isValidDate($_GET['from_date'])) {
+ $_SESSION['from_date'] = strtotime($_GET['from_date']);
}
- if(isset($_GET['to_date'])) {
- $_SESSION['to_date'] = $_GET['to_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;
}
+ if(isset($_SESSION['from_date']) && isset($_SESSION['to_date']))
+ $this->tmpl->assign('date_search_enabled', true);
+
$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()
+ /**
+ * get_tags - grab all tags of f-spot's database
+ *
+ * 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
+ * fact, if the user requests (hide_tags) it will
+ * opt-out some of them.
+ *
+ * this function is getting called once by show()
+ */
private function get_tags()
{
-
$this->avail_tags = Array();
$count = 0;
@@ -136,6 +198,12 @@ class PHPFSPOT {
} // get_tags()
+ /**
+ * extract all photo details
+ *
+ * retrieve all available details from f-spot's
+ * database and return them as object
+ */
public function get_photo_details($idx)
{
$result = $this->db->db_query("
@@ -148,6 +216,13 @@ class PHPFSPOT {
} // get_photo_details
+ /**
+ * returns aligned photo names
+ *
+ * this function returns aligned (length) names for
+ * an specific photo. If the length of the name exceeds
+ * $limit the name will be shrinked (...)
+ */
public function getPhotoName($idx, $limit = 0)
{
if($details = $this->get_photo_details($idx)) {
@@ -160,24 +235,43 @@ class PHPFSPOT {
} // getPhotoName()
+ /**
+ * translate f-spoth photo path
+ *
+ * as the full-qualified path recorded in the f-spot database
+ * is usally not the same as on the webserver, this function
+ * will replace the path with that one specified in the cfg
+ */
public function translate_path($path, $width = 0)
{
return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path);
} // translate_path
+ /**
+ * control HTML ouput for a single photo
+ *
+ * this function provides all the necessary information
+ * for the single photo template.
+ */
public function showPhoto($photo)
{
+ /* get all photos from the current photo selection */
$all_photos = $this->getPhotoSelection();
$count = count($all_photos);
for($i = 0; $i < $count; $i++) {
- if($get_next) {
+ // $get_next will be set, when the photo which has to
+ // be displayed has been found - this means that the
+ // next available is in fact the NEXT image (for the
+ // navigation icons)
+ if(isset($get_next)) {
$next_img = $all_photos[$i];
break;
}
+ /* the next photo is our NEXT photo */
if($all_photos[$i] == $photo) {
$get_next = 1;
}
@@ -201,11 +295,11 @@ class PHPFSPOT {
$thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo);
if(!file_exists($orig_path)) {
- $this->_warning("Photo ". $orig_path ." does not exist!
\n");
+ $this->_error("Photo ". $orig_path ." does not exist!
\n");
}
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");
}
/* If the thumbnail doesn't exist yet, try to create it */
@@ -214,6 +308,7 @@ class PHPFSPOT {
$thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo);
}
+ /* get f-spot database meta information */
$meta = $this->get_meta_informations($orig_path);
/* If EXIF data are available, use them */
@@ -225,16 +320,16 @@ class PHPFSPOT {
}
$meta_date = isset($meta['FileDateTime']) ? strftime("%a %x %X", $meta['FileDateTime']) : "n/a";
- $meta_make = isset($meta['Make']) ? $meta['Make'] ." ". $meta['Model'] : "n/a";
+ $meta_make = isset($meta['Make']) ? $meta['Make'] ." / ". $meta['Model'] : "n/a";
$meta_size = isset($meta['FileSize']) ? round($meta['FileSize']/1024, 1) ."kbyte" : "n/a";
- $current_tags = $this->getCurrentTags();
$extern_link = "index.php?mode=showp&id=". $photo;
+ $current_tags = $this->getCurrentTags();
if($current_tags != "") {
$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);
@@ -260,7 +355,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;
}
@@ -274,13 +369,24 @@ class PHPFSPOT {
$this->tmpl->assign('next_img', $next_img);
}
$this->tmpl->assign('mini_width', $this->cfg->mini_width);
+ $this->tmpl->assign('photo_number', $i);
+ $this->tmpl->assign('photo_count', count($all_photos));
$this->tmpl->show("single_photo.tpl");
} // showPhoto()
+ /**
+ * all available tags and tag cloud
+ *
+ * this function outputs all available tags (time ordered)
+ * and in addition output them as tag cloud (tags which have
+ * many photos will appears more then others)
+ */
public function getAvailableTags()
{
+ $output = "";
+
$result = $this->db->db_query("
SELECT tag_id as id, count(tag_id) as quantity
FROM photo_tags
@@ -328,12 +434,22 @@ class PHPFSPOT {
// uncomment if you want sizes in whole %:
$size = ceil($size);
- print "". $this->tags[$key] .", ";
+ $output.= "". $this->tags[$key] .", ";
}
+ $output = substr($output, 0, strlen($output)-2);
+ print $output;
+
} // getAvailableTags()
+ /**
+ * output all selected tags
+ *
+ * this function output all tags which have been selected
+ * by the user. the selected tags are stored in the
+ * session-variable $_SESSION['selected_tags']
+ */
public function getSelectedTags()
{
$output = "";
@@ -350,11 +466,15 @@ class PHPFSPOT {
} // getSelectedTags()
+ /**
+ * add tag to users session variable
+ *
+ * this function will add the specified to users current
+ * tag selection. if a date search has been made before
+ * it will be now cleared
+ */
public function addTag($tag)
{
- // if the result of a date search are displayed, reset them
- $this->resetDateSearch();
-
if(!isset($_SESSION['selected_tags']))
$_SESSION['selected_tags'] = Array();
@@ -363,6 +483,12 @@ class PHPFSPOT {
} // addTag()
+ /**
+ * remove tag to users session variable
+ *
+ * this function removes the specified tag from
+ * users current tag selection
+ */
public function delTag($tag)
{
if(isset($_SESSION['selected_tags'])) {
@@ -373,6 +499,12 @@ class PHPFSPOT {
} // delTag()
+ /**
+ * reset tag selection
+ *
+ * if there is any tag selection, it will be
+ * deleted now
+ */
public function resetTags()
{
if(isset($_SESSION['selected_tags']))
@@ -380,6 +512,12 @@ class PHPFSPOT {
} // resetTags()
+ /**
+ * reset single photo
+ *
+ * if a specific photo was requested (external link)
+ * unset the session variable now
+ */
public function resetPhotoView()
{
if(isset($_SESSION['current_photo']))
@@ -387,6 +525,12 @@ class PHPFSPOT {
} // resetPhotoView();
+ /**
+ * reset tag search
+ *
+ * if any tag search has taken place, reset
+ * it now
+ */
public function resetTagSearch()
{
if(isset($_SESSION['searchfor']))
@@ -394,6 +538,12 @@ class PHPFSPOT {
} // resetTagSearch()
+ /**
+ * reset date search
+ *
+ * if any date search has taken place, reset
+ * it now
+ */
public function resetDateSearch()
{
if(isset($_SESSION['from_date']))
@@ -403,22 +553,49 @@ class PHPFSPOT {
} // resetDateSearch();
+ /**
+ * return all photo according selection
+ *
+ * this function returns all photos based on
+ * the tag-selection, tag- or date-search.
+ * the tag-search also has to take care of AND
+ * and OR conjunctions
+ */
public function getPhotoSelection()
{
$matched_photos = Array();
+ if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
+ $from_date = $_SESSION['from_date'];
+ $to_date = $_SESSION['to_date'];
+ $additional_where_cond = "
+ p.time>='". $from_date ."'
+ AND
+ p.time<='". $to_date ."'
+ ";
+ }
+
+ if(isset($_SESSION['sort_order'])) {
+ $order_str = $this->get_sort_order();
+ }
+
/* return a search result */
if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
- $result = $this->db->db_query("
+ $query_str = "
SELECT DISTINCT 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 t.name LIKE '%". $_SESSION['searchfor'] ."%'
- ORDER BY p.time ASC
- ");
+ WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'";
+
+ if(isset($additional_where_cond))
+ $query_str.= "AND ". $additional_where_cond ." ";
+ if(isset($order_str))
+ $query_str.= $order_str;
+
+ $result = $this->db->db_query($query_str);
while($row = $this->db->db_fetch_object($result)) {
array_push($matched_photos, $row['photo_id']);
}
@@ -433,14 +610,17 @@ class PHPFSPOT {
$selected = substr($selected, 0, strlen($selected)-1);
if($_SESSION['tag_condition'] == 'or') {
- $result = $this->db->db_query("
+ $query_str = "
SELECT DISTINCT photo_id
FROM photo_tags pt
INNER JOIN photos p
ON p.id=pt.photo_id
WHERE pt.tag_id IN (". $selected .")
- ORDER BY p.time ASC
- ");
+ ";
+ if(isset($additional_where_cond))
+ $query_str.= "AND ". $additional_where_cond ." ";
+ if(isset($order_str))
+ $query_str.= $order_str;
}
elseif($_SESSION['tag_condition'] == 'and') {
@@ -470,49 +650,42 @@ class PHPFSPOT {
ON pt1.photo_id=pt". ($i+2) .".photo_id
";
}
+ $query_str.= "
+ INNER JOIN photos p
+ ON pt1.photo_id=p.id
+ ";
$query_str.= "WHERE pt1.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] ."
";
}
- $result = $this->db->db_query($query_str);
+ if(isset($additional_where_cond))
+ $query_str.= "AND ". $additional_where_cond;
+ if(isset($order_str))
+ $query_str.= $order_str;
}
+ $result = $this->db->db_query($query_str);
while($row = $this->db->db_fetch_object($result)) {
array_push($matched_photos, $row['photo_id']);
}
return $matched_photos;
}
- if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
- $from_date = strtotime($_SESSION['from_date']);
- $to_date = strtotime($_SESSION['to_date']);
- $result = $this->db->db_query("
- SELECT DISTINCT photo_id
- FROM photo_tags pt
- INNER JOIN photos p
- ON p.id=pt.photo_id
- WHERE
- time>='". $from_date ."'
- AND
- time<='". $to_date ."'
- ORDER BY p.time ASC
- ");
- while($row = $this->db->db_fetch_object($result)) {
- array_push($matched_photos, $row['photo_id']);
- }
- return $matched_photos;
- }
-
/* return all available photos */
- $result = $this->db->db_query("
+ $query_str = "
SELECT DISTINCT photo_id
FROM photo_tags pt
INNER JOIN photos p
ON p.id=pt.photo_id
- ORDER BY p.time ASC
- ");
+ ";
+ if(isset($additional_where_cond))
+ $query_str.= "WHERE ". $additional_where_cond ." ";
+ if(isset($order_str))
+ $query_str.= $order_str;
+
+ $result = $this->db->db_query($query_str);
while($row = $this->db->db_fetch_object($result)) {
array_push($matched_photos, $row['photo_id']);
}
@@ -520,6 +693,12 @@ class PHPFSPOT {
} // getPhotoSelection()
+ /**
+ * control HTML ouput for photo index
+ *
+ * this function provides all the necessary information
+ * for the photo index template.
+ */
public function showPhotoIndex()
{
$photos = $this->getPhotoSelection();
@@ -602,6 +781,15 @@ class PHPFSPOT {
if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
$this->tmpl->assign('searchfor', $_SESSION['searchfor']);
+ if(isset($_SESSION['from_date']) && isset($_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'])) {
+ $this->tmpl->assign('tag_result', 1);
+ }
+
/* do we have to display the page selector ? */
if($this->cfg->rows_per_page != 0) {
@@ -627,10 +815,12 @@ class PHPFSPOT {
}
}
+ $dotdot_made = 0;
+
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) ||
@@ -661,12 +851,16 @@ class PHPFSPOT {
$i == $current_page+3 || $i == $current_page+2 || $i == $current_page+1 /* three after */) {
$page_select.= $select;
+ $dotdot_made = 0;
continue;
}
}
- $page_select.= ".";
+ if(!$dotdot_made) {
+ $page_select.= "......... ";
+ $dotdot_made = 1;
+ }
}
/* only show the page selector if we have more then one page */
@@ -681,12 +875,14 @@ 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']);
}
$export_link = "index.php?mode=export";
+ $slideshow_link = "index.php?mode=slideshow";
$this->tmpl->assign('extern_link', $extern_link);
+ $this->tmpl->assign('slideshow_link', $slideshow_link);
$this->tmpl->assign('export_link', $export_link);
$this->tmpl->assign('count', $count);
$this->tmpl->assign('width', $this->cfg->thumb_width);
@@ -706,6 +902,9 @@ class PHPFSPOT {
} // showPhotoIndex()
+ /**
+ * show credit template
+ */
public function showCredits()
{
$this->tmpl->assign('version', $this->cfg->version);
@@ -714,6 +913,14 @@ class PHPFSPOT {
} // showCredits()
+ /**
+ * create_thumbnails for the requested width
+ *
+ * this function creates image thumbnails of $orig_image
+ * stored as $thumb_image. It will check if the image is
+ * in a supported format, if necessary rotate the image
+ * (based on EXIF orientation meta headers) and re-sizing.
+ */
public function create_thumbnail($orig_image, $thumb_image, $width)
{
if(!file_exists($orig_image)) {
@@ -849,12 +1056,22 @@ class PHPFSPOT {
} // create_thumbnail()
+ /**
+ * return all exif meta data from the file
+ */
public function get_meta_informations($file)
{
return exif_read_data($file);
} // get_meta_informations()
+ /**
+ * create phpfspot own sqlite database
+ *
+ * this function creates phpfspots own sqlite database
+ * if it does not exist yet. this own is used to store
+ * some necessary informations (md5 sum's, ...).
+ */
public function check_config_table()
{
// if the config table doesn't exist yet, create it
@@ -897,12 +1114,12 @@ class PHPFSPOT {
$full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
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;
}
@@ -940,6 +1157,12 @@ class PHPFSPOT {
} // gen_thumb()
+ /**
+ * returns stored md5 sum for a specific photo
+ *
+ * this function queries the phpfspot database for a
+ * stored MD5 checksum of the specified photo
+ */
public function getMD5($idx)
{
$result = $this->cfg_db->db_query("
@@ -956,6 +1179,9 @@ class PHPFSPOT {
} // getMD5()
+ /**
+ * set MD5 sum for the specific photo
+ */
private function setMD5($idx, $md5)
{
$result = $this->cfg_db->db_exec("
@@ -965,38 +1191,62 @@ class PHPFSPOT {
} // setMD5()
+ /**
+ * store current tag condition
+ *
+ * this function stores the current tag condition
+ * (AND or OR) in the users session variables
+ */
public function setTagCondition($mode)
{
$_SESSION['tag_condition'] = $mode;
} // setTagCondition()
- public function startTagSearch($searchfor)
+ /**
+ * invoke tag & date search
+ *
+ * this function will return all matching tags and store
+ * them in the session variable selected_tags. furthermore
+ * it also handles the date search.
+ * getPhotoSelection() will then only return the matching
+ * photos.
+ */
+ public function startSearch($searchfor, $sort_order, $from = 0, $to = 0)
{
$_SESSION['searchfor'] = $searchfor;
- $_SESSION['selected_tags'] = Array();
+ $_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']);
- foreach($this->avail_tags as $tag) {
- if(preg_match('/'. $searchfor .'/i', $this->tags[$tag]))
- array_push($_SESSION['selected_tags'], $tag);
+ if($searchfor != "") {
+ /* 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]))
+ array_push($_SESSION['selected_tags'], $tag);
+ }
}
- $this->resetDateSearch();
-
- } // startTagSearch()
-
- public function startDateSearch($from, $to)
- {
- $_SESSION['from_date'] = $from;
- $_SESSION['to_date'] = $to;
- }
+ } // startSearch()
+ /**
+ * rotate image
+ *
+ * this function rotates the image according the
+ * specified angel.
+ */
private function rotateImage($img, $degrees)
{
- if(function_exists("imagerotate"))
+ if(function_exists("imagerotate")) {
$img = imagerotate($img, $degrees, 0);
- else
- {
+ } else {
function imagerotate($src_img, $angle)
{
$src_x = imagesx($src_img);
@@ -1046,7 +1296,9 @@ class PHPFSPOT {
}
break;
- default: $rotate = $src_img;
+ default:
+ $rotate = $src_img;
+ break;
};
return $rotate;
@@ -1061,6 +1313,9 @@ class PHPFSPOT {
} // rotateImage()
+ /**
+ * return all assigned tags for the specified photo
+ */
private function get_photo_tags($idx)
{
$result = $this->db->db_query("
@@ -1080,6 +1335,9 @@ class PHPFSPOT {
} // get_photo_tags()
+ /**
+ * create on-the-fly images with text within
+ */
public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
{
if (strlen($color) != 6)
@@ -1106,6 +1364,9 @@ class PHPFSPOT {
} // showTextImage()
+ /**
+ * check if all requirements are met
+ */
private function checkRequirements()
{
if(!function_exists("imagecreatefromjpeg")) {
@@ -1147,6 +1408,9 @@ class PHPFSPOT {
} // _debug()
+ /**
+ * check if specified MIME type is supported
+ */
public function checkifImageSupported($mime)
{
if(in_array($mime, Array("image/jpeg")))
@@ -1156,26 +1420,48 @@ class PHPFSPOT {
} // checkifImageSupported()
- public function _warning($text)
+ public function _error($text)
{
- print "![\"warning\"](\"resources/green_info.png\")
\n";
- print $text;
+ switch($this->cfg->logging) {
+ case 'display':
+ print "\n";
+ print $text;
+ break;
+ case 'errorlog':
+ error_log($text);
+ break;
+ case 'logfile':
+ error_log($text, 3, $his->cfg->log_file);
+ 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");
-
- $output = "\n";
- $output.= "\n";
- $output.= "\n";
+ $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");
+
+ $output = "getPhotoSelection();
@@ -1282,8 +1570,13 @@ class PHPFSPOT {
break;
case 'MoinMoin':
- // [%pictureurl% %thumbnailurl%]
- print htmlspecialchars(" * [".$orig_url." ".$thumb_url."&fake=1.jpg]") ."
\n";
+ // "[%pictureurl% %thumbnailurl%]"
+ print htmlspecialchars("[".$orig_url." ".$thumb_url."&fake=1.jpg]") ."
\n";
+ break;
+
+ case 'MoinMoinList':
+ // " * [%pictureurl% %thumbnailurl%]"
+ print " " . htmlspecialchars("* [".$orig_url." ".$thumb_url."&fake=1.jpg]") ."
\n";
break;
}
@@ -1291,6 +1584,9 @@ class PHPFSPOT {
} // getExport()
+ /**
+ * return all selected tags as one string
+ */
private function getCurrentTags()
{
$current_tags = "";
@@ -1303,6 +1599,9 @@ class PHPFSPOT {
} // getCurrentTags()
+ /**
+ * return the current photo
+ */
public function getCurrentPhoto()
{
if(isset($_SESSION['current_photo'])) {
@@ -1310,17 +1609,23 @@ class PHPFSPOT {
}
} // getCurrentPhoto()
+ /**
+ * tells the client browser what to do
+ *
+ * this function is getting called via AJAX by the
+ * client browsers. it will tell them what they have
+ * to do next. This is necessary for directly jumping
+ * into photo index or single photo view when the are
+ * requested with specific URLs
+ */
public function whatToDo()
{
- if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) {
- return "showpi_tags";
- }
- elseif(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
- return "showpi_date";
- }
- elseif(isset($_SESSION['current_photo'])) {
+ if(isset($_SESSION['current_photo']) && $_SESSION['start_action'] == 'showp') {
return "show_photo";
}
+ elseif(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) {
+ return "showpi_tags";
+ }
elseif(isset($_SESSION['start_action']) && $_SESSION['start_action'] == 'showpi') {
return "showpi";
}
@@ -1329,6 +1634,9 @@ class PHPFSPOT {
} // whatToDo()
+ /**
+ * return the current process-user
+ */
private function getuid()
{
if($uid = posix_getuid()) {
@@ -1341,6 +1649,165 @@ class PHPFSPOT {
} // getuid()
+ /**
+ * returns a select-dropdown box to select photo index sort parameters
+ */
+ private function get_sort_field()
+ {
+ $output = "";
+ return $output;
+
+ } // get_sort_field()
+
+ /**
+ * returns the currently selected sort order
+ */
+ private function get_sort_order()
+ {
+ switch($_SESSION['sort_order']) {
+ case 'date_asc':
+ return " ORDER BY p.time ASC";
+ break;
+ case 'date_desc':
+ return " ORDER BY p.time DESC";
+ break;
+ case 'name_asc':
+ return " ORDER BY p.name ASC";
+ break;
+ case 'name_desc':
+ return " ORDER BY p.name DESC";
+ break;
+ }
+
+ } // get_sort_order()
+
+ /***
+ * return the next to be shown slide show image
+ *
+ * this function returns the URL of the next image
+ * in the slideshow sequence.
+ */
+ public function getNextSlideShowImage()
+ {
+ $all_photos = $this->getPhotoSelection();
+
+ if(!isset($_SESSION['slideshow_img']) || $_SESSION['slideshow_img'] == count($all_photos)-1)
+ $_SESSION['slideshow_img'] = 0;
+ 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;
+
+ } // getNextSlideShowImage()
+
+ /***
+ * return the previous to be shown slide show image
+ *
+ * this function returns the URL of the previous image
+ * in the slideshow sequence.
+ */
+ public function getPrevSlideShowImage()
+ {
+ $all_photos = $this->getPhotoSelection();
+
+ if(!isset($_SESSION['slideshow_img']) || $_SESSION['slideshow_img'] == 0)
+ $_SESSION['slideshow_img'] = 0;
+ 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;
+
+ } // getPrevSlideShowImage()
+
+ public function resetSlideShow()
+ {
+ if(isset($_SESSION['slideshow_img']))
+ unset($_SESSION['slideshow_img']);
+ } // resetSlideShow()
+
+ /***
+ * get random photo
+ *
+ * this function will get all photos from the fspot
+ * database and randomly return ONE entry
+ *
+ * saddly there is yet no sqlite3 function which returns
+ * the bulk result in array, so we have to fill up our
+ * own here.
+ */
+ public function get_random_photo()
+ {
+ $all = Array();
+
+ $result = $this->db->db_query("
+ SELECT id
+ FROM photos
+ ");
+
+ while($row = $this->db->db_fetch_object($result)) {
+ array_push($all, $row['id']);
+ }
+
+ return $all[array_rand($all)];
+
+ } // 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()
+
}
?>