Deprecate getEditionString()

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
+				<?php p($theme->getName()); ?>
-					if(OC_Util::getEditionString() === '') {
-						p($theme->getName());
-					} else {
-						print_unescaped($theme->getHTMLName());
-					}
-				?>
 			</h1>
 		</div>
 

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);

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();

core/templates/layout.user.php

@@ -48,13 +48,7 @@
 
 			<a href="#" class="header-appname-container menutoggle" tabindex="2">
 				<h1 class="header-appname">
-					<?php
+					<?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
-						if(OC_Util::getEditionString() === '') {
-							p(!empty($_['application'])?$_['application']: $l->t('Apps'));
-						} else {
-							print_unescaped($theme->getHTMLName());
-						}
-					?>
 				</h1>
 				<div class="icon-caret"></div>
 			</a>

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
+		return $this->config->getSystemValue('appstoreenabled', true) === true;
-		$default = false;
-		if (\OC_Util::getEditionString() === '') {
-			$default = true;
-		}
-
-		return $this->config->getSystemValue('appstoreenabled', $default) === true;
 	}
 
 	/**

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);
 

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() === '' &&
+		if (\OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true)) {
-			\OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true
-		) {
 			$settings = array(
 				array(
 					"id" => "help",

lib/private/legacy/util.php

@@ -382,18 +382,11 @@ class OC_Util {
 	}
 
 	/**
-	 * @description get the current installed edition of ownCloud. There is the community
+	 * @deprecated the value is of no use anymore
-	 * edition that just returns an empty string and the enterprise edition
-	 * that returns "Enterprise".
 	 * @return string
 	 */
 	public static function getEditionString() {
-		if (OC_App::isEnabled('enterprise_key')) {
+		return '';
-			return "Enterprise";
-		} else {
-			return "";
-		}
-
 	}
 
 	/**

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');
 		}
 

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>

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; ?>

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);

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))

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() {

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';
 	}
 
 	/**