X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2Fdefault%2Faddrbook_addedit.tpl;h=f77c1a852ffa09f6b571be5fb9295ebce23e17a9;hb=f197ec8835b64975ff47dc6cd86dae75605baebf;hp=6bc5fc6443127d430cdc9b2fbd957cb59756d341;hpb=b116fd78fe16a46736d204d8f81b558e2ea508f7;p=squirrelmail.git

diff --git a/templates/default/addrbook_addedit.tpl b/templates/default/addrbook_addedit.tpl
index 6bc5fc64..f77c1a85 100644
--- a/templates/default/addrbook_addedit.tpl
+++ b/templates/default/addrbook_addedit.tpl
@@ -5,6 +5,7 @@
  * Display the form elements to add/edit an entry in the address book
  * 
  * The following variables are available in this template:
+ *      $current_backend - integer containing backend currently displayed.
  *      $edit       - boolean TRUE if we are editing an existing address.
  *                    FALSE if the form is blank for adding a new address.
  *      $writable_backends - array of address book backends that can be written
@@ -20,7 +21,7 @@
  *                                 could be an array!
  *              $el['Info']      - Additional info about this contact
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2016 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -39,7 +40,7 @@ $formname = $edit ? 'editaddr' : 'addaddr';
 <table cellspacing="0">
  <tr>
   <td class="header" colspan="2">
-   <?php echo $edit ? _("Update address") : _("Add to address book"); ?>
+   <?php echo $edit ? _("Update Address") : _("Add to Address Book"); ?>
   </td>
  </tr>
  <tr>
@@ -60,7 +61,8 @@ $formname = $edit ? 'editaddr' : 'addaddr';
     if (is_array($values['Email'])) {
         echo '<select name="'.$formname.'[email]" id="email">'."\n";
         foreach ($values['Email'] as $email) {
-            echo '<option value="'.htmlspecialchars($email).'">'.htmlspecialchars($email).'</option>'."\n";
+//FIXME: sm_encode_html_special_chars should not be needed inside any template files - I think values are already sanitized by the time they get here
+            echo '<option value="'.sm_encode_html_special_chars($email).'">'.sm_encode_html_special_chars($email).'</option>'."\n";
         }
         echo '</select>'."\n";
     } else {
@@ -105,7 +107,10 @@ $formname = $edit ? 'editaddr' : 'addaddr';
    <select name="backend" id="backend">
     <?php
         foreach ($writable_backends as $id=>$name) {
-            echo '<option value="'.$id.'">'.htmlspecialchars($name).'</option>'."\n";
+//FIXME: sm_encode_html_special_chars should not be needed inside any template files - I think values are already sanitized by the time they get here
+            echo '<option value="' . $id
+               . ($current_backend == $id ? '" selected="selected"' : '"')
+               . '>' . sm_encode_html_special_chars($name) . '</option>' . "\n";
         }
     ?>
    </select>
@@ -119,7 +124,8 @@ $formname = $edit ? 'editaddr' : 'addaddr';
  ?>
  <tr>
   <td colspan="2" class="addButton">
-   <input type="submit" value=<?php echo '"'.($edit ? _("Update address") : _("Add address")).'"'; ?> name="<?php echo $formname; ?>[SUBMIT]" />
+   <input type="hidden" name="new_bnum" value="<?php echo $current_backend; ?>" />
+   <input type="submit" value=<?php echo '"'.($edit ? _("Update Address") : _("Add Address")).'"'; ?> name="<?php echo $formname; ?>[SUBMIT]" />
   </td>
  </tr>
 </table>