issue91, corrected time-range handling

[phpfspot.git] / phpfspot.class.php

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 99f5a173f97601e899b4ae593dcfb00aa0f32ef1..a14c4f6efdaa0f1341e2a18b33df2cddc8745004 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -866,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 ." ";
 
@@ -885,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;
 
@@ -1443,12 +1444,14 @@ class PHPFSPOT {
       $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']);