- <?php p($defaults->getTitle()); ?> + <?php p($theme->getTitle()); ?>

From 75fd6d4fde4cd6d9eda5e6b944739f1f2798447d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 24 Jul 2013 11:51:21 +0200 Subject: [PATCH] initialize OC_Defaults in template constructorX --- apps/files_sharing/templates/public.php | 8 +++----- core/templates/altmail.php | 6 ++---- core/templates/layout.base.php | 4 +--- core/templates/layout.guest.php | 10 ++++------ core/templates/layout.user.php | 8 +++----- core/templates/mail.php | 9 ++++----- lib/template.php | 3 ++- lib/template/base.php | 5 ++++- settings/templates/admin.php | 12 +++++------- settings/templates/personal.php | 8 +++----- 10 files changed, 31 insertions(+), 42 deletions(-) diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 8875d5a8fbd..746a715f3cc 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -2,16 +2,14 @@ - -

- + src="" alt="getName()); ?>" /> +

t('%s shared the folder %s with you', @@ -95,6 +93,6 @@

diff --git a/core/templates/altmail.php b/core/templates/altmail.php index a7df29a2446..2551473c6f0 100644 --- a/core/templates/altmail.php +++ b/core/templates/altmail.php @@ -1,9 +1,7 @@ t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link']))); ?> -- -getName() . ' - ' . $defaults->getSlogan()); ?> -getBaseUrl()); +getName() . ' - ' . $theme->getSlogan()); ?> +getBaseUrl()); diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 2399512eacd..ea10c3042b5 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -6,11 +6,9 @@ - - - <?php p($defaults->getTitle()); ?> + <?php p($theme->getTitle()); ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index e20d28970a5..9f645b6500d 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -6,11 +6,9 @@ - - - <?php p($defaults->getTitle()); ?> + <?php p($theme->getTitle()); ?> @@ -37,14 +35,14 @@ diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 87c02a83d3b..b7405ea273b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -6,12 +6,10 @@ - - <?php p(!empty($_['application'])?$_['application'].' | ':''); - p($defaults->getTitle()); + p($theme->getTitle()); p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> @@ -45,8 +43,8 @@

- + src="" alt="getName()); ?>" /> +

diff --git a/core/templates/mail.php b/core/templates/mail.php index a9fdff06067..de72b136b13 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -1,11 +1,10 @@ -

@@ -21,9 +20,9 @@ print_unescaped($l->t('Hey there,

just letting you know that %s shared Â» +getName()); ?> - +getSlogan()); ?> +
getBaseUrl());?> diff --git a/lib/template.php b/lib/template.php index d17be753db8..9b2c1211e61 100644 --- a/lib/template.php +++ b/lib/template.php @@ -55,6 +55,7 @@ class OC_Template extends \OC\Template\Base { $parts = explode('/', $app); // fix translation when app is something like core/lostpassword $l10n = OC_L10N::get($parts[0]); + $themeDefaults = new OC_Defaults(); list($path, $template) = $this->findTemplate($theme, $app, $name, $fext); @@ -62,7 +63,7 @@ class OC_Template extends \OC\Template\Base { $this->renderas = $renderas; $this->path = $path; - parent::__construct($template, $requesttoken, $l10n); + parent::__construct($template, $requesttoken, $l10n, $themeDefaults); // Some headers to enhance security header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters diff --git a/lib/template/base.php b/lib/template/base.php index c7ddaa2e8e1..88941bc7132 100644 --- a/lib/template/base.php +++ b/lib/template/base.php @@ -12,12 +12,14 @@ class Base { private $template; // The template private $vars; // Vars private $l10n; // The l10n-Object + private $theme; // theme defaults - public function __construct( $template, $requesttoken, $l10n ) { + public function __construct( $template, $requesttoken, $l10n, $theme ) { $this->vars = array(); $this->vars['requesttoken'] = $requesttoken; $this->l10n = $l10n; $this->template = $template; + $this->theme = $theme; } protected function getAppTemplateDirs($theme, $app, $serverroot, $app_dir) { @@ -113,6 +115,7 @@ class Base { // Register the variables $_ = $this->vars; $l = $this->l10n; + $theme = $this->theme; if( !is_null($additionalparams)) { $_ = array_merge( $additionalparams, $this->vars ); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 52127f6710d..2b14c1460d6 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -4,8 +4,6 @@ * See the COPYING-README file. */ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal'); - -$defaults = new OC_Defaults(); // initialize themable default strings and urls ?> t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.')); ?> - t('Please double check the installation guides.', $defaults->getDocBaseUrl().'/server/5.0/admin_manual/installation.html')); ?> + t('Please double check the installation guides.', $theme->getDocBaseUrl().'/server/5.0/admin_manual/installation.html')); ?> @@ -193,13 +191,13 @@ if (!$_['internetconnectionworking']) { t('Enforce HTTPS'));?>
t( 'Forces the clients to connect to %s via an encrypted connection.', - $defaults->getName() + $theme->getName() )); ?>"); p($l->t( 'Please connect to your %s via HTTPS to enable or disable the SSL enforcement.', - $defaults->getName() + $theme->getName() )); print_unescaped(""); } @@ -250,7 +248,7 @@ endfor;?>

t('Version'));?> - getTitle()); ?> + getTitle()); ?>

t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> @@ -259,6 +257,6 @@ endfor;?>

diff --git a/settings/templates/personal.php b/settings/templates/personal.php index ee5ebae708f..b9d9b09f5d0 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -4,8 +4,6 @@ * See the COPYING-README file. */?> - -

t('Get the apps to sync your files'));?>

@@ -105,7 +103,7 @@ if($_['passwordChangeSupported']) {

t('WebDAV'));?>
- t('Use this address to access your Files via WebDAV', array($defaults->getDocBaseUrl())));?> + t('Use this address to access your Files via WebDAV', array($theme->getDocBaseUrl())));?>

t('Version'));?> - getName()); ?>
+ getName()); ?>
t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> -- 2.39.5

	- +

	-- -getName()); ?> - -getSlogan()); ?> - getBaseUrl());?>