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

remove unnecessary variable $entry in error-message in autoresponder, thx to monotek for finding thi

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2011-01-04 20:16:25 +00:00
parent 7057984534
commit c25ad76200
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
customer_ftp.php
View File

@@ -250,13 +250,24 @@ elseif($page == 'accounts')
if($settings['customer']['ftpatdomain'] == '1') if($settings['customer']['ftpatdomain'] == '1')
{ {
$domainlist = array();
$domains = ''; $domains = '';
$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'"); $result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
while($row_domain = $db->fetch_array($result_domains)) while($row_domain = $db->fetch_array($result_domains))
{ {
$domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']); $domainlist[] = $row_domain['domain'];
}
sort($domainlist);
if(isset($domainlist[0]) && $domainlist[0] != '')
{
foreach($domainlist as $dom)
{
$domains .= makeoption($idna_convert->decode($dom), $dom);
}
} }
} }

2
scripts/jobs/cron_autoresponder.php
View File

@@ -201,7 +201,7 @@ if($db->num_rows($result) > 0)
//error while parsing mail //error while parsing mail
if($to == '' || $from == '') if($to == '' || $from == '')
{ {
$cronlog->logAction(CRON_ACTION, LOG_WARNING, "No valid headers found in mail to parse: " . $entry); $cronlog->logAction(CRON_ACTION, LOG_WARNING, "No valid headers found in mail to parse");
continue; continue;
} }