X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=9c426a30ce20f678d9daa95eb2c141305d491faa;hp=3f7a7280253b04cdd44110ee3188ee7560610882;hb=c6745c143300a59acc48cec937b77ab071a5a693;hpb=082eccbfa232173126225daae427ef6a1832338e;ds=sidebyside
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 3f7a728..9c426a3 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -27,6 +27,14 @@ class PHPFSPOT {
$this->get_tags();
+ session_start();
+
+ if(!isset($_SESSION['tag_condition']))
+ $_SESSION['tag_condition'] = 'or';
+
+ if(!isset($_SESSION['searchfor']))
+ $_SESSION['searchfor'] = '';
+
} // __construct()
public function __destruct()
@@ -36,7 +44,9 @@ class PHPFSPOT {
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->show("index.tpl");
} // show()
@@ -57,6 +67,10 @@ class PHPFSPOT {
$tag_id = $row['id'];
$tag_name = $row['name'];
+ /* check if config requests to ignore this tag */
+ if(in_array($row['name'], $this->cfg->hide_tags))
+ continue;
+
$this->tags[$tag_id] = $tag_name;
$this->avail_tags[$count] = $tag_id;
@@ -86,7 +100,7 @@ class PHPFSPOT {
public function showPhoto($photo)
{
- $all_photos = $this->getAllTagPhotos();
+ $all_photos = $this->getPhotoSelection();
foreach($all_photos as $all_photo) {
@@ -108,14 +122,21 @@ class PHPFSPOT {
$meta = $this->get_meta_informations($this->translate_path($details['directory_path']) ."/". $details['name']);
$info = getimagesize($this->translate_path($details['directory_path']) ."/thumbs/". $this->cfg->photo_width ."_". $details['name']);
+ $this->tmpl->assign('description', $details['description']);
+ $this->tmpl->assign('image_name', $details['name']);
+
$this->tmpl->assign('width', $info[0]);
$this->tmpl->assign('height', $info[1]);
- $this->tmpl->assign('c_date', $meta['DateTime']);
- $this->tmpl->assign('madewith', $meta['Make'] ." ". $meta['Model']);
- $this->tmpl->assign('image_name', $details['name']);
+ $this->tmpl->assign('ExifMadeOn', strftime("%a %x %X", $meta['FileDateTime']));
+ $this->tmpl->assign('ExifMadeWith', $meta['Make'] ." ". $meta['Model']);
+ $this->tmpl->assign('ExifOrigResolution', $meta['ExifImageWidth'] ."x". $meta['ExifImageLength']);
+ $this->tmpl->assign('ExifFileSize', round($meta['FileSize']/1024, 1));
+
$this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&width=". $this->cfg->photo_width);
$this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
+ $this->tmpl->assign('tags', $this->get_photo_tags($photo));
+
if($previous_img) {
$this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
}
@@ -130,13 +151,52 @@ class PHPFSPOT {
public function getAvailableTags()
{
- foreach($this->avail_tags as $tag)
- {
- if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags']))
+ $result = $this->db->db_query("
+ SELECT tag_id as id, count(tag_id) as quantity
+ FROM photo_tags
+ GROUP BY tag_id
+ ORDER BY tag_id ASC
+ ");
+
+ $tags = Array();
+
+ while($row = $this->db->db_fetch_object($result)) {
+ $tags[$row['id']] = $row['quantity'];
+ }
+
+ // change these font sizes if you will
+ $max_size = 125; // max font size in %
+ $min_size = 75; // min font size in %
+
+ // get the largest and smallest array values
+ $max_qty = max(array_values($tags));
+ $min_qty = min(array_values($tags));
+
+ // find the range of values
+ $spread = $max_qty - $min_qty;
+ if (0 == $spread) { // we don't want to divide by zero
+ $spread = 1;
+ }
+
+ // determine the font-size increment
+ // this is the increase per tag quantity (times used)
+ $step = ($max_size - $min_size)/($spread);
+
+ // loop through our tag array
+ foreach ($tags as $key => $value) {
+
+ if(isset($_SESSION['selected_tags']) && in_array($key, $_SESSION['selected_tags']))
continue;
- // return all available (= not selected) tags
- print "". $this->tags[$tag] ." ";
+ // calculate CSS font-size
+ // find the $value in excess of $min_qty
+ // multiply by the font-size increment ($size)
+ // and add the $min_size set above
+ $size = $min_size + (($value - $min_qty) * $step);
+ // uncomment if you want sizes in whole %:
+ $size = ceil($size);
+
+ print "". $this->tags[$key] ." ";
}
@@ -148,7 +208,7 @@ class PHPFSPOT {
{
// return all selected tags
if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags'])) {
- print "". $this->tags[$tag] ." ";
+ print "". $this->tags[$tag] ." ";
}
}
@@ -160,7 +220,8 @@ class PHPFSPOT {
if(!isset($_SESSION['selected_tags']))
$_SESSION['selected_tags'] = Array();
- array_push($_SESSION['selected_tags'], $tag);
+ if(!in_array($tag, $_SESSION['selected_tags']))
+ array_push($_SESSION['selected_tags'], $tag);
} // addTag()
@@ -169,6 +230,7 @@ class PHPFSPOT {
if(isset($_SESSION['selected_tags'])) {
$key = array_search($tag, $_SESSION['selected_tags']);
unset($_SESSION['selected_tags'][$key]);
+ sort($_SESSION['selected_tags']);
}
} // delTag()
@@ -179,45 +241,101 @@ class PHPFSPOT {
} // resetTags()
- public function getAllTagPhotos()
+ public function getPhotoSelection()
{
$tagged_photos = Array();
- if(isset($_SESSION['selected_tags'])) {
- $selected = "";
- foreach($_SESSION['selected_tags'] as $tag)
- $selected.= $tag .",";
- $selected = substr($selected, 0, strlen($selected)-1);
+ /* return a search result */
+ if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
$result = $this->db->db_query("
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
+ INNER JOIN tags t
+ ON pt.tag_id=t.id
+ WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%'
+ ORDER BY p.time ASC
");
+ while($row = $this->db->db_fetch_object($result)) {
+ array_push($tagged_photos, $row['photo_id']);
+ }
+ return $tagged_photos;
}
- else {
- $result = $this->db->db_query("
- SELECT DISTINCT photo_id
- FROM photo_tags pt
- INNER JOIN photos p
- ON p.id=pt.photo_id
- ORDER BY p.time ASC
- ");
+
+ /* return according the selected tags */
+ if(isset($_SESSION['selected_tags'])) {
+ $selected = "";
+ foreach($_SESSION['selected_tags'] as $tag)
+ $selected.= $tag .",";
+ $selected = substr($selected, 0, strlen($selected)-1);
+
+ if($_SESSION['tag_condition'] == 'or') {
+ $result = $this->db->db_query("
+ 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
+ ");
+ }
+ elseif($_SESSION['tag_condition'] == 'and') {
+
+ /* Join together a table looking like
+
+ pt1.photo_id pt1.tag_id pt2.photo_id pt2.tag_id ...
+
+ so the query can quickly return all images matching the
+ selected tags in an AND condition
+
+ */
+
+ $query_str = "
+ SELECT DISTINCT pt1.photo_id
+ FROM photo_tags pt1
+ ";
+
+ for($i = 0; $i < count($_SESSION['selected_tags']); $i++) {
+ $query_str.= "
+ INNER JOIN photo_tags pt". ($i+2) ."
+ ON pt1.photo_id=pt". ($i+2) .".photo_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);
+ }
+
+ while($row = $this->db->db_fetch_object($result)) {
+ array_push($tagged_photos, $row['photo_id']);
+ }
+ return $tagged_photos;
}
+ /* return all available photos */
+ $result = $this->db->db_query("
+ SELECT DISTINCT photo_id
+ FROM photo_tags pt
+ INNER JOIN photos p
+ ON p.id=pt.photo_id
+ ORDER BY p.time ASC
+ ");
while($row = $this->db->db_fetch_object($result)) {
array_push($tagged_photos, $row['photo_id']);
}
-
return $tagged_photos;
- } // getAllTagPhotos()
+ } // getPhotoSelection()
public function showPhotoIndex()
{
- $photos = $this->getAllTagPhotos();
+ $photos = $this->getPhotoSelection();
+
$count = count($photos);
$rows = 0;
@@ -241,7 +359,8 @@ class PHPFSPOT {
// +1 for for smarty's selection iteration
$rows++;
- //$images.= "![](\"phpfspot_img.php?idx=".)
\n";
+ if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
+ $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
$this->tmpl->assign('count', $count);
$this->tmpl->assign('width', $this->cfg->thumb_width);
@@ -289,9 +408,53 @@ class PHPFSPOT {
public function create_thumbnail($image, $width)
{
- // if thumbnail already exists, don't recreate it
- if(file_exists(dirname($image) ."/thumbs/". $width ."_". basename($image)))
- return;
+ $meta = $this->get_meta_informations($image);
+
+ $rotate = 0;
+ $flip = false;
+
+ switch($meta['Orientation']) {
+
+ case 1:
+ $rotate = 0;
+ $flip = false;
+ break;
+
+ case 2:
+ $rotate = 0;
+ $flip = true;
+ break;
+
+ case 3:
+ $rotate = 180;
+ $flip = false;
+ break;
+
+ case 4:
+ $rotate = 180;
+ $flip = true;
+ break;
+
+ case 5:
+ $rotate = 90;
+ $flip = true;
+ break;
+
+ case 6:
+ $rotate = 90;
+ $flip = false;
+ break;
+
+ case 7:
+ $rotate = 270;
+ $flip = true;
+ break;
+
+ case 8:
+ $rotate = 270;
+ $flip = false;
+ break;
+ }
$src_img = @imagecreatefromjpeg($image);
@@ -324,6 +487,20 @@ class PHPFSPOT {
/* 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) {
+ print "(FLIP)";
+ $image = $dst_img;
+ for($x = 0; $x < $new_w; $x++) {
+ imagecopy($dst_img, $image, $x, 0, $w - $x - 1, 0, 1, $h);
+ }
+ }
+
+ if($rotate) {
+ print "(ROTATE)";
+ $dst_img = $this->rotateImage($dst_img, $rotate);
+ }
+
/* write down new generated file */
if(!file_exists(dirname($image) ."/thumbs"))
@@ -341,7 +518,6 @@ class PHPFSPOT {
public function get_meta_informations($file)
{
-
return exif_read_data($file);
} // get_meta_informations()
@@ -360,50 +536,39 @@ class PHPFSPOT {
} // check_config_table
- public function gen_thumbs($idx = 0, $fromcmd = 0)
+ public function gen_thumb($idx = 0, $fromcmd = 0, $force = 0)
{
- if(!$idx) {
- /* get all available photos */
- $all = $this->getAllTagPhotos();
- }
- else
- $all = Array($idx);
-
- foreach($all as $photo) {
-
- $details = $this->get_photo_details($photo);
+ $details = $this->get_photo_details($idx);
- $full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
- $file_md5 = md5_file($full_path);
+ $full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
+ $file_md5 = md5_file($full_path);
- if($fromcmd) print "Image ". $details['name'] ." Thumbnails:";
+ if($fromcmd) print "Image [". $idx ."] ". $details['name'] ." Thumbnails:";
- /* if the file hasn't changed there is no need to regen the thumb */
- if($file_md5 == $this->getMD5($photo)) {
- if($fromcmd) print " file has not changed - skipping\n";
- continue;
- }
-
- /* set the new/changed MD5 sum for the current photo */
- $this->setMD5($photo, $file_md5);
-
- $resolutions = Array(
- $this->cfg->thumb_width,
- $this->cfg->bubble_width,
- $this->cfg->photo_width
- );
+ /* if the file hasn't changed there is no need to regen the thumb */
+ if(!$force && $file_md5 == $this->getMD5($idx)) {
+ if($fromcmd) print " file has not changed - skipping\n";
+ return;
+ }
- /* create thumbnails for the requested resolutions */
- foreach($resolutions as $resolution) {
- if($fromcmd) print " ". $resolution ."px";
- $this->create_thumbnail($full_path, $resolution);
- }
+ /* set the new/changed MD5 sum for the current photo */
+ $this->setMD5($idx, $file_md5);
- if($fromcmd) print "\n";
+ $resolutions = Array(
+ $this->cfg->thumb_width,
+ $this->cfg->bubble_width,
+ $this->cfg->photo_width
+ );
+ /* create thumbnails for the requested resolutions */
+ foreach($resolutions as $resolution) {
+ if($fromcmd) print " ". $resolution ."px";
+ $this->create_thumbnail($full_path, $resolution);
}
- } // gen_thumbs()
+ if($fromcmd) print "\n";
+
+ } // gen_thumb()
private function getMD5($idx)
{
@@ -430,6 +595,107 @@ class PHPFSPOT {
} // setMD5()
+ public function setTagCondition($mode)
+ {
+ $_SESSION['tag_condition'] = $mode;
+
+ } // setTagCondition()
+
+ public function startSearch($searchfor)
+ {
+ $_SESSION['searchfor'] = $searchfor;
+
+ } // startSearch()
+
+ private function rotateImage($img, $degrees)
+ {
+ if(function_exists("imagerotate"))
+ $img = imagerotate($img, $degrees, 0);
+ else
+ {
+ function imagerotate($src_img, $angle)
+ {
+ $src_x = imagesx($src_img);
+ $src_y = imagesy($src_img);
+ if ($angle == 180) {
+ $dest_x = $src_x;
+ $dest_y = $src_y;
+ }
+ elseif ($src_x <= $src_y) {
+ $dest_x = $src_y;
+ $dest_y = $src_x;
+ }
+ elseif ($src_x >= $src_y) {
+ $dest_x = $src_y;
+ $dest_y = $src_x;
+ }
+
+ $rotate=imagecreatetruecolor($dest_x,$dest_y);
+ imagealphablending($rotate, false);
+
+ switch ($angle) {
+
+ case 90:
+ for ($y = 0; $y < ($src_y); $y++) {
+ for ($x = 0; $x < ($src_x); $x++) {
+ $color = imagecolorat($src_img, $x, $y);
+ imagesetpixel($rotate, $dest_x - $y - 1, $x, $color);
+ }
+ }
+ break;
+
+ case 270:
+ for ($y = 0; $y < ($src_y); $y++) {
+ for ($x = 0; $x < ($src_x); $x++) {
+ $color = imagecolorat($src_img, $x, $y);
+ imagesetpixel($rotate, $y, $dest_y - $x - 1, $color);
+ }
+ }
+ break;
+
+ case 180:
+ for ($y = 0; $y < ($src_y); $y++) {
+ for ($x = 0; $x < ($src_x); $x++) {
+ $color = imagecolorat($src_img, $x, $y);
+ imagesetpixel($rotate, $dest_x - $x - 1, $dest_y - $y - 1, $color);
+ }
+ }
+ break;
+
+ default: $rotate = $src_img;
+ };
+
+ return $rotate;
+
+ }
+
+ $img = imagerotate($img, $degrees);
+
+ }
+
+ return $img;
+
+ } // rotateImage()
+
+ private function get_photo_tags($idx)
+ {
+ $result = $this->db->db_query("
+ SELECT t.id, t.name
+ FROM tags t
+ INNER JOIN photo_tags pt
+ ON t.id=pt.tag_id
+ WHERE pt.photo_id='". $idx ."'
+ ");
+
+ $tags = Array();
+
+ while($row = $this->db->db_fetch_object($result))
+ $tags[$row['id']] = $row['name'];
+
+ return $tags;
+
+ } // get_photo_tags()
+
}
?>