reusing abook_create_form code

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

diff --git a/plugins/abook_take/take.php b/plugins/abook_take/take.php
index b5b110e57c084589c13efe43a9fea25ea1dc14ee..4fee84b13ed7846044d0901c801b926d7b7d88fc 100644 (file)
--- a/plugins/abook_take/take.php
+++ b/plugins/abook_take/take.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * take.php
  *
@@ -21,14 +20,7 @@ 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');
 
@@ -38,7 +30,6 @@ 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) {
@@ -49,55 +40,9 @@ foreach ($email as $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" .
-
-    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";
+$formdata=array('email'=>$addrs);
 
-    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";
+abook_create_form(SM_PATH . 'src/addressbook.php','addaddr',_("Add to address book"),_("Add address"),$formdata);
+echo '</form>';
 ?>
-</table>
-</form></body>
-</html>
+</body></html>