Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory-plugins
Commits
738781ee
Verified
Commit
738781ee
authored
5 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(cyrus) Fix syntax for subfolders creation
Domain should go at the end issue
#5797
parent
bf0aac94
dev
6104-mail-methods-refactor
6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued
6237-add-requiredattrs-array-to-the-webservice-informations
6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines
6250-supann-configuration-backend-requires-account-life-cycle-section
6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure
6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id
6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5
6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2
6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases
6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user
6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
+11
-1
...s/personal/mail/mail-methods/class_mail-methods-cyrus.inc
with
11 additions
and
1 deletion
+11
-1
cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
+
11
−
1
View file @
738781ee
...
@@ -276,11 +276,21 @@ class mailMethodCyrus extends mailMethod
...
@@ -276,11 +276,21 @@ class mailMethodCyrus extends mailMethod
if
(
$folders
!==
NULL
)
{
if
(
$folders
!==
NULL
)
{
$cyrus_delim
=
(
$this
->
cyrusUseSlashes
?
'/'
:
'.'
);
$cyrus_delim
=
(
$this
->
cyrusUseSlashes
?
'/'
:
'.'
);
/* We need to move the domain to the end
* Example: user/john/Drafts@domain.com instead of user/john@domain.com/Drafts
*/
$account
=
$this
->
account_id
;
$suffix
=
''
;
if
(
preg_match
(
'/^(.+)(\@[^@]+)$/'
,
$this
->
account_id
,
$m
))
{
$account
=
$m
[
1
];
$suffix
=
$m
[
2
];
}
// Walk thru list of specified folders
// Walk thru list of specified folders
foreach
(
$folders
as
$folder
)
{
foreach
(
$folders
as
$folder
)
{
@
DEBUG
(
DEBUG_MAIL
,
__LINE__
,
__FUNCTION__
,
__FILE__
,
'<b>'
.
$this
->
account_id
.
'</b>'
,
@
DEBUG
(
DEBUG_MAIL
,
__LINE__
,
__FUNCTION__
,
__FILE__
,
'<b>'
.
$this
->
account_id
.
'</b>'
,
'<b>IMAP: Add/Update account folder '
.
$folder
.
'</b> on server :'
.
$this
->
parent
->
gosaMailServer
);
'<b>IMAP: Add/Update account folder '
.
$folder
.
'</b> on server :'
.
$this
->
parent
->
gosaMailServer
);
if
(
!
imap_createmailbox
(
$this
->
imap_handle
,
$cfg
[
'connect'
]
.
$
this
->
account
_id
.
$cyrus_delim
.
$folder
))
{
if
(
!
imap_createmailbox
(
$this
->
imap_handle
,
$cfg
[
'connect'
]
.
$account
.
$cyrus_delim
.
$folder
.
$suffix
))
{
$this
->
error
=
imap_last_error
();
$this
->
error
=
imap_last_error
();
return
FALSE
;
return
FALSE
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets