From c25ad7620032ff40bff595b3775baf71d1cf177a Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 4 Jan 2011 20:16:25 +0000 Subject: [PATCH] remove unnecessary variable $entry in error-message in autoresponder, thx to monotek for finding thi --- customer_ftp.php | 13 ++++++++++++- scripts/jobs/cron_autoresponder.php | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/customer_ftp.php b/customer_ftp.php index 10dcf7a8..d9fb70ef 100644 --- a/customer_ftp.php +++ b/customer_ftp.php @@ -250,13 +250,24 @@ elseif($page == 'accounts') if($settings['customer']['ftpatdomain'] == '1') { + $domainlist = array(); $domains = ''; $result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'"); 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); + } } } diff --git a/scripts/jobs/cron_autoresponder.php b/scripts/jobs/cron_autoresponder.php index 0b0fa8c2..ea60a2fb 100644 --- a/scripts/jobs/cron_autoresponder.php +++ b/scripts/jobs/cron_autoresponder.php @@ -201,7 +201,7 @@ if($db->num_rows($result) > 0) //error while parsing mail 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; }