From f88c93a301aea945c8324d91f515e86f05fb7d48 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 5 Mar 2013 15:51:32 +0100 Subject: [PATCH] fix variable typo (undefined variable) in cron_autoresponder; don't use webfonts by default Signed-off-by: Michael Kaufmann (d00p) --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 6 +++--- scripts/jobs/cron_autoresponder.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index b76535a0..b168b17a 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -533,7 +533,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'allow_preset', '1'), ('panel', 'allow_preset_admin', '0'), ('panel', 'password_regex', ''), - ('panel', 'use_webfonts', '1'), + ('panel', 'use_webfonts', '0'), ('panel', 'webfont', 'Numans'), ('panel', 'version', '0.9.28-svn6'); diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 2015ca15..a7670210 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2003,8 +2003,8 @@ if(isFroxlorVersion('0.9.28-svn5')) { $db->query("UPDATE `panel_admins` SET `tickets_see_all` = '1' WHERE `adminid` = '".$userinfo['adminid']."';"); lastStepStatus(0); - showUpdateStep("Inserting new webfont-settings", true); - $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'use_webfonts', '1');"); + showUpdateStep("Inserting new panel webfont-settings (default: off)", true); + $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'use_webfonts', '0');"); $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'webfont', 'Numans');"); lastStepStatus(0); @@ -2015,6 +2015,6 @@ if(isFroxlorVersion('0.9.28-svn5')) { } $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('nginx', 'fastcgiparams', '".$db->escape($fastcgiparams)."')"); lastStepStatus(0); - + updateToVersion('0.9.28-svn6'); } diff --git a/scripts/jobs/cron_autoresponder.php b/scripts/jobs/cron_autoresponder.php index 00861e1e..863ce376 100644 --- a/scripts/jobs/cron_autoresponder.php +++ b/scripts/jobs/cron_autoresponder.php @@ -104,12 +104,12 @@ if($db->num_rows($result) > 0) $lcount = 0; $content = array(); $handle = @fopen($fullFilename, "r"); if ($handle) { // 1023 lines of an email should be enough to analyze it - while (($count++<1023) && (($buffer = fgets($handle)) !== false)) { - $content[]=$buffer; + while (($lcount++<1023) && (($buffer = fgets($handle)) !== false)) { + $content[]=$buffer; } fclose($handle); } - + // error reading mail contents or just empty if(count($content) == 0) {