From 050722c4a141bfda4a2eae435ec290c6b793aae6 Mon Sep 17 00:00:00 2001 From: philippe_mingo Date: Tue, 22 Jan 2002 08:42:26 +0000 Subject: [PATCH] 1.3 git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2198 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/listcommands/README | 10 +++-- plugins/listcommands/mailout.php | 50 +++++++++++-------------- plugins/listcommands/setup.php | 64 +++++++++++++------------------- 3 files changed, 53 insertions(+), 71 deletions(-) diff --git a/plugins/listcommands/README b/plugins/listcommands/README index a5a597c3..ad60fcff 100644 --- a/plugins/listcommands/README +++ b/plugins/listcommands/README @@ -1,4 +1,4 @@ -List Commands plugin -- v1.2 +List Commands plugin -- v1.3 This plugin gives the user a menu of mailinglist options such as (un)subscribe, help and archives when viewing messages from compliant @@ -44,9 +44,11 @@ Changes 1.2 * Fixed too greedy regexp; changed to PCRE. * Fixed IMAP session id handling. - +1.3 + * Fixes to allow internationalization. + Acknowledgements ================ -I'd like to thank Peter Walker, Wouter Teepe and Jason Edwards for their -useful contributions to this plugin. +I'd like to thank Peter Walker, Wouter Teepe, Jason Edwards and Phillipe Mingo +for their useful contributions to this plugin. diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php index 97e71c1b..a4681569 100644 --- a/plugins/listcommands/mailout.php +++ b/plugins/listcommands/mailout.php @@ -1,10 +1,10 @@ -

- - -
' . _("Mailinglist") . ' ' . _($action); ?>
-\n" + .'\n
' . _("Mailinglist") . ' ' . _($action) . + "
"; + switch ( $action ) { case 'Help': @@ -27,7 +25,7 @@ case 'Subscribe': $out_string .= _("This will send a message to %s requesting that you will be subscribed to this list. You will be subscribed with the address below."); break; case 'Unsubscribe': - $out_string = _("This will send a message to %s requesting that you will be subscribed to this list. It will try to unsubscribe the adress below."); + $out_string = _("This will send a message to %s requesting that you will be unsubscribed from this list. It will try to unsubscribe the adress below."); } printf( $out_string, htmlspecialchars($send_to) ); @@ -48,9 +46,8 @@ if ($em != '') { } echo '

' . _("From:"); -$idents = getPref($data_dir, $username, 'identities'); -if ($idents != '' && $idents > 1) -{ +$idents = getPref($data_dir, $username, 'identities'); +if ($idents != '' && $idents > 1) { echo ' ' . "\n" ; -} -else -{ +} else { echo $defaultmail; -} -?> -
- - - - -">

- -
-

- - \ No newline at end of file +} + +echo '
' +. '' +. '' +. '' +. '' +. '

' +. '

'; +?> \ No newline at end of file diff --git a/plugins/listcommands/setup.php b/plugins/listcommands/setup.php index 31077297..d333c479 100644 --- a/plugins/listcommands/setup.php +++ b/plugins/listcommands/setup.php @@ -1,13 +1,13 @@ * */ @@ -21,20 +21,21 @@ function squirrelmail_plugin_init_listcommands () function plugin_listcommands_menu () { - global $imapConnection, $passed_id, $color, $mailbox, $subject; + global $imapConnection, $passed_id, $color, $mailbox, + $subject, $ent_num, $priority_level; /* Array of commands we can deal with from the header. The Reply option is * added later because we generate it using the Post information. */ - $fieldsdescr = array( 'Help' => _("Help"), + $fieldsdescr = array( 'Help' => _("Help"), 'Unsubscribe' => _("Unsubscribe"), - 'Subscribe' => _("Subscribe"), + 'Subscribe' => _("Subscribe"), 'Post' => _("Post to the list"), - 'Archive' => _("List Archives"), + 'Archive' => _("List Archives"), 'Owner' => _("Contact Listowner") ); $fields = array_keys ($fieldsdescr); - $fieldsdescr['Reply'] = 'Reply to the list'; - + $fieldsdescr['Reply'] = _("Reply to the list"); + $cmds = array(); $output = array(); @@ -44,62 +45,49 @@ function plugin_listcommands_menu () { fputs ($imapConnection, "$sid FETCH $passed_id BODY.PEEK[HEADER.FIELDS ($lfields)]\r\n"); $read = sqimap_read_data ($imapConnection, $sid, true, $response, $emessage); - for ($i = 1; $i < count($read); $i++) - { - foreach ($fields as $field) - { - if ( preg_match("/^List-$field: *<(.+?)>/i", $read[$i], $match) ) - { + for ($i = 1; $i < count($read); $i++) { + foreach ($fields as $field) { + if ( preg_match("/^List-$field: *<(.+?)>/i", $read[$i], $match) ) { $cmds[$field] = $match[1]; } } } - foreach ($cmds as $cmd => $url) - { - if ( eregi('mailto:(.+)', $url, $regs) ) - { + foreach ($cmds as $cmd => $url) { + if ( eregi('mailto:(.+)', $url, $regs) ) { $purl = parse_url($url); - - if ( $cmd == 'Post' || $cmd == 'Owner' ) - { + + if ( $cmd == 'Post' || $cmd == 'Owner' ) { $url = 'compose.php?'; - } - else - { + } else { $url = '../plugins/listcommands/mailout.php?action=' . $cmd . '&'; } $url .= 'mailbox=' . urlencode($mailbox) . '&send_to=' . $purl['path']; - - if ( isset($purl['query']) ) - { + + if ( isset($purl['query']) ) { $url .= '&' . $purl['query']; } $output[] = '' . $fieldsdescr[$cmd] . ''; - if ( $cmd == 'Post' ) - { - $url .= '&reply_subj=' . urlencode($subject) . '&reply_id=' . $passed_id; + if ( $cmd == 'Post' ) { + $url .= '&reply_subj=' . urlencode($subject) . + '&reply_id=' . $passed_id . + '&ent_num=' . $ent_num . + '&mailprio=' . $priority_level; $output[] = '' . $fieldsdescr['Reply'] . ''; } - } - elseif ( eregi('^(http|ftp)', $url) ) - { + } elseif ( eregi('^(http|ftp)', $url) ) { $output[] = '' . $fieldsdescr[$cmd] . ''; } - - } - if (count($output) > 0) { echo "". '' . _("Mailinglist options:") . ' ' . implode (' | ', $output) . ''. ''; } - -} +} ?> \ No newline at end of file -- 2.25.1