|
|
|
@ -56,7 +56,6 @@ use OCP\App\IAppManager;
|
|
|
|
|
use OCP\App\ManagerEvent;
|
|
|
|
|
use OCP\Authentication\IAlternativeLogin;
|
|
|
|
|
use OCP\EventDispatcher\IEventDispatcher;
|
|
|
|
|
use OCP\ILogger;
|
|
|
|
|
use OC\AppFramework\Bootstrap\Coordinator;
|
|
|
|
|
use OC\App\DependencyAnalyzer;
|
|
|
|
|
use OC\App\Platform;
|
|
|
|
@ -292,7 +291,7 @@ class OC_App {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
\OCP\Util::writeLog('core', 'No application directories are marked as writable.', ILogger::ERROR);
|
|
|
|
|
\OCP\Server::get(LoggerInterface::class)->error('No application directories are marked as writable.', ['app' => 'core']);
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -517,7 +516,7 @@ class OC_App {
|
|
|
|
|
|
|
|
|
|
foreach (OC::$APPSROOTS as $apps_dir) {
|
|
|
|
|
if (!is_readable($apps_dir['path'])) {
|
|
|
|
|
\OCP\Util::writeLog('core', 'unable to read app folder : ' . $apps_dir['path'], ILogger::WARN);
|
|
|
|
|
\OCP\Server::get(LoggerInterface::class)->warning('unable to read app folder : ' . $apps_dir['path'], ['app' => 'core']);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
$dh = opendir($apps_dir['path']);
|
|
|
|
@ -568,12 +567,12 @@ class OC_App {
|
|
|
|
|
if (array_search($app, $blacklist) === false) {
|
|
|
|
|
$info = $appManager->getAppInfo($app, false, $langCode);
|
|
|
|
|
if (!is_array($info)) {
|
|
|
|
|
\OCP\Util::writeLog('core', 'Could not read app info file for app "' . $app . '"', ILogger::ERROR);
|
|
|
|
|
\OCP\Server::get(LoggerInterface::class)->error('Could not read app info file for app "' . $app . '"', ['app' => 'core']);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!isset($info['name'])) {
|
|
|
|
|
\OCP\Util::writeLog('core', 'App id "' . $app . '" has no name in appinfo', ILogger::ERROR);
|
|
|
|
|
\OCP\Server::get(LoggerInterface::class)->error('App id "' . $app . '" has no name in appinfo', ['app' => 'core']);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -870,11 +869,11 @@ class OC_App {
|
|
|
|
|
}
|
|
|
|
|
return new \OC\Files\View('/' . OC_User::getUser() . '/' . $appId);
|
|
|
|
|
} else {
|
|
|
|
|
\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ', user not logged in', ILogger::ERROR);
|
|
|
|
|
\OCP\Server::get(LoggerInterface::class)->error('Can\'t get app storage, app ' . $appId . ', user not logged in', ['app' => 'core']);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ' not enabled', ILogger::ERROR);
|
|
|
|
|
\OCP\Server::get(LoggerInterface::class)->error('Can\'t get app storage, app ' . $appId . ' not enabled', ['app' => 'core']);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|