Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jozef Sroka
ISPConfig 3
Commits
1339a88a
Commit
1339a88a
authored
Oct 10, 2016
by
Till Brehm
Browse files
Merge branch 'stable-3.1' into 'stable-3.1'
Fixes: 3878 + ipv6-prefix for mirror See merge request !472
parents
e4eefbdf
09f022af
Changes
4
Hide whitespace changes
Inline
Side-by-side
interface/lib/classes/tform_base.inc.php
View file @
1339a88a
...
...
@@ -1053,7 +1053,17 @@ class tform_base {
$this
->
errorMessage
.
=
$errmsg
.
"<br />
\r\n
"
;
}
}
}
else
$this
->
errorMessage
.
=
"function filter_var missing <br />
\r\n
"
;
}
else
{
$tmpval
=
$app
->
functions
->
intval
(
$field_value
);
if
(
$tmpval
===
0
and
!
empty
(
$field_value
))
{
$errmsg
=
$validator
[
'errmsg'
];
if
(
isset
(
$this
->
wordbook
[
$errmsg
]))
{
$this
->
errorMessage
.
=
$this
->
wordbook
[
$errmsg
]
.
"<br />
\r\n
"
;
}
else
{
$this
->
errorMessage
.
=
$errmsg
.
"<br />
\r\n
"
;
}
}
}
break
;
case
'ISPOSITIVE'
:
if
(
function_exists
(
'filter_var'
))
{
...
...
interface/web/admin/templates/server_config_web_edit.htm
View file @
1339a88a
...
...
@@ -48,7 +48,7 @@
<label
for=
"website_autoalias"
class=
"col-sm-3 control-label"
>
{tmpl_var name='website_autoalias_txt'}
</label>
<div
class=
"col-sm-6"
><input
type=
"text"
name=
"website_autoalias"
id=
"website_autoalias"
value=
"{tmpl_var name='website_autoalias'}"
class=
"form-control"
/>
{tmpl_var name='website_autoalias_note_txt'}
<a
href=
"javascript:void(0);"
class=
"addPlaceholder"
>
[client_id]
</a>
,
<a
href=
"javascript:void(0);"
class=
"addPlaceholder"
>
[client_username]
</a>
,
<a
href=
"javascript:void(0);"
class=
"addPlaceholder"
>
[website_id]
</a>
,
<a
href=
"javascript:void(0);"
class=
"addPlaceholder"
>
[website_domain]
</a></div>
</div>
<div
class=
"form-group
apache
"
>
<div
class=
"form-group"
>
<label
for=
"vhost_rewrite_v6"
class=
"col-sm-3 control-label"
>
{tmpl_var name='vhost_rewrite_v6_txt'}
</label>
<div
class=
"col-sm-9"
>
{tmpl_var name='vhost_rewrite_v6'}
...
...
server/plugins-available/apache2_plugin.inc.php
View file @
1339a88a
...
...
@@ -1765,7 +1765,7 @@ class apache2_plugin {
$explode_v6prefix
=
explode
(
':'
,
$web_config
[
'serverconfig'
][
'server'
][
'v6_prefix'
]);
$explode_v6
=
explode
(
':'
,
$data
[
'new'
][
'ipv6_address'
]);
for
(
$i
=
0
;
$i
<=
count
(
$explode_v6prefix
)
-
3
;
$i
++
)
{
for
(
$i
=
0
;
$i
<=
count
(
$explode_v6prefix
)
-
1
;
$i
++
)
{
$explode_v6
[
$i
]
=
$explode_v6prefix
[
$i
];
}
$data
[
'new'
][
'ipv6_address'
]
=
implode
(
':'
,
$explode_v6
);
...
...
server/plugins-available/nginx_plugin.inc.php
View file @
1339a88a
...
...
@@ -960,7 +960,7 @@ class nginx_plugin {
$explode_v6prefix
=
explode
(
':'
,
$conf
[
'serverconfig'
][
'server'
][
'v6_prefix'
]);
$explode_v6
=
explode
(
':'
,
$data
[
'new'
][
'ipv6_address'
]);
for
(
$i
=
0
;
$i
<=
count
(
$explode_v6prefix
)
-
3
;
$i
++
)
{
for
(
$i
=
0
;
$i
<=
count
(
$explode_v6prefix
)
-
1
;
$i
++
)
{
$explode_v6
[
$i
]
=
$explode_v6prefix
[
$i
];
}
$data
[
'new'
][
'ipv6_address'
]
=
implode
(
':'
,
$explode_v6
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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