X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_identities.php;h=013ec3602cee077dd5e2e6e4aa5952e88fa04111;hp=92152a29ff22f7e4811e2d5e78922c0a1be5fe3e;hb=2f617223e0e2742d2d9377aadedd3737b3256430;hpb=e7db48afbf9565737173583af6962520d2491acc diff --git a/src/options_identities.php b/src/options_identities.php index 92152a29..013ec360 100644 --- a/src/options_identities.php +++ b/src/options_identities.php @@ -1,339 +1,239 @@ -
- - -
- - - - - -
- -

- - - - - - - - - - - - - - - - -
-
- -
- -
- - -display('footer.tpl'); + die(); } -function CheckAndDoDefault() -{ - global $username, $data_dir, $full_name, $email_address, $reply_to; - - $i = 1; - $name = 'form_for_' . $i; - global $$name; - while (isset($$name)) - { - $name = 'make_default_' . $i; - global $$name; - if (isset($$name)) { - do_hook('options_identities_renumber', $i, 'default'); - global $full_name, $email_address, $reply_to; - - $name = 'full_name' . $i; - global $$name; - $temp = $full_name; - $full_name = $$name; - $$name = $temp; - - $name = 'email_address' . $i; - global $$name; - $temp = $email_address; - $email_address = $$name; - $$name = $temp; - - $name = 'reply_to' . $i; - global $$name; - $temp = $reply_to; - $reply_to = $$name; - $$name = $temp; - - return true; - } - - $i ++; - $name = 'form_for_' . $i; - global $$name; - } - return false; +if (!sqgetGlobalVar('identities', $identities, SQ_SESSION)) { + $identities = get_identities(); } +sqgetGlobalVar('newidentities', $newidentities, SQ_POST); +sqgetGlobalVar('smaction', $smaction, SQ_POST); +sqgetGlobalVar('return', $return, SQ_POST); +sqgetGlobalVar('smtoken', $submitted_token, SQ_POST, ''); + +// First lets see if there are any actions to perform // +if (!empty($smaction) && is_array($smaction)) { + + // first do a security check + sm_validate_security_token($submitted_token, 3600, TRUE); + + $doaction = ''; + $identid = 0; + + foreach($smaction as $action=>$row) { + // we only need to extract the action and the identity we are + // altering + + foreach($row as $iKey=>$data) { + $identid = $iKey; + } + + $doaction = $action; + } -function CheckForDelete() -{ - global $username, $data_dir, $full_name, $email_address, $reply_to; - - $i = 1; - $name = 'form_for_' . $i; - global $$name; - while (isset($$name)) - { - $name = 'delete_' . $i; - global $$name; - if (isset($$name)) { - return true; - } - - $i ++; - $name = 'form_for_' . $i; - global $$name; - } - return false; + $identities = sqfixidentities( $newidentities , $identid , $action ); + save_identities($identities); } -function CheckAndDoPromote() -{ - global $username, $data_dir, $full_name, $email_address, $reply_to; - - $i = 1; - $name = 'form_for_' . $i; - global $$name; - while (isset($$name)) - { - $name = 'promote_' . $i; - global $$name; - if (isset($$name) && $i > 1) { - do_hook('options_identities_renumber', $i, $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; - - return true; - } - - $i ++; - $name = 'form_for_' . $i; - global $$name; - } - return false; +if (!empty($return)) { + header('Location: ' . get_location() . '/options_personal.php'); + exit; } -function LoadInfo(&$n, &$e, &$r, $post) -{ - global $username, $data_dir; +displayPageHeader($color); + +/* since 1.1.3 */ +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; +} + +$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; + +//FIXME: NO HTML IN THE CORE +echo '
' . "\n" + . addHidden('smtoken', sm_generate_security_token()) . "\n"; + +$oTemplate->assign('identities', $i); +$oTemplate->display('options_advidentity_list.tpl'); + +//FIXME: NO HTML IN THE CORE +echo "
\n"; + +$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 + * + * Contains options_identities_buttons and option_identities_table hooks. + * Before 1.4.5/1.5.1 hooks were placed in ShowTableInfo() function. + * In 1.1.3-1.4.1 they were called in do_hook function with two or + * three arguments. Since 1.4.1 hooks are called in concat_hook_function. + * Arguments are moved to array. + * + * options_identities_buttons hook uses array with two keys. First array key is + * boolean variable used to indicate empty identity field. Second array key + * is integer variable used to indicate identity number + * + * options_identities_table hook uses array with three keys. First array key is + * a string containing background color style CSS (1.4.1-1.4.4/1.5.0 uses only + * html color code). Second array key is boolean variable used to indicate empty + * identity field. Third array key is integer variable used to indicate identity + * number + * @param string $title Name displayed in header row + * @param array $identity Identity information + * @param integer $id identity ID + * @return string html formatted table rows with form fields for identity management + * @since 1.5.1 and 1.4.5 (was called ShowTableInfo() in 1.1.3-1.4.4 and 1.5.0) + */ +function ShowIdentityInfo($title, $identity, $id ) { + global $color; + + if (empty($identity['full_name']) && empty($identity['email_address']) && empty($identity['reply_to']) && empty($identity['signature'])) { + $bg = ''; + $empty = true; + } else { + $bg = ' style="background-color:' . $color[0] . ';"'; + $empty = false; + } + + $name = 'newidentities[%d][%s]'; + + + $return_str = ''; + +//FIXME: NO HTML IN THE CORE + $return_str .= '' . "\n"; + $return_str .= ' ' . $title . ' '. "\n"; + $return_str .= '' . "\n"; + $return_str .= sti_input( _("Full Name") , sprintf($name, $id, 'full_name'), $identity['full_name'], $bg); + $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); + $temp = array(&$bg, &$empty, &$id); + $return_str .= concat_hook_function('options_identities_table', $temp); + $return_str .= ' ' . "\n"; + $return_str .= '   ' . "\n"; + $return_str .= ' ' . "\n"; + $return_str .= ' ' . "\n"; + + if (!$empty && $id > 0) { + $return_str .= ' ' . "\n"; + $return_str .= ' ' . "\n"; + + if ($id > 1) { + $return_str .= ' ' . "\n"; + } + + } + + $temp = array(&$empty, &$id); + $return_str .= concat_hook_function('options_identities_buttons', $temp); + $return_str .= ' ' . "\n"; + $return_str .= '' . "\n"; + $return_str .= '' . "\n"; + $return_str .= '   ' . "\n"; + $return_str .= ''; + + return $return_str; + +} - $n = getPref($data_dir, $username, 'full_name' . $post); - $e = getPref($data_dir, $username, 'email_address' . $post); - $r = getPref($data_dir, $username, 'reply_to' . $post); +/** + * Creates html formated table row with input field + * @param string $title Name displayed next to input field + * @param string $name Name of input field + * @param string $data Default value of input field (data is sanitized with htmlspecialchars) + * @param string $bgcolor html attributes added to row element (tr) + * @return string html formated table row with text input field + * @since 1.2.0 (arguments differ since 1.4.5/1.5.1) + * @todo check right-to-left language issues + * @access private + */ +function sti_input( $title, $name, $data, $bgcolor ) { +//FIXME: NO HTML IN THE CORE + $str = ''; + $str .= '\n"; + $str .= ' ' . $title . ' ' . "\n"; + $str .= ' ' . "\n"; + $str .= ''; + + return $str; - if ($n != '' || $e != '' || $r != '') - return true; } -function ShowTableInfo($full_name, $email_address, $reply_to, $post) -{ - global $color; - - $OtherBG = ' bgcolor="' . $color[0] . '"'; - if ($full_name == '' && $email_address == '' && $reply_to == '') - $OtherBG = ''; - - if ($full_name == '' && $email_address == '' && $reply_to == '') - $isEmptySection = true; - else - $isEmptySection = false; - -?> - > - - : - - - - - - > - - : - - - - - - > - - : - - - - - - - > -   - - "> - - "> - "> - 1) { -?> - "> - - - - -   - -\n"; + $str .= ' ' . $title . ' ' . "\n"; + $str .= ' ' . "\n"; + $str .= ''; + + return $str; + } +