$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']);
continue;
// return all available (= not selected) tags
- print "<a href=\"javascript:Tags('add', ". $tag .");\">". $this->tags[$tag] ."</a> ";
+ print "<a href=\"javascript:Tags('add', ". $tag .");\" class=\"tag\">". $this->tags[$tag] ."</a> ";
}
{
// return all selected tags
if(isset($_SESSION['selected_tags']) && in_array($tag, $_SESSION['selected_tags'])) {
- print "<a href=\"javascript:Tags('del', ". $tag .");\">". $this->tags[$tag] ."</a> ";
+ print "<a href=\"javascript:Tags('del', ". $tag .");\" class=\"tag\">". $this->tags[$tag] ."</a> ";
}
}
if(isset($_SESSION['selected_tags'])) {
$key = array_search($tag, $_SESSION['selected_tags']);
unset($_SESSION['selected_tags'][$key]);
+ sort($_SESSION['selected_tags']);
}
} // delTag()
{
$tagged_photos = Array();
+ /* 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
+ 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;
+ }
+
+ /* return according the selected tags */
if(isset($_SESSION['selected_tags'])) {
$selected = "";
foreach($_SESSION['selected_tags'] as $tag)
array_push($tagged_photos, $row['photo_id']);
}
}
- }
- 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
- ");
- 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;
} // getPhotoSelection()
public function showPhotoIndex()
{
- if($_SESSION['searchfor'] == '')
- $photos = $this->getPhotoSelection();
- else
- $photos = $this->getSearchResult($_SESSION['searchfor']);
+ $photos = $this->getPhotoSelection();
$count = count($photos);
// +1 for for smarty's selection iteration
$rows++;
- //$images.= "<img src=\"phpfspot_img.php?idx=". $photo ."&width=". $this->cfg->thumb_width ."\" /><br />\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);
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)
/* 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"))
public function get_meta_informations($file)
{
-
return exif_read_data($file);
} // get_meta_informations()
{
$_SESSION['searchfor'] = $searchfor;
- } // showSearchResult()
+ } // startSearch()
- public function getSearchResult($for)
+ private function rotateImage($img, $degrees)
{
- $tagged_photos = Array();
+ 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;
- $result = $this->db->db_query("
- 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 '%". $for ."%'
- ORDER BY p.time ASC
- ");
+ }
+
+ $img = imagerotate($img, $degrees);
- while($row = $this->db->db_fetch_object($result)) {
- array_push($tagged_photos, $row['photo_id']);
}
- return $tagged_photos;
+ return $img;
- } // getSearchResult()
+ } // rotateImage()
}
projects / phpfspot.git / blobdiff