mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable enhancedauth by default 

Admins can still enable it via config.php
This commit is contained in:
Lukas Reschke 2012-10-22 23:04:39 +02:00
parent b879cd709e
commit 65619af05b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/json.php
View File

@ -83,7 +83,7 @@ class OC_JSON{
* Check if the user verified the login with his password
*/
public static function verifyUser() {
if(OC_Config::getValue('enhancedauth', true) === true) {
if(OC_Config::getValue('enhancedauth', false) === true) {
if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
$l = OC_L10N::get('lib');
self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));

6
lib/util.php
View File

@ -398,7 +398,7 @@ class OC_Util {
* If not, the user will be shown a password verification page
*/
public static function verifyUser() {
if(OC_Config::getValue('enhancedauth', true) === true) {
if(OC_Config::getValue('enhancedauth', false) === true) {
// Check password to set session
if(isset($_POST['password'])) {
if (OC_User::login(OC_User::getUser(), $_POST["password"] ) === true) {
@ -419,12 +419,12 @@ class OC_Util {
* @return bool
*/
public static function isUserVerified() {
if(OC_Config::getValue('enhancedauth', true) === true) {
if(OC_Config::getValue('enhancedauth', false) === true) {
if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
return false;
}
return true;
}
return true;
}
/**