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

Merge remote-tracking branch 'origin/0.9.31.2' and fix install-SQL file

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-24 15:29:57 +01:00
parent 9fca6a7953 cffd16a6a1
commit da371fa560
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
customer_extras.php
View File

@@ -412,7 +412,6 @@ if ($page == 'overview') {
|| ($error500path != $result['error500path']) || ($error500path != $result['error500path'])
|| ($options_cgi != $result['options_cgi']) || ($options_cgi != $result['options_cgi'])
) { ) {
inserttask('1'); inserttask('1');
$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTACCESS . "` $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTACCESS . "`
SET `options_indexes` = :options_indexes, SET `options_indexes` = :options_indexes,

11
install/froxlor.sql
View File

@@ -1,3 +1,4 @@
DROP TABLE IF EXISTS `ftp_groups`;
CREATE TABLE `ftp_groups` ( CREATE TABLE `ftp_groups` (
`id` int(20) NOT NULL auto_increment, `id` int(20) NOT NULL auto_increment,
`groupname` varchar(60) NOT NULL default '', `groupname` varchar(60) NOT NULL default '',
@@ -331,8 +332,6 @@ CREATE TABLE `panel_settings` (
PRIMARY KEY (`settingid`) PRIMARY KEY (`settingid`)
) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci; ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('catchall', 'catchall_enabled', '1'), ('catchall', 'catchall_enabled', '1'),
('session', 'allow_multiple_login', '0'), ('session', 'allow_multiple_login', '0'),
@@ -494,10 +493,10 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('system', 'customer_ssl_path', '/etc/ssl/froxlor-custom/'), ('system', 'customer_ssl_path', '/etc/ssl/froxlor-custom/'),
('system', 'allow_error_report_admin', '1'), ('system', 'allow_error_report_admin', '1'),
('system', 'allow_error_report_customer', '0'), ('system', 'allow_error_report_customer', '0'),
('system', 'mdalog' '/var/log/mail.log'), ('system', 'mdalog', '/var/log/mail.log'),
('system', 'mtalog' '/var/log/mail.log'), ('system', 'mtalog', '/var/log/mail.log'),
('system', 'mdaserver' 'dovecot'), ('system', 'mdaserver', 'dovecot'),
('system', 'mtaserver' 'postfix'), ('system', 'mtaserver', 'postfix'),
('system', 'mailtraffic_enabled', '1'), ('system', 'mailtraffic_enabled', '1'),
('panel', 'decimal_places', '4'), ('panel', 'decimal_places', '4'),
('panel', 'adminmail', 'admin@SERVERNAME'), ('panel', 'adminmail', 'admin@SERVERNAME'),