Skip to content

Commit de9a85a

Browse files
florian030florian030
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents 6aa0690 + 17b0156 commit de9a85a

File tree

7 files changed

+72
-50
lines changed

7 files changed

+72
-50
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1805,7 +1805,12 @@ public function configure_rspamd() {
18051805

18061806
$tpl = new tpl();
18071807
$tpl->newTemplate('rspamd_worker-controller.inc.master');
1808-
$tpl->setVar('rspamd_password', $mail_config['rspamd_password']);
1808+
$rspamd_password = $mail_config['rspamd_password'];
1809+
$crypted_password = trim(exec('rspamadm pw -p ' . escapeshellarg($rspamd_password)));
1810+
if($crypted_password) {
1811+
$rspamd_password = $crypted_password;
1812+
}
1813+
$tpl->setVar('rspamd_password', $rspamd_password);
18091814
wf('/etc/rspamd/local.d/worker-controller.inc', $tpl->grab());
18101815
chmod('/etc/rspamd/local.d/worker-controller.inc', 0644);
18111816
}

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2082,6 +2082,7 @@ CREATE TABLE `web_domain` (
20822082
`folder_directive_snippets` text,
20832083
`log_retention` int(11) NOT NULL DEFAULT '10',
20842084
`proxy_protocol` enum('n','y') NOT NULL default 'n',
2085+
`server_php_id` INT(11) UNSIGNED NOT NULL DEFAULT 0,
20852086
PRIMARY KEY (`domain_id`),
20862087
UNIQUE KEY `serverdomain` ( `server_id` , `ip_address`, `domain` )
20872088
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

‎install/tpl/system.ini.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ client_username_web_check_disabled=n
3535
backups_include_into_web_quota=n
3636
reseller_can_use_options=n
3737
web_php_options=no,fast-cgi,mod,php-fpm
38+
show_aps_menu=n
3839

3940

4041
[tools]

‎interface/web/mail/form/mail_user.tform.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@
199199
2 => array( 'event' => 'SAVE',
200200
'type' => 'TOLOWER')
201201
),
202-
'validators' => array ( 0 => array ( 'type' => 'ISEMAIL',
202+
'validators' => array ( 0 => array ( 'type' => 'ISEMAILADDRESS',
203+
'allowempty' => 'y',
203204
'errmsg'=> 'sender_cc_error_isemail'),
204205
),
205206
'default' => '',

‎interface/web/sites/ajax_get_json.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
$json .= '"}';
6464
}
6565

66-
if($type == 'getphpfastcgi'){
66+
if($type == 'getserverphp'){
6767
$json = '{';
6868

6969
$server_type = 'apache';
@@ -105,14 +105,14 @@
105105
if(is_array($php_records) && !empty($php_records)) {
106106
foreach( $php_records as $php_record) {
107107
if($php_type == 'php-fpm' || ($php_type == 'hhvm' && $server_type == 'nginx')){
108-
$php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
108+
$php_version = $php_record['server_php_id'];
109109
} else {
110-
$php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
110+
$php_version = $php_record['server_php_id'];
111111
}
112112
if($php_record['name'] != $web_config['php_default_name']) {
113113
$json .= '"'.$php_version.'": "'.$php_record['name'].'",';
114114
} else {
115-
$json .= '"": "'.$php_record['name'].'",';
115+
$json .= '"0": "'.$php_record['name'].'",';
116116
}
117117
}
118118
}

‎interface/web/sites/lib/module.conf.php‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -157,33 +157,37 @@
157157
}
158158

159159
// APS menu
160-
if($app->auth->get_client_limit($userid, 'aps') != 0)
161-
{
162-
$items = array();
163-
164-
$items[] = array( 'title' => 'Available packages',
165-
'target' => 'content',
166-
'link' => 'sites/aps_availablepackages_list.php',
167-
'html_id' => 'aps_availablepackages_list');
168-
169-
$items[] = array( 'title' => 'Installed packages',
170-
'target' => 'content',
171-
'link' => 'sites/aps_installedpackages_list.php',
172-
'html_id' => 'aps_installedpackages_list');
173-
174-
175-
// Second menu group, available only for admins
176-
if($_SESSION['s']['user']['typ'] == 'admin')
177-
{
178-
$items[] = array( 'title' => 'Update Packagelist',
179-
'target' => 'content',
180-
'link' => 'sites/aps_update_packagelist.php',
181-
'html_id' => 'aps_packagedetails_show');
182-
}
183-
184-
$module['nav'][] = array( 'title' => 'APS Installer',
185-
'open' => 1,
186-
'items' => $items);
160+
if($app->auth->get_client_limit($userid, 'aps') != 0) {
161+
// read web config
162+
$app->uses('getconf');
163+
$global_config = $app->getconf->get_global_config('sites');
164+
if($global_config['show_aps_menu'] == 'y') {
165+
$items = array();
166+
167+
$items[] = array( 'title' => 'Available packages',
168+
'target' => 'content',
169+
'link' => 'sites/aps_availablepackages_list.php',
170+
'html_id' => 'aps_availablepackages_list');
171+
172+
$items[] = array( 'title' => 'Installed packages',
173+
'target' => 'content',
174+
'link' => 'sites/aps_installedpackages_list.php',
175+
'html_id' => 'aps_installedpackages_list');
176+
177+
178+
// Second menu group, available only for admins
179+
if($_SESSION['s']['user']['typ'] == 'admin')
180+
{
181+
$items[] = array( 'title' => 'Update Packagelist',
182+
'target' => 'content',
183+
'link' => 'sites/aps_update_packagelist.php',
184+
'html_id' => 'aps_packagedetails_show');
185+
}
186+
187+
$module['nav'][] = array( 'title' => 'APS Installer',
188+
'open' => 1,
189+
'items' => $items);
190+
}
187191
}
188192

189193
// Statistics menu

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

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -280,26 +280,31 @@
280280
serverId = $(this).val();
281281
adjustForm();
282282
reloadWebIP();
283-
reloadFastcgiPHPVersions();
283+
reloadServerPHPVersions();
284284
reloadDirectiveSnippets();
285285
});
286286
}
287287
adjustForm(true);
288-
reloadFastcgiPHPVersions(true);
288+
reloadServerPHPVersions(true);
289289

290290
jQuery('#client_group_id').change(function(){
291291
clientGroupId = $(this).val();
292292
reloadWebIP();
293-
reloadFastcgiPHPVersions();
293+
reloadServerPHPVersions();
294294
});
295295

296296
if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm' || (jQuery('#php').val() == 'hhvm' && serverType == 'nginx')){
297297
jQuery('.server_php_id:hidden').show();
298+
// This block can be removed?
298299
if(jQuery('#php').val() == 'hhvm'){
300+
// There is no element with id="server_php_id_txt"
299301
jQuery('#server_php_id_txt').hide();
302+
// There is no element with id="#fastcgi_php_fallback_version_txt"
300303
jQuery('#fastcgi_php_fallback_version_txt').show();
301304
} else {
305+
// There is no element with id="server_php_id_txt"
302306
jQuery('#server_php_id_txt').show();
307+
// There is no element with id="#fastcgi_php_fallback_version_txt"
303308
jQuery('#fastcgi_php_fallback_version_txt').hide();
304309
}
305310
} else {
@@ -308,14 +313,19 @@
308313
//ISPConfig.resetFormChanged();
309314

310315
jQuery('#php').change(function(){
311-
reloadFastcgiPHPVersions();
316+
reloadServerPHPVersions();
312317
if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm' || (jQuery(this).val() == 'hhvm' && serverType == 'nginx')){
313318
jQuery('.server_php_id:hidden').show();
319+
// This block can be removed?
314320
if(jQuery(this).val() == 'hhvm'){
321+
// There is no element with id="server_php_id_txt"
315322
jQuery('#server_php_id_txt').hide();
323+
// There is no element with id="#fastcgi_php_fallback_version_txt"
316324
jQuery('#fastcgi_php_fallback_version_txt').show();
317325
} else {
326+
// There is no element with id="server_php_id_txt"
318327
jQuery('#server_php_id_txt').show();
328+
// There is no element with id="#fastcgi_php_fallback_version_txt"
319329
jQuery('#fastcgi_php_fallback_version_txt').hide();
320330
}
321331
} else {
@@ -348,7 +358,7 @@
348358
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : parentWebId, type : "getserverid"}, function(data) {
349359
if(data.serverid) serverId = data.serverid;
350360
adjustForm(noFormChange);
351-
if(noFormChange) reloadFastcgiPHPVersions(noFormChange);
361+
if(noFormChange) reloadServerPHPVersions(noFormChange);
352362
});
353363
}
354364

@@ -438,33 +448,33 @@
438448
$('#'+elem).select2();
439449
}
440450

441-
function reloadFastcgiPHPVersions(noFormChange) {
442-
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi", client_group_id : clientGroupId}, function(data) {
451+
function reloadServerPHPVersions(noFormChange) {
452+
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getserverphp", client_group_id : clientGroupId}, function(data) {
443453
//var options = '<option value="">Default</option>';
444454
var options = '';
445-
var phpfastcgiselected = '';
455+
var serverphpidselected = '';
446456
$.each(data, function(key, val) {
447457
<tmpl_if name="id">
448458
if($('#server_php_id').val() == key){
449-
phpfastcgiselected = ' selected="selected"';
459+
serverphpidselected = ' selected="selected"';
450460
} else {
451-
phpfastcgiselected = '';
461+
serverphpidselected = '';
452462
}
453463
</tmpl_else>
454-
phpfastcgiselected = '';
464+
serverphpidselected = '';
455465
</tmpl_if>
456-
options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
466+
options += '<option value="'+key+'"'+serverphpidselected+'>'+val+'</option>';
457467
});
458468
<tmpl_if name="id">
459-
if($('#server_php_id').val() == ''){
460-
phpfastcgiselected = ' selected="selected"';
469+
if($('#server_php_id').val() == '0'){
470+
serverphpidselected = ' selected="selected"';
461471
} else {
462-
phpfastcgiselected = '';
472+
serverphpidselected = '';
463473
}
464474
</tmpl_else>
465-
phpfastcgiselected = '';
475+
serverphpidselected = '';
466476
</tmpl_if>
467-
//options += '<option value=""'+phpfastcgiselected+'>{tmpl_var name="default_php_txt"}</option>';
477+
//options += '<option value=""'+serverphpidselected+'>{tmpl_var name="default_php_txt"}</option>';
468478
$('#server_php_id').html(options).change();
469479
if(noFormChange) ISPConfig.resetFormChanged();
470480
});

0 commit comments

Comments
 (0)