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
baeebc03
Unverified
Commit
baeebc03
authored
4 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(mail) Remove unused fdMailSharedPrefix option
issue
#6104
parent
25279528
6104-mail-methods-refactor
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
mail/config/mail/class_mailPluginConfig.inc
+0
-5
mail/config/mail/class_mailPluginConfig.inc
mail/contrib/openldap/mail-fd-conf.schema
+1
-0
mail/contrib/openldap/mail-fd-conf.schema
mail/personal/mail/class_mail-methods.inc
+0
-13
mail/personal/mail/class_mail-methods.inc
with
1 addition
and
18 deletions
+1
-18
mail/config/mail/class_mailPluginConfig.inc
+
0
−
5
View file @
baeebc03
...
@@ -61,11 +61,6 @@ class mailPluginConfig extends simplePlugin
...
@@ -61,11 +61,6 @@ class mailPluginConfig extends simplePlugin
'fdImapTimeout'
,
FALSE
,
'fdImapTimeout'
,
FALSE
,
0
,
FALSE
0
,
FALSE
),
),
new
StringAttribute
(
_
(
'Shared prefix'
),
_
(
'Prefix to add for mail shared folders.'
),
'fdMailSharedPrefix'
),
]
]
],
],
];
];
...
...
This diff is collapsed.
Click to expand it.
mail/contrib/openldap/mail-fd-conf.schema
+
1
−
0
View file @
baeebc03
...
@@ -61,6 +61,7 @@ attributetype ( 1.3.6.1.4.1.38414.10.10.8 NAME 'fdImapTimeout'
...
@@ -61,6 +61,7 @@ attributetype ( 1.3.6.1.4.1.38414.10.10.8 NAME 'fdImapTimeout'
attributetype ( 1.3.6.1.4.1.38414.10.10.9 NAME 'fdMailSharedPrefix'
attributetype ( 1.3.6.1.4.1.38414.10.10.9 NAME 'fdMailSharedPrefix'
DESC 'FusionDirectory - Prefix for mail shared folders'
DESC 'FusionDirectory - Prefix for mail shared folders'
OBSOLETE
EQUALITY caseExactIA5Match
EQUALITY caseExactIA5Match
SUBSTR caseExactIA5SubstringsMatch
SUBSTR caseExactIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
...
...
This diff is collapsed.
Click to expand it.
mail/personal/mail/class_mail-methods.inc
+
0
−
13
View file @
baeebc03
...
@@ -62,13 +62,6 @@ class mailMethod
...
@@ -62,13 +62,6 @@ class mailMethod
/* Create accounts with '/' instead of '.' */
/* Create accounts with '/' instead of '.' */
protected
$useSlashesInId
=
FALSE
;
protected
$useSlashesInId
=
FALSE
;
/* gosaSharedFolderTarget settings,
* E.g.
* For an accountID like: 'share/john.folder@fusiondirectory.org' the value 'dummy+'
* will result in gosaSharedFolderTarget: dummy+share/john.folder@fusiondirectory.org
*/
protected
$mailSharedPrefix
=
''
;
/* Features */
/* Features */
protected
$enableQuota
=
TRUE
;
protected
$enableQuota
=
TRUE
;
protected
$enableVacation
=
TRUE
;
protected
$enableVacation
=
TRUE
;
...
@@ -167,12 +160,6 @@ class mailMethod
...
@@ -167,12 +160,6 @@ class mailMethod
'<b>MAIL:</b> Shared folder creation set to'
);
'<b>MAIL:</b> Shared folder creation set to'
);
$this
->
share_id
=
$tmp
;
$this
->
share_id
=
$tmp
;
}
}
$tmp
=
$config
->
get_cfg_value
(
'mailSharedPrefix'
);
if
(
!
empty
(
$tmp
))
{
@
DEBUG
(
DEBUG_MAIL
,
__LINE__
,
__FUNCTION__
,
__FILE__
,
'<i>'
.
$tmp
.
'</i>'
,
'<b>MAIL:</b> Shared folder prefix set to'
);
$this
->
mailSharedPrefix
=
$tmp
;
}
$this
->
build_account_id
();
$this
->
build_account_id
();
$this
->
initial_account_id
=
$this
->
account_id
;
$this
->
initial_account_id
=
$this
->
account_id
;
...
...
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