Skip to content

Commit 1e5a80a

Browse files
florian030florian030
committed
Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop
2 parents e6e73ea + fcf38d8 commit 1e5a80a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+416
-902
lines changed

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2007-2016, Till Brehm, ISPConfig UG
1+
Copyright (c) 2007-2020, Till Brehm, ISPConfig UG
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,
@@ -22,4 +22,4 @@ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
2222
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
2323
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
2424
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
25-
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25+
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎install/dist/conf/debian90.conf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
//* Fastcgi
102102
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php/7.0/cgi/';
103103
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
104-
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';
104+
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi7.0';
105105

106106
//* Postfix
107107
$conf['postfix']['installed'] = false; // will be detected automatically during installation

‎install/install.php‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,30 @@
3030

3131
/*
3232
ISPConfig 3 installer.
33-
33+
3434
-------------------------------------------------------------------------------------
3535
- Interactive install
3636
-------------------------------------------------------------------------------------
3737
run:
38-
38+
3939
php install.php
40-
40+
4141
-------------------------------------------------------------------------------------
4242
- Noninteractive (autoinstall) mode
4343
-------------------------------------------------------------------------------------
44-
44+
4545
The autoinstall mode can read the installer questions from a .ini style file or from
46-
a php config file. Examples for both file types are in the docs folder.
46+
a php config file. Examples for both file types are in the docs folder.
4747
See autoinstall.ini.sample and autoinstall.conf_sample.php.
48-
48+
4949
run:
50-
50+
5151
php install.php --autoinstall=autoinstall.ini
52-
52+
5353
or
54-
54+
5555
php install.php --autoinstall=autoinstall.conf.php
56-
56+
5757
*/
5858

5959
error_reporting(E_ALL|E_STRICT);
@@ -146,9 +146,9 @@
146146
//** Installer Interface
147147
//****************************************************************************************************
148148
$inst = new installer();
149-
if (!$inst->get_php_version()) die('ISPConfig requieres PHP '.$inst->min_php."\n");
149+
if (!$inst->get_php_version()) die('ISPConfig requires PHP '.$inst->min_php."\n");
150150
$retval=shell_exec("which which");
151-
if (empty($retval)) die ("ISPConfig requieres which \n");
151+
if (empty($retval)) die ("ISPConfig requires which \n");
152152

153153
$inst->check_prerequisites();
154154

@@ -204,17 +204,17 @@
204204
//** Get MySQL root credentials
205205
$finished = false;
206206
do {
207-
$tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host'],'mysql_hostname');
207+
$tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host'],'mysql_hostname');
208208
$tmp_mysql_server_port = $inst->free_query('MySQL server port', $conf['mysql']['port'],'mysql_port');
209-
$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user'],'mysql_root_user');
210-
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');
211-
$tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database'],'mysql_database');
209+
$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user'],'mysql_root_user');
210+
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');
211+
$tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database'],'mysql_database');
212212
$tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset'],'mysql_charset');
213-
213+
214214
if($install_mode == 'expert') {
215215
swriteln("The next two questions are about the internal ISPConfig database user and password.\nIt is recommended to accept the defaults which are 'ispconfig' as username and a random password.\nIf you use a different password, use only numbers and chars for the password.\n");
216-
217-
$conf['mysql']['ispconfig_user'] = $inst->free_query('ISPConfig mysql database username', $conf['mysql']['ispconfig_user'],'mysql_ispconfig_user');
216+
217+
$conf['mysql']['ispconfig_user'] = $inst->free_query('ISPConfig mysql database username', $conf['mysql']['ispconfig_user'],'mysql_ispconfig_user');
218218
$conf['mysql']['ispconfig_password'] = $inst->free_query('ISPConfig mysql database password', $conf['mysql']['ispconfig_password'],'mysql_ispconfig_password');
219219
}
220220

@@ -264,10 +264,10 @@
264264
//** Get MySQL root credentials
265265
$finished = false;
266266
do {
267-
$tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host'],'mysql_master_hostname');
267+
$tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host'],'mysql_master_hostname');
268268
$tmp_mysql_server_port = $inst->free_query('MySQL master server port', $conf['mysql']['master_port'],'mysql_master_port');
269-
$tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user'],'mysql_master_root_user');
270-
$tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password'],'mysql_master_root_password');
269+
$tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user'],'mysql_master_root_user');
270+
$tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password'],'mysql_master_root_password');
271271
$tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');
272272

273273
//* Initialize the MySQL server connection
@@ -567,7 +567,7 @@
567567
if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port'] = $ispconfig_vhost_port;
568568
unset($ispconfig_vhost_port);
569569

570-
if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface', array('y', 'n'), 'y','ispconfig_use_ssl')) == 'y') {
570+
if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface', array('y', 'n'), 'y','ispconfig_use_ssl')) == 'y') {
571571
$inst->make_ispconfig_ssl_cert();
572572
}
573573
$inst->install_ispconfig_interface = true;

‎install/lib/installer_base.lib.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2761,9 +2761,7 @@ public function make_ispconfig_ssl_cert() {
27612761

27622762
// Request for certs if no LE SSL folder for server fqdn exist
27632763
$le_live_dir = '/etc/letsencrypt/live/' . $hostname;
2764-
if (!@is_dir($le_live_dir) && (
2765-
($svr_ip4 && in_array($svr_ip4, $dns_ips)) || ($svr_ip6 && in_array($svr_ip6, $dns_ips))
2766-
)) {
2764+
if (!@is_dir($le_live_dir) && (($svr_ip4 && in_array($svr_ip4, $dns_ips)) || ($svr_ip6 && in_array($svr_ip6, $dns_ips)))) {
27672765

27682766
// This script is needed earlier to check and open http port 80 or standalone might fail
27692767
// Make executable and temporary symlink latest letsencrypt pre, post and renew hook script before install
@@ -2865,7 +2863,7 @@ public function make_ispconfig_ssl_cert() {
28652863
$date = new DateTime();
28662864

28672865
// If the LE SSL certs for this hostname exists
2868-
if (is_dir($le_live_dir) && in_array($svr_ip, $dns_ips)) {
2866+
if (is_dir($le_live_dir) && (($svr_ip4 && in_array($svr_ip4, $dns_ips)) || ($svr_ip6 && in_array($svr_ip6, $dns_ips)))) {
28692867

28702868
// Backup existing ispserver ssl files
28712869
if (file_exists($ssl_crt_file)) rename($ssl_crt_file, $ssl_crt_file . '-' .$date->format('YmdHis') . '.bak');

‎install/tpl/named.conf.options.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ options {
2121
dnssec-enable yes;
2222
dnssec-validation yes;
2323
dnssec-lookaside auto;
24+
25+
version "unknown";
2426

2527
allow-transfer {none;};
2628

‎interface/index.htm‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎interface/web/dashboard/lib/lang/it.lng‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?php
22
$wb['welcome_user_txt'] = 'Buongiorno %s';
33
$wb['available_modules_txt'] = 'Moduli disponibili';
4-
$wb['last_login_ip'] = "Ultimo login %s da %s";
54
?>

‎interface/web/dns/form/dns_soa.tform.php‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,33 @@
5656
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
5757
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
5858

59+
$form["tabs"]['dns_records'] = array (
60+
'title' => "Records",
61+
'width' => 100,
62+
'template' => "templates/dns_records_edit.htm",
63+
'fields' => array (
64+
//#################################
65+
// Begin Datatable fields
66+
//#################################
67+
68+
//#################################
69+
// END Datatable fields
70+
//#################################
71+
),
72+
'plugins' => array (
73+
'dns_records' => array (
74+
'class' => 'plugin_listview',
75+
'options' => array(
76+
'listdef' => 'list/dns_a.list.php',
77+
'sqlextwhere' => "zone = ".@$app->functions->intval(@$_REQUEST['id']),
78+
'sql_order_by' => "ORDER BY type, name"
79+
)
80+
)
81+
)
82+
);
83+
5984
$form["tabs"]['dns_soa'] = array (
60-
'title' => "DNS Zone",
85+
'title' => "Zone settings",
6186
'width' => 100,
6287
'template' => "templates/dns_soa_edit.htm",
6388
'fields' => array (
@@ -303,31 +328,6 @@
303328
)
304329
);
305330

306-
$form["tabs"]['dns_records'] = array (
307-
'title' => "Records",
308-
'width' => 100,
309-
'template' => "templates/dns_records_edit.htm",
310-
'fields' => array (
311-
//#################################
312-
// Begin Datatable fields
313-
//#################################
314-
315-
//#################################
316-
// END Datatable fields
317-
//#################################
318-
),
319-
'plugins' => array (
320-
'dns_records' => array (
321-
'class' => 'plugin_listview',
322-
'options' => array(
323-
'listdef' => 'list/dns_a.list.php',
324-
'sqlextwhere' => "zone = ".@$app->functions->intval(@$_REQUEST['id']),
325-
'sql_order_by' => "ORDER BY type, name"
326-
)
327-
)
328-
)
329-
);
330-
331331
// show update acl to admins only.
332332
if(!$app->auth->is_admin()) unset($form["tabs"]['dns_soa']['fields']['update_acl']);
333333

‎interface/web/dns/templates/dns_a_edit.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
{tmpl_var name='active'}
1515
</div>
1616
</div>
17-
18-
17+
18+
1919
<input type="hidden" name="id" value="{tmpl_var name='id'}">
2020
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
2121
<input type="hidden" name="type" value="{tmpl_var name='type'}">
22-
22+
2323
<div class="clear"><div class="right">
2424
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_a_edit.php">{tmpl_var name='btn_save_txt'}</button>
25-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
25+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
2626
</div></div>
2727
<script language="JavaScript" type="text/javascript">
2828
jQuery('#data').ispconfigSearch({
@@ -37,5 +37,5 @@
3737
fillSearchFieldWith: 'fill_text',
3838
searchFieldWatermark: '',
3939
resultBoxPosition: ''
40-
});
40+
});
4141
</script>

‎interface/web/dns/templates/dns_aaaa_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<div class="clear"><div class="right">
2424
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_aaaa_edit.php">{tmpl_var name='btn_save_txt'}</button>
25-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
25+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
2626
</div></div>
2727
<script language="JavaScript" type="text/javascript">
2828
jQuery('#data').ispconfigSearch({

0 commit comments

Comments
 (0)