From e9d611cb380996446831517408052bfbefe670cb Mon Sep 17 00:00:00 2001
From: ondrass <ondrass@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 20 Oct 2000 15:13:17 +0000
Subject: [PATCH] - fixed error in iso-8859-2 handling function in
 function/i18n.php. - prepare for another php backend in functions/imap.php. -
 aligned "Sent" button in src/compose.php. - added two .cvsignore files in
 data/ and config/ directory.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@812 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 config/.cvsignore  | 1 +
 data/.cvsignore    | 1 +
 functions/i18n.php | 6 +++---
 functions/imap.php | 9 ++++++---
 src/compose.php    | 4 +---
 5 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 config/.cvsignore
 create mode 100644 data/.cvsignore

diff --git a/config/.cvsignore b/config/.cvsignore
new file mode 100644
index 00000000..4f4773fb
--- /dev/null
+++ b/config/.cvsignore
@@ -0,0 +1 @@
+config.php
diff --git a/data/.cvsignore b/data/.cvsignore
new file mode 100644
index 00000000..68d4a6d7
--- /dev/null
+++ b/data/.cvsignore
@@ -0,0 +1 @@
+*.pref
diff --git a/functions/i18n.php b/functions/i18n.php
index 20c4e535..2b7d5f40 100644
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -58,9 +58,9 @@
       if (ereg("iso-8859-(.*)", $charset, $res)) {
          if ($res[1] == "1")
             return charset_decode_iso_8859_1 ($string);
-         if ($res[1] == "2")
+         else if ($res[1] == "2")
             return charset_decode_iso_8859_2 ($string);
-         if ($res[1] == "7")
+         else if ($res[1] == "7")
             return charset_decode_iso_8859_7 ($string);
          else if ($res[1] == "15")
             return charset_decode_iso_8859_15 ($string);
@@ -221,7 +221,7 @@
    function charset_decode_iso_8859_2 ($string) {
       global $default_charset;
 
-      if (strtolower($default_charset) == "iso-8859-7") {
+      if (strtolower($default_charset) == "iso-8859-2") {
          return $string;
       } else {
          // Only do the slow convert if there are 8-bit characters
diff --git a/functions/imap.php b/functions/imap.php
index 6ec0025e..2fa499f6 100644
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -4,8 +4,11 @@
     **/
 
    $imap_php = true;
+
+   $imap_backend = 'imap';
    
-   include ("../functions/imap_mailbox.php");
-   include ("../functions/imap_messages.php");
-   include ("../functions/imap_general.php");
+   include ("../functions/".$imap_backend."_mailbox.php");
+   include ("../functions/".$imap_backend."_messages.php");
+   include ("../functions/".$imap_backend."_general.php");
+   include ("../functions/".$imap_backend."_search.php");
 ?>
diff --git a/src/compose.php b/src/compose.php
index e7f94025..cf4c4593 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -253,9 +253,7 @@
       echo "</TEXTAREA><BR>\n";
       echo "      </TD>\n";
       echo "   </TR>\n";
-      echo "   <TR><TD COLSPAN=2 ALIGN=CENTER><INPUT TYPE=SUBMIT NAME=send VALUE=\"";
-      echo _("Send");
-      echo "\"></TD></TR>\n";
+      echo "   <TR><TD>&nbsp;</TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT NAME=send VALUE=\""._("Send")."\"></TD></TR>\n";
       
       // This code is for attachments
       echo "   <tr>\n";
-- 
2.25.1