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

Merge remote-tracking branch 'origin/0.9.31'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-08 10:22:21 +01:00
parent 0c0c8c63a7 dde6581f9c
commit 0f80e66a01
10 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
install/froxlor.sql
View File

@@ -362,6 +362,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('dkim', 'dkim_domains', 'domains'),
('dkim', 'dkim_dkimkeys', 'dkim-keys.conf'),
('dkim', 'dkimrestart_command', '/etc/init.d/dkim-filter restart'),
('admin', 'show_news_feed', '1'),
('admin', 'show_version_login', '0'),
('admin', 'show_version_footer', '0'),
('spf', 'use_spf', '0'),

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

@@ -2521,6 +2521,22 @@ if (isFroxlorVersion('0.9.31-dev6')) {
}
if (isFroxlorVersion('0.9.31-rc1')) {
showUpdateStep("Updating from 0.9.31-rc1 to 0.9.31-rc2");
lastStepStatus(0);
$update_admin_news_feed = isset($_POST['update_admin_news_feed']) ? (int)$_POST['update_admin_news_feed'] : '1';
showUpdateStep("Adding new news-feed option");
$ins_stmt = Database::prepare("
INSERT INTO `".TABLE_PANEL_SETTINGS."` SET `settinggroup` = 'admin', `varname` = 'show_news_feed', `value` = :value
");
Database::pexecute($ins_stmt, array('value' => $update_admin_news_feed));
lastStepStatus(0);
updateToVersion('0.9.31-rc2');
}
if (isFroxlorVersion('0.9.31-rc2')) {
showUpdateStep("Updating from 0.9.31-rc1 to 0.9.31-rc99");
lastStepStatus(0);

9
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -601,4 +601,13 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
$question.= makeyesno('update_error_report_customer', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if (versionInUpdate($current_version, '0.9.31-rc2')) {
$has_preconfig = true;
$description = 'You can enable/disable the display/usage of the news-feed for admins<br /><br />';
$question = '<strong>Do you want to enable the news-feed for admins? (default: yes):</strong>&nbsp;';
$question.= makeyesno('update_admin_news_feed', '1', '0', '1').'<br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}