mirror of
https://github.com/YunoHost-Apps/nextcloud_ynh.git
synced 2024-09-03 19:55:57 +02:00
Upgrade to upstream version 16.0.1
This commit is contained in:
parent
ff7590c44e
commit
e60f95660b
4 changed files with 24 additions and 49 deletions
|
@ -6,7 +6,7 @@
|
|||
"en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms",
|
||||
"fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions"
|
||||
},
|
||||
"version": "15.0.7~ynh1",
|
||||
"version": "16.0.1~ynh1",
|
||||
"url": "https://nextcloud.com",
|
||||
"license": "AGPL-3.0",
|
||||
"maintainer": {
|
||||
|
@ -14,7 +14,7 @@
|
|||
"email": "apps@yunohost.org"
|
||||
},
|
||||
"requirements": {
|
||||
"yunohost": ">= 3.5.0"
|
||||
"yunohost": ">= 3.2.0"
|
||||
},
|
||||
"multi_instance": true,
|
||||
"services": [
|
||||
|
|
7
scripts/upgrade.d/upgrade.15.sh
Normal file
7
scripts/upgrade.d/upgrade.15.sh
Normal file
|
@ -0,0 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Last available nextcloud version
|
||||
next_version="16.0.0"
|
||||
|
||||
# Nextcloud tarball checksum sha256
|
||||
nextcloud_source_sha256="4532f7028b1d9bf060f75ac4fbbde52a59ecd9c9155f3178a038d3cf3609402e"
|
|
@ -1,10 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Last available nextcloud version
|
||||
next_version="15.0.7"
|
||||
next_version="16.0.1"
|
||||
|
||||
# Nextcloud tarball checksum sha256
|
||||
nextcloud_source_sha256="3e6158951fa72010ccd50dbeac05d8df162183f7bbc62a1c6c89ed7081fa9d49"
|
||||
nextcloud_source_sha256="a80ce586e9e930b2fba69707311e575346cd4dc4402e84678c730f9930d78aee"
|
||||
|
||||
# This function will only be executed upon applying the last upgrade referenced above
|
||||
last_upgrade_operations () {
|
||||
|
|
|
@ -1,57 +1,25 @@
|
|||
core/Controller/LoginController.php | 25 ++++++++++++++-----------
|
||||
1 file changed, 14 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
|
||||
index 182d2bc106..82523e306e 100644
|
||||
index 85d3b6b837..e7b9f5fdca 100644
|
||||
--- a/core/Controller/LoginController.php
|
||||
+++ b/core/Controller/LoginController.php
|
||||
@@ -95,13 +95,13 @@ class LoginController extends Controller {
|
||||
* @param Throttler $throttler
|
||||
*/
|
||||
public function __construct($appName,
|
||||
- IRequest $request,
|
||||
- IUserManager $userManager,
|
||||
- IConfig $config,
|
||||
- ISession $session,
|
||||
- IUserSession $userSession,
|
||||
- IURLGenerator $urlGenerator,
|
||||
- ILogger $logger,
|
||||
+ IRequest $request,
|
||||
+ IUserManager $userManager,
|
||||
+ IConfig $config,
|
||||
+ ISession $session,
|
||||
+ IUserSession $userSession,
|
||||
+ IURLGenerator $urlGenerator,
|
||||
+ ILogger $logger,
|
||||
Manager $twoFactorManager,
|
||||
Defaults $defaults,
|
||||
Throttler $throttler) {
|
||||
@@ -130,7 +130,10 @@ class LoginController extends Controller {
|
||||
@@ -130,11 +130,12 @@ class LoginController extends Controller {
|
||||
}
|
||||
$this->userSession->logout();
|
||||
|
||||
- $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
|
||||
- $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
|
||||
- 'core.login.showLoginForm',
|
||||
- ['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
|
||||
+ $redirectUrl = $this->config->getSystemValue('logout_url',
|
||||
+ $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')
|
||||
+ );
|
||||
+ $this->urlGenerator->linkToRouteAbsolute(
|
||||
+ 'core.login.showLoginForm',
|
||||
+ ['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers)
|
||||
));
|
||||
-
|
||||
+ $response = new RedirectResponse($redirectUrl);
|
||||
$this->session->set('clearingExecutionContexts', '1');
|
||||
$this->session->close();
|
||||
$response->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
|
||||
return $response;
|
||||
}
|
||||
@@ -303,10 +306,10 @@ class LoginController extends Controller {
|
||||
$previousUser = $user;
|
||||
$user = $users[0]->getUID();
|
||||
if($user !== $previousUser) {
|
||||
- $loginResult = $this->userManager->checkPassword($user, $password);
|
||||
- }
|
||||
+ $loginResult = $this->userManager->checkPassword($user, $password);
|
||||
}
|
||||
}
|
||||
+ }
|
||||
|
||||
if ($loginResult === false) {
|
||||
$this->logger->warning('Login failed: \''. $user .
|
||||
@@ -314,7 +317,7 @@ class LoginController extends Controller {
|
||||
@@ -329,7 +330,7 @@ class LoginController extends Controller {
|
||||
['app' => 'core']);
|
||||
return $this->createLoginFailedResponse($user, $originalUser,
|
||||
$redirect_url, self::LOGIN_MSG_INVALIDPASSWORD);
|
||||
|
|
Loading…
Add table
Reference in a new issue