X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_identities.php;h=25e087ae5d89a4527fc720b3038240cca756ad51;hb=e4c6fe416876dabfcddf636bb7dd8af11cd064a6;hp=aff95a75c31fe7aa32ff05548d3cae94ca663fc9;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git diff --git a/src/options_identities.php b/src/options_identities.php index aff95a75..25e087ae 100644 --- a/src/options_identities.php +++ b/src/options_identities.php @@ -11,102 +11,73 @@ * $Id$ */ -/*****************************************************************/ -/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ -/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ -/*** + Base level indent should begin at left margin, as ***/ -/*** the require_once below looks. ***/ -/*** + All identation should consist of four space blocks ***/ -/*** + Tab characters are evil. ***/ -/*** + all comments should use "slash-star ... star-slash" ***/ -/*** style -- no pound characters, no slash-slash style ***/ -/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ -/*** ALWAYS USE { AND } CHARACTERS!!! ***/ -/*** + Please use ' instead of ", when possible. Note " ***/ -/*** should always be used in _( ) function calls. ***/ -/*** Thank you for your help making the SM code more readable. ***/ -/*****************************************************************/ - require_once('../src/validate.php'); require_once('../functions/display_messages.php'); +require_once('../functions/html.php'); - if (isset($return)) { - SaveUpdateFunction(); - header('Location: options_personal.php'); - exit(); - } - - displayPageHeader($color, 'None'); - - $Info = do_hook('options_identities_process', 0); - if ($Info[1]) - SaveUpdateFunction(); - - if (CheckAndDoDefault() || CheckAndDoPromote()) { - SaveUpdateFunction(); - } - if (isset($update) || CheckForDelete()) - SaveUpdateFunction(); - - LoadInfo($full_name, $email_address, $reply_to, ''); - -?> -
- - -
- - - - - -
- -

- - - - - - - -
'; + $td_str .= ShowTableInfo($full_name, $email_address, $reply_to, $signature, ''); $num = 1; - while (LoadInfo($full_name, $email_address, $reply_to, $num)) - { -?> - - - - - - - - -
-
- -
- -
- - -' . + html_tag( 'table', "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', "\n" . + ''. _("Options") . ' - ' . _("Advanced Identities") .'
' . + 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"' ) . + + ''; function SaveUpdateFunction() { - global $username, $data_dir, $full_name, $email_address, $reply_to; + global $username, $data_dir, $full_name, $email_address, $reply_to, $signature; $i = 1; $fakeI = 1; @@ -140,6 +111,12 @@ require_once('../functions/display_messages.php'); $filled ++; setPref($data_dir, $username, 'reply_to' . $fakeI, $$name); + $name = 'signature' . $i; + global $$name; + if ($$name != '') + $filled ++; + setSig($data_dir, $username, $fakeI, $$name); + if ($filled == 0) $fakeI --; } @@ -157,16 +134,19 @@ require_once('../functions/display_messages.php'); removePref($data_dir, $username, 'full_name' . $fakeI); removePref($data_dir, $username, 'email_address' . $fakeI); removePref($data_dir, $username, 'reply_to' . $fakeI); + setSig($data_dir, $username, $fakeI, ""); $fakeI ++; } setPref($data_dir, $username, 'full_name', $full_name); setPref($data_dir, $username, 'email_address', $email_address); setPref($data_dir, $username, 'reply_to', $reply_to); + setSig($data_dir, $username, "g", $signature); + } function CheckAndDoDefault() { - global $username, $data_dir, $full_name, $email_address, $reply_to; + global $username, $data_dir, $full_name, $email_address, $reply_to, $signature; $i = 1; $name = 'form_for_' . $i; @@ -177,7 +157,7 @@ require_once('../functions/display_messages.php'); global $$name; if (isset($$name)) { do_hook('options_identities_renumber', $i, 'default'); - global $full_name, $email_address, $reply_to; + global $full_name, $email_address, $reply_to, $signature; $name = 'full_name' . $i; global $$name; @@ -197,6 +177,13 @@ require_once('../functions/display_messages.php'); $reply_to = $$name; $$name = $temp; + $name = 'signature' . $i; + global $$name; + $temp = $signature; + $signature = $$name; + $$name = $temp; + + return true; } @@ -208,7 +195,7 @@ require_once('../functions/display_messages.php'); } function CheckForDelete() { - global $username, $data_dir, $full_name, $email_address, $reply_to; + global $username, $data_dir, $full_name, $email_address, $reply_to, $signature; $i = 1; $name = 'form_for_' . $i; @@ -240,28 +227,35 @@ require_once('../functions/display_messages.php'); if (isset($$name) && $i > 1) { do_hook('options_identities_renumber', $i, $i - 1); - $nameA = 'full_name' . $i; - $nameB = 'full_name' . ($i - 1); + $nameA = 'full_name' . $i; + $nameB = 'full_name' . ($i - 1); + global $$nameA, $$nameB; + $temp = $$nameA; + $$nameA = $$nameB; + $$nameB = $temp; + + $nameA = 'email_address' . $i; + $nameB = 'email_address' . ($i - 1); + global $$nameA, $$nameB; + $temp = $$nameA; + $$nameA = $$nameB; + $$nameB = $temp; + + $nameA = 'reply_to' . $i; + $nameB = 'reply_to' . ($i - 1); + global $$nameA, $$nameB; + $temp = $$nameA; + $$nameA = $$nameB; + $$nameB = $temp; + + $nameA = 'signature' . $i; + $nameB = 'signature' . ($i - 1); global $$nameA, $$nameB; $temp = $$nameA; $$nameA = $$nameB; $$nameB = $temp; - $nameA = 'email_address' . $i; - $nameB = 'email_address' . ($i - 1); - global $$nameA, $$nameB; - $temp = $$nameA; - $$nameA = $$nameB; - $$nameB = $temp; - - $nameA = 'reply_to' . $i; - $nameB = 'reply_to' . ($i - 1); - global $$nameA, $$nameB; - $temp = $$nameA; - $$nameA = $$nameB; - $$nameB = $temp; - - return true; + return true; } $i ++; @@ -271,60 +265,76 @@ require_once('../functions/display_messages.php'); return false; } - function LoadInfo(&$n, &$e, &$r, $post) { + function LoadInfo(&$n, &$e, &$r, &$s, $post) { global $username, $data_dir; $n = getPref($data_dir, $username, 'full_name' . $post); $e = getPref($data_dir, $username, 'email_address' . $post); $r = getPref($data_dir, $username, 'reply_to' . $post); + if ($post == '') + $post = 'g'; + $s = getSig($data_dir,$username,$post); - if ($n != '' || $e != '' || $r != '') + if ($n != '' || $e != '' || $r != '' || $s != '') return true; } function sti_input( $title, $hd, $data, $post, $bg ) { + $return_val = html_tag( 'tr', + html_tag( 'td', $title . ':', 'right', '', 'nowrap' ) . + html_tag( 'td', '' , 'left' ) , + '', $bg ); + return ($return_val); +} - echo "$title:". - ''. - '"; - +function sti_textarea( $title, $hd, $data, $post, $bg ) { + $return_val = html_tag( 'tr', + html_tag( 'td', $title . ':', 'right', '', 'nowrap' ) . + html_tag( 'td', '' , 'left' ) , + '', $bg ); + return ($return_val); } -function ShowTableInfo($full_name, $email_address, $reply_to, $post) { +function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post) { global $color; - $OtherBG = ' bgcolor="' . $color[0] . '"'; - if ($full_name == '' && $email_address == '' && $reply_to == '') + $OtherBG = $color[0]; + if ($full_name == '' && $email_address == '' && $reply_to == '' && $signature == '') $OtherBG = ''; - if ($full_name == '' && $email_address == '' && $reply_to == '') + if ($full_name == '' && $email_address == '' && $reply_to == '' && $signature == '') $isEmptySection = true; 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 ); + $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 "". - ' '. - "". - ''; + $return_val .= html_tag( 'tr', '', '', $OtherBG); + $return_val .= html_tag( 'td', ' ', 'left' ); + $return_val .= html_tag( 'td', '', 'left' ); + $return_val .= ''; + $return_val .= ''; + + if (! $isEmptySection && $post != '') { - echo "'. - "'; } if (! $isEmptySection && $post != '' && $post > 1) { - echo ''; } do_hook('options_identities_buttons', $isEmptySection, $post); - echo ''. - ' '; + $return_val .= ''. + html_tag( 'tr', html_tag( 'td', ' ', 'left', '', 'colspan="2"' )); + + return ($return_val); } -?> +?> \ No newline at end of file