From 7c0951244a176e0b42d2d66a4288d74460821a8c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 6 Sep 2016 14:11:30 +0200 Subject: [PATCH] Deprecate getEditionString() --- apps/files_sharing/templates/public.php | 8 +------- core/Command/Status.php | 6 ++---- core/Controller/OCSController.php | 2 +- core/templates/layout.user.php | 8 +------- lib/private/OCSClient.php | 8 +------- lib/private/Updater/VersionCheck.php | 2 +- lib/private/legacy/app.php | 4 +--- lib/private/legacy/util.php | 11 ++--------- settings/Controller/CheckSetupController.php | 10 ++-------- settings/templates/personal.php | 4 ---- .../templates/settings.development.notice.php | 3 --- status.php | 2 +- .../Controller/CheckSetupControllerTest.php | 16 ++-------------- tests/lib/Updater/VersionCheckTest.php | 2 +- tests/lib/UpdaterTest.php | 2 +- 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);

- getName()); - } else { - print_unescaped($theme->getHTMLName()); - } - ?> + getName()); ?>

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

- t('Apps')); - } else { - print_unescaped($theme->getHTMLName()); - } - ?> + t('Apps')); ?>

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']) { - t('Help translate'));?> - @@ -181,7 +179,6 @@ if($_['passwordChangeSupported']) { alt="t('iOS app'));?>" /> -

t('If you want to support the project spread the word!'));?>

-

t('Show First Run Wizard again'));?>

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

{linkclose}' )); ?>

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