X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=63a913937d8ac5eac60352bd724805e5e924de8b;hp=b61f5161a68d0ed5b81242d2850c0ad887680cb5;hb=e54956dad7e0632849db2a92eb7ceff88b52247d;hpb=0501e39d1db0f53d3b9b645a78de068b15f964ed

diff --git a/phpfspot.class.php b/phpfspot.class.php
index b61f516..63a9139 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);
@@ -191,9 +198,9 @@ class PHPFSPOT {
       if(isset($_SESSION['from_date']) && isset($_SESSION['to_date']))
          $this->tmpl->assign('date_search_enabled', true);
 
+      $this->tmpl->register_function("sort_select_list", array(&$this, "smarty_sort_select_list"), false);
       $this->tmpl->assign('from_date', $this->get_calendar('from'));
       $this->tmpl->assign('to_date', $this->get_calendar('to'));
-      $this->tmpl->assign('sort_field', $this->get_sort_field());
       $this->tmpl->assign('content_page', 'welcome.tpl');
       $this->tmpl->show("index.tpl");
 
@@ -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()
 
@@ -615,6 +630,9 @@ class PHPFSPOT {
       if(!isset($_SESSION['selected_tags']))
          $_SESSION['selected_tags'] = Array();
 
+      if(isset($_SESSION['searchfor']))
+         unset($_SESSION['searchfor']);
+
       if(!in_array($tag, $_SESSION['selected_tags']))
          array_push($_SESSION['selected_tags'], $tag);
    
@@ -628,6 +646,9 @@ class PHPFSPOT {
     */
    public function delTag($tag)
    {
+      if(isset($_SESSION['searchfor']))
+         unset($_SESSION['searchfor']);
+
       if(isset($_SESSION['selected_tags'])) {
          $key = array_search($tag, $_SESSION['selected_tags']);
          unset($_SESSION['selected_tags'][$key]);
@@ -1159,9 +1180,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;
@@ -1414,12 +1435,11 @@ 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);
       else
@@ -1440,6 +1460,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
     *
@@ -1923,20 +1960,21 @@ class PHPFSPOT {
    /**
     * returns a select-dropdown box to select photo index sort parameters
     */
-   private function get_sort_field()
+   public function smarty_sort_select_list($params, &$smarty)
    {
-      $output = "<select name=\"sort_order\">";
-      foreach(array('date_asc', 'date_desc', 'name_asc', 'name_desc') as $sort_order) {
-         $output.= "<option value=\"". $sort_order ."\"";
-         if($sort_order == $_SESSION['sort_order']) {
+      $output = "";
+
+      foreach($this->sort_orders as $key => $value) {
+         $output.= "<option value=\"". $key ."\"";
+         if($key == $_SESSION['sort_order']) {
             $output.= " selected=\"selected\"";
          }
-         $output.= ">". $sort_order ."</option>";
+         $output.= ">". $value ."</option>";
       }
-      $output.= "</select>";
+
       return $output;
 
-   } // get_sort_field()
+   } // smarty_sort_select_list()
 
    /**
     * returns the currently selected sort order
@@ -1951,10 +1989,20 @@ class PHPFSPOT {
             return " ORDER BY p.time DESC";
             break;
          case 'name_asc':
-            return " ORDER BY p.name ASC";
+            if($this->dbver < 9) {
+               return " ORDER BY p.name ASC";
+            }
+            else {
+               return " ORDER BY basename(p.uri) ASC";
+            }
             break;
          case 'name_desc':
-            return " ORDER BY p.name DESC";
+            if($this->dbver < 9) {
+               return " ORDER BY p.name DESC";
+            }
+            else {
+               return " ORDER BY basename(p.uri) DESC";
+            }
             break;
       }