maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merged upstream/master to encrypted passwords, refs #852

Browse Source 
Signed-off-by: Andreas Burchert (scarya) <scarya@froxlor.org>
This commit is contained in:
Andreas Burchert (scarya)
2012-07-25 09:01:52 +02:00
parent 46e788f875 b8fefe6020
commit 5b15de8e9a
11 changed files with 89 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/functions/filedir/function.maildirExists.php
View File

@@ -30,7 +30,10 @@ function maildirExists($result = null)
{
$loginname = getCustomerDetail($result['customerid'], 'loginname');
if($loginname !== false) {
$maildir = makeCorrectDir($settings['system']['vmail_homedir'] .'/'. $loginname .'/'. $result['email_full']);
$email_user=substr($result['email_full'],0,strrpos($result['email_full'],"@"));
$email_domain=substr($result['email_full'],strrpos($result['email_full'],"@")+1);
$maildirname=trim($settings['system']['vmail_maildirname']);
$maildir = makeCorrectDir($settings['system']['vmail_homedir'] .'/'. $loginname .'/'. $email_domain .'/'. $email_user . (!empty($maildirname)?'/'.$maildirname:''));
if(@file_exists($maildir)) {
return true;
}

4
lib/functions/froxlor/function.CronjobFunctions.php
View File

@@ -209,6 +209,10 @@ function getOutstandingTasks()
$task_desc = $lng['tasks']['deleting_customerfiles'];
$task_desc = str_replace('%loginname%', $loginname, $task_desc);
}
elseif($row['type'] == '7')
{
$task_desc = $lng['tasks']['remove_emailacc_files'];
}
/*
* Set FS - quota
*/