X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_identities.php;h=792f9a92d2eab92f3199b95c30c52e7e961ec752;hb=ffdae6e7ca11112273750f5ad80882164375a7e4;hp=026ae1f1a56c37dc50034f9c4581b81b353a7b20;hpb=202bcbcc2b67c7c153db1b09b608b62beeba0496;p=squirrelmail.git

diff --git a/src/options_identities.php b/src/options_identities.php
index 026ae1f1..792f9a92 100644
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -21,6 +21,13 @@ require('../include/init.php');
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'functions/identity.php');
 
+/* make sure that page is not available when $edit_identity is false */
+if (!$edit_identity) {
+    error_box(_("Editing identities is disabled."));
+    $oTemplate->display('footer.tpl');
+    die();
+}
+
 if (!sqgetGlobalVar('identities', $identities, SQ_SESSION)) {
     $identities = get_identities();
 }
@@ -59,44 +66,42 @@ displayPageHeader($color, 'None');
 /* since 1.1.3 */
 do_hook('options_identities_top');
 
-$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 ) {
+$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;
+}
 
-    if ($iKey == 0) {
-        $hdr_str = _("Default Identity");
-    } else {
-        $hdr_str = sprintf( _("Alternate Identity %d"), $iKey);
-    }
+$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;
 
-    $td_str .= ShowIdentityInfo( $hdr_str, $ident, $iKey );
+echo '<form name="f" action="options_identities.php" method="post">' . "\n";
 
-}
+$oTemplate->assign('identities', $i);
+$oTemplate->display('options_advidentity_list.tpl');
+
+echo "</form>\n";
+
+$oTemplate->display('footer.tpl');
 
-$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>';
+/**
+ * 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