mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use customclient_* values by default and do not use them in custom themes anymore 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-03-26 19:12:26 +02:00
parent e2b44d199b
commit cf4d27b115
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/config.sample.php
View File

@ -782,7 +782,8 @@ $CONFIG = array(
* Defaults to * Defaults to
* * Desktop client: ``https://nextcloud.com/install/#install-clients`` * * Desktop client: ``https://nextcloud.com/install/#install-clients``
* * Android client: ``https://play.google.com/store/apps/details?id=com.nextcloud.client`` * * 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' => 'customclient_desktop' =>
'https://nextcloud.com/install/#install-clients', 'https://nextcloud.com/install/#install-clients',
@ -790,7 +791,8 @@ $CONFIG = array(
'https://play.google.com/store/apps/details?id=com.nextcloud.client', 'https://play.google.com/store/apps/details?id=com.nextcloud.client',
'customclient_ios' => 'customclient_ios' =>
'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
'customclient_ios_appid' =>
'1125420102',
/** /**
* Apps * Apps
* *

9
lib/private/legacy/defaults.php
View File

@ -54,15 +54,16 @@ class OC_Defaults {
public function __construct() { public function __construct() {
$this->l = \OC::$server->getL10N('lib'); $this->l = \OC::$server->getL10N('lib');
$config = \OC::$server->getConfig();
$this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */ $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->defaultName = 'Nextcloud'; /* short name, used when referring to the software */
$this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */ $this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */
$this->defaultBaseUrl = 'https://nextcloud.com'; $this->defaultBaseUrl = 'https://nextcloud.com';
$this->defaultSyncClientUrl = 'https://nextcloud.com/install/#install-clients'; $this->defaultSyncClientUrl = $config->getSystemValue('customclient_desktop', 'https://nextcloud.com/install/#install-clients');
$this->defaultiOSClientUrl = 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8'; $this->defaultiOSClientUrl = $config->getSystemValue('customclient_ios', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8');
$this->defaultiTunesAppId = '1125420102'; $this->defaultiTunesAppId = $config->getSystemValue('customclient_ios_appid', '1125420102');
$this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.nextcloud.client'; $this->defaultAndroidClientUrl = $config->getSystemValue('customclient_android', 'https://play.google.com/store/apps/details?id=com.nextcloud.client');
$this->defaultDocBaseUrl = 'https://docs.nextcloud.com'; $this->defaultDocBaseUrl = 'https://docs.nextcloud.com';
$this->defaultDocVersion = '14'; // used to generate doc links $this->defaultDocVersion = '14'; // used to generate doc links
$this->defaultSlogan = $this->l->t('a safe home for all your data'); $this->defaultSlogan = $this->l->t('a safe home for all your data');

32
themes/example/defaults.php
View File

@ -28,38 +28,6 @@ class OC_Theme {
return 'https://nextcloud.com'; 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 * Returns the documentation URL
* @return string URL * @return string URL