Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Guilherme Filippo
ISPConfig 3
Commits
0ff3f159
Commit
0ff3f159
authored
Sep 25, 2010
by
tbrehm
Browse files
Fixed: FS#1305 - Webdav user information is not written to domains vhost file.
parent
0c05d995
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/plugins-available/apache2_plugin.inc.php
View file @
0ff3f159
...
...
@@ -1155,26 +1155,29 @@ class apache2_plugin {
*/
private
function
_writeHtDigestFile
(
$filename
,
$username
,
$authname
,
$pwdhash
)
{
$changed
=
false
;
$in
=
fopen
(
$filename
,
'r'
);
$output
=
''
;
/*
* read line by line and search for the username and authname
*/
while
(
preg_match
(
"/:/"
,
$line
=
fgets
(
$in
)))
{
$line
=
rtrim
(
$line
);
$tmp
=
explode
(
':'
,
$line
);
if
(
$tmp
[
0
]
==
$username
&&
$tmp
[
1
]
==
$authname
)
{
/*
* found the user. delete or change it?
*/
if
(
$pwdhash
!=
''
)
{
$output
.
=
$tmp
[
0
]
.
':'
.
$tmp
[
1
]
.
':'
.
$pwdhash
.
"
\n
"
;
}
$changed
=
true
;
}
else
{
$output
.
=
$line
.
"
\n
"
;
if
(
is_file
(
$filename
))
{
$in
=
fopen
(
$filename
,
'r'
);
$output
=
''
;
/*
* read line by line and search for the username and authname
*/
while
(
preg_match
(
"/:/"
,
$line
=
fgets
(
$in
)))
{
$line
=
rtrim
(
$line
);
$tmp
=
explode
(
':'
,
$line
);
if
(
$tmp
[
0
]
==
$username
&&
$tmp
[
1
]
==
$authname
)
{
/*
* found the user. delete or change it?
*/
if
(
$pwdhash
!=
''
)
{
$output
.
=
$tmp
[
0
]
.
':'
.
$tmp
[
1
]
.
':'
.
$pwdhash
.
"
\n
"
;
}
$changed
=
true
;
}
else
{
$output
.
=
$line
.
"
\n
"
;
}
}
fclose
(
$in
);
}
/*
* if we didn't change anything, we have to add the new user at the end of the file
...
...
@@ -1182,7 +1185,7 @@ class apache2_plugin {
if
(
!
$changed
)
{
$output
.
=
$username
.
':'
.
$authname
.
':'
.
$pwdhash
.
"
\n
"
;
}
fclose
(
$in
);
/*
* Now lets write the new file
...
...
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