link map info to users

darcs-hash:20070626132621-6e07b-1d01dfc3031fc72f58d4140f32db68f1c5e09c9e.gz

diff --git a/index.php b/index.php
index 9eba4f069cf7d8f0e8f2e662ebb401e3fd1bcd31..8fdc91cb3752524e9ae4458c9c65d33beb09cd47 100644 (file)
--- a/index.php
+++ b/index.php
@@ -45,6 +45,7 @@
   $smarty->assign('filter',$_REQUEST['filter']);
   $smarty->assign('marker',$_REQUEST['marker']);
   $smarty->assign('search',$_REQUEST['search']);
+  $smarty->assign('org',$_REQUEST['org']);
   //display templates
   if(!empty($_REQUEST['export'])){
     if ($conf['userlogreq'] == 1 && $user == ''){

diff --git a/templates/list_map_entry.tpl b/templates/list_map_entry.tpl
index 33975836d454d04c552c34db96ab8698b89fb1b1..9027a4758cf91f3faac2af9b2623628045c198a0 100644 (file)
--- a/templates/list_map_entry.tpl
+++ b/templates/list_map_entry.tpl
@@ -1,7 +1,11 @@
 
 {ldelim}
     adr: '{$entry.street|escape:javascript}, {$entry.zip|escape:javascript} {$entry.location|escape:javascript}',
-    info: '\x3ch4\x3e{$entry.organization|escape:javascript}\x3c/h4\x3e{$entry.street|escape:javascript}\x3cbr /\x3e{$entry.zip|escape:javascript} {$entry.location|escape:javascript}'
+    info: '\x3ch4\x3e\x3ca href="entry.php?dn={$entry.dn|escape:url}"\x3e'+
+          '{$entry.givenname|escape:javascript} {$entry.name|escape:javascript}\x3c/a\x3e\x3c/h4\x3e'+
+          '{$entry.organization|escape:javascript}\x3cbr /\x3e'+
+          '{$entry.street|escape:javascript}\x3cbr /\x3e'+
+          '{$entry.zip|escape:javascript} {$entry.location|escape:javascript}'
 {rdelim},
 
 

diff --git a/templates/toolbar.tpl b/templates/toolbar.tpl
index cd1df671e868bb7e664346d9b65302cd1fe073a5..a44c5e1b0a8b4f63f4aee6ffb6cac81b6affeb8e 100644 (file)
--- a/templates/toolbar.tpl
+++ b/templates/toolbar.tpl
@@ -62,11 +62,11 @@
   {if $list} <!-- export -->
     {if $smarty.request.export != 'map' && $conf.gmapkey}
         <li>
-          <a href="index.php?filter={$filter|escape:url}&amp;marker={$marker|escape:url}&amp;search={$search|escape:url}&amp;export=map" class="ed_map">{$lang.map}</a>
+          <a href="index.php?filter={$filter|escape:url}&amp;marker={$marker|escape:url}&amp;search={$search|escape:url}&amp;org={$org|escape:url}&amp;export=map" class="ed_map">{$lang.map}</a>
         </li>
     {/if}
     <li>
-      <a href="index.php?filter={$filter|escape:url}&amp;marker={$marker|escape:url}&amp;search={$search|escape:url}&amp;export=csv"
+      <a href="index.php?filter={$filter|escape:url}&amp;marker={$marker|escape:url}&amp;search={$search|escape:url}&amp;org={$org|escape:url}&amp;export=csv"
          class="ed_csvexport">{$lang.csvexport}</a>
     </li>
   {/if}