Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 6a1c267

Browse files
committed
Do not override __AJXP_VALUE_SET__ value. Typo in AJXP_SAFE_SECRET_KEY.
1 parent 6d23456 commit 6a1c267

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

core/src/plugins/core.conf/class.AbstractConfDriver.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,7 @@ public function switchAction($action, $httpVars, $fileVars)
778778
}
779779
$name = $xmlNode->getAttribute("name");
780780
if (isSet($data[$name]) || $data[$name] === "") {
781+
if($data[$name] == "__AJXP_VALUE_SET__") continue;
781782
if ($data[$name] === "" || $userObject->parentRole == null
782783
|| $userObject->parentRole->filterParameterValue($pluginId, $name, AJXP_REPO_SCOPE_ALL, "") != $data[$name]
783784
|| $userObject->personalRole->filterParameterValue($pluginId, $name, AJXP_REPO_SCOPE_ALL, "") != $data[$name]) {
@@ -874,7 +875,7 @@ public function switchAction($action, $httpVars, $fileVars)
874875
$password = $httpVars["webdav_pass"];
875876
if (function_exists('mcrypt_encrypt')) {
876877
$user = $userObject->getId();
877-
$secret = (defined("AJXP_SECRET_KEY")? AJXP_SAFE_SECRET_KEY:"\1CDAFx¨op#");
878+
$secret = (defined("AJXP_SAFE_SECRET_KEY")? AJXP_SAFE_SECRET_KEY:"\1CDAFx¨op#");
878879
$password = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, md5($user.$secret), $password, MCRYPT_MODE_ECB));
879880
}
880881
$davData["PASS"] = $password;

0 commit comments

Comments
 (0)