diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/Controller/CheckSetupController.php | 10 | ||||
| -rw-r--r-- | settings/templates/personal.php | 4 | ||||
| -rw-r--r-- | settings/templates/settings.development.notice.php | 3 |
3 files changed, 2 insertions, 15 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index 3881952872f..d9e4846672c 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -174,19 +174,13 @@ class CheckSetupController extends Controller { * @return string */ private function isUsedTlsLibOutdated() { - // Appstore is disabled by default in EE - $appStoreDefault = false; - if (\OC_Util::getEditionString() === '') { - $appStoreDefault = true; - } - // Don't run check when: // 1. Server has `has_internet_connection` set to false // 2. AppStore AND S2S is disabled if(!$this->config->getSystemValue('has_internet_connection', true)) { return ''; } - if(!$this->config->getSystemValue('appstoreenabled', $appStoreDefault) + if(!$this->config->getSystemValue('appstoreenabled', true) && $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no' && $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') { return ''; @@ -200,7 +194,7 @@ class CheckSetupController extends Controller { } $features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing'); - if(!$this->config->getSystemValue('appstoreenabled', $appStoreDefault)) { + if(!$this->config->getSystemValue('appstoreenabled', true)) { $features = (string)$this->l10n->t('Federated Cloud Sharing'); } diff --git a/settings/templates/personal.php b/settings/templates/personal.php index a3ea87a89c6..bbb47f48bab 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -157,12 +157,10 @@ if($_['passwordChangeSupported']) { </option> <?php endforeach;?> </select> - <?php if (OC_Util::getEditionString() === ''): ?> <a href="https://www.transifex.com/nextcloud/nextcloud/" target="_blank" rel="noreferrer"> <em><?php p($l->t('Help translate'));?></em> </a> - <?php endif; ?> </form> @@ -181,7 +179,6 @@ if($_['passwordChangeSupported']) { alt="<?php p($l->t('iOS app'));?>" /> </a> - <?php if (OC_Util::getEditionString() === ''): ?> <p> <?php print_unescaped($l->t('If you want to support the project <a href="https://nextcloud.com/contribute" @@ -190,7 +187,6 @@ if($_['passwordChangeSupported']) { <a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">spread the word</a>!'));?> </p> - <?php endif; ?> <?php if(OC_APP::isEnabled('firstrunwizard')) {?> <p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p> diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php index ccbd0b7df80..72d81d08cf5 100644 --- a/settings/templates/settings.development.notice.php +++ b/settings/templates/settings.development.notice.php @@ -1,4 +1,3 @@ -<?php if (OC_Util::getEditionString() === ''): ?> <p> <?php print_unescaped(str_replace( [ @@ -63,5 +62,3 @@ {newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}' )); ?> </p> - -<?php endif; ?> |