commit
ea470f8777
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,11 +5,17 @@
|
||||||
<description>Adjust the Nextcloud theme</description>
|
<description>Adjust the Nextcloud theme</description>
|
||||||
<licence>AGPL</licence>
|
<licence>AGPL</licence>
|
||||||
<author>Nextcloud</author>
|
<author>Nextcloud</author>
|
||||||
<version>0.1.0</version>
|
<version>0.2.0</version>
|
||||||
<namespace>Theming</namespace>
|
<namespace>Theming</namespace>
|
||||||
<category>other</category>
|
<category>other</category>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.0" max-version="9.1" />
|
<owncloud min-version="9.0" max-version="9.1" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
<types>
|
||||||
|
<logging/>
|
||||||
|
</types>
|
||||||
|
|
||||||
<default_enable/>
|
<default_enable/>
|
||||||
</info>
|
</info>
|
||||||
|
|
|
@ -77,6 +77,10 @@ class Template extends \OC_Defaults {
|
||||||
return $this->config->getAppValue('theming', 'name', $this->name);
|
return $this->config->getAppValue('theming', 'name', $this->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getHTMLName() {
|
||||||
|
return $this->config->getAppValue('theming', 'name', $this->name);
|
||||||
|
}
|
||||||
|
|
||||||
public function getTitle() {
|
public function getTitle() {
|
||||||
return $this->config->getAppValue('theming', 'name', $this->name);
|
return $this->config->getAppValue('theming', 'name', $this->name);
|
||||||
}
|
}
|
||||||
|
@ -93,6 +97,15 @@ class Template extends \OC_Defaults {
|
||||||
return $this->config->getAppValue('theming', 'slogan', $this->slogan);
|
return $this->config->getAppValue('theming', 'slogan', $this->slogan);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getShortFooter() {
|
||||||
|
$slogan = $this->getSlogan();
|
||||||
|
$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
|
||||||
|
' rel="noreferrer">' .$this->getEntity() . '</a>'.
|
||||||
|
($slogan !== '' ? ' – ' . $slogan : '');
|
||||||
|
|
||||||
|
return $footer;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Color that is used for the header as well as for mail headers
|
* Color that is used for the header as well as for mail headers
|
||||||
*
|
*
|
||||||
|
|
|
@ -91,6 +91,26 @@ class TemplateTest extends TestCase {
|
||||||
$this->assertEquals('MyCustomCloud', $this->template->getName());
|
$this->assertEquals('MyCustomCloud', $this->template->getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testGetHTMLNameWithDefault() {
|
||||||
|
$this->config
|
||||||
|
->expects($this->once())
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('theming', 'name', 'Nextcloud')
|
||||||
|
->willReturn('Nextcloud');
|
||||||
|
|
||||||
|
$this->assertEquals('Nextcloud', $this->template->getHTMLName());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetHTMLNameWithCustom() {
|
||||||
|
$this->config
|
||||||
|
->expects($this->once())
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('theming', 'name', 'Nextcloud')
|
||||||
|
->willReturn('MyCustomCloud');
|
||||||
|
|
||||||
|
$this->assertEquals('MyCustomCloud', $this->template->getHTMLName());
|
||||||
|
}
|
||||||
|
|
||||||
public function testGetTitleWithDefault() {
|
public function testGetTitleWithDefault() {
|
||||||
$this->config
|
$this->config
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
|
@ -172,6 +192,32 @@ class TemplateTest extends TestCase {
|
||||||
$this->assertEquals('My custom Slogan', $this->template->getSlogan());
|
$this->assertEquals('My custom Slogan', $this->template->getSlogan());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testGetShortFooter() {
|
||||||
|
$this->config
|
||||||
|
->expects($this->exactly(3))
|
||||||
|
->method('getAppValue')
|
||||||
|
->willReturnMap([
|
||||||
|
['theming', 'url', 'https://nextcloud.com/', 'url'],
|
||||||
|
['theming', 'name', 'Nextcloud', 'Name'],
|
||||||
|
['theming', 'slogan', 'Safe Data', 'Slogan'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertEquals('<a href="url" target="_blank" rel="noreferrer">Name</a> – Slogan', $this->template->getShortFooter());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetShortFooterEmptySlogan() {
|
||||||
|
$this->config
|
||||||
|
->expects($this->exactly(3))
|
||||||
|
->method('getAppValue')
|
||||||
|
->willReturnMap([
|
||||||
|
['theming', 'url', 'https://nextcloud.com/', 'url'],
|
||||||
|
['theming', 'name', 'Nextcloud', 'Name'],
|
||||||
|
['theming', 'slogan', 'Safe Data', ''],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertEquals('<a href="url" target="_blank" rel="noreferrer">Name</a>', $this->template->getShortFooter());
|
||||||
|
}
|
||||||
|
|
||||||
public function testGetMailHeaderColorWithDefault() {
|
public function testGetMailHeaderColorWithDefault() {
|
||||||
$this->config
|
$this->config
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
|
|
|
@ -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();
|
||||||
|
|
|
@ -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'];
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
|
@ -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());
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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();
|
||||||
|
|
||||||
|
|
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -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');
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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();
|
||||||
|
|
Loading…
Reference in New Issue