displayPageHeader($color, 'None');
/* since 1.1.3 */
-do_hook('options_identities_top');
+do_hook('options_identities_top', $null);
+
+$i = array();
+foreach ($identities as $key=>$ident) {
+ $a = array();
+ $a['Title'] = $key==0 ? _("Default Identity") : sprintf(_("Alternate Identity %d"), $key);
+ $a['New'] = false;
+ $a['Default'] = $key==0;
+ $a['FullName'] = htmlspecialchars($ident['full_name']);
+ $a['Email'] = htmlspecialchars($ident['email_address']);
+ $a['ReplyTo'] = htmlspecialchars($ident['reply_to']);
+ $a['Signature'] = htmlspecialchars($ident['signature']);
+ $i[$key] = $a;
+}
-$td_str = '';
-$td_str .= '<form name="f" action="options_identities.php" method="post"><br />' . "\n";
-$td_str .= '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . "\n";
-$cnt = count($identities);
-foreach( $identities as $iKey=>$ident ) {
+$a = array();
+$a['Title'] = _("Add New Identity");
+$a['New'] = true;
+$a['Default'] = false;
+$a['FullName'] = '';
+$a['Email'] = '';
+$a['ReplyTo'] = '';
+$a['Signature'] = '';
+$i[count($i)] = $a;
- if ($iKey == 0) {
- $hdr_str = _("Default Identity");
- } else {
- $hdr_str = sprintf( _("Alternate Identity %d"), $iKey);
- }
+//FIXME: NO HTML IN THE CORE
+echo '<form name="f" action="options_identities.php" method="post">' . "\n";
- $td_str .= ShowIdentityInfo( $hdr_str, $ident, $iKey );
+$oTemplate->assign('identities', $i);
+$oTemplate->display('options_advidentity_list.tpl');
-}
+//FIXME: NO HTML IN THE CORE
+echo "</form>\n";
-$td_str .= ShowIdentityInfo( _("Add a New Identity"), array('full_name'=>'','email_address'=>'','reply_to'=>'','signature'=>''), $cnt);
-$td_str .= '</table>' . "\n";
-$td_str .= '</form>';
-
-echo '<br /> ' . "\n" .
- 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('td', "\n" . $td_str ,'','', 'style="text-align:center;"')
- ),
- '', '', '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>';
+$oTemplate->display('footer.tpl');
+
+/**
+ * The functions below should not be needed with the additions of templates,
+ * however they will remain in case plugins use them.
+ */
/**
* Returns html formated identity form fields
$return_str = '';
+//FIXME: NO HTML IN THE CORE
$return_str .= '<tr>' . "\n";
$return_str .= ' <th style="text-align:center;background-color:' . $color[9] . ';" colspan="2">' . $title . '</th> '. "\n";
$return_str .= '</tr>' . "\n";
$return_str .= sti_input( _("E-Mail Address") , sprintf($name, $id, 'email_address'), $identity['email_address'], $bg);
$return_str .= sti_input( _("Reply To"), sprintf($name, $id, 'reply_to'), $identity['reply_to'], $bg);
$return_str .= sti_textarea( _("Signature"), sprintf($name, $id, 'signature'), $identity['signature'], $bg);
- $return_str .= concat_hook_function('options_identities_table', array($bg, $empty, $id));
+ $return_str .= concat_hook_function('options_identities_table', $temp=array(&$bg, &$empty, &$id));
$return_str .= '<tr' . $bg . '> ' . "\n";
$return_str .= ' <td> </td>' . "\n";
$return_str .= ' <td>' . "\n";
}
- $return_str .= concat_hook_function('options_identities_buttons', array($empty, $id));
+ $return_str .= concat_hook_function('options_identities_buttons', $temp=array(&$empty, &$id));
$return_str .= ' </td>' . "\n";
$return_str .= '</tr>' . "\n";
$return_str .= '<tr>' . "\n";
* @access private
*/
function sti_input( $title, $name, $data, $bgcolor ) {
+//FIXME: NO HTML IN THE CORE
$str = '';
$str .= '<tr' . $bgcolor . ">\n";
$str .= ' <td style="white-space: nowrap;text-align:right;">' . $title . ' </td>' . "\n";
* @access private
*/
function sti_textarea( $title, $name, $data, $bgcolor ) {
+//FIXME: NO HTML IN THE CORE
$str = '';
$str .= '<tr' . $bgcolor . ">\n";
$str .= ' <td style="white-space: nowrap;text-align:right;">' . $title . ' </td>' . "\n";
}
-?>
\ No newline at end of file
+?>