Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ISPConfig 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ISPConfig
ISPConfig 3
Commits
d2212dda
Commit
d2212dda
authored
14 years ago
by
tbrehm
Browse files
Options
Downloads
Patches
Plain Diff
Fixed bug in maildirmake function:
http://www.howtoforge.com/forums/showthread.php?t=48890
parent
6fc833c0
No related branches found
No related tags found
2 merge requests
!46
Master
,
!21
Master
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
server/lib/classes/system.inc.php
+8
-6
8 additions, 6 deletions
server/lib/classes/system.inc.php
with
8 additions
and
6 deletions
server/lib/classes/system.inc.php
+
8
−
6
View file @
d2212dda
...
@@ -1187,13 +1187,13 @@ class system{
...
@@ -1187,13 +1187,13 @@ class system{
global
$app
;
global
$app
;
if
(
$subfolder
!=
''
)
{
if
(
$subfolder
!=
''
)
{
$dir
=
escapeshell
arg
(
$maildir_path
.
'/.'
.
$subfolder
);
$dir
=
escapeshell
cmd
(
$maildir_path
.
'/.'
.
$subfolder
);
}
else
{
}
else
{
$dir
=
escapeshell
arg
(
$maildir_path
);
$dir
=
escapeshell
cmd
(
$maildir_path
);
}
}
if
(
$user
!=
''
&&
$user
!=
'root'
&&
$this
->
is_user
(
$user
))
{
if
(
$user
!=
''
&&
$user
!=
'root'
&&
$this
->
is_user
(
$user
))
{
$user
=
escapeshell
arg
(
$user
);
$user
=
escapeshell
cmd
(
$user
);
// I assume that the name of the (vmail group) is the same as the name of the mail user in ISPConfig 3
// I assume that the name of the (vmail group) is the same as the name of the mail user in ISPConfig 3
$group
=
$user
;
$group
=
$user
;
chown
(
$dir
,
$user
);
chown
(
$dir
,
$user
);
...
@@ -1214,18 +1214,20 @@ class system{
...
@@ -1214,18 +1214,20 @@ class system{
chmod
(
$dir
,
0700
);
chmod
(
$dir
,
0700
);
/*
if($user != '' && $this->is_user($user) && $user != 'root') {
if($user != '' && $this->is_user($user) && $user != 'root') {
$user
=
escapeshell
arg
(
$user
);
$user = escapeshell
cmd
($user);
// I assume that the name of the (vmail group) is the same as the name of the mail user in ISPConfig 3
// I assume that the name of the (vmail group) is the same as the name of the mail user in ISPConfig 3
$group = $user;
$group = $user;
exec("chown $user:$group $dir $dir_cur $dir_new $dir_tmp");
exec("chown $user:$group $dir $dir_cur $dir_new $dir_tmp");
}
}
*/
//* Add the subfolder to the subscriptions and courierimapsubscribed files
//* Add the subfolder to the subscriptions and courierimapsubscribed files
if
(
$subfolder
!=
''
)
{
if
(
$subfolder
!=
''
)
{
// Courier
// Courier
if
(
!
is_file
(
$maildir_path
.
'/courierimapsubscribed'
))
{
if
(
!
is_file
(
$maildir_path
.
'/courierimapsubscribed'
))
{
$tmp_file
=
escapeshell
arg
(
$maildir_path
.
'/courierimapsubscribed'
);
$tmp_file
=
escapeshell
cmd
(
$maildir_path
.
'/courierimapsubscribed'
);
touch
(
$tmp_file
);
touch
(
$tmp_file
);
chmod
(
$tmp_file
,
0744
);
chmod
(
$tmp_file
,
0744
);
chown
(
$tmp_file
,
'vmail'
);
chown
(
$tmp_file
,
'vmail'
);
...
@@ -1235,7 +1237,7 @@ class system{
...
@@ -1235,7 +1237,7 @@ class system{
// Dovecot
// Dovecot
if
(
!
is_file
(
$maildir_path
.
'/subscriptions'
))
{
if
(
!
is_file
(
$maildir_path
.
'/subscriptions'
))
{
$tmp_file
=
escapeshell
arg
(
$maildir_path
.
'/subscriptions'
);
$tmp_file
=
escapeshell
cmd
(
$maildir_path
.
'/subscriptions'
);
touch
(
$tmp_file
);
touch
(
$tmp_file
);
chmod
(
$tmp_file
,
0744
);
chmod
(
$tmp_file
,
0744
);
chown
(
$tmp_file
,
'vmail'
);
chown
(
$tmp_file
,
'vmail'
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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