Skip to content

Commit 36c2570

Browse files
florian030florian030
committed
Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop
2 parents 6ad23f8 + 2b408b7 commit 36c2570

23 files changed

+542
-398
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2553,7 +2553,7 @@ public function configure_apps_vhost() {
25532553
}
25542554

25552555
// comment out the listen directive if port is 80 or 443
2556-
if($conf['web']['apps_vhost_ip'] == 80 or $conf['web']['apps_vhost_ip'] == 443) {
2556+
if($conf['web']['apps_vhost_port'] == 80 or $conf['web']['apps_vhost_port'] == 443) {
25572557
$tpl->setVar('vhost_port_listen','#');
25582558
} else {
25592559
$tpl->setVar('vhost_port_listen','');

‎install/tpl/apache_apps.vhost.master‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,9 @@
122122
{/tmpl_if}
123123

124124
</VirtualHost>
125+
126+
<tmpl_if name='apache_version' op='>=' value='2.3.3' format='version'>
127+
<IfModule mod_ssl.c>
128+
<tmpl_var name="ssl_comment">SSLStaplingCache shmcb:/var/run/ocsp(128000)
129+
</IfModule>
130+
</tmpl_if>

‎install/tpl/nginx_apps.vhost.master‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
server {
2-
listen {apps_vhost_port} {ssl_on};
2+
listen {apps_vhost_ip}{apps_vhost_port} {ssl_on};
33
listen [::]:{apps_vhost_port} {ssl_on} ipv6only=on;
44

55
{ssl_comment}ssl_protocols TLSv1.2;
@@ -99,7 +99,7 @@ server {
9999
fastcgi_param REDIRECT_STATUS 200;
100100
# To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used
101101
{use_tcp}fastcgi_pass 127.0.0.1:9000;
102-
{use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;
102+
{use_socket}fastcgi_pass unix:{fpm_socket};
103103
fastcgi_index index.php;
104104
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
105105
fastcgi_buffer_size 128k;
@@ -149,7 +149,7 @@ server {
149149
fastcgi_param REDIRECT_STATUS 200;
150150
# To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used
151151
{use_tcp}fastcgi_pass 127.0.0.1:9000;
152-
{use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;
152+
{use_socket}fastcgi_pass unix:{fpm_socket};
153153
fastcgi_index index.php;
154154
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
155155
fastcgi_buffer_size 128k;

‎interface/web/admin/templates/language_add.htm‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
<div class='page-header'>
2-
<h1><tmpl_var name="list_head_txt"></h1>
2+
<h1>
3+
<tmpl_var name="list_head_txt">
4+
</h1>
35
</div>
4-
<p><tmpl_var name="list_desc_txt"></p>
6+
<p>
7+
<tmpl_var name="list_desc_txt">
8+
</p>
59

10+
<div class="panel" style="padding:20px;">
11+
<div class="pnl_formsarea">
12+
<div class="form-group">
13+
<label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
14+
<div class="col-sm-9"><select name="lng_select" id="language" class="form-control flags">
15+
{tmpl_var name='language_option'}
16+
</select></div>
17+
</div>
18+
<div class="form-group">
19+
<label for="lng_new" class="col-sm-3 control-label">{tmpl_var name='language_new_txt'}</label>
20+
<div class="col-sm-9"><input type="text" name="lng_new" id="lng_new" value="" class="form-control" /></div>
21+
<p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
22+
</div>
623

7-
<div class="form-group">
8-
<label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
9-
<div class="col-sm-9"><select name="lng_select" id="language" class="form-control flags">
10-
{tmpl_var name='language_option'}
11-
</select></div>
12-
</div>
13-
<div class="form-group">
14-
<label for="lng_new" class="col-sm-3 control-label">{tmpl_var name='language_new_txt'}</label>
15-
<div class="col-sm-9"><input type="text" name="lng_new" id="lng_new" value="" class="form-control" /></div><p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
16-
</div>
17-
24+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
1825

19-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
20-
21-
<div class="clear"><div class="right">
22-
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_add.php">{tmpl_var name='btn_save_txt'}</button>
23-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
24-
</div></div>
26+
<div class="clear">
27+
<div class="right">
28+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_add.php">{tmpl_var name='btn_save_txt'}</button>
29+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
30+
</div>
31+
</div>
32+
</div>

‎interface/web/admin/templates/language_complete.htm‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,39 @@
11
<div class='page-header'>
2-
<h1><tmpl_var name="list_head_txt"></h1>
2+
<h1>
3+
<tmpl_var name="list_head_txt">
4+
</h1>
35
</div>
4-
<p><tmpl_var name="list_desc_txt"></p>
56

67
<div class="panel panel_language_complete">
8+
<div class="alert alert-info">
9+
<p>
10+
<tmpl_var name="list_desc_txt">
11+
</p>
12+
</div>
13+
<tmpl_if name="msg">
14+
<div id="OKMsg">
15+
<tmpl_var name="msg">
16+
</div>
17+
</tmpl_if>
18+
<tmpl_if name="error">
19+
<div id="errorMsg">
20+
<tmpl_var name="error">
21+
</div>
22+
</tmpl_if>
723

8-
<tmpl_if name="msg">
9-
<div id="OKMsg"><tmpl_var name="msg"></div>
10-
</tmpl_if>
11-
<tmpl_if name="error">
12-
<div id="errorMsg"><tmpl_var name="error"></div>
13-
</tmpl_if>
14-
15-
<div class="pnl_formsarea">
16-
<div class="form-group">
17-
<label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
18-
<div class="col-sm-9">
19-
<select name="lng_select" id="language" class="form-control flags">{tmpl_var name='language_option'}</select>
20-
</div>
21-
</div>
24+
<div class="pnl_formsarea">
25+
<div class="form-group">
26+
<label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
27+
<div class="col-sm-9">
28+
<select name="lng_select" id="language" class="form-control flags">{tmpl_var name='language_option'}</select>
29+
</div>
30+
</div>
2231
<div class="clear">
23-
<div class="right">
24-
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_complete.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="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
32+
<div class="right">
33+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_complete.php">{tmpl_var name='btn_save_txt'}</button>
34+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
2635
</div>
27-
</div>
28-
</div>
36+
</div>
37+
</div>
2938

3039
</div>

‎interface/web/admin/templates/language_export.htm‎

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,35 @@
11
<div class='page-header'>
2-
<h1><tmpl_var name="list_head_txt"></h1>
2+
<h1>
3+
<tmpl_var name="list_head_txt">
4+
</h1>
35
</div>
4-
<p><tmpl_var name="list_desc_txt"></p>
6+
<p>
7+
<tmpl_var name="list_desc_txt">
8+
</p>
59

10+
<div class="panel panel_language_import" style="padding:20px;">
11+
<div class="pnl_formsarea">
12+
<div class="form-group">
13+
<label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
14+
<div class="col-sm-9"><select name="lng_select" id="lng_select" class="form-control flags">
15+
{tmpl_var name='language_option'}
16+
</select></div>
17+
</div>
18+
<tmpl_if name="msg">
19+
<div id="OKMsg">
20+
<p>
21+
<tmpl_var name="msg">
22+
</p>
23+
</div>
24+
</tmpl_if>
625

7-
<div class="form-group">
8-
<label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
9-
<div class="col-sm-9"><select name="lng_select" id="lng_select" class="form-control flags">
10-
{tmpl_var name='language_option'}
11-
</select></div>
12-
</div>
13-
14-
15-
<tmpl_if name="msg">
16-
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
17-
</tmpl_if>
18-
19-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
20-
21-
<div class="clear"><div class="right">
22-
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_export.php">{tmpl_var name='btn_save_txt'}</button>
23-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
24-
</div></div>
26+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
27+
28+
<div class="clear">
29+
<div class="right">
30+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_export.php">{tmpl_var name='btn_save_txt'}</button>
31+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
32+
</div>
33+
</div>
34+
</div>
35+
</div>

‎interface/web/admin/templates/language_import.htm‎

Lines changed: 50 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,54 @@
11
<div class='page-header'>
2-
<h1><tmpl_var name="list_head_txt"></h1>
2+
<h1>
3+
<tmpl_var name="list_head_txt">
4+
</h1>
35
</div>
4-
<p><tmpl_var name="list_desc_txt"></p>
6+
<div class="panel" style="padding:20px;">
7+
<div class="pnl_formsarea">
8+
<div class="alert alert-warning">
9+
<p>
10+
<tmpl_var name="list_desc_txt">
11+
</p>
12+
</div>
13+
<div class="form-group">
14+
<label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_import_txt'}</label>
15+
<input name="file" id="file" size="30" type="file" class="fileUpload" />
16+
</div>
17+
<div class="form-group">
18+
<label class="col-sm-3 control-label">{tmpl_var name='language_overwrite_txt'}</label>
19+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite" /></div>
20+
</div>
21+
<div class="form-group">
22+
<label class="col-sm-3 control-label">{tmpl_var name='ignore_version_txt'}</label>
23+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version" /></div>
24+
</div>
525

626

7-
<div class="form-group">
8-
<label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_import_txt'}</label>
9-
<input name="file" id="file" size="30" type="file" class="fileUpload" />
10-
</div>
11-
<div class="form-group">
12-
<label class="col-sm-3 control-label">{tmpl_var name='language_overwrite_txt'}</label>
13-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite"/></div>
14-
</div>
15-
<div class="form-group">
16-
<label class="col-sm-3 control-label">{tmpl_var name='ignore_version_txt'}</label>
17-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version"/></div>
18-
</div>
19-
20-
21-
<tmpl_if name="msg">
22-
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
23-
</tmpl_if>
24-
<tmpl_if name="error">
25-
<div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
26-
</tmpl_if>
27-
28-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
29-
30-
<div class="clear"><div class="right">
31-
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_import.php" data-form-upload="true">{tmpl_var name='btn_save_txt'}</button>
32-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
33-
</div></div>
27+
<tmpl_if name="msg">
28+
<div id="OKMsg">
29+
<p>
30+
<tmpl_var name="msg">
31+
</p>
32+
</div>
33+
</tmpl_if>
34+
<tmpl_if name="error">
35+
<div id="errorMsg">
36+
<h3>
37+
<tmpl_var name="error_txt">
38+
</h3>
39+
<ol>
40+
<tmpl_var name="error">
41+
</ol>
42+
</div>
43+
</tmpl_if>
44+
45+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
46+
47+
<div class="clear">
48+
<div class="right">
49+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_import.php" data-form-upload="true">{tmpl_var name='btn_save_txt'}</button>
50+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
51+
</div>
52+
</div>
53+
</div>
54+
</div>

‎interface/web/admin/templates/remote_action_ispcupdate.htm‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,36 @@ <h1><tmpl_var name="do_ispcupdate_caption"></h1>
66
-->
77

88
<div class='page-header'>
9-
<h1><tmpl_var name="ispconfig_update_title"></h1>
9+
<h1>
10+
<tmpl_var name="ispconfig_update_title">
11+
</h1>
1012
</div>
11-
<p style="margin-top:50px; font-size:14px;"><tmpl_var name="ispconfig_update_text"></p>
12-
13-
<div class="panel panel_language_add">
14-
15-
<div class="pnl_formsarea">
16-
<!--
13+
<div class="panel" style="padding:20px;">
14+
<div class="pnl_formsarea">
15+
<p style="font-size:14px;">
16+
<tmpl_var name="ispconfig_update_text">
17+
</p>
18+
</div>
19+
</div>
20+
<!--
1721
<legend>{tmpl_var name='do_ispcupdate_caption'}</legend>
1822
<div class="form-group">
1923
<label for="server_select" class="col-sm-3 control-label">{tmpl_var name='select_server_txt'}</label>
2024
<div class="col-sm-9"><select name="server_select" id="server" class="form-control" onchange="document.getElementById('OKMsg').style.visibility = 'hidden'; ">
2125
{tmpl_var name='server_option'}
2226
</select></div>
2327
</div>
24-
25-
28+
29+
2630
<tmpl_if name="msg">
2731
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
2832
</tmpl_if>
29-
30-
33+
34+
3135
<div class="clear"><div class="right">
3236
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_do_txt'}" data-submit-form="pageForm" data-form-action="admin/remote_action_ispcupdate.php">{tmpl_var name='btn_do_txt'}</button>
3337
</div></div>
3438
-->
35-
</div>
36-
37-
</div>
39+
</div>
40+
41+
</div>

0 commit comments

Comments
 (0)