X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fabook_take%2Ffunctions.php;h=fd0060cb636c1b3fc220b59332c12be752e98cb2;hb=6edb574e192d8b3fe9dc882dabc258489d6d08c9;hp=6351cfb520f1e129e3064a15c695504fecab31e2;hpb=70e61af67cdbaba986c0880c88fa96e8708bfef5;p=squirrelmail.git

diff --git a/plugins/abook_take/functions.php b/plugins/abook_take/functions.php
index 6351cfb5..fd0060cb 100644
--- a/plugins/abook_take/functions.php
+++ b/plugins/abook_take/functions.php
@@ -3,19 +3,16 @@
 /**
  * functions.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Functions for the Address Take plugin
  *
- * $Id$
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package plugins
  * @subpackage abook_take
  */
 
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'functions/url_parser.php');
-
+/** */
 function valid_email ($email, $verify)
 {
     global $Email_RegExp_Match;
@@ -38,8 +35,7 @@ function abook_take_read_string($str)
         $str = substr(strstr($str, $hits[0]), strlen($hits[0]));
         if (! isset($abook_found_email[$hits[0]]))
         {
-            echo '<input type="hidden" name="email[]" value="' .
-                 htmlspecialchars($hits[0]) . "\" />\n";
+            echo addHidden('email[]', $hits[0]);
             $abook_found_email[$hits[0]] = 1;
         }
     }
@@ -57,7 +53,8 @@ function abook_take_read()
 {
     global $message;
 
-    echo '<br /><form action="../plugins/abook_take/take.php" method="post"><center>'."\n";
+    echo '<br />' . addForm(SM_PATH . 'plugins/abook_take/take.php') .
+         '<div style="text-align: center;">' . "\n";
 
     if (isset($message->rfc822_header->reply_to))
         abook_take_read_array($message->rfc822_header->reply_to);
@@ -68,26 +65,24 @@ function abook_take_read()
     if (isset($message->rfc822_header->to))
         abook_take_read_array($message->rfc822_header->to);
 
-    echo '<input type="submit" value="' . _("Take Address") . '" />' .
-         '</center></form>';
+    echo addSubmit(_("Take Address")) .
+         '</div></form>';
 }
 
 function abook_take_pref()
 {
     global $username, $data_dir, $abook_take_verify;
 
-    $abook_take_verify = getPref($data_dir, $username, 'abook_take_verify');
+    $abook_take_verify = getPref($data_dir, $username, 'abook_take_verify', false);
 }
 
 function abook_take_options()
 {
     global $abook_take_verify;
 
-    echo '<tr>' . html_tag('td',_("Address Book Take:"),'right','','nowrap') . "\n" .
-         '<td><input name="abook_take_abook_take_verify" type="checkbox"';
-    if (isset($abook_take_verify) && $abook_take_verify)
-        echo ' checked';
-    echo ' /> ' . _("Try to verify addresses") . "</td></tr>\n";
+    echo '<tr>' . html_tag('td',_("Address Book Take:"),'right','','style="white-space: nowrap;"') . "\n" .  '<td>' .
+         addCheckbox('abook_take_abook_take_verify', $abook_take_verify) .
+         _("Try to verify addresses") . "</td></tr>\n";
 }
 
 function abook_take_save()
@@ -99,5 +94,3 @@ function abook_take_save()
     else
         setPref($data_dir, $username, 'abook_take_verify', '');
 }
-
-?>