Skip to content

Commit 75b7fc5

Browse files
author
Marius Cramer
committed
- ported some patches
1 parent af4c7ab commit 75b7fc5

File tree

9 files changed

+33
-9
lines changed

9 files changed

+33
-9
lines changed

‎install/lib/update.lib.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,4 +385,24 @@ function updateDbAndIni() {
385385

386386

387387

388+
function setDefaultServers(){
389+
global $inst, $conf;
390+
391+
// clients
392+
$clients = $inst->db->queryAllRecords("SELECT * FROM ".$conf["mysql"]["database"].".client");
393+
if(is_array($clients) && !empty($clients)){
394+
foreach($clients as $client){
395+
// mailserver
396+
if(trim($client['mail_servers']) == '') $inst->db->query("UPDATE ".$conf["mysql"]["database"].".client SET mail_servers = '".trim($client['default_mailserver'])."' WHERE client_id = ".$client['client_id']);
397+
// webserver
398+
if(trim($client['web_servers']) == '') $inst->db->query("UPDATE ".$conf["mysql"]["database"].".client SET web_servers = '".trim($client['default_webserver'])."' WHERE client_id = ".$client['client_id']);
399+
// dns server
400+
if(trim($client['dns_servers']) == '') $inst->db->query("UPDATE ".$conf["mysql"]["database"].".client SET dns_servers = '".trim($client['default_dnsserver'])."' WHERE client_id = ".$client['client_id']);
401+
// db server
402+
if(trim($client['db_servers']) == '') $inst->db->query("UPDATE ".$conf["mysql"]["database"].".client SET db_servers = '".trim($client['default_dbserver'])."' WHERE client_id = ".$client['client_id']);
403+
}
404+
}
405+
406+
}
407+
388408
?>

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,5 @@ UPDATE `dbispconfig`.`sys_ini` SET `default_logo` = 'data:image/png;base64,iVBOR
139139

140140
ALTER TABLE `directive_snippets` ADD `required_php_snippets` VARCHAR(255) NOT NULL DEFAULT '' AFTER `customer_viewable`;
141141
ALTER TABLE `dns_rr` CHANGE `ttl` `ttl` INT(11) UNSIGNED NOT NULL DEFAULT '3600';
142-
ALTER TABLE `dns_soa` CHANGE `minimum` `minimum` INT(11) UNSIGNED NOT NULL DEFAULT '3600', CHANGE `ttl` `ttl` INT(11) UNSIGNED NOT NULL DEFAULT '3600';
142+
ALTER TABLE `dns_soa` CHANGE `minimum` `minimum` INT(11) UNSIGNED NOT NULL DEFAULT '3600', CHANGE `ttl` `ttl` INT(11) UNSIGNED NOT NULL DEFAULT '3600';
143+
ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm,hhvm';

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ CREATE TABLE `client` (
201201
`limit_web_ip` text,
202202
`limit_web_domain` int(11) NOT NULL DEFAULT '-1',
203203
`limit_web_quota` int(11) NOT NULL DEFAULT '-1',
204-
`web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm',
204+
`web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm,hhvm',
205205
`limit_cgi` enum('n','y') NOT NULL DEFAULT 'n',
206206
`limit_ssi` enum('n','y') NOT NULL DEFAULT 'n',
207207
`limit_perl` enum('n','y') NOT NULL DEFAULT 'n',

‎install/update.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,9 @@
513513
}
514514
}
515515

516+
//* Set default servers
517+
setDefaultServers();
518+
516519
//* Create md5 filelist
517520
$md5_filename = '/usr/local/ispconfig/security/data/file_checksums_'.date('Y-m-d_h-i').'.md5';
518521
exec('find /usr/local/ispconfig -type f -print0 | xargs -0 md5sum > '.$md5_filename);

‎interface/web/dns/dns_soa_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ function onShowEnd() {
150150
$options_dns_servers = "";
151151

152152
foreach ($dns_servers as $dns_server) {
153-
$options_dns_servers .= "<option value='$dns_server[server_id]'>$dns_server[server_name]</option>";
153+
$options_dns_servers .= '<option value="'.$dns_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $dns_server['server_id'] ? ' selected="selected"' : '').'>'.$dns_server['server_name'].'</option>';
154154
}
155155

156156
$app->tpl->setVar("client_server_id", $options_dns_servers);

‎interface/web/dns/dns_wizard.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
$options_dns_servers = "";
148148

149149
foreach ($dns_servers as $dns_server) {
150-
$options_dns_servers .= "<option value='$dns_server[server_id]'>$dns_server[server_name]</option>";
150+
$options_dns_servers .= '<option value="'.$dns_server['server_id'].'"'.($_POST['server_id'] == $dns_server['server_id'] ? ' selected="selected"' : '').'>'.$dns_server['server_name'].'</option>';
151151
}
152152

153153
$app->tpl->setVar("server_id", $options_dns_servers);

‎interface/web/mail/mail_domain_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ function onShowEnd() {
139139
$options_mail_servers = "";
140140

141141
foreach ($mail_servers as $mail_server) {
142-
$options_mail_servers .= "<option value='$mail_server[server_id]'>$mail_server[server_name]</option>";
142+
$options_mail_servers .= '<option value="'.$mail_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $mail_server['server_id'] ? ' selected="selected"' : '').'>'.$mail_server['server_name'].'</option>';
143143
}
144144

145145
$app->tpl->setVar("client_server_id", $options_mail_servers);

‎interface/web/sites/database_edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function onShowEnd() {
8989
}
9090

9191
foreach ($tmp as $db_server) {
92-
$options_db_servers .= "<option value='$db_server[server_id]'>$db_server[server_name]</option>";
92+
$options_db_servers .= '<option value="'.$db_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $db_server['server_id'] ? ' selected="selected"' : '').'>'.$db_server['server_name'].'</option>';
9393
}
9494

9595
$app->tpl->setVar("server_id", $options_db_servers);
@@ -112,7 +112,7 @@ function onShowEnd() {
112112
}
113113

114114
foreach ($tmp as $db_server) {
115-
$options_db_servers .= "<option value='$db_server[server_id]'>$db_server[server_name]</option>";
115+
$options_db_servers .= '<option value="'.$db_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $db_server['server_id'] ? ' selected="selected"' : '').'>'.$db_server['server_name'].'</option>';
116116
}
117117

118118
$app->tpl->setVar("server_id", $options_db_servers);

‎interface/web/sites/web_vhost_domain_edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ function onShowEnd() {
173173
$options_web_servers = "";
174174

175175
foreach ($web_servers as $web_server) {
176-
$options_web_servers .= "<option value='$web_server[server_id]'>$web_server[server_name]</option>";
176+
$options_web_servers .= '<option value="'.$web_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $web_server['server_id'] ? ' selected="selected"' : '').'>'.$web_server['server_name'].'</option>';
177177
}
178178

179179
$app->tpl->setVar("server_id", $options_web_servers);
@@ -298,7 +298,7 @@ function onShowEnd() {
298298
$options_web_servers = "";
299299

300300
foreach ($web_servers as $web_server) {
301-
$options_web_servers .= "<option value='$web_server[server_id]'>$web_server[server_name]</option>";
301+
$options_web_servers .= '<option value="'.$web_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $web_server['server_id'] ? ' selected="selected"' : '').'>'.$web_server['server_name'].'</option>';
302302
}
303303

304304
$app->tpl->setVar("server_id", $options_web_servers);

0 commit comments

Comments
 (0)