Skip to content

Commit 4721d9d

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
2 parents e21ba7a + 891c025 commit 4721d9d

File tree

7 files changed

+100
-9
lines changed

7 files changed

+100
-9
lines changed

‎install/sql/incremental/upd_0003.sql‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
ALTER TABLE `software_package` ADD `package_remote_functions` TEXT NULL AFTER `package_requires_db`;
21
ALTER TABLE `client` ADD `customer_no` VARCHAR( 64 ) NULL AFTER `contact_name` , ADD `vat_id` VARCHAR( 64 ) NULL AFTER `customer_no`;

‎install/sql/incremental/upd_0050.sql‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,19 @@
1+
CREATE TABLE IF NOT EXISTS `dns_slave` (
2+
`id` int(10) unsigned NOT NULL auto_increment,
3+
`sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
4+
`sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
5+
`sys_perm_user` varchar(5) NOT NULL DEFAULT '',
6+
`sys_perm_group` varchar(5) NOT NULL DEFAULT '',
7+
`sys_perm_other` varchar(5) NOT NULL DEFAULT '',
8+
`server_id` int(11) NOT NULL default '1',
9+
`origin` varchar(255) NOT NULL DEFAULT '',
10+
`ns` varchar(255) NOT NULL DEFAULT '',
11+
`active` enum('N','Y') NOT NULL DEFAULT 'N',
12+
`xfer` varchar(255) NOT NULL DEFAULT '',
13+
PRIMARY KEY (`id`),
14+
KEY `origin` (`origin`),
15+
KEY `active` (`active`)
16+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
17+
118
ALTER TABLE `dns_slave` DROP INDEX `origin`;
219
ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);

‎install/sql/incremental/upd_0071.sql‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ ALTER TABLE `client`
33
ALTER TABLE `client_template`
44
ADD `limit_database_quota` int(11) NOT NULL default '-1' AFTER `limit_database`;
55
ALTER TABLE `web_database`
6-
ADD `database_quota` int(11) unsigned DEFAULT NULL AFTER `database_name_prefix`,
7-
ADD `last_quota_notification` date NULL default NULL;
6+
ADD `database_quota` int(11) unsigned DEFAULT NULL AFTER `database_name_prefix`;

‎install/sql/incremental/upd_0074.sql‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,6 @@ ALTER TABLE `shell_user`
158158
CHANGE `chroot` `chroot` varchar(255) NOT NULL DEFAULT '',
159159
CHANGE `ssh_rsa` `ssh_rsa` text;
160160

161-
ALTER TABLE `software_package`
162-
CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',
163-
CHANGE `package_title` `package_title` varchar(64) NOT NULL DEFAULT '',
164-
CHANGE `package_key` `package_key` varchar(255) NOT NULL DEFAULT '';
165-
166161
ALTER TABLE `software_update`
167162
CHANGE `software_repo_id` `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
168163
CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',

‎install/sql/incremental/upd_0075.sql‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
ALTER TABLE `web_database` ADD `last_quota_notification` date NULL default NULL AFTER `database_quota`;
2+
3+
ALTER TABLE `ftp_user` CHANGE `username_prefix` `username_prefix` varchar(50) NOT NULL DEFAULT '';
4+
5+
ALTER TABLE `mail_domain` CHANGE `dkim` `dkim` enum('n','y') NOT NULL DEFAULT 'n';
6+
ALTER TABLE `mail_forwarding` CHANGE `destination` `destination` text;
7+
ALTER TABLE `mail_user`
8+
CHANGE `uid` `uid` int(11) unsigned NOT NULL DEFAULT '5000',
9+
CHANGE `gid` `gid` int(11) unsigned NOT NULL DEFAULT '5000';
10+
11+
ALTER TABLE `server`
12+
CHANGE `proxy_server` `proxy_server` tinyint(1) NOT NULL DEFAULT '0',
13+
CHANGE `firewall_server` `firewall_server` tinyint(1) NOT NULL DEFAULT '0',
14+
CHANGE `dbversion` `dbversion` int(11) unsigned NOT NULL DEFAULT '1';
15+
16+
ALTER TABLE `server_ip`
17+
CHANGE `virtualhost_port` `virtualhost_port` varchar(255) DEFAULT '80,443';
18+
19+
ALTER TABLE `shell_user`
20+
CHANGE `username_prefix` `username_prefix` varchar(50) NOT NULL DEFAULT '';
21+
22+
ALTER TABLE `client` ADD `limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1' AFTER `default_slave_dnsserver`;
23+
ALTER TABLE `client_template` ADD `limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1' AFTER `limit_dns_zone`;
24+
25+
ALTER TABLE `client`
26+
CHANGE `id_rsa` `id_rsa` varchar(2000) NOT NULL DEFAULT '',
27+
CHANGE `ssh_rsa` `ssh_rsa` varchar(600) NOT NULL DEFAULT '';
28+
29+
ALTER TABLE `software_package` CHANGE `software_repo_id` `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0';
30+
ALTER TABLE `software_package` ADD `package_installable` enum('yes','no','key') NOT NULL default 'yes' AFTER `package_type`;
31+
ALTER TABLE `software_package` ADD `package_requires_db` enum('no','mysql') NOT NULL default 'no' AFTER `package_installable`;
32+
ALTER TABLE `software_package` ADD `package_remote_functions` TEXT NULL AFTER `package_requires_db`;
33+
ALTER TABLE `software_package` ADD `package_key` varchar(255) NOT NULL DEFAULT '' AFTER `package_remote_functions`;
34+
ALTER TABLE `software_package` ADD `package_config` text AFTER `package_key`;
35+
36+
ALTER TABLE `software_package`
37+
CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',
38+
CHANGE `package_title` `package_title` varchar(64) NOT NULL DEFAULT '',
39+
CHANGE `package_key` `package_key` varchar(255) NOT NULL DEFAULT '';
40+
41+
INSERT IGNORE INTO `sys_config` (`group`, `name`, `value`) VALUES ('interface', 'session_timeout', '0');
42+
43+
ALTER TABLE `sys_datalog` CHANGE `status` `status` set('pending','ok','warning','error') NOT NULL DEFAULT 'ok';
44+
45+
ALTER TABLE `sys_session` CHANGE `session_id` `session_id` varchar(64) NOT NULL DEFAULT '';
46+
47+
ALTER TABLE `sys_user` CHANGE `language` `language` varchar(2) NOT NULL DEFAULT 'en';
48+
ALTER TABLE `sys_user`
49+
ADD `id_rsa` varchar(2000) NOT NULL DEFAULT '' AFTER `client_id`,
50+
ADD `ssh_rsa` varchar(600) NOT NULL DEFAULT '' AFTER `id_rsa`;
51+
52+
ALTER TABLE `webdav_user` CHANGE `username_prefix` `username_prefix` varchar(50) NOT NULL DEFAULT '';
53+
54+
ALTER TABLE `web_database` CHANGE `database_name_prefix` `database_name_prefix` varchar(50) NOT NULL DEFAULT '';
55+
56+
ALTER TABLE `web_database_user` CHANGE `database_user_prefix` `database_user_prefix` varchar(50) NOT NULL DEFAULT '';
57+
58+
ALTER TABLE `web_domain` DROP COLUMN `document_root_www`;
59+
ALTER TABLE `web_domain`
60+
CHANGE `ssl_key` `ssl_key` mediumtext,
61+
CHANGE `apache_directives` `apache_directives` mediumtext,
62+
CHANGE `php_open_basedir` `php_open_basedir` mediumtext,
63+
CHANGE `custom_php_ini` `custom_php_ini` mediumtext;
64+
65+
CREATE TABLE IF NOT EXISTS `dns_slave` (
66+
`id` int(10) unsigned NOT NULL auto_increment,
67+
`sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
68+
`sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
69+
`sys_perm_user` varchar(5) NOT NULL DEFAULT '',
70+
`sys_perm_group` varchar(5) NOT NULL DEFAULT '',
71+
`sys_perm_other` varchar(5) NOT NULL DEFAULT '',
72+
`server_id` int(11) NOT NULL default '1',
73+
`origin` varchar(255) NOT NULL DEFAULT '',
74+
`ns` varchar(255) NOT NULL DEFAULT '',
75+
`active` enum('N','Y') NOT NULL DEFAULT 'N',
76+
`xfer` varchar(255) NOT NULL DEFAULT '',
77+
PRIMARY KEY (`id`),
78+
UNIQUE KEY `slave` (`origin`,`server_id`),
79+
KEY `active` (`active`)
80+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,6 +1765,7 @@ CREATE TABLE `web_database` (
17651765
`database_name` varchar(64) DEFAULT NULL,
17661766
`database_name_prefix` varchar(50) NOT NULL default '',
17671767
`database_quota` int(11) unsigned DEFAULT NULL,
1768+
`last_quota_notification` date NULL default NULL,
17681769
`database_user_id` int(11) unsigned DEFAULT NULL,
17691770
`database_ro_user_id` int(11) unsigned DEFAULT NULL,
17701771
`database_charset` varchar(64) DEFAULT NULL,

‎interface/web/client/client_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ function onAfterInsert() {
364364
//* Get sender address
365365
if($app->auth->is_admin()) {
366366
$app->uses('getconf');
367-
$system_config = $app->getconf->get_global_config();
367+
$system_config = $app->getconf->get_global_config('mail');
368368
$from = $system_config['admin_mail'];
369369
} else {
370370
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);

0 commit comments

Comments
 (0)