From cf4d27b115edfe9148a52b1e667e6ef5d3d06c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 26 Mar 2018 19:12:26 +0200 Subject: [PATCH] Use customclient_* values by default and do not use them in custom themes anymore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- config/config.sample.php | 6 ++++-- lib/private/legacy/defaults.php | 9 +++++---- themes/example/defaults.php | 32 -------------------------------- 3 files changed, 9 insertions(+), 38 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index 8595c024e4..ba5f3d6814 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -782,7 +782,8 @@ $CONFIG = array( * Defaults to * * Desktop client: ``https://nextcloud.com/install/#install-clients`` * * Android client: ``https://play.google.com/store/apps/details?id=com.nextcloud.client`` - * * iOS client : ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8`` + * * iOS client: ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8`` + * *iOS client app id: ``1125420102`` */ 'customclient_desktop' => 'https://nextcloud.com/install/#install-clients', @@ -790,7 +791,8 @@ $CONFIG = array( 'https://play.google.com/store/apps/details?id=com.nextcloud.client', 'customclient_ios' => 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', - +'customclient_ios_appid' => + '1125420102', /** * Apps * diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php index c541e53a48..3a22c91a8d 100644 --- a/lib/private/legacy/defaults.php +++ b/lib/private/legacy/defaults.php @@ -54,15 +54,16 @@ class OC_Defaults { public function __construct() { $this->l = \OC::$server->getL10N('lib'); + $config = \OC::$server->getConfig(); $this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */ $this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */ $this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */ $this->defaultBaseUrl = 'https://nextcloud.com'; - $this->defaultSyncClientUrl = 'https://nextcloud.com/install/#install-clients'; - $this->defaultiOSClientUrl = 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8'; - $this->defaultiTunesAppId = '1125420102'; - $this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.nextcloud.client'; + $this->defaultSyncClientUrl = $config->getSystemValue('customclient_desktop', 'https://nextcloud.com/install/#install-clients'); + $this->defaultiOSClientUrl = $config->getSystemValue('customclient_ios', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8'); + $this->defaultiTunesAppId = $config->getSystemValue('customclient_ios_appid', '1125420102'); + $this->defaultAndroidClientUrl = $config->getSystemValue('customclient_android', 'https://play.google.com/store/apps/details?id=com.nextcloud.client'); $this->defaultDocBaseUrl = 'https://docs.nextcloud.com'; $this->defaultDocVersion = '14'; // used to generate doc links $this->defaultSlogan = $this->l->t('a safe home for all your data'); diff --git a/themes/example/defaults.php b/themes/example/defaults.php index 39006c94ad..8ed4761c66 100644 --- a/themes/example/defaults.php +++ b/themes/example/defaults.php @@ -28,38 +28,6 @@ class OC_Theme { return 'https://nextcloud.com'; } - /** - * Returns the URL where the sync clients are listed - * @return string URL - */ - public function getSyncClientUrl() { - return 'https://nextcloud.com/install/#install-clients'; - } - - /** - * Returns the URL to the App Store for the iOS Client - * @return string URL - */ - public function getiOSClientUrl() { - return 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8'; - } - - /** - * Returns the AppId for the App Store for the iOS Client - * @return string AppId - */ - public function getiTunesAppId() { - return '1125420102'; - } - - /** - * Returns the URL to Google Play for the Android Client - * @return string URL - */ - public function getAndroidClientUrl() { - return 'https://play.google.com/store/apps/details?id=com.nextcloud.client'; - } - /** * Returns the documentation URL * @return string URL