- 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

diff --git a/config/.cvsignore b/config/.cvsignore
new file mode 100644 (file)
index 0000000..4f4773f
--- /dev/null
+++ b/config/.cvsignore
@@ -0,0 +1 @@
+config.php

diff --git a/data/.cvsignore b/data/.cvsignore
new file mode 100644 (file)
index 0000000..68d4a6d
--- /dev/null
+++ b/data/.cvsignore
@@ -0,0 +1 @@
+*.pref

diff --git a/functions/i18n.php b/functions/i18n.php
index 20c4e535b0aea2d97d62dc72fd1eb1dda1cc5166..2b7d5f40659b980fa8a275a21274aa6aeca98563 100644 (file)
--- 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 (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);
             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);
             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;
 
    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
          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 6ec0025efc49d783cd5c287c124a01bb8293a9b4..2fa499f64be3065665220e68e17d9bc2ab11133c 100644 (file)
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -4,8 +4,11 @@
     **/
 
    $imap_php = true;
     **/
 
    $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 e7f9402522348b2363022a6f6852cfe4f24fefdf..cf4c4593b81f0218b599d0adf86bd2c72ed0e017 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -253,9 +253,7 @@
       echo "</TEXTAREA><BR>\n";
       echo "      </TD>\n";
       echo "   </TR>\n";
       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";
       
       // This code is for attachments
       echo "   <tr>\n";