X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fabook_take%2Ftake.php;h=b5b110e57c084589c13efe43a9fea25ea1dc14ee;hb=8a9f3f9dc2706202105145d13a58446f588d24d2;hp=964c2c8d223936e72dd65e773095bc7bb57f94cc;hpb=d55c0f66fc0f73d886fc2040936a28d7a17fa1ea;p=squirrelmail.git

diff --git a/plugins/abook_take/take.php b/plugins/abook_take/take.php
index 964c2c8d..b5b110e5 100644
--- a/plugins/abook_take/take.php
+++ b/plugins/abook_take/take.php
@@ -1,86 +1,103 @@
 <?php
-  /**
-   **  take.php
-   **	
-   **	Adds a "taken" address to the address book.  Takes addresses from
-   **   incoming mail -- the body, To, From, Cc, or Reply-To.
-   **/
-   
-   chdir('..');
-   require_once('../src/validate.php');
-   require_once("../functions/strings.php");
-   require_once("../config/config.php");
-   require_once("../functions/i18n.php");
-   require_once("../functions/page_header.php");
-   require_once("../functions/addressbook.php");
-   require_once("../src/load_prefs.php");
-   
-   displayPageHeader($color, "None");
-   
-   $abook_take_verify = getPref($data_dir, $username, 'abook_take_verify');
 
-?>
-<FORM ACTION="../../src/addressbook.php" NAME=f_add METHOD="POST">
-<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>
-<TR><TH BGCOLOR="<?PHP 
-    echo $color[0]; 
-?>" ALIGN=CENTER><?PHP
-   // open address book, trash errors, skip LDAP
-   $abook = addressbook_init(false, true);
-   printf(_("Add to %s"), $abook->localbackendname);
-?></TH></TR>
-</TABLE>
-<TABLE BORDER=0 CELLPADDING=1 COLS=2 WIDTH="90%" ALIGN=center>
-<?PHP
-  $name = 'addaddr';
-  
-  printf("<TR><TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>%s:</TD>",
-     _("Nickname"));
-  printf("<TD BGCOLOR=\"%s\" ALIGN=left>".
-     "<INPUT NAME=\"%s[nickname]\" SIZE=15 VALUE=\"\">".
-     "&nbsp;<SMALL>%s</SMALL></TD></TR>\n",
-     $color[4], $name, _("Must be unique"));
-  printf("<TR><TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>%s:</TD>",
-     _("E-mail address"));
-  
-  echo "<TD BGCOLOR=\"$color[4]\" ALIGN=left>\n";
-  echo '<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>\n";
-  
-  printf("<TR><TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>%s:</TD>",
-     _("First name"));
-  printf("<TD BGCOLOR=\"%s\" ALIGN=left>".
-     "<INPUT NAME=\"%s[firstname]\" SIZE=45 VALUE=\"\"></TD></TR>\n",
-     $color[4], $name);
-  printf("<TR><TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>%s:</TD>",
-     _("Last name"));
-  printf("<TD BGCOLOR=\"%s\" ALIGN=left>".
-     "<INPUT NAME=\"%s[lastname]\" SIZE=45 VALUE=\"\"></TD></TR>\n",
-     $color[4], $name);
-  printf("<TR><TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>%s:</TD>",
-     _("Additional info"));
-  printf("<TD BGCOLOR=\"%s\" ALIGN=left>".
-     "<INPUT NAME=\"%s[label]\" SIZE=45 VALUE=\"\"></TD></TR>\n",
-     $color[4], $name);
+/**
+ * take.php
+ *
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Address Take -- steals addresses from incoming email messages. Searches
+ * the To, Cc, From and Reply-To headers.
+ *
+ * $Id$
+ * @package plugins
+ * @subpackage abook_take
+ */
+
+/**
+ * Path for SquirrelMail required files.
+ * @ignore */
+define('SM_PATH','../../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/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 . 'functions/addressbook.php');
+require_once(SM_PATH . 'include/load_prefs.php');
+require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/forms.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';
+
+$addrs = array();
+foreach ($email as $Val) {
+    if (valid_email($Val, $abook_take_verify)) {
+        $addrs[$Val] = $Val;
+    } else {
+        $addrs[$Val] = 'FAIL - ' . $Val;
+    }
+}
+
+echo addForm(SM_PATH . 'src/addressbook.php', 'POST', 'f_add') . "\n" .
+    html_tag( 'table',
+        html_tag( 'tr',
+            html_tag( 'th', sprintf(_("Add to %s"), $abook->localbackendname), 'center', $color[0] )
+        ) ,
+    'center', '', 'width="100%"' ) . "\n" .
 
-  printf("<TR><TD COLSPAN=2 BGCOLOR=\"%s\" ALIGN=center>\n".
-     "<INPUT TYPE=submit NAME=\"%s[SUBMIT]\" VALUE=\"%s\"></TD></TR>\n",
-     $color[4], $name, _("Add address"));
+    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', addInput($name . '[nickname]', '', 15) .
+                    '&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] ) . "\n" .
+            addSelect($name . '[email]', $addrs, null, true) .
+            '</td></tr>' . "\n";
 
-      print "</TABLE>\n";
+    if ($squirrelmail_language == 'ja_JP') {
+        echo html_tag( 'tr', "\n" .
+                html_tag( 'td', _("Last name") . ':', 'right', $color[4], 'width="50"' ) .
+                html_tag( 'td', addInput($name . '[lastname]', '', 45), 'left', $color[4] )
+             ) . "\n" .
+             html_tag( 'tr', "\n" .
+                html_tag( 'td', _("First name") . ':', 'right', $color[4], 'width="50"' ) .
+                html_tag( 'td', addInput($name . '[firstname]', '', 45), 'left', $color[4] )
+             ) . "\n";
+    } else {
+        echo html_tag( 'tr', "\n" .
+                html_tag( 'td', _("First name") . ':', 'right', $color[4], 'width="50"' ) .
+                html_tag( 'td', addInput($name . '[firstname]', '', 45), 'left', $color[4] )
+             ) . "\n" .
+             html_tag( 'tr', "\n" .
+                html_tag( 'td', _("Last name") . ':', 'right', $color[4], 'width="50"' ) .
+                html_tag( 'td', addInput($name . '[lastname]', '', 45), 'left', $color[4] )
+             ) . "\n";
+    }
+    echo html_tag( 'tr', "\n" .
+            html_tag( 'td', _("Additional info") . ':', 'right', $color[4], 'width="50"' ) .
+            html_tag( 'td', addInput($name . '[label]', '', 45), 'left', $color[4] )
+         ) . "\n" .
+         html_tag( 'tr', "\n" .
+            html_tag( 'td',
+                addSubmit(_("Add address"), $name . '[SUBMIT]'),
+                'center', $color[4], 'colspan="2"' )
+         ) . "\n";
 ?>
-</FORM></BODY>
-</HTML>
+</table>
+</form></body>
+</html>