YunoHost-Apps/nextcloud_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/nextcloud_ynh.git synced 2024-09-03 19:55:57 +02:00
Code Issues Activity Actions

[enh] Update Nextcloud to v10.0.0 with logout patch

Browse source
This commit is contained in:
Jérôme Lebleu 2016-08-28 21:54:46 +02:00
parent cc21dc5fa3
commit 780d925e26
5 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -5,7 +5,7 @@ Nextcloud for YunoHost
own data. A personal cloud which run on your own server. With Nextcloud own data. A personal cloud which run on your own server. With Nextcloud
you can synchronize your files over your devices. you can synchronize your files over your devices.
**Shipped version:** 9.0.52 **Shipped version:** 10.0.0
![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png) ![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png)

6
conf/nextcloud-deps.control
View file

@ -4,8 +4,10 @@ Homepage: https://owncloud.org/
Standards-Version: 3.9.2 Standards-Version: 3.9.2
Package: nextcloud-deps Package: nextcloud-deps
Version: 9.0-1 Version: 10.0-1
Depends: acl, php5-cli, php5-apcu, tar, smbclient Depends: php5-gd, php5-json, php5-intl, php5-mcrypt
, php5-curl, php5-apcu, php5-imagick
, acl, tar, smbclient
Architecture: all Architecture: all
Description: meta package for nextcloud dependencies Description: meta package for nextcloud dependencies
Nextcloud gives you universal access to your files through a web Nextcloud gives you universal access to your files through a web

4
manifest.json
View file

@ -4,11 +4,11 @@
"name": "Nextcloud", "name": "Nextcloud",
"description": { "description": {
"en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms", "en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms",
"fr": "Accédez et partagez vos fichiers, calendriers, contacts, mail et bien plus depuis n'importe quel appareil, selon vos conditions" "fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions"
}, },
"url": "https://nextcloud.com", "url": "https://nextcloud.com",
"license": "AGPL-3", "license": "AGPL-3",
"version": "9.0.52", "version": "10.0.0",
"maintainer": { "maintainer": {
"name": "jerome", "name": "jerome",
"email": "jerome@yunohost.org" "email": "jerome@yunohost.org"

29
patches/00-add-logout_url-conf.patch
View file

@ -1,15 +1,14 @@
--- a/lib/base.php 2016-04-04 21:26:47.281448433 +0200 --- a/core/Controller/LoginController.php
+++ b/lib/base.php 2016-04-04 21:27:16.034283534 +0200 +++ b/core/Controller/LoginController.php
@@ -920,8 +920,10 @@ @@ -100,7 +100,10 @@ class LoginController extends Controller {
\OC::$server->getConfig()->deleteUserValue(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']); }
} $this->userSession->logout();
OC_User::logout();
- // redirect to webroot and add slash if webroot is empty - return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
- header("Location: " . \OC::$server->getURLGenerator()->getAbsoluteURL('/')); + $redirectUrl = $this->config->getSystemValue('logout_url',
+ // Use system config or redirect to webroot and add slash if webroot is empty + $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')
+ $redirect_url = $systemConfig->getValue('logout_url', + );
+ \OC::$server->getURLGenerator()->getAbsoluteURL('/')); + return new RedirectResponse($redirectUrl);
+ header("Location: " . $redirect_url); }
} else {
// Redirect to default application /**
OC_Util::redirectToDefaultPage();

4
scripts/_common.sh
View file

@ -5,7 +5,7 @@
APPNAME="nextcloud" APPNAME="nextcloud"
# Nextcloud version # Nextcloud version
VERSION="9.0.52" VERSION="10.0.0"
# Package name for Nextcloud dependencies # Package name for Nextcloud dependencies
DEPS_PKG_NAME="nextcloud-deps" DEPS_PKG_NAME="nextcloud-deps"
@ -14,7 +14,7 @@ DEPS_PKG_NAME="nextcloud-deps"
NEXTCLOUD_SOURCE_URL="https://download.nextcloud.com/server/releases/nextcloud-${VERSION}.tar.bz2" NEXTCLOUD_SOURCE_URL="https://download.nextcloud.com/server/releases/nextcloud-${VERSION}.tar.bz2"
# Remote URL to fetch Nextcloud tarball checksum # Remote URL to fetch Nextcloud tarball checksum
NEXTCLOUD_SOURCE_SHA256="70429565bb010e3a3d7bd16b43980fe7c08bfeffaa88ebaf528b96e4b2fe16c0" NEXTCLOUD_SOURCE_SHA256="1aaa177c0a00095fb97a3ca7eefb0b4236b652d58341e1cf3dbea9dc0787761f"
# App package root directory should be the parent folder # App package root directory should be the parent folder
PKGDIR=$(cd ../; pwd) PKGDIR=$(cd ../; pwd)