- fixed attachment names from being lower case

- added "Significant Contributions" section to AUTHORS file
- Fixed misspelling of Portuguese (was Portugese)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@680 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/AUTHORS b/AUTHORS
index 805f18a8b6be1bd935e88211abd437729097bcaa..e21acde1d94fa1a375304e77f2b569717bf47295 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,23 +1,28 @@
  Developers:
  -----------
  Developers:
  -----------

-   Luke Ehresman (luke@squirrelmail.org)
-   Nathan Ehresman (nathan@squirrelmail.org)
-   Gustav Foseid (gustavf@squirrelmail.org)
-   Pål Løberg (pallo@squirrelmail.org)
+   Luke Ehresman <luke@squirrelmail.org>
+   Nathan Ehresman <nathan@squirrelmail.org>
+   Gustav Foseid <gustavf@squirrelmail.org>
+   Pål Løberg <pallo@squirrelmail.org>

    Shane Wilson
    Sergiusz Pawlowicz
    Steve Gare
    Gerrit Padgham
    Matt Phillips
    Shane Wilson
    Sergiusz Pawlowicz
    Steve Gare
    Gerrit Padgham
    Matt Phillips

-   David Whittington

    Lewis Bergman
 
  Translations:
  -------------
    Lewis Bergman
 
  Translations:
  -------------

-   Norwegian:    Gustav Foseid (gustavf@squirrelmail.org)
-   German:       Chris Thil (cj@limburgerhof.de)
-   Russian:      Konstantin Riabitsev (graf@relhum.org)
-   Polish:       Lukasz Klimek (casa@lo.pila.pl)
-   Swedish:      Tobias Ekbom (tobias@vallcom.net)     
-   Dutch:        Arjan Halma (arjan@halma.nl)
-   Portugese (Brazil): Henrique Moura (henriquemoura@hotmail.com)
+   Norwegian:    Gustav Foseid <gustavf@squirrelmail.org>
+   German:       Chris Thil <cj@limburgerhof.de>
+   Russian:      Konstantin Riabitsev <graf@relhum.org>
+   Polish:       Lukasz Klimek <casa@lo.pila.pl>
+   Swedish:      Tobias Ekbom <tobias@vallcom.net>     
+   Dutch:        Arjan Halma <arjan@halma.nl>
+   Portuguese (Brazil): Henrique Moura <henriquemoura@hotmail.com>
+
+ Significant Contributions:
+ --------------------------
+   Konstantin Riabitsev <graf@relhum.org>
+   Alex Bleeker <beheer@hackers.nl>
+   Many others...

diff --git a/functions/i18n.php b/functions/i18n.php
index 889affd28fa245a24db14d3482451bb4a2b6c461..33dbc3bbb07cb2c4c9b425f80d13e0209c94fa35 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -27,7 +27,7 @@
    $languages["sv"]["CHARSET"] = "iso-8859-1";
    $languages["nl"]["NAME"]    = "Dutch";
    $languages["nl"]["CHARSET"] = "iso-8859-1";
    $languages["sv"]["CHARSET"] = "iso-8859-1";
    $languages["nl"]["NAME"]    = "Dutch";
    $languages["nl"]["CHARSET"] = "iso-8859-1";

-   $languages["pt_BR"]["NAME"] = "Portugese (Brazil)";
+   $languages["pt_BR"]["NAME"] = "Portuguese (Brazil)";

    $languages["pt_BR"]["CHARSET"] = "iso-8859-1";
 
    // Decodes a string to the internal encoding from the given charset
    $languages["pt_BR"]["CHARSET"] = "iso-8859-1";
 
    // Decodes a string to the internal encoding from the given charset

diff --git a/functions/mime.php b/functions/mime.php
index 25dcca5385d5a2808459b7660dc0991e2bc94f76..18e2dd7bb7df92519469b237949aeb730aefecc4 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -65,11 +65,12 @@
          $read = fgets ($imap_stream, 10000);
          $response = substr($read, 0, 4);
       }
          $read = fgets ($imap_stream, 10000);
          $response = substr($read, 0, 4);
       }

-      $read = strtolower($bodystructure);
+   //   $read = strtolower($bodystructure);
+      $read = $bodystructure;

 
       if ($debug_mime) echo "<tt>$read</tt><br><br>";
       // isolate the body structure and remove beginning and end parenthesis
 
       if ($debug_mime) echo "<tt>$read</tt><br><br>";
       // isolate the body structure and remove beginning and end parenthesis

-      $read = trim(substr ($read, strpos($read, "bodystructure") + 13));
+      $read = trim(substr ($read, strpos(strtolower($read), "bodystructure") + 13));

       $read = trim(substr ($read, 0, -1));
       $end = mime_match_parenthesis(0, $read);
       while ($end == strlen($read)-1) {
       $read = trim(substr ($read, 0, -1));
       $end = mime_match_parenthesis(0, $read);
       while ($end == strlen($read)-1) {


@@ -195,20 +196,20 @@
          // This is where all the text parts get put into the header
          switch ($elem_num) {
             case 1: 
          // This is where all the text parts get put into the header
          switch ($elem_num) {
             case 1: 

-               $msg->header->type0 = $text;
-               if ($debug_mime) echo "<tt>type0 = $text</tt><br>";
+               $msg->header->type0 = strtolower($text);
+               if ($debug_mime) echo "<tt>type0 = ".strtolower($text)."</tt><br>";

                break;
             case 2: 
                break;
             case 2: 

-               $msg->header->type1 = $text;
-               if ($debug_mime) echo "<tt>type1 = $text</tt><br>";
+               $msg->header->type1 = strtolower($text);
+               if ($debug_mime) echo "<tt>type1 = ".strtolower($text)."</tt><br>";

                break;
             case 5:
                $msg->header->description = $text;
                if ($debug_mime) echo "<tt>description = $text</tt><br>";
                break;
             case 6:
                break;
             case 5:
                $msg->header->description = $text;
                if ($debug_mime) echo "<tt>description = $text</tt><br>";
                break;
             case 6:

-               $msg->header->encoding = $text;
-               if ($debug_mime) echo "<tt>encoding = $text</tt><br>";
+               $msg->header->encoding = strtolower($text);
+               if ($debug_mime) echo "<tt>encoding = ".strtolower($text)."</tt><br>";

                break;
             case 7:
                $msg->header->size = $text;
                break;
             case 7:
                $msg->header->size = $text;


@@ -306,7 +307,7 @@
                $structure = trim(substr($structure, strlen($tmp) + 2));
                
                $k = count($props);
                $structure = trim(substr($structure, strlen($tmp) + 2));
                
                $k = count($props);

-               $props[$k]["name"] = $tmp;
+               $props[$k]["name"] = strtolower($tmp);

                $props[$k]["value"] = $value;
             } else if ($char == "(") {
                $end = mime_match_parenthesis (0, $structure);
                $props[$k]["value"] = $value;
             } else if ($char == "(") {
                $end = mime_match_parenthesis (0, $structure);

diff --git a/src/compose.php b/src/compose.php
index afc4652203ee303c62c704a62d67dff46738d005..660752290e6574a04506e2d94738768e210c7e7b 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -351,7 +351,7 @@
       error_reporting(0); // Rename will produce error output if it fails
       if (!rename($attachfile, $attachment_dir.$localfilename)) {
          if (!copy($attachfile, $attachment_dir.$localfilename)) {
       error_reporting(0); // Rename will produce error output if it fails
       if (!rename($attachfile, $attachment_dir.$localfilename)) {
          if (!copy($attachfile, $attachment_dir.$localfilename)) {

-            plain_error_message(_("Could not move/copy file. File not attached"));
+            plain_error_message(_("Could not move/copy file. File not attached"), $color);

             $failed = true;
          }
       }
             $failed = true;
          }
       }