$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);
*/
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()
$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))
* 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);
else
} // 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
*
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))
*/
public function smarty_sort_select_list($params, &$smarty)
{
- $output = "<select name=\"sort_order\">";
+ $output = "";
- $sorter = array(
- 'date_asc' => 'Date ↑',
- 'date_desc' => 'Date ↓',
- 'name_asc' => 'Name ↑',
- 'name_desc' => 'Name ↓'
- );
-
- foreach($sorter as $key => $value) {
+ foreach($this->sort_orders as $key => $value) {
$output.= "<option value=\"". $key ."\"";
if($key == $_SESSION['sort_order']) {
$output.= " selected=\"selected\"";
}
$output.= ">". $value ."</option>";
}
- $output.= "</select>";
return $output;