X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=0ce73936b10b8a66a62bcd7b2a07b11f92cff6cd;hp=40b65516241fc8141f6c85ecb2aa342b5588994b;hb=3face190fc281981026fe48fb80cea007a2e841b;hpb=bb3bcfbb5f2627788d4ee498ddbd3b7024a2d326 diff --git a/phpfspot.class.php b/phpfspot.class.php index 40b6551..0ce7393 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -49,6 +49,13 @@ class PHPFSPOT { $this->cfg->product = "phpfspot"; $this->cfg->version = "1.2"; + $this->sort_orders= array( + 'date_asc' => 'Date ↑', + 'date_desc' => 'Date ↓', + 'name_asc' => 'Name ↑', + 'name_desc' => 'Name ↓' + ); + /* Check necessary requirements */ if(!$this->checkRequirements()) { exit(1); @@ -158,10 +165,10 @@ class PHPFSPOT { $_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': @@ -516,6 +523,7 @@ class PHPFSPOT { */ public function getAvailableTags() { + /* retrive tags from database */ $this->get_tags(); $output = ""; @@ -559,10 +567,10 @@ class PHPFSPOT { 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); @@ -587,9 +595,11 @@ class PHPFSPOT { */ public function getSelectedTags() { + /* retrive tags from database */ $this->get_tags(); $output = ""; + foreach($this->avail_tags as $tag) { // return all selected tags @@ -598,8 +608,13 @@ class PHPFSPOT { } } - $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() @@ -851,13 +866,14 @@ class PHPFSPOT { /* 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 ." "; @@ -870,7 +886,7 @@ class PHPFSPOT { $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; @@ -1079,6 +1095,8 @@ class PHPFSPOT { $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); @@ -1165,9 +1183,9 @@ class PHPFSPOT { // 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; @@ -1291,7 +1309,7 @@ class PHPFSPOT { * 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; @@ -1324,6 +1342,8 @@ class PHPFSPOT { $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; @@ -1334,15 +1354,14 @@ class PHPFSPOT { /* 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)) @@ -1420,18 +1439,19 @@ class PHPFSPOT { * getPhotoSelection() will then only return the matching * photos. */ - public function startSearch($searchfor, $sort_order, $from = 0, $to = 0) + public function startSearch($searchfor, $from = 0, $to = 0) { $this->get_tags(); $_SESSION['searchfor'] = $searchfor; - $_SESSION['sort_order'] = $sort_order; + 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']); @@ -1446,6 +1466,23 @@ class PHPFSPOT { } // startSearch() + /** + * updates sort order in session variable + * + * this function is invoked by RPC and will sort the requested + * sort order in the session variable. + */ + public function updateSortOrder($order) + { + if(isset($this->sort_orders[$order])) { + $_SESSION['sort_order'] = $order; + return "ok"; + } + + return "unkown error"; + + } // updateSortOrder() + /** * rotate image * @@ -1601,6 +1638,11 @@ class PHPFSPOT { print "PEAR Calendar package is missing
\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
\n"; + $missing = true; + } ini_restore('track_errors'); if(isset($missing)) @@ -1931,23 +1973,15 @@ class PHPFSPOT { */ public function smarty_sort_select_list($params, &$smarty) { - $output = ""; return $output;