if(!isset($_SESSION['searchfor']))
$_SESSION['searchfor'] = '';
- // if begin_with is still set but rows_per_page is now 0, unset it
- if(isset($_SESSION['begin_with']) && $this->cfg->rows_per_page == 0)
+ // if begin_with is still set but thumbs_per_page is now 0, unset it
+ if(isset($_SESSION['begin_with']) && $this->cfg->thumbs_per_page == 0)
unset($_SESSION['begin_with']);
} // __construct()
$_SESSION['start_action'] = 'showp';
}
if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
- $_SESSION['from_date'] = strtotime($_GET['from_date']);
+ $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00");
}
if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
- $_SESSION['to_date'] = strtotime($_GET['to_date']);
+ $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59");
}
break;
case 'export':
$this->tmpl->assign('extern_link', $extern_link);
- if(file_exists($thumb_path)) {
+ if(!file_exists($thumb_path)) {
+ $this->_error("Can't open file ". $thumb_path ."\n");
+ return;
+ }
- $info = getimagesize($thumb_path);
+ $info = getimagesize($thumb_path);
- $this->tmpl->assign('description', $details['description']);
- $this->tmpl->assign('image_name', $this->parse_uri($details['uri'], 'filename'));
+ $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('ExifMadeOn', $meta_date);
- $this->tmpl->assign('ExifMadeWith', $meta_make);
- $this->tmpl->assign('ExifOrigResolution', $meta_res);
- $this->tmpl->assign('ExifFileSize', $meta_size);
-
- $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('width', $info[0]);
+ $this->tmpl->assign('height', $info[1]);
+ $this->tmpl->assign('ExifMadeOn', $meta_date);
+ $this->tmpl->assign('ExifMadeWith', $meta_make);
+ $this->tmpl->assign('ExifOrigResolution', $meta_res);
+ $this->tmpl->assign('ExifFileSize', $meta_size);
+
+ $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('image_filename', $this->parse_uri($details['uri'], 'filename'));
- $this->tmpl->assign('tags', $this->get_photo_tags($photo));
- $this->tmpl->assign('current', $current);
- }
- else {
- $this->_error("Can't open file ". $thumb_path ."\n");
- return;
- }
+ $this->tmpl->assign('tags', $this->get_photo_tags($photo));
+ $this->tmpl->assign('current', $current);
if($previous_img) {
$this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
*/
public function getAvailableTags()
{
+ /* retrive tags from database */
$this->get_tags();
$output = "";
if(isset($_SESSION['selected_tags']) && in_array($key, $_SESSION['selected_tags']))
continue;
- // 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
+ // 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);
*/
public function getSelectedTags()
{
+ /* retrive tags from database */
$this->get_tags();
$output = "";
+
foreach($this->avail_tags as $tag)
{
// return all selected tags
}
}
- $output = substr($output, 0, strlen($output)-2);
- print $output;
+ if($output != "") {
+ $output = substr($output, 0, strlen($output)-2);
+ return $output;
+ }
+ else {
+ return "no tags selected";
+ }
} // getSelectedTags()
/* return all available photos */
$query_str = "
- SELECT DISTINCT photo_id
- FROM photo_tags pt
- INNER JOIN photos p
+ SELECT p.id
+ FROM photos p
+ LEFT JOIN photo_tags pt
ON p.id=pt.photo_id
- INNER JOIN tags t
+ LEFT JOIN tags t
ON pt.tag_id=t.id
";
+
if(isset($additional_where_cond))
$query_str.= "WHERE ". $additional_where_cond ." ";
$result = $this->db->db_query($query_str);
while($row = $this->db->db_fetch_object($result)) {
- array_push($matched_photos, $row['photo_id']);
+ array_push($matched_photos, $row['id']);
}
return $matched_photos;
if(isset($_SESSION['begin_with']) && $_SESSION['begin_with'] != "")
$anchor = $_SESSION['begin_with'];
- if(!isset($this->cfg->rows_per_page) || $this->cfg->rows_per_page == 0) {
+ if(!isset($this->cfg->thumbs_per_page) || $this->cfg->thumbs_per_page == 0) {
$begin_with = 0;
$end_with = $count;
}
- elseif($this->cfg->rows_per_page > 0) {
+ elseif($this->cfg->thumbs_per_page > 0) {
if(!isset($_SESSION['begin_with']) || $_SESSION['begin_with'] == 0) {
$begin_with = 0;
}
else {
-
$begin_with = $_SESSION['begin_with'];
-
- // verify $begin_with - perhaps the thumbs-per-rows or
- // rows-per-page variables have changed or the jump back
- // from a photo wasn't exact - so calculate the real new
- // starting point
- $multiplicator = $this->cfg->rows_per_page * $this->cfg->thumbs_per_row;
- for($i = 0; $i <= $count; $i+=$multiplicator) {
- if($begin_with >= $i && $begin_with < $i+$multiplicator) {
- $begin_with = $i;
- break;
- }
- }
}
- $end_with = $begin_with + ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
+ $end_with = $begin_with + $this->cfg->thumbs_per_page;
}
-
- $rows = 0;
- $cols = 0;
- $images[$rows] = Array();
- $img_height[$rows] = Array();
- $img_width[$rows] = Array();
- $img_id[$rows] = Array();
- $img_name[$rows] = Array();
+ $thumbs = 0;
+ $images[$thumbs] = Array();
+ $img_height[$thumbs] = Array();
+ $img_width[$thumbs] = Array();
+ $img_id[$thumbs] = Array();
+ $img_name[$thumbs] = Array();
$img_title = Array();
for($i = $begin_with; $i < $end_with; $i++) {
if(isset($photos[$i])) {
- $images[$rows][$cols] = $photos[$i];
- $img_id[$rows][$cols] = $i;
- $img_name[$rows][$cols] = htmlspecialchars($this->getPhotoName($photos[$i], 15));
- $img_title[$rows][$cols] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0));
+ $images[$thumbs] = $photos[$i];
+ $img_id[$thumbs] = $i;
+ $img_name[$thumbs] = htmlspecialchars($this->getPhotoName($photos[$i], 15));
+ $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]);
if(file_exists($thumb_path)) {
$info = getimagesize($thumb_path);
- $img_width[$rows][$cols] = $info[0];
- $img_height[$rows][$cols] = $info[1];
- }
-
- if($cols == $this->cfg->thumbs_per_row-1) {
- $cols = 0;
- $rows++;
- $images[$rows] = Array();
- $img_width[$rows] = Array();
- $img_height[$rows] = Array();
- }
- else {
- $cols++;
+ $img_width[$thumbs] = $info[0];
+ $img_height[$thumbs] = $info[1];
}
+ $thumbs++;
}
}
// +1 for for smarty's selection iteration
- $rows++;
+ $thumbs++;
if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
$this->tmpl->assign('searchfor', $_SESSION['searchfor']);
}
/* do we have to display the page selector ? */
- if($this->cfg->rows_per_page != 0) {
+ if($this->cfg->thumbs_per_page != 0) {
$page_select = "";
/* calculate the page switchers */
- $previous_start = $begin_with - ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
- $next_start = $begin_with + ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
+ $previous_start = $begin_with - $this->cfg->thumbs_per_page;
+ $next_start = $begin_with + $this->cfg->thumbs_per_page;
if($begin_with != 0)
$this->tmpl->assign("previous_url", "javascript:showPhotoIndex(". $previous_start .");");
if($end_with < $count)
$this->tmpl->assign("next_url", "javascript:showPhotoIndex(". $next_start .");");
- $photo_per_page = $this->cfg->rows_per_page * $this->cfg->thumbs_per_row;
+ $photo_per_page = $this->cfg->thumbs_per_page;
$last_page = ceil($count / $photo_per_page);
/* get the current selected page */
$this->tmpl->assign('rss_link', $rss_link);
$this->tmpl->assign('count', $count);
$this->tmpl->assign('width', $this->cfg->thumb_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);
$this->tmpl->assign('img_width', $img_width);
$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_title', $img_title);
- $this->tmpl->assign('rows', $rows);
- $this->tmpl->assign('columns', $this->cfg->thumbs_per_row);
+ $this->tmpl->assign('thumbs', $thumbs);
$this->tmpl->show("photo_index.tpl");
// 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
-
- if($width >= $cur_width) {
+ // 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;
* 2. Check if the md5sum of the original file has changed
* 3. Generate the thumbnails if needed
*/
- public function gen_thumb($idx = 0, $force = 0)
+ public function gen_thumb($idx = 0, $force = 0, $overwrite = false)
{
$error = 0;
$changes = false;
foreach($resolutions as $resolution) {
+
+ $generate_it = false;
$thumb_sub_path = substr($file_md5, 0, 2);
$thumb_path = $this->cfg->thumb_path ."/". $thumb_sub_path ."/". $resolution ."_". $file_md5;
/* if the thumbnail file doesn't exist, create it */
if(!file_exists($thumb_path)) {
-
- $this->_debug(" ". $resolution ."px");
- if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
- $error = 1;
-
- $changes = true;
+ $generate_it = true;
}
/* if the file hasn't changed there is no need to regen the thumb */
elseif($file_md5 != $this->getMD5($idx) || $force) {
+ $generate_it = true;
+ }
+
+ if($generate_it || $overwrite) {
$this->_debug(" ". $resolution ."px");
if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
$this->get_tags();
$_SESSION['searchfor'] = $searchfor;
+
if($from != 0)
- $_SESSION['from_date'] = strtotime($from);
+ $_SESSION['from_date'] = strtotime($from ." 00:00:00");
else
unset($_SESSION['from_date']);
+
if($to != 0)
- $_SESSION['to_date'] = strtotime($to);
+ $_SESSION['to_date'] = strtotime($to ." 23:59:59");
else
unset($_SESSION['to_date']);
print "PEAR Calendar package is missing<br />\n";
$missing = true;
}
+ @include_once 'Console/Getopt.php';
+ if(isset($php_errormsg) && preg_match('/Failed opening.*for inclusion/i', $php_errormsg)) {
+ print "PEAR Console_Getopt package is missing<br />\n";
+ $missing = true;
+ }
ini_restore('track_errors');
if(isset($missing))
projects / phpfspot.git / blobdiff