Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
lolo888
ISPConfig 3
Commits
8388ae72
Commit
8388ae72
authored
Oct 15, 2009
by
tbrehm
Browse files
Fixed a problem with apache rewrite rules wen noflag is selected.
Fixed: FS#934 - Webalizer statistics wrong
parent
baeb2be6
Changes
2
Hide whitespace changes
Inline
Side-by-side
server/cron_daily.php
View file @
8388ae72
...
...
@@ -133,12 +133,15 @@ $webalizer_conf = escapeshellcmd($rec["document_root"].'/log/webalizer.conf');
if
(
!@
is_file
(
$webalizer_conf
))
{
exec
(
"cp
$webalizer_conf_main
$webalizer_conf
"
);
}
if
(
@
is_file
(
$webalizer_conf
))
{
setConfigVar
(
$webalizer_conf
,
'Incremental'
,
'yes'
);
setConfigVar
(
$webalizer_conf
,
'IncrementalName'
,
$
log
dir
.
'/webalizer.current'
);
setConfigVar
(
$webalizer_conf
,
'HistoryName'
,
$
log
dir
.
'/webalizer.hist'
);
setConfigVar
(
$webalizer_conf
,
'IncrementalName'
,
$
stats
dir
.
'/webalizer.current'
);
setConfigVar
(
$webalizer_conf
,
'HistoryName'
,
$
stats
dir
.
'/webalizer.hist'
);
}
if
(
!@
is_dir
(
$statsdir
))
mkdir
(
$statsdir
);
exec
(
"
$webalizer
-c
$webalizer_conf
-n
$domain
-s
$domain
-r
$domain
-q -T -p -o
$statsdir
$logfile
"
);
}
...
...
server/plugins-available/apache2_plugin.inc.php
View file @
8388ae72
...
...
@@ -579,6 +579,10 @@ class apache2_plugin {
$rewrite_rules
=
array
();
if
(
$data
[
"new"
][
"redirect_type"
]
!=
''
)
{
if
(
substr
(
$data
[
"new"
][
"redirect_path"
],
-
1
)
!=
'/'
)
$data
[
"new"
][
"redirect_path"
]
.
=
'/'
;
if
(
$data
[
"new"
][
"redirect_type"
]
==
'no'
&&
substr
(
$data
[
"new"
][
"redirect_path"
],
0
,
4
)
!=
'http'
)
{
$data
[
"new"
][
"redirect_path"
]
=
$data
[
"new"
][
"document_root"
]
.
"/web"
.
realpath
(
$data
[
"new"
][
"redirect_path"
])
.
'/'
;
}
$rewrite_rules
[]
=
array
(
'rewrite_domain'
=>
$data
[
"new"
][
"domain"
],
'rewrite_type'
=>
(
$data
[
"new"
][
"redirect_type"
]
==
'no'
)
?
''
:
'['
.
$data
[
"new"
][
"redirect_type"
]
.
']'
,
'rewrite_target'
=>
$data
[
"new"
][
"redirect_path"
]);
...
...
@@ -626,6 +630,9 @@ class apache2_plugin {
// Rewriting
if
(
$alias
[
"redirect_type"
]
!=
''
)
{
if
(
substr
(
$data
[
"new"
][
"redirect_path"
],
-
1
)
!=
'/'
)
$data
[
"new"
][
"redirect_path"
]
.
=
'/'
;
if
(
$data
[
"new"
][
"redirect_type"
]
==
'no'
&&
substr
(
$data
[
"new"
][
"redirect_path"
],
0
,
4
)
!=
'http'
)
{
$data
[
"new"
][
"redirect_path"
]
=
$data
[
"new"
][
"document_root"
]
.
"/web"
.
realpath
(
$data
[
"new"
][
"redirect_path"
])
.
'/'
;
}
$rewrite_rules
[]
=
array
(
'rewrite_domain'
=>
$alias
[
"domain"
],
'rewrite_type'
=>
(
$alias
[
"redirect_type"
]
==
'no'
)
?
''
:
'['
.
$alias
[
"redirect_type"
]
.
']'
,
'rewrite_target'
=>
$alias
[
"redirect_path"
]);
...
...
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