- Cleanup variable name in address search for compose to clearup confusion.

  - Remove Javascript from address search page when JavaScript is disabled.
  - Add "Check All" function to address book when using "in-page" addressbook.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13713 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4bb711e85f06480eb3df3e4f7800ccbca610843e..9e7eb7978bbbd34ec463fd1fb2b18e1fa598583c 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -310,6 +310,9 @@ Version 1.5.2 - SVN
     base URI is now uniformly generated, extraneous cookies are cleaned
     up and session IDs are regenerated upon every login (Thanks to Tomas
     Hoger). [CVE-2009-1580]
+  - Cleanup variable name in address search for compose to clearup confusion.
+  - Remove Javascript from address search page when JavaScript is disabled.
+  - Add "Check All" function to address book when using "in-page" addressbook.
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 25a11eaefcddb959fbe48eb06b96fa9643a250c7..7e2672003d13a49b63283649d77b083c6c25396d 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -38,7 +38,7 @@ function display_result($res, $includesource = true) {
 
     if(sizeof($res) <= 0) return;
 
-    $oTemplate->assign('use_js', true);
+    $oTemplate->assign('compose_addr_pop', true);
     $oTemplate->assign('include_abook_name', $includesource);
     $oTemplate->assign('addresses', formatAddressList($res));
     
@@ -83,7 +83,7 @@ $abook = addressbook_init($showerr);
 if ($show == 'form' && ! isset($listall)) {
     echo "<form name=\"sform\" target=\"abookres\" action=\"addrbook_search.php\" method=\"post\">\n";
     
-    $oTemplate->assign('use_js', true);
+    $oTemplate->assign('compose_addr_pop', true);
     $oTemplate->assign('backends', getBackends());
     $oTemplate->display('addressbook_search_form.tpl');
     

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 5ae70c566c2d379aeeb505f0b5b963d75eb68be1..c9beedde0f3f66cb8f9155822617b270a313ee9e 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -82,7 +82,7 @@ function addr_display_result($res, $includesource = true) {
          addHidden('html_addr_search_done', 'true');
     addr_insert_hidden();
     
-    $oTemplate->assign('use_js', false);
+    $oTemplate->assign('compose_addr_pop', false);
     $oTemplate->assign('include_abook_name', $includesource);
     $oTemplate->assign('addresses', formatAddressList($res));
     
@@ -114,7 +114,7 @@ if (isset($session)) {
     echo addHidden('session', $session);
 }
 
-$oTemplate->assign('use_js', false);
+$oTemplate->assign('compose_addr_pop', false);
 $oTemplate->assign('backends', getBackends());
 
 $oTemplate->display('addressbook_search_form.tpl');

diff --git a/templates/default/addrbook_search_list.tpl b/templates/default/addrbook_search_list.tpl
index b6bf63d3af732f3abe4a6cd61943bf81b6eea97a..f9d39eb56c203e07517257485579d7dd0754adea 100644 (file)
--- a/templates/default/addrbook_search_list.tpl
+++ b/templates/default/addrbook_search_list.tpl
@@ -39,14 +39,24 @@ extract($t);
 $colspan = $include_abook_name ? 5 : 4;
 ?>
 <?php
-if ($use_js) {
+if ($javascript_on) {
     insert_javascript(); 
 }
 ?>
 <div id="addressList">
 <table cellspacing="0">
  <tr>
-  <td class="colHeader" style="width:1%"></td>
+  <td class="colHeader" style="width:1%; font-size: 8pt; white-space: nowrap;">
+<?php
+if ($javascript_on && !$compose_addr_pop) {
+?>
+    <input type="checkbox" id="checkAllTo" onClick="CheckAll('T');"><label for="checkAllTo"><?php echo _("All");?></label> &nbsp;
+    <input type="checkbox" id="checkAllCc" onClick="CheckAll('C');"><label for="checkAllCc"><?php echo _("Cc");?></label> &nbsp;
+    <input type="checkbox" id="checkAllBcc" onClick="CheckAll('B');"><label for="checkAllBcc"><?php echo _("Bcc");?></label>
+<?php
+}
+?>
+  </td>
   <td class="colHeader"><?php echo _("Name"); ?></td>
   <td class="colHeader"><?php echo _("E-mail"); ?></td>
   <td class="colHeader"><?php echo _("Info"); ?></td>
@@ -60,12 +70,19 @@ if ($use_js) {
     if (count($addresses) == 0) {
         echo '<tr><td class="abookEmpty" colspan="'.$colspan.'">'._("Address book is empty").'</td></tr>'."\n";
     }
+
+    if ($compose_addr_pop) {
+      $addr_str = '<a href="javascript:to_and_close(\'%1$s\')">%1$s</a>';
+    } else {
+      $addr_str = '%1$s';
+    }
+    
     foreach ($addresses as $index=>$contact) {
         ?>
  <tr class=<?php echo '"'.(($index+1)%2 ? 'even' : 'odd').'"'; ?>>
   <td class="abookCompose" style="width:1%">
    <?php
-    if ($use_js) {
+    if ($compose_addr_pop) {
         ?>
    <a href="javascript:to_address('<?php echo $contact['JSEmail']; ?>')"><?php echo _("To"); ?></a> |
    <a href="javascript:cc_address('<?php echo $contact['JSEmail']; ?>')"><?php echo _("Cc"); ?></a> |
@@ -81,7 +98,7 @@ if ($use_js) {
    ?> 
   </td>
   <td class="abookField"><?php echo $contact['FullName']; ?></td>
-  <td class="abookField"><a href="javascript:to_and_close('<?php echo $contact['JSEmail']; ?>')"><?php echo $contact['Email']; ?></a></td>
+  <td class="abookField"><?php echo sprintf($addr_str, $contact['Email']); ?></td>
   <td class="abookField"><?php echo $contact['Info']; ?></td>
         <?php 
         if ($include_abook_name) {
@@ -94,9 +111,11 @@ if ($use_js) {
 ?>
 </table>
 <?php
-if (!$use_js) {
+if (!$compose_addr_pop) {
     echo '<input type="submit" name="addr_search_done" value="'. _("Use Addresses") .'" />'."\n";
     echo '<input type="submit" name="addr_search_cancel" value="'. _("Cancel") .'" />'."\n";
+} else {
+    echo '<input type="submit" onClick="javascript:parent.close();" name="close_window" value="' . _("Close Window") . '" />'. "\n";
 }
 ?>
 </div>

diff --git a/templates/default/addressbook_popup.tpl b/templates/default/addressbook_popup.tpl
index 118ec47ad19c0636fb5b0925957570e8cec9a2b6..37e1973db58e03d4b53f820e486d09ab78496c68 100644 (file)
--- a/templates/default/addressbook_popup.tpl
+++ b/templates/default/addressbook_popup.tpl
@@ -20,7 +20,7 @@ extract($t);
 
 /** Begin template **/
 ?>
-<frameset rows="80,*" border="0">
+<frameset rows="95,*" border="0">
     <frame name="abookmain"
            marginwidth="0"
            scrolling="no"

diff --git a/templates/util_addressbook.php b/templates/util_addressbook.php
index 68a0645996809518d199bba960cda169cc532319..8b582c0993876ebb23d6c7a09ae5302c56624609 100644 (file)
--- a/templates/util_addressbook.php
+++ b/templates/util_addressbook.php
@@ -123,6 +123,16 @@ function insert_javascript() {
         }
     }
 
+    function CheckAll(ch) {
+        var chkObj = "";
+        for (var i = 0; i < document.addressbook.elements.length; i++) {
+            chkObj = document.addressbook.elements[i];
+            if (chkObj.type == "checkbox" && chkObj.name.substr(0,16) == "send_to_search[" + ch) {
+                chkObj.checked = !(chkObj.checked);
+            }
+        }
+    }
+
 // --></script>
 <?php
 } /* End of included JavaScript */