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

Add extendedSupport to Subscription 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2019-06-11 16:08:26 +02:00
parent 1d24a06aa5
commit 78d7448c7d
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/Controller/OCSController.php
View File

@ -97,6 +97,7 @@ class OCSController extends \OCP\AppFramework\OCSController {
'micro' => $micro, 'micro' => $micro,
'string' => \OC_Util::getVersionString(), 'string' => \OC_Util::getVersionString(),
'edition' => '', 'edition' => '',
'extendedSupport' => \OCP\Util::hasExtendedSupport()
); );
if($this->userSession->isLoggedIn()) { if($this->userSession->isLoggedIn()) {

10
lib/public/Util.php
View File

@ -89,7 +89,11 @@ class Util {
public static function getVersion() { public static function getVersion() {
return \OC_Util::getVersion(); return \OC_Util::getVersion();
} }
public static function hasExtendedSupport(): bool {
return \OC::$server->getConfig()->getSystemValueBool('extendedSupport', false);
}
/** /**
* Set current update channel * Set current update channel
* @param string $channel * @param string $channel
@ -98,7 +102,7 @@ class Util {
public static function setChannel($channel) { public static function setChannel($channel) {
\OC::$server->getConfig()->setSystemValue('updater.release.channel', $channel); \OC::$server->getConfig()->setSystemValue('updater.release.channel', $channel);
} }
/** /**
* Get current update channel * Get current update channel
* @return string * @return string
@ -555,7 +559,7 @@ class Util {
public static function needUpgrade() { public static function needUpgrade() {
if (!isset(self::$needUpgradeCache)) { if (!isset(self::$needUpgradeCache)) {
self::$needUpgradeCache=\OC_Util::needUpgrade(\OC::$server->getSystemConfig()); self::$needUpgradeCache=\OC_Util::needUpgrade(\OC::$server->getSystemConfig());
} }
return self::$needUpgradeCache; return self::$needUpgradeCache;
} }

6
status.php
View File

@ -42,14 +42,16 @@ try {
# see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php # see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php
# for description and defaults # for description and defaults
$defaults = new \OCP\Defaults(); $defaults = new \OCP\Defaults();
$values=array( $values = [
'installed'=>$installed, 'installed'=>$installed,
'maintenance' => $maintenance, 'maintenance' => $maintenance,
'needsDbUpgrade' => \OCP\Util::needUpgrade(), 'needsDbUpgrade' => \OCP\Util::needUpgrade(),
'version'=>implode('.', \OCP\Util::getVersion()), 'version'=>implode('.', \OCP\Util::getVersion()),
'versionstring'=>OC_Util::getVersionString(), 'versionstring'=>OC_Util::getVersionString(),
'edition'=> '', 'edition'=> '',
'productname'=>$defaults->getName()); 'productname'=>$defaults->getName(),
'extendedSupport' => \OCP\Util::hasExtendedSupport()
];
if (OC::$CLI) { if (OC::$CLI) {
print_r($values); print_r($values);
} else { } else {