issue67, when called from an external link, also check the consider-date-search-box...

git-svn-id: file:///var/lib/svn/phpfspot/trunk@259 fa6a889d-dae6-447d-9e79-4ba9a3039384

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 86235ac40e5183fff4303dbebca4c3c617c477a3..9d3f548a2f38e7d714687e9cbabf0c52375aa598 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -147,6 +147,9 @@ class PHPFSPOT {
             break;
       }
 
             break;
       }
 

+      if(isset($_SESSION['from_date']) && isset($_SESSION['to_date']))
+       $this->tmpl->assign('date_search_enabled', true);
+

       $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('from_date', $this->get_calendar('from'));
       $this->tmpl->assign('to_date', $this->get_calendar('to'));
       $this->tmpl->assign('sort_field', $this->get_sort_field());

diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl
index 549f2dc071acd7a93d9f1d6e716a0457b03e2d38..2a6c14bc24b5f1e706382d19c6e902f248204665 100644 (file)
--- a/themes/default/templates/search.tpl
+++ b/themes/default/templates/search.tpl
@@ -19,7 +19,14 @@
     </tr>
     <tr>
      <td>Date:</td>
     </tr>
     <tr>
      <td>Date:</td>

-     <td><input type="checkbox" name="consider_date" value="Y" onclick="datesearch();">consider date-search
+     <td>
+      { if ! $date_search_enabled }
+       <input type="checkbox" name="consider_date" value="Y" onclick="datesearch();">
+      { else }
+       <input type="checkbox" name="consider_date" value="Y" onclick="datesearch();" checked="checked">
+      { /if }
+      consider date-search
+     </td>

     </tr>
     <tr>
      <td>&nbsp;</td>
     </tr>
     <tr>
      <td>&nbsp;</td>