Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
1d6d38ce
Commit
1d6d38ce
authored
Sep 20, 2011
by
Falko Timme
Browse files
- Hide Nginx Directives field - has no function yet.
- Added escapeshellcmd to some paths in nginx_plugin.inc.php.
parent
45ee6715
Changes
2
Hide whitespace changes
Inline
Side-by-side
interface/web/sites/templates/web_domain_advanced.htm
View file @
1d6d38ce
...
...
@@ -32,7 +32,7 @@
<label
for=
"apache_directives"
>
{tmpl_var name='apache_directives_txt'}
</label>
<textarea
name=
"apache_directives"
id=
"apache_directives"
rows=
'10'
cols=
'50'
style=
"width:400px;"
>
{tmpl_var name='apache_directives'}
</textarea>
</div>
<div
class=
"ctrlHolder
nginx
"
>
<div
class=
"ctrlHolder
apache
"
>
<label
for=
"nginx_directives"
>
{tmpl_var name='nginx_directives_txt'}
</label>
<textarea
name=
"nginx_directives"
id=
"nginx_directives"
rows=
'10'
cols=
'50'
style=
"width:400px;"
>
{tmpl_var name='nginx_directives'}
</textarea>
</div>
...
...
server/plugins-available/nginx_plugin.inc.php
View file @
1d6d38ce
...
...
@@ -1101,7 +1101,7 @@ class nginx_plugin {
$tpl
->
setVar
(
'fpm_port'
,
$web_config
[
'php_fpm_start_port'
]
+
$data
[
'new'
][
'domain_id'
]);
$tpl
->
setVar
(
'fpm_user'
,
$data
[
'new'
][
'system_user'
]);
$tpl
->
setVar
(
'fpm_group'
,
$data
[
'new'
][
'system_group'
]);
$php_open_basedir
=
(
$data
[
'new'
][
'php_open_basedir'
]
==
''
)
?
$data
[
'new'
][
'document_root'
]
:
$data
[
'new'
][
'php_open_basedir'
];
$php_open_basedir
=
(
$data
[
'new'
][
'php_open_basedir'
]
==
''
)
?
escapeshellcmd
(
$data
[
'new'
][
'document_root'
]
)
:
escapeshellcmd
(
$data
[
'new'
][
'php_open_basedir'
]
)
;
$tpl
->
setVar
(
'php_open_basedir'
,
$php_open_basedir
);
if
(
$php_open_basedir
!=
''
){
$tpl
->
setVar
(
'enable_php_open_basedir'
,
''
);
...
...
@@ -1121,8 +1121,8 @@ class nginx_plugin {
foreach
(
$ini_settings
as
$ini_setting
){
list
(
$key
,
$value
)
=
explode
(
'='
,
$ini_setting
);
if
(
$value
){
$value
=
trim
(
$value
);
$key
=
trim
(
$key
);
$value
=
escapeshellcmd
(
trim
(
$value
)
)
;
$key
=
escapeshellcmd
(
trim
(
$key
)
)
;
switch
(
strtolower
(
$value
))
{
case
'on'
:
case
'off'
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment