From a747d9712060960573e845094f747d88ef391a43 Mon Sep 17 00:00:00 2001
From: jangliss <jangliss@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 25 May 2003 13:05:34 +0000
Subject: [PATCH] Non-ascii characters caused problems with SVN function and
 were replaced with a ? by SourceForge.net in your original log message, which
 follows:

Certain characters in translations would mess up on the post, such as an
umlaut would appear as &amp;ouml; in html, but after being posted it appears as
? so matching would always fail, making it impossible for those with
chars like that to mod/delete servers. (Bug #742705)



git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4937 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 plugins/mail_fetch/options.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 8e755bc5..170cbf28 100644
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -27,7 +27,15 @@ if(!sqgetGlobalVar('mf_cypher', $mf_cypher, SQ_POST)) {
     $mf_cypher = '';
 }
 if(! sqgetGlobalVar('mf_action', $mf_action, SQ_POST) ) {
-    $mf_action = 'config';
+    if (sqgetGlobalVar('mf_action_mod', $mf_action_mod, SQ_POST)) {
+        $mf_action = 'Modify';
+    }
+    elseif (sqgetGlobalVar('mf_action_del', $mf_action_del, SQ_POST)) {
+        $mf_action = 'Delete';
+    }
+    else {
+        $mf_action = 'config';
+    }
 }
 
 sqgetGlobalVar('mf_sn',            $mf_sn,            SQ_POST);
@@ -42,6 +50,7 @@ sqgetGlobalVar('mf_fref',          $mf_fref,          SQ_POST);
 sqgetGlobalVar('mf_lmos',          $mf_lmos,          SQ_POST);
 sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
 
+
 /* end globals */
 
     displayPageHeader( $color, 'None' );
@@ -246,15 +255,15 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                     htmlspecialchars( (($mailfetch_alias_[$i]=='')?$mailfetch_server_[$i]:$mailfetch_alias_[$i])) . "</option>>";
             }
             echo '</select>'.
-                 '&nbsp;&nbsp;<INPUT TYPE=submit name=mf_action value="' . _("Modify") . '">'.
-                 '&nbsp;&nbsp;<INPUT TYPE=submit name=mf_action value="' . _("Delete") . '">'.
+                 '&nbsp;&nbsp;<INPUT TYPE=submit name=mf_action_mod value="' . _("Modify") . '">'.
+                 '&nbsp;&nbsp;<INPUT TYPE=submit name=mf_action_del value="' . _("Delete") . '">'.
                  '</form>';
         } else {
             echo _("No-one server in use. Try to add.");
         }
         echo '</td></tr></table>';
         break;
-    case _("Delete"):                                     //erase confirmation about a server
+    case 'Delete':                                     //erase confirmation about a server
         echo html_tag( 'table',
                     html_tag( 'tr',
                         html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
@@ -277,7 +286,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
                 ) ,
             'center', '', 'width="70%" cols="1" cellpadding="5" cellspacing="1"' );
         break;                                  //modify a server
-    case _("Modify"):
+    case 'Modify':
         echo html_tag( 'table',
                     html_tag( 'tr',
                         html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
-- 
2.25.1