X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fabook_take%2Ftake.php;h=59fa6841bd2e036d8f0bc3a9c1375bd3926ac3b2;hp=da149203d2e340797a96630a3e266df59bb3738c;hb=2be6e3fc90746bcafa7a200b599e6d48409b5e43;hpb=08185f2a7631c3a12cb1ac085fec3be471b56b00

diff --git a/plugins/abook_take/take.php b/plugins/abook_take/take.php
index da149203..59fa6841 100644
--- a/plugins/abook_take/take.php
+++ b/plugins/abook_take/take.php
@@ -1,83 +1,48 @@
 <?php
 
-  /**
-   * take.php
-   *
-   * Adds a "taken" address to the address book.  Takes addresses from
-   * incoming mail -- the body, To, From, Cc, or Reply-To.
-   */
-   
-/* Path for SquirrelMail required files. */
+/**
+ * take.php
+ *
+ * Address Take -- steals addresses from incoming email messages. Searches
+ * the To, Cc, From and Reply-To headers.
+ *
+ * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage abook_take
+ */
+
+/**
+ * Path for SquirrelMail required files.
+ * @ignore */
 define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'config/config.php');
-require_once(SM_PATH . 'src/validate.php');
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'config/config.php');
-require_once(SM_PATH . 'functions/i18n.php');
-require_once(SM_PATH . 'functions/page_header.php');
+require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/addressbook.php');
-require_once(SM_PATH . 'src/load_prefs.php');
-require_once(SM_PATH . 'functions/html.php');
-   
+
 displayPageHeader($color, 'None');
-  
+
+/* input form data */
+sqgetGlobalVar('email', $email, SQ_POST);
+
 $abook_take_verify = getPref($data_dir, $username, 'abook_take_verify');
 
 $abook = addressbook_init(false, true);
-$name = 'addaddr';
-echo '<form action="../../src/addressbook.php" name="f_add" method="post">' ."\n" .
-    html_tag( 'table',
-        html_tag( 'tr',
-            html_tag( 'th', sprintf(_("Add to %s"), $abook->localbackendname), 'center', $color[0] )
-        ) ,
-    'center', '', 'width="100%" cols="1"' ) .
 
-    html_tag( 'table', '', 'center', '', 'border="0" cellpadding="1" cols="2" width="90%"' ) . "\n" .
-            html_tag( 'tr', "\n" .
-                html_tag( 'td', _("Nickname") . ':', 'right', $color[4], 'width="50"' ) . "\n" .
-                html_tag( 'td', '<input name="' . $name . '[nickname]" size="15" value="">' .
-                    '&nbsp;<small>' . _("Must be unique") . '</small>',
-                'left', $color[4] )
-            ) . "\n" .
-            html_tag( 'tr' ) . "\n" .
-            html_tag( 'td', _("E-mail address") . ':', 'right', $color[4], 'width="50"' ) . "\n" .
-            html_tag( 'td', '', 'left', $color[4] ) .
-                '<select name="' . $name . "[email]\">\n";
-  foreach ($email as $Val)
-  {
-      if (valid_email($Val, $abook_take_verify))
-      {
-          echo '<option value="' . htmlspecialchars($Val) .
-              '">' . htmlspecialchars($Val) . "</option>\n";
-      }
-      else
-      {
-          echo '<option value="' . htmlspecialchars($Val) .
-	      '">FAIL - ' . htmlspecialchars($Val) . "</option>\n";
-      }
-  }
-  echo '</select></td></tr>' . "\n" . 
+$addrs = array();
+foreach ($email as $Val) {
+    if (valid_email($Val, $abook_take_verify)) {
+        $addrs[$Val] = $Val;
+    } else {
+        $addrs[$Val] = 'FAIL - ' . $Val;
+    }
+}
+
+$formdata=array('email'=>$addrs);
 
-  html_tag( 'tr', "\n" .
-      html_tag( 'td', _("First name") . ':', 'right', $color[4], 'width="50"' ) .
-      html_tag( 'td', '<input name="' . $name . '[firstname]" size="45" value="">', 'left', $color[4] )
-  ) . "\n" .
-  html_tag( 'tr', "\n" .
-      html_tag( 'td', _("Last name") . ':', 'right', $color[4], 'width="50"' ) .
-      html_tag( 'td', '<input name="' . $name . '[lastname]" size="45" value="">', 'left', $color[4] )
-  ) . "\n" .
-  html_tag( 'tr', "\n" .
-      html_tag( 'td', _("Additional info") . ':', 'right', $color[4], 'width="50"' ) .
-      html_tag( 'td', '<input name="' . $name . '[label]" size="45" value="">', 'left', $color[4] )
-  ) . "\n" .
-  html_tag( 'tr', "\n" .
-      html_tag( 'td',
-          '<input type="submit" name="' . $name . '[SUBMIT]" size="45" value="'. _("Add address") .'">' ,
-      'center', $color[4], 'colspan="2"' )
-  ) . "\n" .
-  '</table>';
+abook_create_form(SM_PATH . 'src/addressbook.php','addaddr',_("Add to address book"),_("Add address"),$formdata);
+echo '</form>';
 ?>
-</form></body>
-</html>
+</body></html>
\ No newline at end of file