@@ -119,27 +119,6 @@ function user_insert($event_name,$data) {
119119 //exec("su -c 'maildirmake ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
120120 $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ]);
121121
122- if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Sent ' )) {
123- //exec("su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
124- //$app->log('Created submaildir Sent: '."su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
125- $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Sent ' );
126- }
127- if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Drafts ' )) {
128- //exec("su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
129- //$app->log('Created submaildir Drafts: '."su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
130- $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Drafts ' );
131- }
132- if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Trash ' )) {
133- //exec("su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
134- //$app->log('Created submaildir Trash: '."su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
135- $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Trash ' );
136- }
137- if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Junk ' )) {
138- //exec("su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
139- //$app->log('Created submaildir Junk: '."su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
140- $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Junk ' );
141- }
142-
143122 exec ('chown -R ' .$ mail_config ['mailuser_name ' ].': ' .$ mail_config ['mailuser_group ' ].' ' .escapeshellcmd ($ data ['new ' ]['maildir ' ]));
144123 $ app ->log ("Set ownership on " .escapeshellcmd ($ data ['new ' ]['maildir ' ]),LOGLEVEL_DEBUG );
145124
@@ -150,6 +129,27 @@ function user_insert($event_name,$data) {
150129 }
151130 }
152131
132+ if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Sent ' )) {
133+ //exec("su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
134+ //$app->log('Created submaildir Sent: '."su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
135+ $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Sent ' );
136+ }
137+ if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Drafts ' )) {
138+ //exec("su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
139+ //$app->log('Created submaildir Drafts: '."su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
140+ $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Drafts ' );
141+ }
142+ if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Trash ' )) {
143+ //exec("su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
144+ //$app->log('Created submaildir Trash: '."su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
145+ $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Trash ' );
146+ }
147+ if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Junk ' )) {
148+ //exec("su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
149+ //$app->log('Created submaildir Junk: '."su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
150+ $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Junk ' );
151+ }
152+
153153 //* Set the maildir quota
154154 if (is_dir ($ data ['new ' ]['maildir ' ].'/new ' ) && $ mail_config ['pop3_imap_daemon ' ] != 'dovecot ' ) {
155155 exec ("su -c 'maildirmake -q " .$ data ['new ' ]['quota ' ]."S " .escapeshellcmd ($ data ['new ' ]['maildir ' ])."' " .$ mail_config ['mailuser_name ' ]);
@@ -207,27 +207,6 @@ function user_update($event_name,$data) {
207207 //$app->log("Created Maildir "."su -c 'maildirmake ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
208208 $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ]);
209209
210- if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Sent ' )) {
211- //exec("su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
212- //$app->log('Created submaildir Sent: '."su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
213- $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Sent ' );
214- }
215- if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Drafts ' )) {
216- //exec("su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
217- //$app->log('Created submaildir Drafts: '."su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
218- $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Drafts ' );
219- }
220- if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Trash ' )) {
221- //exec("su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
222- //$app->log('Created submaildir Trash: '."su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
223- $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Trash ' );
224- }
225- if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Junk ' )) {
226- //exec("su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
227- //$app->log('Created submaildir Junk: '."su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
228- $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Junk ' );
229- }
230-
231210 exec ('chown -R ' .$ mail_config ['mailuser_name ' ].': ' .$ mail_config ['mailuser_group ' ].' ' .escapeshellcmd ($ data ['new ' ]['maildir ' ]));
232211 $ app ->log ("Set ownership on " .escapeshellcmd ($ data ['new ' ]['maildir ' ]),LOGLEVEL_DEBUG );
233212 //* This is to fix the maildrop quota not being rebuilt after the quota is changed.
@@ -237,6 +216,27 @@ function user_update($event_name,$data) {
237216 }
238217 }
239218
219+ if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Sent ' )) {
220+ //exec("su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
221+ //$app->log('Created submaildir Sent: '."su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
222+ $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Sent ' );
223+ }
224+ if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Drafts ' )) {
225+ //exec("su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
226+ //$app->log('Created submaildir Drafts: '."su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
227+ $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Drafts ' );
228+ }
229+ if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Trash ' )) {
230+ //exec("su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
231+ //$app->log('Created submaildir Trash: '."su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
232+ $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Trash ' );
233+ }
234+ if (!is_dir ($ data ['new ' ]['maildir ' ].'/.Junk ' )) {
235+ //exec("su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
236+ //$app->log('Created submaildir Junk: '."su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
237+ $ app ->system ->maildirmake ($ maildomain_path ,$ mail_config ['mailuser_name ' ],'Junk ' );
238+ }
239+
240240 // Move mailbox, if domain has changed and delete old mailbox
241241 if ($ data ['new ' ]['maildir ' ] != $ data ['old ' ]['maildir ' ] && is_dir ($ data ['old ' ]['maildir ' ])) {
242242 if (is_dir ($ data ['new ' ]['maildir ' ])) {
0 commit comments