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

fix variable typo (undefined variable) in cron_autoresponder; don't use webfonts by default

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-03-05 15:51:32 +01:00
parent 92aea9d27e
commit f88c93a301
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/froxlor.sql
View File

@@ -533,7 +533,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('panel', 'allow_preset', '1'), ('panel', 'allow_preset', '1'),
('panel', 'allow_preset_admin', '0'), ('panel', 'allow_preset_admin', '0'),
('panel', 'password_regex', ''), ('panel', 'password_regex', ''),
('panel', 'use_webfonts', '1'), ('panel', 'use_webfonts', '0'),
('panel', 'webfont', 'Numans'), ('panel', 'webfont', 'Numans'),
('panel', 'version', '0.9.28-svn6'); ('panel', 'version', '0.9.28-svn6');

6
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -2003,8 +2003,8 @@ if(isFroxlorVersion('0.9.28-svn5')) {
$db->query("UPDATE `panel_admins` SET `tickets_see_all` = '1' WHERE `adminid` = '".$userinfo['adminid']."';"); $db->query("UPDATE `panel_admins` SET `tickets_see_all` = '1' WHERE `adminid` = '".$userinfo['adminid']."';");
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Inserting new webfont-settings", true); showUpdateStep("Inserting new panel webfont-settings (default: off)", true);
$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'use_webfonts', '1');"); $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');"); $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'webfont', 'Numans');");
lastStepStatus(0); 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)."')"); $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('nginx', 'fastcgiparams', '".$db->escape($fastcgiparams)."')");
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.28-svn6'); updateToVersion('0.9.28-svn6');
} }

6
scripts/jobs/cron_autoresponder.php
View File

@@ -104,12 +104,12 @@ if($db->num_rows($result) > 0)
$lcount = 0; $content = array(); $handle = @fopen($fullFilename, "r"); $lcount = 0; $content = array(); $handle = @fopen($fullFilename, "r");
if ($handle) { if ($handle) {
// 1023 lines of an email should be enough to analyze it // 1023 lines of an email should be enough to analyze it
while (($count++<1023) && (($buffer = fgets($handle)) !== false)) { while (($lcount++<1023) && (($buffer = fgets($handle)) !== false)) {
$content[]=$buffer; $content[]=$buffer;
} }
fclose($handle); fclose($handle);
} }
// error reading mail contents or just empty // error reading mail contents or just empty
if(count($content) == 0) if(count($content) == 0)
{ {