summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/files_sharing/templates/public.php8
-rw-r--r--core/Command/Status.php6
-rw-r--r--core/Controller/OCSController.php2
-rw-r--r--core/templates/layout.user.php8
-rw-r--r--lib/private/OCSClient.php8
-rw-r--r--lib/private/Updater/VersionCheck.php2
-rw-r--r--lib/private/legacy/app.php4
-rw-r--r--lib/private/legacy/util.php11
-rw-r--r--settings/Controller/CheckSetupController.php10
-rw-r--r--settings/templates/personal.php4
-rw-r--r--settings/templates/settings.development.notice.php3
-rw-r--r--status.php2
-rw-r--r--tests/Settings/Controller/CheckSetupControllerTest.php16
-rw-r--r--tests/lib/Updater/VersionCheckTest.php2
-rw-r--r--tests/lib/UpdaterTest.php2
15 files changed, 17 insertions, 71 deletions
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index fe363ed82f5..1b282f04a7a 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -43,13 +43,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
<div class="header-appname-container">
<h1 class="header-appname">
- <?php
- if(OC_Util::getEditionString() === '') {
- p($theme->getName());
- } else {
- print_unescaped($theme->getHTMLName());
- }
- ?>
+ <?php p($theme->getName()); ?>
</h1>
</div>
diff --git a/core/Command/Status.php b/core/Command/Status.php
index 91c79d27670..177c63f0405 100644
--- a/core/Command/Status.php
+++ b/core/Command/Status.php
@@ -38,13 +38,11 @@ class Status extends Base {
}
protected function execute(InputInterface $input, OutputInterface $output) {
- $installed = (bool) \OC::$server->getConfig()->getSystemValue('installed', false);
-
$values = array(
- 'installed' => $installed,
+ 'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
'version' => implode('.', \OCP\Util::getVersion()),
'versionstring' => \OC_Util::getVersionString(),
- 'edition' => $installed ? \OC_Util::getEditionString() : '',
+ 'edition' => '',
);
$this->writeArrayInOutputFormat($input, $output, $values);
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index c785f1ff94a..13cc4d8ce2c 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -81,7 +81,7 @@ class OCSController extends \OCP\AppFramework\OCSController {
'minor' => $minor,
'micro' => $micro,
'string' => \OC_Util::getVersionString(),
- 'edition' => \OC_Util::getEditionString(),
+ 'edition' => '',
);
$result['capabilities'] = $this->capabilitiesManager->getCapabilities();
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index b5466b6fc05..6b9cd4061ed 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -48,13 +48,7 @@
<a href="#" class="header-appname-container menutoggle" tabindex="2">
<h1 class="header-appname">
- <?php
- if(OC_Util::getEditionString() === '') {
- p(!empty($_['application'])?$_['application']: $l->t('Apps'));
- } else {
- print_unescaped($theme->getHTMLName());
- }
- ?>
+ <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
</h1>
<div class="icon-caret"></div>
</a>
diff --git a/lib/private/OCSClient.php b/lib/private/OCSClient.php
index d864e6d4dcb..76c0b136c06 100644
--- a/lib/private/OCSClient.php
+++ b/lib/private/OCSClient.php
@@ -70,13 +70,7 @@ class OCSClient {
* @return bool
*/
public function isAppStoreEnabled() {
- // For a regular edition default to true, all others default to false
- $default = false;
- if (\OC_Util::getEditionString() === '') {
- $default = true;
- }
-
- return $this->config->getSystemValue('appstoreenabled', $default) === true;
+ return $this->config->getSystemValue('appstoreenabled', true) === true;
}
/**
diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php
index d240687f9bd..6f6508d314c 100644
--- a/lib/private/Updater/VersionCheck.php
+++ b/lib/private/Updater/VersionCheck.php
@@ -71,7 +71,7 @@ class VersionCheck {
$version['installed'] = $this->config->getAppValue('core', 'installedat');
$version['updated'] = $this->config->getAppValue('core', 'lastupdatedat');
$version['updatechannel'] = \OC_Util::getChannel();
- $version['edition'] = \OC_Util::getEditionString();
+ $version['edition'] = '';
$version['build'] = \OC_Util::getBuild();
$versionString = implode('x', $version);
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 1efd3bceb23..d964212f3bb 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -437,9 +437,7 @@ class OC_App {
$settings = array();
// by default, settings only contain the help menu
- if (OC_Util::getEditionString() === '' &&
- \OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true
- ) {
+ if (\OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true)) {
$settings = array(
array(
"id" => "help",
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index 648be70cf0d..04dcb8fc896 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -382,18 +382,11 @@ class OC_Util {
}
/**
- * @description get the current installed edition of ownCloud. There is the community
- * edition that just returns an empty string and the enterprise edition
- * that returns "Enterprise".
+ * @deprecated the value is of no use anymore
* @return string
*/
public static function getEditionString() {
- if (OC_App::isEnabled('enterprise_key')) {
- return "Enterprise";
- } else {
- return "";
- }
-
+ return '';
}
/**
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; ?>
diff --git a/status.php b/status.php
index ed7287cb317..e0db479d3e4 100644
--- a/status.php
+++ b/status.php
@@ -43,7 +43,7 @@ try {
'maintenance' => $maintenance,
'version'=>implode('.', \OCP\Util::getVersion()),
'versionstring'=>OC_Util::getVersionString(),
- 'edition'=> $installed ? OC_Util::getEditionString() : '',
+ 'edition'=> '',
'productname'=>$defaults->getName());
if (OC::$CLI) {
print_r($values);
diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php
index e4f66b5d879..c465ee79ed1 100644
--- a/tests/Settings/Controller/CheckSetupControllerTest.php
+++ b/tests/Settings/Controller/CheckSetupControllerTest.php
@@ -508,12 +508,6 @@ class CheckSetupControllerTest extends TestCase {
}
public function testIsUsedTlsLibOutdatedWithAppstoreDisabledAndServerToServerSharingEnabled() {
- // Appstore is disabled by default in EE
- $appStoreDefault = false;
- if (\OC_Util::getEditionString() === '') {
- $appStoreDefault = true;
- }
-
$this->config
->expects($this->at(0))
->method('getSystemValue')
@@ -522,7 +516,7 @@ class CheckSetupControllerTest extends TestCase {
$this->config
->expects($this->at(1))
->method('getSystemValue')
- ->with('appstoreenabled', $appStoreDefault)
+ ->with('appstoreenabled', true)
->will($this->returnValue(false));
$this->config
->expects($this->at(2))
@@ -543,12 +537,6 @@ class CheckSetupControllerTest extends TestCase {
}
public function testIsUsedTlsLibOutdatedWithAppstoreDisabledAndServerToServerSharingDisabled() {
- // Appstore is disabled by default in EE
- $appStoreDefault = false;
- if (\OC_Util::getEditionString() === '') {
- $appStoreDefault = true;
- }
-
$this->config
->expects($this->at(0))
->method('getSystemValue')
@@ -557,7 +545,7 @@ class CheckSetupControllerTest extends TestCase {
$this->config
->expects($this->at(1))
->method('getSystemValue')
- ->with('appstoreenabled', $appStoreDefault)
+ ->with('appstoreenabled', true)
->will($this->returnValue(false));
$this->config
->expects($this->at(2))
diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php
index fb43571cece..5283ca9c555 100644
--- a/tests/lib/Updater/VersionCheckTest.php
+++ b/tests/lib/Updater/VersionCheckTest.php
@@ -50,7 +50,7 @@ class VersionCheckTest extends \Test\TestCase {
* @return string
*/
private function buildUpdateUrl($baseUrl) {
- return $baseUrl . '?version='.implode('x', Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'x'.\OC_Util::getEditionString().'x';
+ return $baseUrl . '?version='.implode('x', Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'xx';
}
public function testCheckInCache() {
diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php
index e45a9f08243..0c67a3f7433 100644
--- a/tests/lib/UpdaterTest.php
+++ b/tests/lib/UpdaterTest.php
@@ -61,7 +61,7 @@ class UpdaterTest extends \Test\TestCase {
* @return string
*/
private function buildUpdateUrl($baseUrl) {
- return $baseUrl . '?version='.implode('x', \OCP\Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'x'.\OC_Util::getEditionString().'x';
+ return $baseUrl . '?version='.implode('x', \OCP\Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'xx';
}
/**
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 23:45:14 +0000