holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail: fix a namespace issue (for additional defineable namespaces under dovecot) reported by E.Popp

Browse Source
This commit is contained in:
Klaus Leithoff 2014-05-08 08:50:48 +00:00
parent cd3c1901af
commit ee46a063a0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mail/inc/class.mail_ui.inc.php
View File

@ -200,7 +200,7 @@ class mail_ui
foreach($nameSpaces as $key => $value ) foreach($nameSpaces as $key => $value )
{ {
if (str_replace($value['delimiter'],"",$value['prefix']) == $folderName && if (str_replace($value['delimiter'],"",$value['prefix']) == $folderName &&
$key == 'others' || $key == 'user') $value['type'] == 'others' || $value['type'] == 'shared')
{ {
$validFolder = false; $validFolder = false;
} }
@ -211,10 +211,10 @@ class mail_ui
try try
{ {
$this->mail_bo->subscribe($folderName, $status); $this->mail_bo->subscribe($folderName, $status);
} catch (Exception $ex) } catch (Exception $e)
{ {
$result = false; $result = false;
error_log(__METHOD__.__LINE__."() error ".$ex."happend while subscribing to folder ". $folderName ); error_log(__METHOD__.__LINE__."() error ".$e->getMessage()." happend while subscribing to folder ". $folderName );
} }
} }
@ -223,10 +223,10 @@ class mail_ui
try try
{ {
$this->mail_bo->subscribe($folderName, $status); $this->mail_bo->subscribe($folderName, $status);
} catch (Exception $ex) } catch (Exception $e)
{ {
$result = false; $result = false;
error_log(__METHOD__.__LINE__."() error ".$ex."happend while unsubscribing of folder ". $folderName ); error_log(__METHOD__.__LINE__."() error ".$e->getMessage()." happend while unsubscribing of folder ". $folderName );
} }
} }
return $result; return $result;