diff options
author | Björn Schießle <schiessle@owncloud.com> | 2013-07-24 13:51:21 +0400 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2013-07-24 13:51:21 +0400 |
commit | 75fd6d4fde4cd6d9eda5e6b944739f1f2798447d (patch) | |
tree | 2d04d64bcdeb2ea13de68b9606307ebf799aeb87 /settings/templates | |
parent | 2622839fcfb360eafc6d670885ca265ebed1433c (diff) |
initialize OC_Defaults in template constructorX
Diffstat (limited to 'settings/templates')
-rw-r--r-- | settings/templates/admin.php | 12 | ||||
-rw-r--r-- | settings/templates/personal.php | 8 |
2 files changed, 8 insertions, 12 deletions
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 ?> <?php @@ -32,7 +30,7 @@ if (!$_['isWebDavWorking']) { <span class="securitywarning"> <?php p($l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.')); ?> - <?php print_unescaped($l->t('Please double check the <a href="%s">installation guides</a>.', $defaults->getDocBaseUrl().'/server/5.0/admin_manual/installation.html')); ?> + <?php print_unescaped($l->t('Please double check the <a href="%s">installation guides</a>.', $theme->getDocBaseUrl().'/server/5.0/admin_manual/installation.html')); ?> </span> </fieldset> @@ -193,13 +191,13 @@ if (!$_['internetconnectionworking']) { <label for="forcessl"><?php p($l->t('Enforce HTTPS'));?></label><br/> <em><?php p($l->t( 'Forces the clients to connect to %s via an encrypted connection.', - $defaults->getName() + $theme->getName() )); ?></em> <?php if (!$_['isConnectedViaHTTPS']) { print_unescaped("<br/><em>"); p($l->t( 'Please connect to your %s via HTTPS to enable or disable the SSL enforcement.', - $defaults->getName() + $theme->getName() )); print_unescaped("</em>"); } @@ -250,7 +248,7 @@ endfor;?> <fieldset class="personalblock"> <legend><strong><?php p($l->t('Version'));?></strong></legend> - <strong><?php p($defaults->getTitle()); ?></strong> <?php p(OC_Util::getVersionString()); ?> + <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString()); ?> <?php if (OC_Util::getEditionString() === ''): ?> <p> <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?> @@ -259,6 +257,6 @@ endfor;?> </fieldset> <fieldset class="personalblock credits-footer"> <p> - <?php print_unescaped($defaults->getShortFooter()); ?> + <?php print_unescaped($theme->getShortFooter()); ?> </p> </fieldset> 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. */?> -<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> - <div class="clientsbox"> <h2><?php p($l->t('Get the apps to sync your files'));?></h2> <a href="<?php p($_['clients']['desktop']); ?>" target="_blank"> @@ -105,7 +103,7 @@ if($_['passwordChangeSupported']) { <fieldset class="personalblock"> <legend><strong><?php p($l->t('WebDAV'));?></strong></legend> <code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br /> - <em><?php print_unescaped($l->t('Use this address to <a href="%s/server/5.0/user_manual/files/files.html" target="_blank">access your Files via WebDAV</a>', array($defaults->getDocBaseUrl())));?></em> + <em><?php print_unescaped($l->t('Use this address to <a href="%s/server/5.0/user_manual/files/files.html" target="_blank">access your Files via WebDAV</a>', array($theme->getDocBaseUrl())));?></em> </fieldset> <?php foreach($_['forms'] as $form) { @@ -114,13 +112,13 @@ if($_['passwordChangeSupported']) { <fieldset class="personalblock"> <legend><strong><?php p($l->t('Version'));?></strong></legend> - <strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/> + <strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/> <?php if (OC_Util::getEditionString() === ''): ?> <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?> <?php endif; ?> </fieldset> <fieldset class="personalblock credits-footer"> <p> - <?php print_unescaped($defaults->getShortFooter()); ?> + <?php print_unescaped($theme->getShortFooter()); ?> </p> </fieldset> |