diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/nextcloud/APKBUILD | 10 | ||||
| -rw-r--r-- | user/nextcloud/use-external-docs-if-local-not-avail.patch | 79 |
2 files changed, 41 insertions, 48 deletions
diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD index d5f62c610..05a578014 100644 --- a/user/nextcloud/APKBUILD +++ b/user/nextcloud/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=nextcloud -pkgver=17.0.5 +pkgver=18.0.3 pkgrel=0 pkgdesc="Self-hosted file sync and groupware server" url="https://nextcloud.com" @@ -35,6 +35,7 @@ depends=" $pkgname-sqlite !$pkgname-files_texteditor + !$pkgname-gallery !$pkgname-user_external " makedepends="libxml2-utils" @@ -75,6 +76,7 @@ _bundled_apps="accessibility lookup_server_connector oauth2 provisioning_api + settings support twofactor_backupcodes workflowengine @@ -95,11 +97,11 @@ _apps="activity files_versions files_videoplayer firstrunwizard - gallery logreader nextcloud_announcements notifications password_policy + photos privacy recommendations serverinfo @@ -253,12 +255,12 @@ _package_app() { mv "$pkgdir/$_appsdir/$_appname" "$subpkgdir/$_appsdir/" } -sha512sums="c23cc36ba7f1a203422485e90d7284e399282406f5672b6c82c345a9dea3908d9c135621d391eb91a03f5a1e42a233bea9cd82efe2089be38d259619e3dbe0f9 nextcloud-17.0.5.zip +sha512sums="f7ae10f89ca4d1c0da240eefecadcddf15172177c411181a5dd7977b33ac2237805211156dbe229dfc9e71f8da3d1062677b8463f19b4103a757f1fd20af0b73 nextcloud-18.0.3.zip 3336c2f534de1e380d64bb87f07dcaeb617db5b7bb9446ed845e78be917c1c87eb6f7da71a6b4382198d977e21e550b3165d0b276b07b68a0a569a383766c75d dont-chmod.patch aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b disable-integrity-check-as-default.patch de1b433c2fb2582b599cb25e718e454fc4b93543a5a60eee39a03bcccf35d281594611395bdebe02319bedd9a894507eef97010ebdfca381e0f1a09df283d375 iconv-ascii-translit-not-supported.patch -478f5cd7c5d30380ea619d3e8ec623217a06a09b27534266f00297545c7d276b068c5d984673eebc5676e8bac7f45112549498944ce3fa678ac8a69541d7c430 use-external-docs-if-local-not-avail.patch +9f4c8c3682808995c1a900cf965b65bddf6a4ac340a364f1bbbda7ebb52c5753da0d8290bbce1885202a7e2bd2f1736a0517195a97e37c9eda07005342257030 use-external-docs-if-local-not-avail.patch 4d01c89d5fd86190fb3bd6a5ca97bc623ec55d92cbf030c18c5811d711cea557485d334a6588e458eea4e0b3ad82f4defd7cb5a9d4f393ce4d5b32abf45db596 nextcloud-config.php 7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba nextcloud.logrotate dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a nextcloud.confd diff --git a/user/nextcloud/use-external-docs-if-local-not-avail.patch b/user/nextcloud/use-external-docs-if-local-not-avail.patch index 19145b5ce..a9c779fef 100644 --- a/user/nextcloud/use-external-docs-if-local-not-avail.patch +++ b/user/nextcloud/use-external-docs-if-local-not-avail.patch @@ -1,53 +1,44 @@ +Forward port of the following to NC 18: + From: Jakub Jirutka <jakub@jirutka.cz> Date: Tue, 27 Jun 2017 02:07:00 +0200 Subject: [PATCH] Show link to external docs if local is not installed ---- a/settings/help.php -+++ b/settings/help.php -@@ -34,22 +34,36 @@ - OC_Util::addStyle( "settings", "settings" ); - \OC::$server->getNavigationManager()->setActiveEntry('help'); - -+$localDocs = true; - - if(isset($_GET['mode']) and $_GET['mode'] === 'admin') { -- $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); -+ if (file_exists(\OC::$SERVERROOT . '/core/doc/admin/index.html')) { -+ $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); -+ } else { -+ $url=\OC::$server->query(\OCP\Defaults::class)->buildDocLinkToKey('admin-manual'); -+ $localDocs=false; -+ } - $style1=''; - $style2=' active'; - }else{ - $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); -+ if (file_exists( \OC::$SERVERROOT . '/core/doc/user/index.html' )) { -+ $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); -+ } else { -+ $url=\OC::$server->query(\OCP\Defaults::class)->buildDocLinkToKey('user-manual'); -+ $localDocs=false; -+ } - $style1=' active'; - $style2=''; - } - +--- nextcloud/apps/settings/lib/Controller/HelpController.php 2020-03-11 09:52:40.000000000 -0500 ++++ nextcloud/apps/settings/lib/Controller/HelpController.php 2020-03-30 21:25:34.840255846 -0500 +@@ -75,9 +75,16 @@ class HelpController extends Controller + $mode = 'user'; + } + +- $documentationUrl = $this->urlGenerator->getAbsoluteURL( +- $this->urlGenerator->linkTo('core', 'doc/' . $mode . '/index.html') +- ); ++ $localDocs = true; + - $url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user'; - $url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin'; - - $tmpl = new OC_Template( "settings", "help", "user" ); - $tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser())); -+$tmpl->assign( "localDocs", $localDocs ); - $tmpl->assign( "url", $url ); - $tmpl->assign( "url1", $url1 ); - $tmpl->assign( "url2", $url2 ); - ---- a/settings/templates/help.php -+++ b/settings/templates/help.php -@@ -42,6 +42,17 @@ ++ if (file_exists(\OC::$SERVERROOT . '/core/doc/'. $mode . '/index.html')) { ++ $documentationUrl = $this->urlGenerator->getAbsoluteURL( ++ $this->urlGenerator->linkTo('core', 'doc/' . $mode . '/index.html') ++ ); ++ } else { ++ $localDocs = false; ++ $documentationUrl=\OC::$server->query(\OCP\Defaults::class)->buildDocLinkToKey($mode . "-manual"); ++ } + + $urlUserDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'user']); + $urlAdminDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'admin']); +@@ -88,6 +95,7 @@ class HelpController extends Controller + 'urlUserDocs' => $urlUserDocs, + 'urlAdminDocs' => $urlAdminDocs, + 'mode' => $mode, ++ 'localDocs' => $localDocs, + ]); + $policy = new ContentSecurityPolicy(); + $policy->addAllowedFrameDomain('\'self\''); +--- nextcloud/apps/settings/templates/help.php 2020-03-11 09:52:40.000000000 -0500 ++++ nextcloud/apps/settings/templates/help.php 2020-03-30 21:23:06.980254262 -0500 +@@ -31,6 +31,17 @@ </div> - + <div id="app-content" class="help-includes"> +<?php if ($_['localDocs']) { ?> <iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe"> |