X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=eb2312bf709a9b5ff0302d4538fa18480e6c2a1b;hp=467fdb2db1e83b5f763a93e7cb2a363a86c630bf;hb=5aacb6d86fa943c66ee94eb603887bb40e034ec5;hpb=9e0069f45399b5436200c158c8fdbda3da1ffe5a
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 467fdb2..eb2312b 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -2,8 +2,9 @@
/***************************************************************************
*
- * Copyright (c) by Andreas Unterkircher, unki@netshadow.at
- * All rights reserved
+ * phpfspot, presents your F-Spot photo collection in Web browsers.
+ *
+ * Copyright (c) by Andreas Unterkircher
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,20 +25,79 @@
require_once "phpfspot_cfg.php";
require_once "phpfspot_db.php";
+/**
+ * PHPFSPOT main class
+ *
+ * this class contains the most functions which will to the major
+ * work for phpfspot.
+ *
+ * @package phpfspot
+ */
class PHPFSPOT {
+ /**
+ * phpfspot configuration
+ * @access public
+ * @see PHPFSPOT_CFG()
+ * @var PHPFSPOT_CFG
+ */
var $cfg;
+
+ /**
+ * SQLite database handle to f-spot database
+ * @see PHPFSPOT_DB()
+ * @access public
+ * @var PHPFSPOT_DB
+ */
var $db;
+
+ /**
+ * SQLite database handle to phpfspot database
+ * @see PHPFSPOT_DB()
+ * @access public
+ * @var PHPFSPOT_DB
+ */
var $cfg_db;
+
+ /**
+ * Smarty template engine
+ * @link http://smarty.php.net smarty.php.net
+ * @see PHPFSPOT_TMPL()
+ * @access public
+ * @var PHPFSPOT_TMPL
+ */
var $tmpl;
+
+ /**
+ * full tag - list
+ * @access public
+ * @var array
+ */
var $tags;
+
+ /**
+ * list of available, not-selected, tags
+ * @access public
+ * @var array
+ */
var $avail_tags;
+ /**
+ * true if runtime error occued
+ * @access private
+ * @var boolean
+ */
private $runtime_error = false;
+
+ /**
+ * F-Spot database version
+ * @access private
+ * @var integer
+ */
private $dbver;
/**
- * class constructor
+ * class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver)
*
* this function will be called on class construct
* and will check requirements, loads configuration,
@@ -45,6 +105,14 @@ class PHPFSPOT {
*/
public function __construct()
{
+ /**
+ * register PHPFSPOT class global
+ *
+ * @global PHPFSPOT $GLOBALS['phpfspot']
+ * @name $phpfspot
+ */
+ $GLOBALS['phpfspot'] =& $this;
+
$this->cfg = new PHPFSPOT_CFG;
/* verify config settings */
@@ -54,7 +122,7 @@ class PHPFSPOT {
/* set application name and version information */
$this->cfg->product = "phpfspot";
- $this->cfg->version = "1.3";
+ $this->cfg->version = "1.4";
$this->sort_orders= array(
'date_asc' => 'Date ↑',
@@ -66,44 +134,72 @@ class PHPFSPOT {
);
/* Check necessary requirements */
- if(!$this->checkRequirements()) {
+ if(!$this->check_requirements()) {
exit(1);
}
- $this->db = new PHPFSPOT_DB($this, $this->cfg->fspot_db);
+ /******* Opening F-Spot's sqlite database *********/
+
+ /* Check if database file is writeable */
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();
+ /* open the database */
+ $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 for user ". $this->getuid() ."\n";
- exit(1);
+ /* change sqlite temp directory, if requested */
+ if(isset($this->cfg->sqlite_temp_dir)) {
+ $this->db->db_exec("
+ PRAGMA
+ temp_store_directory = '". $this->cfg->sqlite_temp_dir ."'
+ ");
}
+ $this->dbver = $this->getFspotDBVersion();
+
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->thumb_path)) {
+ print $this->cfg->thumb_path .": directory is not writeable for user ". $this->getuid() ."\n";
+ exit(1);
+ }
+
+ /******* Opening phpfspot's sqlite database *********/
+
+ /* Check if directory where the database file is stored is writeable */
+ if(!is_writeable(dirname($this->cfg->phpfspot_db))) {
+ print dirname($this->cfg->phpfspot_db) .": directory is not writeable for user ". $this->getuid() ."\n";
+ exit(1);
+ }
+
+ /* Check if database file is writeable */
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();
+ /* open the database */
+ $this->cfg_db = new PHPFSPOT_DB($this, $this->cfg->phpfspot_db);
- /* include Smarty template engine */
- if(!$this->check_readable($this->cfg->smarty_path .'/libs/Smarty.class.php')) {
- exit(1);
+ /* change sqlite temp directory, if requested */
+ if(isset($this->cfg->sqlite_temp_dir)) {
+ $this->cfg_db->db_exec("
+ PRAGMA
+ temp_store_directory = '". $this->cfg->sqlite_temp_dir ."'
+ ");
}
- require $this->cfg->smarty_path .'/libs/Smarty.class.php';
- /* overload Smarty class if our own template handler */
+
+ /* Check if some tables need to be created */
+ $this->check_config_table();
+
+ /* overload Smarty class with our own template handler */
require_once "phpfspot_tmpl.php";
- $this->tmpl = new PHPFSPOT_TMPL($this);
+ $this->tmpl = new PHPFSPOT_TMPL();
/* check if all necessary indices exist */
$this->checkDbIndices();
@@ -293,6 +389,8 @@ class PHPFSPOT {
*
* retrieve all available details from f-spot's
* database and return them as object
+ * @param integer $idx
+ * @return object|null
*/
public function get_photo_details($idx)
{
@@ -349,6 +447,9 @@ class PHPFSPOT {
* this function returns aligned (length) names for
* an specific photo. If the length of the name exceeds
* $limit the name will be shrinked (...)
+ * @param integer $idx
+ * @param integer $limit
+ * @return string|null
*/
public function getPhotoName($idx, $limit = 0)
{
@@ -369,6 +470,9 @@ class PHPFSPOT {
* If the length of the name exceeds $limit the
* text will be shortend and some content in between
* will be replaced with "..."
+ * @param string $ext
+ * @param integer $limit
+ * @return string
*/
private function shrink_text($text, $limit)
{
@@ -386,8 +490,10 @@ class PHPFSPOT {
* 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
+ * @param string $path
+ * @return string
*/
- public function translate_path($path, $width = 0)
+ public function translate_path($path)
{
return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path);
@@ -398,6 +504,7 @@ class PHPFSPOT {
*
* this function provides all the necessary information
* for the single photo template.
+ * @param integer photo
*/
public function showPhoto($photo)
{
@@ -455,14 +562,18 @@ class PHPFSPOT {
$thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo);
}
- /* get f-spot database meta information */
- $meta = $this->get_meta_informations($orig_path);
+ /* get mime-type, height and width from the original photo */
+ $info = getimagesize($orig_path);
+
+ /* get EXIF information if JPEG */
+ if($info['mime'] == "image/jpeg") {
+ $meta = $this->get_meta_informations($orig_path);
+ }
/* If EXIF data are available, use them */
if(isset($meta['ExifImageWidth'])) {
$meta_res = $meta['ExifImageWidth'] ."x". $meta['ExifImageLength'];
} else {
- $info = getimagesize($orig_path);
$meta_res = $info[0] ."x". $info[1];
}
@@ -486,13 +597,13 @@ class PHPFSPOT {
return;
}
- $info = getimagesize($thumb_path);
+ $info_thumb = getimagesize($thumb_path);
$this->tmpl->assign('description', $details['description']);
$this->tmpl->assign('image_name', $this->parse_uri($details['uri'], 'filename'));
- $this->tmpl->assign('width', $info[0]);
- $this->tmpl->assign('height', $info[1]);
+ $this->tmpl->assign('width', $info_thumb[0]);
+ $this->tmpl->assign('height', $info_thumb[1]);
$this->tmpl->assign('ExifMadeOn', $meta_date);
$this->tmpl->assign('ExifMadeWith', $meta_make);
$this->tmpl->assign('ExifOrigResolution', $meta_res);
@@ -503,7 +614,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 .");");
@@ -515,13 +627,12 @@ class PHPFSPOT {
$this->tmpl->assign('next_img', $next_img);
}
$this->tmpl->assign('mini_width', $this->cfg->mini_width);
+ $this->tmpl->assign('photo_width', $this->cfg->photo_width);
$this->tmpl->assign('photo_number', $i);
$this->tmpl->assign('photo_count', count($all_photos));
$this->tmpl->show("single_photo.tpl");
- print "\n";
-
} // showPhoto()
/**
@@ -557,6 +668,10 @@ class PHPFSPOT {
$max_size = 125; // max font size in %
$min_size = 75; // min font size in %
+ // color
+ $max_sat = hexdec('cc');
+ $min_sat = hexdec('44');
+
// get the largest and smallest array values
$max_qty = max(array_values($tags));
$min_qty = min(array_values($tags));
@@ -570,6 +685,7 @@ class PHPFSPOT {
// determine the font-size increment
// this is the increase per tag quantity (times used)
$step = ($max_size - $min_size)/($spread);
+ $step_sat = ($max_sat - $min_sat)/($spread);
// loop through our tag array
foreach ($tags as $key => $value) {
@@ -585,8 +701,14 @@ class PHPFSPOT {
// uncomment if you want sizes in whole %:
$size = ceil($size);
+ $color = $min_sat + ($value - $min_qty) * $step_sat;
+
+ $r = '44';
+ $g = dechex($color);
+ $b = '88';
+
if(isset($this->tags[$key])) {
- $output.= "". $this->tags[$key] .", ";
+ $output.= "". $this->tags[$key] .", ";
}
}
@@ -602,6 +724,7 @@ class PHPFSPOT {
* this function output all tags which have been selected
* by the user. the selected tags are stored in the
* session-variable $_SESSION['selected_tags']
+ * @return string
*/
public function getSelectedTags()
{
@@ -634,6 +757,7 @@ class PHPFSPOT {
* this function will add the specified to users current
* tag selection. if a date search has been made before
* it will be now cleared
+ * @return string
*/
public function addTag($tag)
{
@@ -656,6 +780,8 @@ class PHPFSPOT {
*
* this function removes the specified tag from
* users current tag selection
+ * @param string $tag
+ * @return string
*/
public function delTag($tag)
{
@@ -685,6 +811,58 @@ class PHPFSPOT {
} // resetTags()
+ /**
+ * returns the value for the autocomplet tag-search
+ * @return string
+ */
+ public function get_xml_tag_list()
+ {
+ if(!isset($_GET['search']) || !is_string($_GET['search']))
+ $_GET['search'] = '';
+
+ $length = 15;
+ $i = 1;
+
+ /* retrive tags from database */
+ $this->get_tags();
+
+ $matched_tags = Array();
+
+ header("Content-Type: text/xml");
+
+ $string = "\n";
+ $string.= "\n";
+
+ foreach($this->avail_tags as $tag)
+ {
+ if(!empty($_GET['search']) &&
+ preg_match("/". $_GET['search'] ."/i", $this->tags[$tag]) &&
+ count($matched_tags) < $length) {
+
+ $count = $this->get_num_photos($tag);
+
+ if($count == 1) {
+ $string.= " ". $this->tags[$tag] ."\n";
+ }
+ else {
+ $string.= " ". $this->tags[$tag] ."\n";
+
+ }
+ $i++;
+ }
+
+ /* if we have collected enough items, break out */
+ if(count($matched_tags) >= $length)
+ break;
+ }
+
+ $string.= "\n";
+
+ return $string;
+
+ } // get_xml_tag_list()
+
+
/**
* reset single photo
*
@@ -744,15 +922,17 @@ class PHPFSPOT {
* the tag-selection, tag- or date-search.
* the tag-search also has to take care of AND
* and OR conjunctions
+ * @return array
*/
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 ."'
@@ -799,7 +979,7 @@ class PHPFSPOT {
ON pt2.tag_id=t2.id
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)) {
@@ -836,7 +1016,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)) {
@@ -892,7 +1072,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)) {
@@ -921,11 +1101,11 @@ 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))
+ 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). "')";
@@ -954,15 +1134,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) {
@@ -981,6 +1158,7 @@ class PHPFSPOT {
$img_width[$thumbs] = Array();
$img_id[$thumbs] = Array();
$img_name[$thumbs] = Array();
+ $img_fullname[$thumbs] = Array();
$img_title = Array();
for($i = $begin_with; $i < $end_with; $i++) {
@@ -990,6 +1168,7 @@ class PHPFSPOT {
$images[$thumbs] = $photos[$i];
$img_id[$thumbs] = $i;
$img_name[$thumbs] = htmlspecialchars($this->getPhotoName($photos[$i], 15));
+ $img_fullname[$thumbs] = htmlspecialchars($this->getPhotoName($photos[$i], 0));
$img_title[$thumbs] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0));
$thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i]);
@@ -1120,6 +1299,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);
@@ -1127,13 +1307,20 @@ class PHPFSPOT {
$this->tmpl->assign('img_height', $img_height);
$this->tmpl->assign('img_id', $img_id);
$this->tmpl->assign('img_name', $img_name);
+ $this->tmpl->assign('img_fullname', $img_fullname);
$this->tmpl->assign('img_title', $img_title);
$this->tmpl->assign('thumbs', $thumbs);
$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()
@@ -1156,6 +1343,10 @@ class PHPFSPOT {
* 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.
+ * @param string $orig_image
+ * @param string $thumb_image
+ * @param integer $width
+ * @return boolean
*/
public function create_thumbnail($orig_image, $thumb_image, $width)
{
@@ -1169,133 +1360,171 @@ class PHPFSPOT {
if(!$this->checkifImageSupported($details['mime']))
return false;
- $meta = $this->get_meta_informations($orig_image);
-
- $rotate = 0;
- $flip_hori = false;
- $flip_vert = false;
-
- switch($meta['Orientation']) {
- case 1: /* top, left */
- /* nothing to do */ break;
- case 2: /* top, right */
- $rotate = 0; $flip_hori = true; break;
- case 3: /* bottom, left */
- $rotate = 180; break;
- case 4: /* bottom, right */
- $flip_vert = true; break;
- case 5: /* left side, top */
- $rotate = 90; $flip_vert = true; break;
- case 6: /* right side, top */
- $rotate = 90; break;
- case 7: /* left side, bottom */
- $rotate = 270; $flip_vert = true; break;
- case 8: /* right side, bottom */
- $rotate = 270; break;
- }
-
- $src_img = @imagecreatefromjpeg($orig_image);
-
- if(!$src_img) {
- print "Can't load image from ". $orig_image ."\n";
- return false;
- }
+ switch($details['mime']) {
+
+ case 'image/jpeg':
+
+ $meta = $this->get_meta_informations($orig_image);
+
+ $rotate = 0;
+ $flip_hori = false;
+ $flip_vert = false;
+
+ switch($meta['Orientation']) {
+ case 1: /* top, left */
+ /* nothing to do */ break;
+ case 2: /* top, right */
+ $rotate = 0; $flip_hori = true; break;
+ case 3: /* bottom, left */
+ $rotate = 180; break;
+ case 4: /* bottom, right */
+ $flip_vert = true; break;
+ case 5: /* left side, top */
+ $rotate = 90; $flip_vert = true; break;
+ case 6: /* right side, top */
+ $rotate = 90; break;
+ case 7: /* left side, bottom */
+ $rotate = 270; $flip_vert = true; break;
+ case 8: /* right side, bottom */
+ $rotate = 270; break;
+ }
- /* grabs the height and width */
- $cur_width = imagesx($src_img);
- $cur_height = imagesy($src_img);
+ $src_img = @imagecreatefromjpeg($orig_image);
+ $handler = "gd";
+ break;
- // 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. 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;
- }
+ case 'image/png':
- // If the image will be rotate because EXIF orientation said so
- // 'virtually rotate' the image for further calculations
- if($rotate == 90 || $rotate == 270) {
- $tmp = $cur_width;
- $cur_width = $cur_height;
- $cur_height = $tmp;
- }
+ $src_img = @imagecreatefrompng($orig_image);
+ $handler = "gd";
+ break;
- /* calculates aspect ratio */
- $aspect_ratio = $cur_height / $cur_width;
+ case 'image/tiff':
+
+ $src_img = new Imagick($orig_image);
+ print_r($src_img->queryFormats());
+
+ $handler = "imagick";
+ exit(1);
+ break;
- /* sets new size */
- if($aspect_ratio < 1) {
- $new_w = $width;
- $new_h = abs($new_w * $aspect_ratio);
- } else {
- /* 'virtually' rotate the image and calculate it's ratio */
- $tmp_w = $cur_height;
- $tmp_h = $cur_width;
- /* now get the ratio from the 'rotated' image */
- $tmp_ratio = $tmp_h/$tmp_w;
- /* now calculate the new dimensions */
- $tmp_w = $width;
- $tmp_h = abs($tmp_w * $tmp_ratio);
-
- // now that we know, how high they photo should be, if it
- // gets rotated, use this high to scale the image
- $new_h = $tmp_h;
- $new_w = abs($new_h / $aspect_ratio);
-
- // If the image will be rotate because EXIF orientation said so
- // now 'virtually rotate' back the image for the image manipulation
- if($rotate == 90 || $rotate == 270) {
- $tmp = $new_w;
- $new_w = $new_h;
- $new_h = $tmp;
- }
}
- /* creates new image of that size */
- $dst_img = imagecreatetruecolor($new_w, $new_h);
- imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255));
+ switch($handler) {
- /* copies resized portion of original image into new image */
- imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $new_w, $new_h, imagesx($src_img), imagesy($src_img));
+ case 'gd':
- /* needs the image to be flipped horizontal? */
- if($flip_hori) {
- $this->_debug("(FLIP)");
- $dst_img = $this->flipImage($dst_img, 'hori');
- }
- /* needs the image to be flipped vertical? */
- if($flip_vert) {
- $this->_debug("(FLIP)");
- $dst_img = $this->flipImage($dst_img, 'vert');
- }
+ if(!isset($src_img) || empty($src_img)) {
+ print "Can't load image from ". $orig_image ."\n";
+ return false;
+ }
- if($rotate) {
- $this->_debug("(ROTATE)");
- $dst_img = $this->rotateImage($dst_img, $rotate);
- }
+ /* grabs the height and width */
+ $cur_width = imagesx($src_img);
+ $cur_height = imagesy($src_img);
+
+ // 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. 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;
+ }
- /* write down new generated file */
- $result = imagejpeg($dst_img, $thumb_image, 75);
+ // If the image will be rotate because EXIF orientation said so
+ // 'virtually rotate' the image for further calculations
+ if($rotate == 90 || $rotate == 270) {
+ $tmp = $cur_width;
+ $cur_width = $cur_height;
+ $cur_height = $tmp;
+ }
- /* free your mind */
- imagedestroy($dst_img);
- imagedestroy($src_img);
+ /* calculates aspect ratio */
+ $aspect_ratio = $cur_height / $cur_width;
- if($result === false) {
- print "Can't write thumbnail ". $thumb_image ."\n";
- return false;
- }
+ /* sets new size */
+ if($aspect_ratio < 1) {
+ $new_w = $width;
+ $new_h = abs($new_w * $aspect_ratio);
+ } else {
+ /* 'virtually' rotate the image and calculate it's ratio */
+ $tmp_w = $cur_height;
+ $tmp_h = $cur_width;
+ /* now get the ratio from the 'rotated' image */
+ $tmp_ratio = $tmp_h/$tmp_w;
+ /* now calculate the new dimensions */
+ $tmp_w = $width;
+ $tmp_h = abs($tmp_w * $tmp_ratio);
+
+ // now that we know, how high they photo should be, if it
+ // gets rotated, use this high to scale the image
+ $new_h = $tmp_h;
+ $new_w = abs($new_h / $aspect_ratio);
+
+ // If the image will be rotate because EXIF orientation said so
+ // now 'virtually rotate' back the image for the image manipulation
+ if($rotate == 90 || $rotate == 270) {
+ $tmp = $new_w;
+ $new_w = $new_h;
+ $new_h = $tmp;
+ }
+ }
- return true;
+ /* creates new image of that size */
+ $dst_img = imagecreatetruecolor($new_w, $new_h);
+
+ imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255));
+
+ /* copies resized portion of original image into new image */
+ imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $new_w, $new_h, imagesx($src_img), imagesy($src_img));
+
+ /* needs the image to be flipped horizontal? */
+ if($flip_hori) {
+ $this->_debug("(FLIP)");
+ $dst_img = $this->flipImage($dst_img, 'hori');
+ }
+ /* needs the image to be flipped vertical? */
+ if($flip_vert) {
+ $this->_debug("(FLIP)");
+ $dst_img = $this->flipImage($dst_img, 'vert');
+ }
+
+ if($rotate) {
+ $this->_debug("(ROTATE)");
+ $dst_img = $this->rotateImage($dst_img, $rotate);
+ }
+
+ /* write down new generated file */
+ $result = imagejpeg($dst_img, $thumb_image, 75);
+
+ /* free your mind */
+ imagedestroy($dst_img);
+ imagedestroy($src_img);
+
+ if($result === false) {
+ print "Can't write thumbnail ". $thumb_image ."\n";
+ return false;
+ }
+
+ return true;
+
+ break;
+
+ case 'imagick':
+
+ break;
+
+ }
} // create_thumbnail()
/**
* return all exif meta data from the file
+ * @param string $file
+ * @return array
*/
public function get_meta_informations($file)
{
@@ -1334,6 +1563,9 @@ class PHPFSPOT {
* readable
* 2. Check if the md5sum of the original file has changed
* 3. Generate the thumbnails if needed
+ * @param integer $idx
+ * @param integer $force
+ * @param boolean $overwrite
*/
public function gen_thumb($idx = 0, $force = 0, $overwrite = false)
{
@@ -1374,6 +1606,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 +1648,8 @@ class PHPFSPOT {
*
* this function queries the phpfspot database for a
* stored MD5 checksum of the specified photo
+ * @param integer $idx
+ * @return string|null
*/
public function getMD5($idx)
{
@@ -1434,6 +1669,8 @@ class PHPFSPOT {
/**
* set MD5 sum for the specific photo
+ * @param integer $idx
+ * @param string $md5
*/
private function setMD5($idx, $md5)
{
@@ -1449,6 +1686,8 @@ class PHPFSPOT {
*
* this function stores the current tag condition
* (AND or OR) in the users session variables
+ * @param string $mode
+ * @return string
*/
public function setTagCondition($mode)
{
@@ -1466,8 +1705,9 @@ class PHPFSPOT {
* it also handles the date search.
* getPhotoSelection() will then only return the matching
* photos.
+ * @return string
*/
- public function startSearch($searchfor_tag, $from = 0, $to = 0)
+ public function startSearch()
{
if(isset($_POST['from']) && $this->isValidDate($_POST['from'])) {
$from = $_POST['from'];
@@ -1478,28 +1718,27 @@ class PHPFSPOT {
if(isset($_POST['for_tag']) && is_string($_POST['for_tag'])) {
$searchfor_tag = $_POST['for_tag'];
+ $_SESSION['searchfor_tag'] = $_POST['for_tag'];
}
if(isset($_POST['for_name']) && is_string($_POST['for_name'])) {
$searchfor_name = $_POST['for_name'];
+ $_SESSION['searchfor_name'] = $_POST['for_name'];
}
$this->get_tags();
- $_SESSION['searchfor_tag'] = $searchfor_tag;
- $_SESSION['searchfor_name'] = $searchfor_name;
-
- if($from != 0)
+ 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_tag != "") {
+ if(isset($searchfor_tag) && !empty($searchfor_tag)) {
/* new search, reset the current selected tags */
$_SESSION['selected_tags'] = Array();
foreach($this->avail_tags as $tag) {
@@ -1517,6 +1756,8 @@ class PHPFSPOT {
*
* this function is invoked by RPC and will sort the requested
* sort order in the session variable.
+ * @param string $sort_order
+ * @return string
*/
public function updateSortOrder($order)
{
@@ -1534,6 +1775,9 @@ class PHPFSPOT {
*
* this function rotates the image according the
* specified angel.
+ * @param string $img
+ * @param integer $degress
+ * @return image
*/
private function rotateImage($img, $degrees)
{
@@ -1611,6 +1855,9 @@ class PHPFSPOT {
*
* this function will return an either horizontal or
* vertical flipped truecolor image.
+ * @param string $image
+ * @param string $mode
+ * @return image
*/
private function flipImage($image, $mode)
{
@@ -1637,6 +1884,8 @@ class PHPFSPOT {
/**
* return all assigned tags for the specified photo
+ * @param integer $idx
+ * @return array
*/
private function get_photo_tags($idx)
{
@@ -1659,6 +1908,11 @@ class PHPFSPOT {
/**
* create on-the-fly images with text within
+ * @param string $txt
+ * @param string $color
+ * @param integer $space
+ * @param integer $font
+ * @param integer $w
*/
public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
{
@@ -1688,8 +1942,9 @@ class PHPFSPOT {
/**
* check if all requirements are met
+ * @return boolean
*/
- private function checkRequirements()
+ private function check_requirements()
{
if(!function_exists("imagecreatefromjpeg")) {
print "PHP GD library extension is missing
\n";
@@ -1718,6 +1973,11 @@ class PHPFSPOT {
print "PEAR Console_Getopt package is missing
\n";
$missing = true;
}
+ @include_once $this->cfg->smarty_path .'/libs/Smarty.class.php';
+ if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) {
+ print "Smarty template engine can not be found in ". $this->cfg->smarty_path ."/libs/Smarty.class.php
\n";
+ $missing = true;
+ }
ini_restore('track_errors');
if(isset($missing))
@@ -1725,7 +1985,7 @@ class PHPFSPOT {
return true;
- } // checkRequirements()
+ } // check_requirements()
private function _debug($text)
{
@@ -1737,16 +1997,22 @@ class PHPFSPOT {
/**
* check if specified MIME type is supported
+ * @param string $mime
+ * @return boolean
*/
public function checkifImageSupported($mime)
{
- if(in_array($mime, Array("image/jpeg")))
+ if(in_array($mime, Array("image/jpeg", "image/png", "image/tiff")))
return true;
return false;
} // checkifImageSupported()
+ /**
+ * output error text
+ * @param string $text
+ */
public function _error($text)
{
switch($this->cfg->logging) {
@@ -1769,6 +2035,8 @@ class PHPFSPOT {
/**
* output calendard input fields
+ * @param string $mode
+ * @return string
*/
private function get_calendar($mode)
{
@@ -1795,6 +2063,9 @@ class PHPFSPOT {
/**
* output calendar matrix
+ * @param integer $year
+ * @param integer $month
+ * @param integer $day
*/
public function get_calendar_matrix($year = 0, $month = 0, $day = 0)
{
@@ -1873,6 +2144,7 @@ class PHPFSPOT {
/**
* output export page
+ * @param string $mode
*/
public function getExport($mode)
{
@@ -1955,7 +2227,12 @@ class PHPFSPOT {
". $details['description']);
$orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
- $meta = $this->get_meta_informations($orig_path);
+
+ /* get EXIF information if JPEG */
+ if($details['mime'] == "image/jpeg") {
+ $meta = $this->get_meta_informations($orig_path);
+ }
+
$meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($orig_path);
?>
@@ -1983,6 +2260,7 @@ class PHPFSPOT {
/**
* return all selected tags as one string
+ * @return array
*/
private function getCurrentTags()
{
@@ -2014,6 +2292,7 @@ class PHPFSPOT {
* to do next. This is necessary for directly jumping
* into photo index or single photo view when the are
* requested with specific URLs
+ * @return string
*/
public function whatToDo()
{
@@ -2033,6 +2312,7 @@ class PHPFSPOT {
/**
* return the current process-user
+ * @return string
*/
private function getuid()
{
@@ -2048,6 +2328,9 @@ class PHPFSPOT {
/**
* returns a select-dropdown box to select photo index sort parameters
+ * @param array $params
+ * @param smarty $smarty
+ * @return string
*/
public function smarty_sort_select_list($params, &$smarty)
{
@@ -2067,6 +2350,7 @@ class PHPFSPOT {
/**
* returns the currently selected sort order
+ * @return string
*/
private function get_sort_order()
{
@@ -2103,12 +2387,13 @@ class PHPFSPOT {
} // 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.
- */
+ /**
+ * return the next to be shown slide show image
+ *
+ * this function returns the URL of the next image
+ * in the slideshow sequence.
+ * @return string
+ */
public function getNextSlideShowImage()
{
$all_photos = $this->getPhotoSelection();
@@ -2122,12 +2407,13 @@ class PHPFSPOT {
} // getNextSlideShowImage()
- /***
- * return the previous to be shown slide show image
- *
- * this function returns the URL of the previous image
- * in the slideshow sequence.
- */
+ /**
+ * return the previous to be shown slide show image
+ *
+ * this function returns the URL of the previous image
+ * in the slideshow sequence.
+ * @return string
+ */
public function getPrevSlideShowImage()
{
$all_photos = $this->getPhotoSelection();
@@ -2148,16 +2434,17 @@ class PHPFSPOT {
} // 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.
- */
+ /**
+ * 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.
+ * @return array
+ */
public function get_random_photo()
{
$all = Array();
@@ -2181,6 +2468,8 @@ class PHPFSPOT {
* this function validates if the provided date
* contains a valid date and will return true
* if it is.
+ * @param string $date_str
+ * @return boolean
*/
public function isValidDate($date_str)
{
@@ -2195,15 +2484,22 @@ class PHPFSPOT {
/**
* timestamp to string conversion
+ * @param integer $timestamp
+ * @return string
*/
private function ts2str($timestamp)
{
return strftime("%Y-%m-%d", $timestamp);
} // ts2str()
+ /**
+ * extract tag-names from $_GET['tags']
+ * @param string $tags_str
+ * @return string
+ */
private function extractTags($tags_str)
{
- $not_validated = split(',', $_GET['tags']);
+ $not_validated = split(',', $tags_str);
$validated = array();
foreach($not_validated as $tag) {
@@ -2217,6 +2513,9 @@ class PHPFSPOT {
/**
* returns the full path to a thumbnail
+ * @param integer $width
+ * @param integer $photo
+ * @return string
*/
public function get_thumb_path($width, $photo)
{
@@ -2234,6 +2533,7 @@ class PHPFSPOT {
/**
* returns server's virtual host name
+ * @return string
*/
private function get_server_name()
{
@@ -2241,8 +2541,8 @@ class PHPFSPOT {
} // get_server_name()
/**
- * returns type of webprotocol which is
- * currently used
+ * returns type of webprotocol which is currently used
+ * @return string
*/
private function get_web_protocol()
{
@@ -2254,11 +2554,33 @@ class PHPFSPOT {
/**
* return url to this phpfspot installation
+ * @return string
*/
private function get_phpfspot_url()
{
return $this->get_web_protocol() ."://". $this->get_server_name() . $this->cfg->web_path;
} // get_phpfspot_url()
+
+ /**
+ * returns the number of photos which are tagged with $tag_id
+ * @param integer $tag_id
+ * @return integer
+ */
+ public function get_num_photos($tag_id)
+ {
+ if($result = $this->db->db_fetchSingleRow("
+ SELECT count(*) as number
+ FROM photo_tags
+ WHERE
+ tag_id LIKE '". $tag_id ."'")) {
+
+ return $result['number'];
+
+ }
+
+ return 0;
+
+ } // get_num_photos()
/**
* check file exists and is readable
@@ -2266,6 +2588,9 @@ class PHPFSPOT {
* returns true, if everything is ok, otherwise false
* if $silent is not set, this function will output and
* error message
+ * @param string $file
+ * @param boolean $silent
+ * @return boolean
*/
private function check_readable($file, $silent = null)
{
@@ -2310,6 +2635,7 @@ class PHPFSPOT {
*
* this function will return the F-Spot database version number
* It is stored within the sqlite3 database in the table meta
+ * @return string|null
*/
public function getFspotDBVersion()
{
@@ -2326,8 +2652,10 @@ class PHPFSPOT {
} // getFspotDBVersion()
/**
- * parse the provided URI and will returned the
- * requested chunk
+ * parse the provided URI and will returned the requested chunk
+ * @param string $uri
+ * @param string $mode
+ * @return string
*/
public function parse_uri($uri, $mode)
{
@@ -2355,6 +2683,7 @@ class PHPFSPOT {
*
* this function checks if all necessary configuration options are
* specified and set.
+ * @return boolean
*/
private function check_config_options()
{
@@ -2423,8 +2752,8 @@ 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;
@@ -2466,6 +2795,30 @@ class PHPFSPOT {
} // 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()
+ * @param integer $current
+ * @param integer $max
+ * @return integer
+ */
+ 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
?>