|
|
@@ -13,6 +13,7 @@
|
|
|
|
|
|
require_once('../src/validate.php');
|
|
|
require_once('../functions/display_messages.php');
|
|
|
+require_once('../functions/html.php');
|
|
|
|
|
|
if (isset($return)) {
|
|
|
SaveUpdateFunction();
|
|
|
@@ -34,61 +35,46 @@ require_once('../functions/display_messages.php');
|
|
|
SaveUpdateFunction();
|
|
|
}
|
|
|
|
|
|
+ do_hook('options_identities_top');
|
|
|
LoadInfo($full_name, $email_address, $reply_to, $signature, '');
|
|
|
-
|
|
|
-?>
|
|
|
-<br>
|
|
|
-<table width="95%" align=center border=0 cellpadding=2 cellspacing=0>
|
|
|
-<tr><td bgcolor="<?php echo $color[0] ?>" align="center">
|
|
|
-
|
|
|
- <b><?php echo _("Options") . ' - ' . _("Advanced Identities"); ?></b>
|
|
|
-
|
|
|
- <table width="100%" border="0" cellpadding="1" cellspacing="1">
|
|
|
- <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
|
|
|
-
|
|
|
-<form name="f" action="options_identities.php" method="post"><br>
|
|
|
-
|
|
|
-<?php do_hook('options_identities_top'); ?>
|
|
|
-
|
|
|
-<table width="80%" cellpadding=2 cellspacing=0 border=0>
|
|
|
- <tr bgcolor="<?php echo $color[9] ?>">
|
|
|
- <th colspan=2 align=center><?php echo _("Default Identity") ?></th>
|
|
|
- </tr>
|
|
|
-<?PHP
|
|
|
-
|
|
|
- ShowTableInfo($full_name, $email_address, $reply_to, $signature, '');
|
|
|
+ $td_str = '';
|
|
|
+ $td_str .= '<form name="f" action="options_identities.php" method="post"><br>';
|
|
|
+ $td_str .= ShowTableInfo($full_name, $email_address, $reply_to, $signature, '');
|
|
|
|
|
|
- $num = 1;
|
|
|
- while (LoadInfo($full_name, $email_address, $reply_to, $signature, $num))
|
|
|
- {
|
|
|
-?>
|
|
|
- <tr bgcolor="<?PHP echo $color[9] ?>">
|
|
|
- <th colspan=2 align=center><?PHP printf (_("Alternate Identity %d"),
|
|
|
- $num) ?></th>
|
|
|
- </tr>
|
|
|
-<?PHP
|
|
|
- ShowTableInfo($full_name, $email_address, $reply_to, $signature, $num);
|
|
|
- $num ++;
|
|
|
- }
|
|
|
-
|
|
|
-?>
|
|
|
- <tr bgcolor="<?php echo $color[9] ?>">
|
|
|
- <th colspan=2 align=center><?PHP echo _("Add a New Identity") ?></th>
|
|
|
- </tr>
|
|
|
-<?php
|
|
|
- ShowTableInfo('', '', '', '', $num);
|
|
|
-?>
|
|
|
-</table>
|
|
|
-</form>
|
|
|
-
|
|
|
- </td></tr>
|
|
|
- </table>
|
|
|
-
|
|
|
-</td></tr>
|
|
|
-</table>
|
|
|
-</body></html>
|
|
|
-
|
|
|
-<?PHP
|
|
|
+ $num = 1;
|
|
|
+ while (LoadInfo($full_name, $email_address, $reply_to, $signature, $num)) {
|
|
|
+ $td_str .= html_tag( 'tr',
|
|
|
+ html_tag( 'th', sprintf (_("Alternate Identity %d"), $num), 'center', '', 'colspan="2"' ) ,
|
|
|
+ '', $color[9]);
|
|
|
+ $td_str .= ShowTableInfo($full_name, $email_address, $reply_to, $signature, $num);
|
|
|
+ $num ++;
|
|
|
+ }
|
|
|
+
|
|
|
+ echo '<br>' .
|
|
|
+ html_tag( 'table', "\n" .
|
|
|
+ html_tag( 'tr', "\n" .
|
|
|
+ html_tag( 'td', "\n" .
|
|
|
+ '<b>'. _("Options") . ' - ' . _("Advanced Identities") .'</b><br>' .
|
|
|
+ html_tag( 'table', "\n" .
|
|
|
+ html_tag( 'tr', "\n" .
|
|
|
+ html_tag( 'td', "\n" .
|
|
|
+ html_tag( 'table', "\n" .
|
|
|
+ html_tag( 'tr', "\n" .
|
|
|
+ html_tag( 'th', _("Default Identity"), 'center', '', 'colspan="2"' ) ,
|
|
|
+ '', $color[9]) . "\n" .
|
|
|
+ $td_str . "\n" .
|
|
|
+ html_tag( 'tr',
|
|
|
+ html_tag( 'th', _("Add a New Identity") . ShowTableInfo('', '', '', '', $num), 'center', '', 'colspan="2"' ) ,
|
|
|
+ '', $color[9]) ,
|
|
|
+ '', '', 'width="80%" cellpadding="2" cellspacing="0" border="0"' ) ,
|
|
|
+ 'center', $color[4] )
|
|
|
+ ) ,
|
|
|
+ '', '', 'width="100%" border="0" cellpadding="1" cellspacing="1"' ) ,
|
|
|
+ 'center', $color[0] )
|
|
|
+ ) ,
|
|
|
+ 'center', '', 'width="95%" border="0" cellpadding="2" cellspacing="0"' ) .
|
|
|
+
|
|
|
+ '</body></html>';
|
|
|
|
|
|
function SaveUpdateFunction() {
|
|
|
global $username, $data_dir, $full_name, $email_address, $reply_to, $signature;
|
|
|
@@ -294,27 +280,25 @@ require_once('../functions/display_messages.php');
|
|
|
}
|
|
|
|
|
|
function sti_input( $title, $hd, $data, $post, $bg ) {
|
|
|
-
|
|
|
- echo "<tr$bg><td align=right nowrap>$title:".
|
|
|
- '</td><td>'.
|
|
|
- '<input size=50 type=text value="' . htmlspecialchars($data) .
|
|
|
- "\" name=\"$hd$post\"></td></tr>";
|
|
|
-
|
|
|
+ $return_val = html_tag( 'tr',
|
|
|
+ html_tag( 'td', $title . ':', 'right', '', 'nowrap' ) .
|
|
|
+ html_tag( 'td', '<input size="50" type="text" value="' . htmlspecialchars($data) . '" name="' . $hd . $post . '">' , 'left' ) ,
|
|
|
+ '', $bg );
|
|
|
+ return ($return_val);
|
|
|
}
|
|
|
|
|
|
function sti_textarea( $title, $hd, $data, $post, $bg ) {
|
|
|
-
|
|
|
- echo "<tr$bg><td align=right nowrap>$title:".
|
|
|
- '</td><td>'.
|
|
|
- "<textarea cols=50 rows=5 name=\"$hd$post\">" . htmlspecialchars($data) .
|
|
|
- "</textarea></td></tr>";
|
|
|
-
|
|
|
+ $return_val = html_tag( 'tr',
|
|
|
+ html_tag( 'td', $title . ':', 'right', '', 'nowrap' ) .
|
|
|
+ html_tag( 'td', '<textarea cols="50" rows="5" name="' . $hd . $post . '">' . htmlspecialchars($data) . '</textarea>' , 'left' ) ,
|
|
|
+ '', $bg );
|
|
|
+ return ($return_val);
|
|
|
}
|
|
|
|
|
|
function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post) {
|
|
|
global $color;
|
|
|
|
|
|
- $OtherBG = ' bgcolor="' . $color[0] . '"';
|
|
|
+ $OtherBG = $color[0];
|
|
|
if ($full_name == '' && $email_address == '' && $reply_to == '' && $signature == '')
|
|
|
$OtherBG = '';
|
|
|
|
|
|
@@ -323,29 +307,34 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post)
|
|
|
else
|
|
|
$isEmptySection = false;
|
|
|
|
|
|
- sti_input( _("Full Name"), 'full_name', $full_name, $post, $OtherBG );
|
|
|
- sti_input( _("E-Mail Address"), 'email_address', $email_address, $post, $OtherBG );
|
|
|
- sti_input( _("Reply To"), 'reply_to', $reply_to, $post, $OtherBG );
|
|
|
- sti_textarea( _("Signature"), 'signature', $signature, $post, $OtherBG );
|
|
|
+ $return_val = '';
|
|
|
+ $return_val .= sti_input( _("Full Name"), 'full_name', $full_name, $post, $OtherBG );
|
|
|
+ $return_val .= sti_input( _("E-Mail Address"), 'email_address', $email_address, $post, $OtherBG );
|
|
|
+ $return_val .= sti_input( _("Reply To"), 'reply_to', $reply_to, $post, $OtherBG );
|
|
|
+ $return_val .= sti_textarea( _("Signature"), 'signature', $signature, $post, $OtherBG );
|
|
|
|
|
|
do_hook('options_identities_table', $OtherBG, $isEmptySection, $post);
|
|
|
- echo "<tr$OtherBG>".
|
|
|
- '<td> </td><td>'.
|
|
|
- "<input type=hidden name=\"form_for_$post\" value=\"1\">".
|
|
|
- '<input type=submit name="update" value="'.
|
|
|
- _("Save / Update") . '">';
|
|
|
+ $return_val .= html_tag( 'tr', '', '', $OtherBG);
|
|
|
+ $return_val .= html_tag( 'td', ' ', 'left' );
|
|
|
+ $return_val .= html_tag( 'td', '', 'left' );
|
|
|
+ $return_val .= '<input type=hidden name="form_for_'. $post .'" value="1">';
|
|
|
+ $return_val .= '<input type="submit" name="update" value="' . _("Save / Update") . '">';
|
|
|
+
|
|
|
+
|
|
|
if (! $isEmptySection && $post != '') {
|
|
|
- echo "<input type=submit name=\"make_default_$post\" value=\"".
|
|
|
+ $return_val .= '<input type="submit" name="make_default_' . $post . '" value="'.
|
|
|
_("Make Default") . '">'.
|
|
|
- "<input type=submit name=\"delete_$post\" value=\"".
|
|
|
+ '<input type=submit name="delete_' . $post . '" value="'.
|
|
|
_("Delete") . '">';
|
|
|
}
|
|
|
if (! $isEmptySection && $post != '' && $post > 1) {
|
|
|
- echo '<input type=submit name="promote_' . $post . '" value="'.
|
|
|
+ $return_val .= '<input type=submit name="promote_' . $post . '" value="'.
|
|
|
_("Move Up") . '">';
|
|
|
}
|
|
|
do_hook('options_identities_buttons', $isEmptySection, $post);
|
|
|
- echo '</td></tr>'.
|
|
|
- '<tr><td colspan="2"> </td></tr>';
|
|
|
+ $return_val .= '</td></tr>'.
|
|
|
+ html_tag( 'tr', html_tag( 'td', ' ', 'left', '', 'colspan="2"' ));
|
|
|
+
|
|
|
+ return ($return_val);
|
|
|
}
|
|
|
?>
|
philippe_mingo