From 6c60ce367a70fcf7a9c8fe7d4cd3aab98da21aa9 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 28 Sep 2010 07:44:23 +0000
Subject: [PATCH] make sure keywords of parameters/dparameters are stripped of
 leading and trailing whitespase, as this meets the expectation later on.
 Otherwise keys in the parameters/dparameters structure may not be
 found/identified

---
 egw-pear/Net/IMAP.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/egw-pear/Net/IMAP.php b/egw-pear/Net/IMAP.php
index ae84542172..7a092aea3e 100644
--- a/egw-pear/Net/IMAP.php
+++ b/egw-pear/Net/IMAP.php
@@ -737,7 +737,7 @@ class Net_IMAP extends Net_IMAPProtocol {
           if(is_array($_structure[8][1])) {
             foreach($_structure[8][1] as $key => $value) {
               if($key%2 == 0) {
-                $part->dparameters[strtoupper($_structure[8][1][$key])] = $_structure[8][1][$key+1];
+                $part->dparameters[trim(strtoupper($_structure[8][1][$key]))] = $_structure[8][1][$key+1];
               }
             }
           }
@@ -807,7 +807,7 @@ class Net_IMAP extends Net_IMAPProtocol {
           if(is_array($_structure[8][1])) {
             foreach($_structure[8][1] as $key => $value) {
               if($key%2 == 0) {
-                $part->dparameters[strtoupper($_structure[8][1][$key])] = $_structure[8][1][$key+1];
+                $part->dparameters[trim(strtoupper($_structure[8][1][$key]))] = $_structure[8][1][$key+1];
               }
             }
           }
@@ -820,7 +820,7 @@ class Net_IMAP extends Net_IMAPProtocol {
           if(is_array($_structure[9][1])) {
             foreach($_structure[9][1] as $key => $value) {
               if($key%2 == 0) {
-                $part->dparameters[strtoupper($_structure[9][1][$key])] = $_structure[9][1][$key+1];
+                $part->dparameters[trim(strtoupper($_structure[9][1][$key]))] = $_structure[9][1][$key+1];
               }
             }
           }
@@ -853,14 +853,14 @@ class Net_IMAP extends Net_IMAPProtocol {
 		if(is_array($_structure[1])) {
 			foreach($_structure[1] as $key => $value) {
 				if($key%2 == 0) {
-					$part->parameters[strtoupper($_structure[1][$key])] = $_structure[1][$key+1];
+					$part->parameters[trim(strtoupper($_structure[1][$key]))] = $_structure[1][$key+1];
 				}
 			}
 		}
         if(is_array($_structure[2])) {
           foreach($_structure[2] as $key => $value) {
             if($key%2 == 0) {
-              $part->parameters[strtoupper($_structure[2][$key])] = $_structure[2][$key+1];
+              $part->parameters[strtoupper(trim($_structure[2][$key]))] = $_structure[2][$key+1];
             }
           }
         }