Skip to content

Commit e69a5b3

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.1' into 'stable-3.1'
Stable 3.1 See merge request ispconfig/ispconfig3!950
2 parents b165707 + b450032 commit e69a5b3

File tree

9 files changed

+75
-21
lines changed

9 files changed

+75
-21
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2478,24 +2478,13 @@ public function install_ispconfig() {
24782478
//* copy the ISPConfig security part
24792479
$command = 'cp -rf ../security '.$install_dir;
24802480
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
2481-
2482-
//* Apply changed security_settings.ini values to new security_settings.ini file
2483-
if(is_file('/usr/local/ispconfig/security/security_settings.ini~')) {
2484-
$security_settings_old = ini_to_array(file_get_contents('/usr/local/ispconfig/security/security_settings.ini~'));
2485-
$security_settings_new = ini_to_array(file_get_contents('/usr/local/ispconfig/security/security_settings.ini'));
2486-
if(is_array($security_settings_new) && is_array($security_settings_old)) {
2487-
foreach($security_settings_new as $section => $sval) {
2488-
if(is_array($sval)) {
2489-
foreach($sval as $key => $val) {
2490-
if(isset($security_settings_old[$section]) && isset($security_settings_old[$section][$key])) {
2491-
$security_settings_new[$section][$key] = $security_settings_old[$section][$key];
2492-
}
2493-
}
2494-
}
2495-
}
2496-
file_put_contents('/usr/local/ispconfig/security/security_settings.ini',array_to_ini($security_settings_new));
2497-
}
2481+
2482+
$configfile = 'security_settings.ini';
2483+
if(is_file($install_dir.'/security/'.$configfile)) {
2484+
copy($install_dir.'/security/'.$configfile, $install_dir.'/security/'.$configfile.'~');
24982485
}
2486+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
2487+
wf($install_dir.'/security/'.$configfile, $content);
24992488

25002489
//* Create a symlink, so ISPConfig is accessible via web
25012490
// Replaced by a separate vhost definition for port 8080

security/security_settings.ini renamed to install/tpl/security_settings.ini.master

File renamed without changes.

‎interface/lib/classes/listform_actions.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ public function prepareDataRow($rec)
189189
//* substitute value for select fields
190190
if(is_array($app->listform->listDef['item']) && count($app->listform->listDef['item']) > 0) {
191191
foreach($app->listform->listDef['item'] as $field) {
192+
if($rec['active'] == 'n') $rec['warn_inactive'] = 'y';
192193
$key = $field['field'];
193194
if(isset($field['formtype']) && $field['formtype'] == 'SELECT') {
194195
if(strtolower($rec[$key]) == 'y' or strtolower($rec[$key]) == 'n') {

‎interface/web/admin/lib/lang/de_server_php.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ $wb['php_fpm_init_script_txt'] = 'Pfad zum PHP-FPM Init Script';
1414
$wb['php_fpm_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis';
1515
$wb['php_fpm_pool_dir_txt'] = 'Pfad zum PHP-FPM Pool Verzeichnis';
1616
$wb['active_txt'] = 'Aktiv';
17+
$wb['php_in_use_error'] = 'Diese PHP-Version wird noch benutzt.';
18+
$wb['php_name_in_use_error'] = 'Der Name kann nicht geändert werden.';
1719
?>

‎interface/web/admin/lib/lang/en_server_php.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
1414
$wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
1515
$wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
1616
$wb['active_txt'] = 'Active';
17+
$wb['php_in_use_error'] = 'This PHP-Version is in use.';
18+
$wb['php_name_in_use_error'] = 'The name can not be changed.';
1719
?>

‎interface/web/admin/server_php_del.php‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,39 @@
4646
$app->auth->check_module_permissions('admin');
4747
$app->auth->check_security_permissions('admin_allow_server_php');
4848

49-
$app->uses("tform_actions");
50-
$app->tform_actions->onDelete();
49+
$app->uses('tpl,tform,tform_actions');
50+
$app->load('tform_actions');
51+
52+
class page_action extends tform_actions {
53+
54+
function onBeforeDelete() {
55+
global $app; $conf;
56+
57+
$check = array();
58+
59+
// fastcgi
60+
if(!empty(trim($this->dataRecord['php_fastcgi_binary']))) $check[] = trim($this->dataRecord['php_fastcgi_binary']);
61+
if(!empty(trim($this->dataRecord['php_fastcgi_ini_dir']))) $check[] = trim($this->dataRecord['php_fastcgi_ini_dir']);
62+
if(!empty($check)) $fastcgi_check = implode(':', $check);
63+
unset($check);
64+
65+
// fpm
66+
if(!empty(trim($this->dataRecord['php_fpm_init_script']))) $check[] = trim($this->dataRecord['php_fpm_init_script']);
67+
if(!empty(trim($this->dataRecord['php_fpm_ini_dir']))) $check[] = trim($this->dataRecord['php_fpm_ini_dir']);
68+
if(!empty(trim($this->dataRecord['php_fpm_pool_dir']))) $check[] = trim($this->dataRecord['php_fpm_pool_dir']);
69+
if(!empty($check)) $fpm_check = implode(':', $check);
70+
71+
$sql = 'SELECT domain_id FROM web_domain WHERE server_id = ? AND fastcgi_php_version LIKE ?';
72+
if(isset($fastcgi_check)) $web_domains_fastcgi = $app->db->queryAllRecords($sql, $this->dataRecord['server_id'], '%:'.$fastcgi_check);
73+
if(isset($fpm_check)) $web_domains_fpm = $app->db->queryAllRecords($sql, $this->dataRecord['server_id'], '%:'.$fpm_check);
74+
75+
if(!empty($webdomains_fastcgi) || !empty($web_domains_fpm)) $app->error($app->tform->lng('php_in_use_error'));
76+
77+
}
78+
79+
}
80+
81+
$page = new page_action;
82+
$page->onDelete();
5183

5284
?>

‎interface/web/admin/server_php_edit.php‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,35 @@
5050
$app->load('tform_actions');
5151

5252
class page_action extends tform_actions {
53+
function onSubmit() {
54+
global $app;
55+
56+
if(isset($this->id) && $this->id > 0 && $app->tform->getCurrentTab() == 'php_name') {
57+
$rec = $app->db->queryOneRecord('SELECT * FROM server_php WHERE server_php_id = ?', $this->id);
58+
if($rec['name'] != $this->dataRecord['name']) {
59+
$check = array();
60+
// fastcgi
61+
if($rec['php_fastcgi_binary'] != '') $check[] = $rec['php_fastcgi_binary'];
62+
if($rec['php_fastcgi_ini_dir'] != '') $check[] = $rec['php_fastcgi_ini_dir'];
63+
if(!empty($check)) $fastcgi_check = implode(':', $check);
64+
unset($check);
65+
// fpm
66+
if($rec['php_fpm_init_script'] != '') $check[] = $rec['php_fpm_init_script'];
67+
if($rec['php_fpm_ini_dir'] != '') $check[] = $rec['php_fpm_ini_dir'];
68+
if($rec['php_fpm_pool_dir'] != '') $check[] = $rec['php_fpm_pool_dir'];
69+
if(!empty($check)) $fpm_check = implode(':', $check);
70+
71+
$sql = 'SELECT domain_id FROM web_domain WHERE server_id = ? AND fastcgi_php_version LIKE ?';
72+
if(isset($fastcgi_check)) $web_domains_fastcgi = $app->db->queryAllRecords($sql, $this->dataRecord['server_id'], '%:'.$fastcgi_check);
73+
if(isset($fpm_check)) $web_domains_fpm = $app->db->queryAllRecords($sql, $this->dataRecord['server_id'], '%:'.$fpm_check);
74+
75+
if(!empty($webdomains_fastcgi) || !empty($web_domains_fpm)) $app->error($app->tform->lng('php_in_use_error').' '.$app->tform->lng('php_name_in_use_error'));
76+
}
77+
}
5378

79+
parent::onSubmit();
80+
81+
}
5482
function onBeforeUpdate() {
5583
global $app, $conf;
5684

‎interface/web/sites/templates/web_vhost_domain_admin_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h1><tmpl_if name='vhostdomain_type' op='==' value='domain'>{tmpl_var name="doma
3737
</thead>
3838
<tbody>
3939
<tmpl_loop name="records">
40-
<tr>
40+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
4141
<tmpl_if name="vhostdomain_type" value="domain"><td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="domain_id"}</a></td></tmpl_if>
4242
<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="active"}</a></td>
4343
<tmpl_if name="vhostdomain_type" value="domain"><td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="sys_groupid"}</a></td></tmpl_if>

‎interface/web/sites/templates/web_vhost_domain_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h1><tmpl_if name='vhostdomain_type' op='==' value='domain'>{tmpl_var name="doma
5252
</thead>
5353
<tbody>
5454
<tmpl_loop name="records">
55-
<tr>
55+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
5656
<tmpl_if name="vhostdomain_type" value="domain"><td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="domain_id"}</a></td></tmpl_if>
5757
<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="active"}</a></td>
5858
<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>

0 commit comments

Comments
 (0)