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

always allow remembered login 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2017-01-02 13:27:10 +01:00 committed by Roeland Jago Douma
parent 6f84eb89fc
commit 140555b786
No known key found for this signature in database
GPG Key ID: F941078878347C0C
9 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/encryption/appinfo/info.xml
View File

@ -18,7 +18,6 @@
<user>user-encryption</user> <user>user-encryption</user>
<admin>admin-encryption</admin> <admin>admin-encryption</admin>
</documentation> </documentation>
<rememberlogin>false</rememberlogin>
<version>1.5.0</version> <version>1.5.0</version>
<types> <types>
<filesystem/> <filesystem/>

1
apps/files_external/appinfo/info.xml
View File

@ -12,7 +12,6 @@
<documentation> <documentation>
<admin>admin-external-storage</admin> <admin>admin-external-storage</admin>
</documentation> </documentation>
<rememberlogin>false</rememberlogin>
<version>1.2.0</version> <version>1.2.0</version>
<types> <types>
<filesystem/> <filesystem/>

1
core/Controller/LoginController.php
View File

@ -159,7 +159,6 @@ class LoginController extends Controller {
} }
$parameters['alt_login'] = OC_App::getAlternativeLogIns(); $parameters['alt_login'] = OC_App::getAlternativeLogIns();
$parameters['rememberLoginAllowed'] = OC_Util::rememberLoginAllowed();
$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0; $parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
if (!is_null($user) && $user !== '') { if (!is_null($user) && $user !== '') {

2
core/templates/login.php
View File

@ -68,7 +68,6 @@ script('core', [
<input type="submit" id="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" /> <input type="submit" id="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" />
<div class="login-additional"> <div class="login-additional">
<?php if ($_['rememberLoginAllowed'] === true) : ?>
<div class="remember-login-container"> <div class="remember-login-container">
<?php if ($_['rememberLoginState'] === 0) { ?> <?php if ($_['rememberLoginState'] === 0) { ?>
<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white"> <input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white">
@ -77,7 +76,6 @@ script('core', [
<?php } ?> <?php } ?>
<label for="remember_login"><?php p($l->t('Stay logged in')); ?></label> <label for="remember_login"><?php p($l->t('Stay logged in')); ?></label>
</div> </div>
<?php endif; ?>
</div> </div>
<input type="hidden" name="timezone_offset" id="timezone_offset"/> <input type="hidden" name="timezone_offset" id="timezone_offset"/>

21
lib/private/legacy/util.php
View File

@ -1001,27 +1001,6 @@ class OC_Util {
} }
} }
/**
* Check if it is allowed to remember login.
*
* @note Every app can set 'rememberlogin' to 'false' to disable the remember login feature
*
* @return bool
*/
public static function rememberLoginAllowed() {
$apps = OC_App::getEnabledApps();
foreach ($apps as $app) {
$appInfo = OC_App::getAppInfo($app);
if (isset($appInfo['rememberlogin']) && $appInfo['rememberlogin'] === 'false') {
return false;
}
}
return true;
}
/** /**
* Check if the user is a subadmin, redirects to home if not * Check if the user is a subadmin, redirects to home if not
* *

3
tests/Core/Controller/LoginControllerTest.php
View File

@ -179,7 +179,6 @@ class LoginControllerTest extends TestCase {
'user_autofocus' => true, 'user_autofocus' => true,
'canResetPassword' => true, 'canResetPassword' => true,
'alt_login' => [], 'alt_login' => [],
'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(),
'rememberLoginState' => 0, 'rememberLoginState' => 0,
'resetPasswordLink' => null, 'resetPasswordLink' => null,
], ],
@ -238,7 +237,6 @@ class LoginControllerTest extends TestCase {
'user_autofocus' => false, 'user_autofocus' => false,
'canResetPassword' => $expectedResult, 'canResetPassword' => $expectedResult,
'alt_login' => [], 'alt_login' => [],
'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(),
'rememberLoginState' => 0, 'rememberLoginState' => 0,
'resetPasswordLink' => false, 'resetPasswordLink' => false,
], ],
@ -277,7 +275,6 @@ class LoginControllerTest extends TestCase {
'user_autofocus' => false, 'user_autofocus' => false,
'canResetPassword' => false, 'canResetPassword' => false,
'alt_login' => [], 'alt_login' => [],
'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(),
'rememberLoginState' => 0, 'rememberLoginState' => 0,
'resetPasswordLink' => false, 'resetPasswordLink' => false,
], ],

1
tests/data/app/expected-info.json
View File

@ -13,7 +13,6 @@
"user": "user-encryption", "user": "user-encryption",
"admin": "admin-encryption" "admin": "admin-encryption"
}, },
"rememberlogin": "false",
"types": ["filesystem"], "types": ["filesystem"],
"ocsid": "166047", "ocsid": "166047",
"dependencies": { "dependencies": {

1
tests/data/app/invalid-info.xml
View File

@ -14,7 +14,6 @@
<user>user-encryption</user> <user>user-encryption</user>
<admin>admin-encryption</admin> <admin>admin-encryption</admin>
</documentation> </documentation>
<rememberlogin>false</rememberlogin>
<types> <types>
<filesystem/> <filesystem/>
</types> </types>

1
tests/data/app/valid-info.xml
View File

@ -14,7 +14,6 @@
<user>user-encryption</user> <user>user-encryption</user>
<admin>admin-encryption</admin> <admin>admin-encryption</admin>
</documentation> </documentation>
<rememberlogin>false</rememberlogin>
<types> <types>
<filesystem/> <filesystem/>
</types> </types>