fixed marker and search for CSV export

darcs-hash:20051207103730-6e07b-4ed501cd104e65ccf19d7cfea2b8f8ab1d37aaa9.gz

diff --git a/index.php b/index.php
index 22d5c10936c3e3fb53bc2d9b309916dc739f7be3..e90d846b47bbdeb92e66610271eb8c0929ea4b04 100644 (file)
--- a/index.php
+++ b/index.php
@@ -44,6 +44,8 @@
   tpl_markers();
   $smarty->assign('list',$list);
   $smarty->assign('filter',$_REQUEST['filter']);
+  $smarty->assign('marker',$_REQUEST['marker']);
+  $smarty->assign('search',$_REQUEST['search']);
   //display templates
   if($_REQUEST['export'] == 'csv'){
     header("Content-Type: text/csv");

diff --git a/templates/footer.tpl b/templates/footer.tpl
index ef01231ed89d7d7268651e3d46bbb8da45ed1a65..b77ae164cf95c3fbf41c345ce066e1453fb246f9 100644 (file)
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -12,7 +12,7 @@
         <a href="entry.php?dn={$dn|escape:url}&mode=vcf"><img src="pix/vcard.png" border="0" width="22" height="22" align="middle">{$lang.vcfexport}</a>
       {/if}
       {if $list}
-        <a href="index.php?filter={$filter|escape:url}&export=csv"><img src="pix/csv.png" border="0" width="22" height="22" align="middle">{$lang.csvexport}</a>
+        <a href="index.php?filter={$filter|escape:url}&marker={$marker|escape:url}&search={$search|escape:url}&export=csv"><img src="pix/csv.png" border="0" width="22" height="22" align="middle">{$lang.csvexport}</a>
       {/if}
       {if $user}
           <a href="import.php"><img src="pix/import.png" border="0" width="22" height="22" align="middle">{$lang.vcfimport}</a>