Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ONLYOFFICE/onlyoffice-owncloud
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a02ecb165d4dc2b9cde29d813286f39edca42cdb
Choose a base ref
..
head repository: ONLYOFFICE/onlyoffice-owncloud
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd957511fa78acc95c8169a38358c78418c1a03a
Choose a head ref
Showing with 108 additions and 150 deletions.
  1. +108 −150 appinfo/application.php
258 changes: 108 additions & 150 deletions appinfo/application.php
Original file line number Diff line number Diff line change
@@ -72,8 +72,7 @@ public function __construct(array $urlParams = []) {
function () {
if (!empty($this->appConfig->GetDocumentServerUrl())
&& $this->appConfig->SettingsAreSuccessful()
&& $this->appConfig->isUserAllowedToUse()
) {
&& $this->appConfig->isUserAllowedToUse()) {
Util::addScript("onlyoffice", "desktop");
Util::addScript("onlyoffice", "main");
Util::addScript("onlyoffice", "share");
@@ -114,176 +113,135 @@ function () {

$previewManager = $container->query(IPreview::class);
if ($this->appConfig->GetPreview()) {
$previewManager->registerProvider(
Preview::getMimeTypeRegex(),
function () use ($container) {
return $container->query(Preview::class);
}
);
$previewManager->registerProvider(Preview::getMimeTypeRegex(), function () use ($container) {
return $container->query(Preview::class);
});
}

$notificationManager = \OC::$server->getNotificationManager();
$notificationManager->registerNotifier(
function () use ($appName) {
$notificationManager->registerNotifier(function () use ($appName) {
return new Notifier(
$appName,
\OC::$server->getL10NFactory(),
\OC::$server->getURLGenerator(),
\OC::$server->getLogger(),
\OC::$server->getUserManager()
);
}, function () use ($appName) {
}, function () use ($appName) {
return [
"id" => $appName,
"name" => $appName,
];
}
);
});

$container->registerService(
"L10N",
function ($c) {
return $c->query("ServerContainer")->getL10N($c->query("AppName"));
}
);
$container->registerService("L10N", function ($c) {
return $c->query("ServerContainer")->getL10N($c->query("AppName"));
});

$container->registerService(
"RootStorage",
function ($c) {
return $c->query("ServerContainer")->getRootFolder();
}
);
$container->registerService("RootStorage", function ($c) {
return $c->query("ServerContainer")->getRootFolder();
});

$container->registerService(
"UserSession",
function ($c) {
return $c->query("ServerContainer")->getUserSession();
}
);
$container->registerService("UserSession", function ($c) {
return $c->query("ServerContainer")->getUserSession();
});

$container->registerService(
"Logger",
function ($c) {
return $c->query("ServerContainer")->getLogger();
}
);
$container->registerService("Logger", function ($c) {
return $c->query("ServerContainer")->getLogger();
});

$container->registerService(
"URLGenerator",
function ($c) {
return $c->query("ServerContainer")->getURLGenerator();
}
);
$container->registerService("URLGenerator", function ($c) {
return $c->query("ServerContainer")->getURLGenerator();
});

// Controllers
$container->registerService(
"SettingsController",
function ($c) {
return new SettingsController(
$c->query("AppName"),
$c->query("Request"),
$c->query("URLGenerator"),
$c->query("L10N"),
$c->query("Logger"),
$this->appConfig,
$this->crypt
);
}
);

$container->registerService(
"SettingsApiController",
function ($c) {
return new SettingsApiController(
$c->query("AppName"),
$c->query("Request"),
$c->query("URLGenerator"),
$this->appConfig
);
}
);

$container->registerService(
"EditorController",
function ($c) {
return new EditorController(
$c->query("AppName"),
$c->query("Request"),
$c->query("RootStorage"),
$c->query("UserSession"),
$c->query("ServerContainer")->getUserManager(),
$c->query("URLGenerator"),
$c->query("L10N"),
$c->query("Logger"),
$this->appConfig,
$this->crypt,
$c->query("IManager"),
$c->query("Session"),
$c->query("ServerContainer")->getGroupManager()
);
}
);

$container->registerService(
"EditorApiController",
function ($c) {
return new EditorApiController(
$c->query("AppName"),
$c->query("Request"),
$c->query("RootStorage"),
$c->query("UserSession"),
$c->query("URLGenerator"),
$c->query("L10N"),
$c->query("Logger"),
$this->appConfig,
$this->crypt,
$c->query("IManager"),
$c->query("Session"),
$c->get(ITagManager::class)
);
}
);

$container->registerService(
"CallbackController",
function ($c) {
return new CallbackController(
$c->query("AppName"),
$c->query("Request"),
$c->query("RootStorage"),
$c->query("UserSession"),
$c->query("ServerContainer")->getUserManager(),
$c->query("L10N"),
$c->query("Logger"),
$this->appConfig,
$this->crypt,
$c->query("IManager")
);
}
);

$container->registerService(
"TemplateController",
function ($c) {
return new TemplateController(
$c->query("AppName"),
$c->query("Request"),
$c->query("L10N"),
$c->query("Logger")
);
}
);
$container->registerService("SettingsController", function ($c) {
return new SettingsController(
$c->query("AppName"),
$c->query("Request"),
$c->query("URLGenerator"),
$c->query("L10N"),
$c->query("Logger"),
$this->appConfig,
$this->crypt
);
});

$container->registerService("SettingsApiController", function ($c) {
return new SettingsApiController(
$c->query("AppName"),
$c->query("Request"),
$c->query("URLGenerator"),
$this->appConfig
);
});

$container->registerService("EditorController", function ($c) {
return new EditorController(
$c->query("AppName"),
$c->query("Request"),
$c->query("RootStorage"),
$c->query("UserSession"),
$c->query("ServerContainer")->getUserManager(),
$c->query("URLGenerator"),
$c->query("L10N"),
$c->query("Logger"),
$this->appConfig,
$this->crypt,
$c->query("IManager"),
$c->query("Session"),
$c->query("ServerContainer")->getGroupManager()
);
});

$container->registerService("EditorApiController", function ($c) {
return new EditorApiController(
$c->query("AppName"),
$c->query("Request"),
$c->query("RootStorage"),
$c->query("UserSession"),
$c->query("URLGenerator"),
$c->query("L10N"),
$c->query("Logger"),
$this->appConfig,
$this->crypt,
$c->query("IManager"),
$c->query("Session"),
$c->get(ITagManager::class)
);
});

$container->registerService("CallbackController", function ($c) {
return new CallbackController(
$c->query("AppName"),
$c->query("Request"),
$c->query("RootStorage"),
$c->query("UserSession"),
$c->query("ServerContainer")->getUserManager(),
$c->query("L10N"),
$c->query("Logger"),
$this->appConfig,
$this->crypt,
$c->query("IManager")
);
});

$container->registerService("TemplateController", function ($c) {
return new TemplateController(
$c->query("AppName"),
$c->query("Request"),
$c->query("L10N"),
$c->query("Logger")
);
});

$container->registerService(
"WebAssetController",
function ($c) {
return new WebAssetController(
$c->query("AppName"),
$c->query("Request"),
$c->query("Logger")
);
}
);
$container->registerService("WebAssetController", function ($c) {
return new WebAssetController(
$c->query("AppName"),
$c->query("Request"),
$c->query("Logger")
);
});

$checkBackgroundJobs = new JobListController(
$container->query("AppName"),