$_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':
*/
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;
$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+20);
+ $this->tmpl->assign('thumb_container_height', $this->cfg->thumb_height);
$this->tmpl->assign('images', $images);
$this->tmpl->assign('img_width', $img_width);
$this->tmpl->assign('img_height', $img_height);
// 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))