X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=42d3075a2d665bd22bbc8b40e09c6ad505496548;hp=e4ca4ffa9cde084ac3b7d6561e566a0e18e1994c;hb=eaf7260e0a6318f25cc6fcb18661ca04acd46005;hpb=ae3e56961cdc914f315c54b1e2918aa35b638221;ds=sidebyside
diff --git a/phpfspot.class.php b/phpfspot.class.php
index e4ca4ff..42d3075 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -19,11 +19,22 @@ class PHPFSPOT {
$this->cfg = new PHPFSPOT_CFG;
$this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
+
$this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db);
+ $this->check_config_table();
+
$this->tmpl = new PHPFSPOT_TMPL($this);
$this->get_tags();
+ session_start();
+
+ if(!isset($_SESSION['tag_condition']))
+ $_SESSION['tag_condition'] = 'or';
+
+ if(!isset($_SESSION['searchfor']))
+ $_SESSION['searchfor'] = '';
+
} // __construct()
public function __destruct()
@@ -33,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()
@@ -54,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;
@@ -83,7 +100,7 @@ class PHPFSPOT {
public function showPhoto($photo)
{
- $all_photos = $this->getAllTagPhotos();
+ $all_photos = $this->getPhotoSelection();
foreach($all_photos as $all_photo) {
@@ -104,13 +121,14 @@ class PHPFSPOT {
$details = $this->get_photo_details($photo);
$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('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('image_url', 'phpfspot_img.php?idx='. $photo ."&width=". $this->cfg->photo_width);
+ $this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
if($previous_img) {
$this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
@@ -175,45 +193,99 @@ 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
+ ");
+ while($row = $this->db->db_fetch_object($result)) {
+ array_push($tagged_photos, $row['photo_id']);
+ }
+ }
+ elseif($_SESSION['tag_condition'] == 'and') {
+ $result = $this->db->db_query("
+ SELECT DISTINCT photo_id, tag_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
+ ");
+
+ /* now we need to check if each object fulfills the condition
+ and has all the selected tags assigned
+ */
+ $match_object = Array();
+ $matches_needed = count($_SESSION['selected_tags']);
+ while($row = $this->db->db_fetch_object($result)) {
+ /* set the counter for this object */
+ if(!isset($match_object[$row['photo_id']]))
+ $match_object[$row['photo_id']] = $matches_needed;
+
+ /* we have a match? decrement the counter */
+ if(in_array($row['tag_id'], $_SESSION['selected_tags']))
+ $match_object[$row['photo_id']]--;
+
+ /* if the object has all necessary tags, add it to the result */
+ if($match_object[$row['photo_id']] == 0)
+ 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;
@@ -237,7 +309,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);
@@ -258,7 +331,7 @@ class PHPFSPOT {
$details = $this->get_photo_details($photo);
- $image_url = "phpfspot_img.php?idx=". $photo ."&width=200";
+ $image_url = "phpfspot_img.php?idx=". $photo ."&width=". $this->cfg->bubble_width;
$filesize = filesize($this->translate_path($details['directory_path']) ."/". $details['name']);
$filesize = rand($filesize/1024, 2);
@@ -283,12 +356,60 @@ class PHPFSPOT {
} // showCredits()
- public function resize_image($image, $width)
+ 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);
if($src_img)
@@ -320,6 +441,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"))
@@ -333,15 +468,180 @@ class PHPFSPOT {
imagedestroy($src_img);
}
- } // resize_image()
+ } // create_thumbnail()
public function get_meta_informations($file)
{
-
return exif_read_data($file);
} // get_meta_informations()
+ public function check_config_table()
+ {
+ // if the config table doesn't exist yet, create it
+ if(!$this->cfg_db->db_check_table_exists("images")) {
+ $this->cfg_db->db_exec("
+ CREATE TABLE images (
+ img_idx int primary key,
+ img_md5 varchar(32)
+ )
+ ");
+ }
+
+ } // check_config_table
+
+ public function gen_thumbs($idx = 0, $fromcmd = 0)
+ {
+ if(!$idx) {
+ /* get all available photos */
+ $all = $this->getPhotoSelection();
+ }
+ else
+ $all = Array($idx);
+
+ foreach($all as $photo) {
+
+ $details = $this->get_photo_details($photo);
+
+ $full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
+ $file_md5 = md5_file($full_path);
+
+ if($fromcmd) print "Image ". $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
+ );
+
+ /* create thumbnails for the requested resolutions */
+ foreach($resolutions as $resolution) {
+ if($fromcmd) print " ". $resolution ."px";
+ $this->create_thumbnail($full_path, $resolution);
+ }
+
+ if($fromcmd) print "\n";
+
+ }
+
+ } // gen_thumbs()
+
+ private function getMD5($idx)
+ {
+ $result = $this->cfg_db->db_query("
+ SELECT img_md5
+ FROM images
+ WHERE img_idx='". $idx ."'
+ ");
+
+ if(!$result)
+ return 0;
+
+ $img = $this->cfg_db->db_fetch_object($result);
+ return $img['img_md5'];
+
+ } // getMD5()
+
+ private function setMD5($idx, $md5)
+ {
+ $result = $this->cfg_db->db_exec("
+ REPLACE INTO images (img_idx, img_md5)
+ VALUES ('". $idx ."', '". $md5 ."')
+ ");
+
+ } // 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()
+
}
?>