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

Use the themed Defaults everywhere

This commit is contained in:
Joas Schilling 2016-07-15 08:46:31 +02:00
parent e8d6621a24
commit 2c988ecbf4
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
16 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/Connector/PublicAuth.php
View File

@ -65,7 +65,7 @@ class PublicAuth extends AbstractBasic {
$this->session = $session; $this->session = $session;
// setup realm // setup realm
$defaults = new \OC_Defaults(); $defaults = new \OCP\Defaults();
$this->realm = $defaults->getName(); $this->realm = $defaults->getName();
} }

2
apps/dav/lib/Connector/Sabre/Auth.php
View File

@ -78,7 +78,7 @@ class Auth extends AbstractBasic {
$this->principalPrefix = $principalPrefix; $this->principalPrefix = $principalPrefix;
// setup realm // setup realm
$defaults = new \OC_Defaults(); $defaults = new \OCP\Defaults();
$this->realm = $defaults->getName(); $this->realm = $defaults->getName();
} }

2
apps/federation/lib/DAV/FedAuth.php
View File

@ -38,7 +38,7 @@ class FedAuth extends AbstractBasic {
$this->principalPrefix = 'principals/system/'; $this->principalPrefix = 'principals/system/';
// setup realm // setup realm
$defaults = new \OC_Defaults(); $defaults = new \OCP\Defaults();
$this->realm = $defaults->getName(); $this->realm = $defaults->getName();
} }

6
core/Application.php
View File

@ -35,7 +35,7 @@ use OC\Core\Controller\LostController;
use OC\Core\Controller\TokenController; use OC\Core\Controller\TokenController;
use OC\Core\Controller\TwoFactorChallengeController; use OC\Core\Controller\TwoFactorChallengeController;
use OC\Core\Controller\UserController; use OC\Core\Controller\UserController;
use OC_Defaults; use OCP\Defaults;
use OCP\AppFramework\App; use OCP\AppFramework\App;
use OCP\Util; use OCP\Util;
@ -165,8 +165,8 @@ class Application extends App {
$container->registerService('UserFolder', function(SimpleContainer $c) { $container->registerService('UserFolder', function(SimpleContainer $c) {
return $c->query('ServerContainer')->getUserFolder(); return $c->query('ServerContainer')->getUserFolder();
}); });
$container->registerService('Defaults', function() { $container->registerService('Defaults', function(SimpleContainer $c) {
return new OC_Defaults; return $c->query('ServerContainer')->getThemingDefaults();
}); });
$container->registerService('Mailer', function(SimpleContainer $c) { $container->registerService('Mailer', function(SimpleContainer $c) {
return $c->query('ServerContainer')->getMailer(); return $c->query('ServerContainer')->getMailer();

2
core/Command/Maintenance/Install.php
View File

@ -64,7 +64,7 @@ class Install extends Command {
// validate the environment // validate the environment
$server = \OC::$server; $server = \OC::$server;
$setupHelper = new Setup($this->config, $server->getIniWrapper(), $setupHelper = new Setup($this->config, $server->getIniWrapper(),
$server->getL10N('lib'), new \OC_Defaults(), $server->getLogger(), $server->getL10N('lib'), $server->getThemingDefaults(), $server->getLogger(),
$server->getSecureRandom()); $server->getSecureRandom());
$sysInfo = $setupHelper->getSystemInfo(true); $sysInfo = $setupHelper->getSystemInfo(true);
$errors = $sysInfo['errors']; $errors = $sysInfo['errors'];

8
core/Controller/LostController.php
View File

@ -38,7 +38,6 @@ use \OCP\IConfig;
use OCP\IUserManager; use OCP\IUserManager;
use OCP\Mail\IMailer; use OCP\Mail\IMailer;
use OCP\Security\ISecureRandom; use OCP\Security\ISecureRandom;
use \OC_Defaults;
use OCP\Security\StringUtils; use OCP\Security\StringUtils;
/** /**
@ -54,8 +53,7 @@ class LostController extends Controller {
protected $urlGenerator; protected $urlGenerator;
/** @var IUserManager */ /** @var IUserManager */
protected $userManager; protected $userManager;
// FIXME: Inject a non-static factory of OC_Defaults for better unit-testing /** @var \OC_Defaults */
/** @var OC_Defaults */
protected $defaults; protected $defaults;
/** @var IL10N */ /** @var IL10N */
protected $l10n; protected $l10n;
@ -77,7 +75,7 @@ class LostController extends Controller {
* @param IRequest $request * @param IRequest $request
* @param IURLGenerator $urlGenerator * @param IURLGenerator $urlGenerator
* @param IUserManager $userManager * @param IUserManager $userManager
* @param OC_Defaults $defaults * @param \OC_Defaults $defaults
* @param IL10N $l10n * @param IL10N $l10n
* @param IConfig $config * @param IConfig $config
* @param ISecureRandom $secureRandom * @param ISecureRandom $secureRandom
@ -90,7 +88,7 @@ class LostController extends Controller {
IRequest $request, IRequest $request,
IURLGenerator $urlGenerator, IURLGenerator $urlGenerator,
IUserManager $userManager, IUserManager $userManager,
OC_Defaults $defaults, \OC_Defaults $defaults,
IL10N $l10n, IL10N $l10n,
IConfig $config, IConfig $config,
ISecureRandom $secureRandom, ISecureRandom $secureRandom,

2
lib/base.php
View File

@ -812,7 +812,7 @@ class OC {
if (!$systemConfig->getValue('installed', false)) { if (!$systemConfig->getValue('installed', false)) {
\OC::$server->getSession()->clear(); \OC::$server->getSession()->clear();
$setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(), $setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),
\OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(), \OC::$server->getL10N('lib'), \OC::$server->getThemingDefaults(), \OC::$server->getLogger(),
\OC::$server->getSecureRandom()); \OC::$server->getSecureRandom());
$controller = new OC\Core\Controller\SetupController($setupHelper); $controller = new OC\Core\Controller\SetupController($setupHelper);
$controller->run($_POST); $controller->run($_POST);

4
lib/private/Console/Application.php
View File

@ -26,8 +26,8 @@
namespace OC\Console; namespace OC\Console;
use OC_App; use OC_App;
use OC_Defaults;
use OCP\Console\ConsoleEvent; use OCP\Console\ConsoleEvent;
use OCP\Defaults;
use OCP\IConfig; use OCP\IConfig;
use OCP\IRequest; use OCP\IRequest;
use Symfony\Component\Console\Application as SymfonyApplication; use Symfony\Component\Console\Application as SymfonyApplication;
@ -51,7 +51,7 @@ class Application {
* @param IRequest $request * @param IRequest $request
*/ */
public function __construct(IConfig $config, EventDispatcherInterface $dispatcher, IRequest $request) { public function __construct(IConfig $config, EventDispatcherInterface $dispatcher, IRequest $request) {
$defaults = new OC_Defaults; $defaults = \OC::$server->getThemingDefaults();
$this->config = $config; $this->config = $config;
$this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString()); $this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
$this->dispatcher = $dispatcher; $this->dispatcher = $dispatcher;

2
lib/private/Server.php
View File

@ -562,7 +562,7 @@ class Server extends ServerContainer implements IServerContainer {
return new Mailer( return new Mailer(
$c->getConfig(), $c->getConfig(),
$c->getLogger(), $c->getLogger(),
new \OC_Defaults() $c->getThemingDefaults()
); );
}); });
$this->registerService('OcsClient', function (Server $c) { $this->registerService('OcsClient', function (Server $c) {

2
lib/private/Setup.php
View File

@ -426,7 +426,7 @@ class Setup {
} }
$setupHelper = new \OC\Setup($config, \OC::$server->getIniWrapper(), $setupHelper = new \OC\Setup($config, \OC::$server->getIniWrapper(),
\OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(), \OC::$server->getL10N('lib'), \OC::$server->getThemingDefaults(), \OC::$server->getLogger(),
\OC::$server->getSecureRandom()); \OC::$server->getSecureRandom());
$htaccessContent = file_get_contents($setupHelper->pathToHtaccess()); $htaccessContent = file_get_contents($setupHelper->pathToHtaccess());

4
lib/private/URLGenerator.php
View File

@ -29,7 +29,7 @@
*/ */
namespace OC; namespace OC;
use OC_Defaults; use OCP\Defaults;
use OCP\ICacheFactory; use OCP\ICacheFactory;
use OCP\IConfig; use OCP\IConfig;
use OCP\IURLGenerator; use OCP\IURLGenerator;
@ -222,7 +222,7 @@ class URLGenerator implements IURLGenerator {
* @return string url to the online documentation * @return string url to the online documentation
*/ */
public function linkToDocs($key) { public function linkToDocs($key) {
$theme = new OC_Defaults(); $theme = \OC::$server->getThemingDefaults();
return $theme->buildDocLinkToKey($key); return $theme->buildDocLinkToKey($key);
} }
} }

2
lib/private/legacy/util.php
View File

@ -631,7 +631,7 @@ class OC_Util {
$webServerRestart = false; $webServerRestart = false;
$setup = new \OC\Setup($config, \OC::$server->getIniWrapper(), \OC::$server->getL10N('lib'), $setup = new \OC\Setup($config, \OC::$server->getIniWrapper(), \OC::$server->getL10N('lib'),
new \OC_Defaults(), \OC::$server->getLogger(), \OC::$server->getSecureRandom()); \OC::$server->getThemingDefaults(), \OC::$server->getLogger(), \OC::$server->getSecureRandom());
$urlGenerator = \OC::$server->getURLGenerator(); $urlGenerator = \OC::$server->getURLGenerator();

2
lib/public/Defaults.php
View File

@ -51,7 +51,7 @@ class Defaults {
* @since 6.0.0 * @since 6.0.0
*/ */
function __construct() { function __construct() {
$this->defaults = new \OC_Defaults(); $this->defaults = \OC::$server->getThemingDefaults();
} }
/** /**

2
settings/Application.php
View File

@ -227,7 +227,7 @@ class Application extends App {
return $c->query('ServerContainer')->getMailer(); return $c->query('ServerContainer')->getMailer();
}); });
$container->registerService('Defaults', function(IContainer $c) { $container->registerService('Defaults', function(IContainer $c) {
return new \OC_Defaults; return $c->query('ServerContainer')->getThemingDefaults();
}); });
$container->registerService('DefaultMailAddress', function(IContainer $c) { $container->registerService('DefaultMailAddress', function(IContainer $c) {
return Util::getDefaultEmailAddress('no-reply'); return Util::getDefaultEmailAddress('no-reply');

1
settings/Controller/MailSettingsController.php
View File

@ -29,7 +29,6 @@ use OCP\IRequest;
use OCP\IL10N; use OCP\IL10N;
use OCP\IConfig; use OCP\IConfig;
use OCP\Mail\IMailer; use OCP\Mail\IMailer;
use OCP\Mail\IMessage;
/** /**
* @package OC\Settings\Controller * @package OC\Settings\Controller

2
settings/personal.php
View File

@ -37,7 +37,7 @@
OC_Util::checkLoggedIn(); OC_Util::checkLoggedIn();
$defaults = new OC_Defaults(); // initialize themable default strings and urls $defaults = \OC::$server->getThemingDefaults();
$certificateManager = \OC::$server->getCertificateManager(); $certificateManager = \OC::$server->getCertificateManager();
$config = \OC::$server->getConfig(); $config = \OC::$server->getConfig();
$urlGenerator = \OC::$server->getURLGenerator(); $urlGenerator = \OC::$server->getURLGenerator();