Merge branch 'devel'
[phpfspot.git] / phpfspot.class.php
index 826fafd2d1101b792306590de0cd032731443a7d..f1b0dc64dbf53702ab52e10c15a6b698dbfb1ca2 100644 (file)
@@ -116,10 +116,10 @@ class PHPFSPOT {
          $_SESSION['tag_condition'] = 'or';
 
       if(!isset($_SESSION['sort_order']))
-         $_SESSION['sort_order'] = 'date_asc';
+         $_SESSION['sort_order'] = 'date_desc';
 
-      if(!isset($_SESSION['searchfor']))
-         $_SESSION['searchfor'] = '';
+      if(!isset($_SESSION['searchfor_tag']))
+         $_SESSION['searchfor_tag'] = '';
 
       // 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)
@@ -143,7 +143,7 @@ class PHPFSPOT {
     */
    public function show()
    {
-      $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
+      $this->tmpl->assign('searchfor_tag', $_SESSION['searchfor_tag']);
       $this->tmpl->assign('page_title', $this->cfg->page_title);
       $this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
       $this->tmpl->assign('template_path', 'themes/'. $this->cfg->theme_name);
@@ -503,7 +503,8 @@ class PHPFSPOT {
       $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);
+      $this->tmpl->assign('current_page', $this->getCurrentPage($current, $count));
+      $this->tmpl->assign('current_img', $photo);
 
       if($previous_img) {
          $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
@@ -638,11 +639,14 @@ class PHPFSPOT {
       if(!isset($_SESSION['selected_tags']))
          $_SESSION['selected_tags'] = Array();
 
-      if(isset($_SESSION['searchfor']))
-         unset($_SESSION['searchfor']);
+      if(isset($_SESSION['searchfor_tag']))
+         unset($_SESSION['searchfor_tag']);
 
       if(!in_array($tag, $_SESSION['selected_tags']))
          array_push($_SESSION['selected_tags'], $tag);
+
+
+      return "ok";
    
    } // addTag()
 
@@ -654,8 +658,8 @@ class PHPFSPOT {
     */
    public function delTag($tag)
    {
-      if(isset($_SESSION['searchfor']))
-         unset($_SESSION['searchfor']);
+      if(isset($_SESSION['searchfor_tag']))
+         unset($_SESSION['searchfor_tag']);
 
       if(isset($_SESSION['selected_tags'])) {
          $key = array_search($tag, $_SESSION['selected_tags']);
@@ -663,6 +667,8 @@ class PHPFSPOT {
          sort($_SESSION['selected_tags']);
       }
 
+      return "ok";
+
    } // delTag()
 
    /**
@@ -694,17 +700,28 @@ class PHPFSPOT {
    /**
     * reset tag search
     *
-    * if any tag search has taken place, reset
-    * it now
+    * if any tag search has taken place, reset it now
     */
    public function resetTagSearch()
    {
-      if(isset($_SESSION['searchfor']))
-         unset($_SESSION['searchfor']);
+      if(isset($_SESSION['searchfor_tag']))
+         unset($_SESSION['searchfor_tag']);
 
    } // resetTagSearch()
 
-    /**
+   /**
+    * reset name search
+    *
+    * if any name search has taken place, reset it now
+    */
+   public function resetNameSearch()
+   {
+      if(isset($_SESSION['searchfor_name']))
+         unset($_SESSION['searchfor_name']);
+
+   } // resetNameSearch()
+
+   /**
     * reset date search
     *
     * if any date search has taken place, reset
@@ -741,12 +758,33 @@ class PHPFSPOT {
          ";
       } 
 
+      if(isset($_SESSION['searchfor_name'])) {
+         if($this->dbver < 9) {
+            $additional_where_cond.= "
+                  (
+                        p.name LIKE '%". $_SESSION['searchfor_name'] ."%'
+                     OR
+                        p.description LIKE '%". $_SESSION['searchfor_name'] ."%'
+                  )
+            ";
+         }
+         else {
+            $additional_where_cond.= "
+                  (
+                        basename(p.uri) LIKE '%". $_SESSION['searchfor_name'] ."%'
+                     OR
+                        p.description LIKE '%". $_SESSION['searchfor_name'] ."%'
+                  )
+            ";
+         }
+      }
+
       if(isset($_SESSION['sort_order'])) {
          $order_str = $this->get_sort_order();
       }
 
       /* return a search result */
-      if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') {
+      if(isset($_SESSION['searchfor_tag']) && $_SESSION['searchfor_tag'] != '') {
          $query_str = "
             SELECT DISTINCT pt1.photo_id
                FROM photo_tags pt1
@@ -758,7 +796,7 @@ class PHPFSPOT {
                ON pt1.photo_id=p.id
             INNER JOIN tags t2
                ON pt2.tag_id=t2.id
-            WHERE t.name LIKE '%". $_SESSION['searchfor'] ."%' ";
+            WHERE t.name LIKE '%". $_SESSION['searchfor_tag'] ."%' ";
 
          if(isset($additional_where_cond))
             $query_str.= "AND ". $additional_where_cond ." ";
@@ -915,15 +953,12 @@ class PHPFSPOT {
 
       $count = count($photos);
 
-      if(isset($_SESSION['begin_with']) && $_SESSION['begin_with'] != "")
-         $anchor = $_SESSION['begin_with'];
-
+      /* if all thumbnails should be shown on one page */
       if(!isset($this->cfg->thumbs_per_page) || $this->cfg->thumbs_per_page == 0) {
-
          $begin_with = 0;
          $end_with = $count;
-
       }
+      /* thumbnails should be splitted up in several pages */
       elseif($this->cfg->thumbs_per_page > 0) {
 
          if(!isset($_SESSION['begin_with']) || $_SESSION['begin_with'] == 0) {
@@ -967,8 +1002,8 @@ class PHPFSPOT {
       // +1 for for smarty's selection iteration
       $thumbs++;
 
-      if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
-         $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
+      if(isset($_SESSION['searchfor_tag']) && $_SESSION['searchfor_tag'] != '')
+         $this->tmpl->assign('searchfor_tag', $_SESSION['searchfor_tag']);
 
       if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) {
          $this->tmpl->assign('from_date', $this->ts2str($_SESSION['from_date']));
@@ -1093,8 +1128,14 @@ class PHPFSPOT {
 
       $this->tmpl->show("photo_index.tpl");
 
-      if(isset($anchor))
-         print "<script language=\"JavaScript\">self.location.hash = '#image". $anchor ."';</script>\n";
+      /* if we are returning to photo index from an photo-view,
+         scroll the window to the last shown photo-thumbnail.
+         after this, unset the last_photo session variable.
+      */
+      if(isset($_SESSION['last_photo'])) {
+         print "<script language=\"JavaScript\">moveToThumb(". $_SESSION['last_photo'] .");</script>\n";
+         unset($_SESSION['last_photo']);
+      }
 
    } // showPhotoIndex()
 
@@ -1415,6 +1456,8 @@ class PHPFSPOT {
    {
       $_SESSION['tag_condition'] = $mode;
 
+      return "ok";
+
    } // setTagCondition()
 
    /** 
@@ -1426,11 +1469,27 @@ class PHPFSPOT {
     * getPhotoSelection() will then only return the matching
     * photos.
     */
-   public function startSearch($searchfor, $from = 0, $to = 0)
+   public function startSearch($searchfor_tag, $from = 0, $to = 0)
    {
+      if(isset($_POST['from']) && $this->isValidDate($_POST['from'])) {
+         $from = $_POST['from'];
+      }
+      if(isset($_POST['to']) && $this->isValidDate($_POST['to'])) {
+         $to = $_POST['to'];
+      }
+
+      if(isset($_POST['for_tag']) && is_string($_POST['for_tag'])) {
+         $searchfor_tag = $_POST['for_tag'];
+      }
+
+      if(isset($_POST['for_name']) && is_string($_POST['for_name'])) {
+         $searchfor_name = $_POST['for_name'];
+      }
+
       $this->get_tags();
 
-      $_SESSION['searchfor'] = $searchfor;
+      $_SESSION['searchfor_tag'] = $searchfor_tag;
+      $_SESSION['searchfor_name'] = $searchfor_name;
 
       if($from != 0)
          $_SESSION['from_date'] = strtotime($from ." 00:00:00");
@@ -1442,15 +1501,17 @@ class PHPFSPOT {
       else
          unset($_SESSION['to_date']);
 
-      if($searchfor != "") {
+      if($searchfor_tag != "") {
          /* new search, reset the current selected tags */
          $_SESSION['selected_tags'] = Array();
          foreach($this->avail_tags as $tag) {
-            if(preg_match('/'. $searchfor .'/i', $this->tags[$tag]))
+            if(preg_match('/'. $searchfor_tag .'/i', $this->tags[$tag]))
                array_push($_SESSION['selected_tags'], $tag);
          }
       }
 
+      return "ok";
+
    } // startSearch()
 
    /**
@@ -2086,6 +2147,7 @@ class PHPFSPOT {
    {
       if(isset($_SESSION['slideshow_img']))
          unset($_SESSION['slideshow_img']);
+
    } // resetSlideShow()
    
    /***
@@ -2370,6 +2432,63 @@ class PHPFSPOT {
 
    } // check_config_options()
 
+   /**
+    * cleanup phpfspot own database
+    *
+    * When photos are getting delete from F-Spot, there will remain
+    * remain some residues in phpfspot own database. This function
+    * will try to wipe them out.
+    */
+   public function cleanup_phpfspot_db()
+   {
+      $to_delete = Array();
+
+      $result = $this->cfg_db->db_query("
+         SELECT img_idx
+         FROM images
+         ORDER BY img_idx ASC
+      ");
+
+      while($row = $this->cfg_db->db_fetch_object($result)) {
+         if(!$this->db->db_fetchSingleRow("
+            SELECT id
+            FROM photos
+            WHERE id='". $row['img_idx'] ."'")) {
+
+            array_push($to_delete, $row['img_idx'], ',');
+         }
+      }
+
+      print count($to_delete) ." unnecessary objects will be removed from phpfspot's database.\n";
+
+      $this->cfg_db->db_exec("
+         DELETE FROM images
+         WHERE img_idx IN (". implode($to_delete) .")
+      ");
+
+   } // cleanup_phpfspot_db()
+
+   /**
+    * return first image of the page, the $current photo
+    * lies in.
+    *
+    * this function is used to find out the first photo of the
+    * current page, in which the $current photo lies. this is
+    * used to display the correct photo, when calling showPhotoIndex()
+    * from showImage()
+    */
+   private function getCurrentPage($current, $max)
+   {
+      if(isset($this->cfg->thumbs_per_page) && !empty($this->cfg->thumbs_per_page)) {
+         for($page_start = 0; $page_start <= $max; $page_start+=$this->cfg->thumbs_per_page) {
+            if($current >= $page_start && $current < ($page_start+$this->cfg->thumbs_per_page))
+               return $page_start;
+         }
+      }
+      return 0;
+
+   } // getCurrentPage()
+
 } // class PHPFSPOT
 
 ?>