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

Use public methods for OC_App::isShipped 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-08-01 18:57:00 +02:00
parent 84c22fdeef
commit cd02b2205e
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Command/App/ListApps.php
View File

@ -73,7 +73,7 @@ class ListApps extends Base {
//sort enabled apps above disabled apps
foreach ($apps as $app) {
if ($shippedFilter !== null && \OC_App::isShipped($app) !== $shippedFilter){
if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter){
continue;
}
if ($this->manager->isInstalled($app)) {

8
lib/private/Updater.php
View File

@ -315,10 +315,11 @@ class Updater extends BasicEmitter {
$apps = \OC_App::getEnabledApps();
$this->emit('\OC\Updater', 'appUpgradeCheckBefore');
$appManager = \OC::$server->getAppManager();
foreach ($apps as $appId) {
$info = \OC_App::getAppInfo($appId);
$compatible = \OC_App::isAppCompatible($version, $info);
$isShipped = \OC_App::isShipped($appId);
$isShipped = $appManager->isShipped($appId);
if ($compatible && $isShipped && \OC_App::shouldUpgrade($appId)) {
/**
@ -407,11 +408,12 @@ class Updater extends BasicEmitter {
$apps = OC_App::getEnabledApps();
$version = Util::getVersion();
$disabledApps = [];
$appManager = \OC::$server->getAppManager();
foreach ($apps as $app) {
// check if the app is compatible with this version of ownCloud
$info = OC_App::getAppInfo($app);
if(!OC_App::isAppCompatible($version, $info)) {
if (OC_App::isShipped($app)) {
if ($appManager->isShipped($app)) {
throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update');
}
OC_App::disable($app);
@ -422,7 +424,7 @@ class Updater extends BasicEmitter {
continue;
}
// shipped apps will remain enabled
if (OC_App::isShipped($app)) {
if ($appManager->isShipped($app)) {
continue;
}
// authentication and session apps will remain enabled as well

7
lib/private/legacy/api.php
View File

@ -123,13 +123,14 @@ class OC_API {
$name = $parameters['_route'];
// Foreach registered action
$responses = array();
$appManager = \OC::$server->getAppManager();
foreach(self::$actions[$name] as $action) {
// Check authentication and availability
if(!self::isAuthorised($action)) {
$responses[] = array(
'app' => $action['app'],
'response' => new OC_OCS_Result(null, API::RESPOND_UNAUTHORISED, 'Unauthorised'),
'shipped' => OC_App::isShipped($action['app']),
'shipped' => $appManager->isShipped($action['app']),
);
continue;
}
@ -137,7 +138,7 @@ class OC_API {
$responses[] = array(
'app' => $action['app'],
'response' => new OC_OCS_Result(null, API::RESPOND_NOT_FOUND, 'Api method not found'),
'shipped' => OC_App::isShipped($action['app']),
'shipped' => $appManager->isShipped($action['app']),
);
continue;
}
@ -145,7 +146,7 @@ class OC_API {
$responses[] = array(
'app' => $action['app'],
'response' => call_user_func($action['action'], $parameters),
'shipped' => OC_App::isShipped($action['app']),
'shipped' => $appManager->isShipped($action['app']),
);
}
$response = self::mergeResponses($responses);

23
lib/private/legacy/app.php
View File

@ -282,18 +282,6 @@ class OC_App {
}
}
/**
* check if app is shipped
*
* @param string $appId the id of the app to check
* @return bool
*
* Check if an app that is installed is a shipped app or installed from the appstore.
*/
public static function isShipped($appId) {
return \OC::$server->getAppManager()->isShipped($appId);
}
/**
* get all enabled apps
*/
@ -396,7 +384,7 @@ class OC_App {
* @return bool
*/
public static function removeApp($app) {
if (self::isShipped($app)) {
if (\OC::$server->getAppManager()->isShipped($app)) {
return false;
}
@ -777,8 +765,9 @@ class OC_App {
public function listAllApps() {
$installedApps = OC_App::getAllApps();
$appManager = \OC::$server->getAppManager();
//we don't want to show configuration for these
$blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
$blacklist = $appManager->getAlwaysEnabledApps();
$appList = array();
$langCode = \OC::$server->getL10N('core')->getLanguageCode();
$urlGenerator = \OC::$server->getURLGenerator();
@ -810,7 +799,7 @@ class OC_App {
$info['active'] = $active;
if (self::isShipped($app)) {
if ($appManager->isShipped($app)) {
$info['internal'] = true;
$info['level'] = self::officialApp;
$info['removable'] = false;
@ -823,12 +812,12 @@ class OC_App {
if($appPath !== false) {
$appIcon = $appPath . '/img/' . $app . '.svg';
if (file_exists($appIcon)) {
$info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, $app . '.svg');
$info['preview'] = $urlGenerator->imagePath($app, $app . '.svg');
$info['previewAsIcon'] = true;
} else {
$appIcon = $appPath . '/img/app.svg';
if (file_exists($appIcon)) {
$info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, 'app.svg');
$info['preview'] = $urlGenerator->imagePath($app, 'app.svg');
$info['previewAsIcon'] = true;
}
}