Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>tags/v12.0.0beta1
@@ -18,7 +18,6 @@ | |||
<user>user-encryption</user> | |||
<admin>admin-encryption</admin> | |||
</documentation> | |||
<rememberlogin>false</rememberlogin> | |||
<version>1.5.0</version> | |||
<types> | |||
<filesystem/> |
@@ -12,7 +12,6 @@ | |||
<documentation> | |||
<admin>admin-external-storage</admin> | |||
</documentation> | |||
<rememberlogin>false</rememberlogin> | |||
<version>1.2.0</version> | |||
<types> | |||
<filesystem/> |
@@ -159,7 +159,6 @@ class LoginController extends Controller { | |||
} | |||
$parameters['alt_login'] = OC_App::getAlternativeLogIns(); | |||
$parameters['rememberLoginAllowed'] = OC_Util::rememberLoginAllowed(); | |||
$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0; | |||
if (!is_null($user) && $user !== '') { |
@@ -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" /> | |||
<div class="login-additional"> | |||
<?php if ($_['rememberLoginAllowed'] === true) : ?> | |||
<div class="remember-login-container"> | |||
<?php if ($_['rememberLoginState'] === 0) { ?> | |||
<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white"> | |||
@@ -77,7 +76,6 @@ script('core', [ | |||
<?php } ?> | |||
<label for="remember_login"><?php p($l->t('Stay logged in')); ?></label> | |||
</div> | |||
<?php endif; ?> | |||
</div> | |||
<input type="hidden" name="timezone_offset" id="timezone_offset"/> |
@@ -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 | |||
* |
@@ -179,7 +179,6 @@ class LoginControllerTest extends TestCase { | |||
'user_autofocus' => true, | |||
'canResetPassword' => true, | |||
'alt_login' => [], | |||
'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(), | |||
'rememberLoginState' => 0, | |||
'resetPasswordLink' => null, | |||
], | |||
@@ -238,7 +237,6 @@ class LoginControllerTest extends TestCase { | |||
'user_autofocus' => false, | |||
'canResetPassword' => $expectedResult, | |||
'alt_login' => [], | |||
'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(), | |||
'rememberLoginState' => 0, | |||
'resetPasswordLink' => false, | |||
], | |||
@@ -277,7 +275,6 @@ class LoginControllerTest extends TestCase { | |||
'user_autofocus' => false, | |||
'canResetPassword' => false, | |||
'alt_login' => [], | |||
'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(), | |||
'rememberLoginState' => 0, | |||
'resetPasswordLink' => false, | |||
], |
@@ -13,7 +13,6 @@ | |||
"user": "user-encryption", | |||
"admin": "admin-encryption" | |||
}, | |||
"rememberlogin": "false", | |||
"types": ["filesystem"], | |||
"ocsid": "166047", | |||
"dependencies": { |
@@ -14,7 +14,6 @@ | |||
<user>user-encryption</user> | |||
<admin>admin-encryption</admin> | |||
</documentation> | |||
<rememberlogin>false</rememberlogin> | |||
<types> | |||
<filesystem/> | |||
</types> |
@@ -14,7 +14,6 @@ | |||
<user>user-encryption</user> | |||
<admin>admin-encryption</admin> | |||
</documentation> | |||
<rememberlogin>false</rememberlogin> | |||
<types> | |||
<filesystem/> | |||
</types> |