open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move to non-static OC_Defaults

Browse Source 
Conflicts:

	lib/mail.php
remotes/origin/stable6
Björn Schießle 12 years ago
parent d46e62886a
commit 3c691c9ec9
10 changed files with 81 additions and 78 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      apps/files_sharing/templates/public.php
  2. 4
      core/templates/layout.base.php
  3. 8
      core/templates/layout.guest.php
  4. 6
      core/templates/layout.user.php
  5. 111
      lib/defaults.php
  6. 6
      lib/mail.php
  7. 2
      lib/util.php
  8. 4
      settings/personal.php
  9. 6
      settings/templates/admin.php
  10. 6
      settings/templates/personal.php

6
apps/files_sharing/templates/public.php
Unescape View File

@ -2,7 +2,7 @@
<div id="notification" style="display: none;"></div>
</div>
<?php OC_Defaults::init(); // initialize themable default strings and urls ?>
<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
<input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL">
@ -11,7 +11,7 @@
<header><div id="header">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
<div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div>
<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
<div class="header-right">
<?php if (isset($_['folder'])): ?>
<span id="details"><?php p($l->t('%s shared the folder %s with you',
@ -91,6 +91,6 @@
</div>
<footer>
<p class="info">
<?php print_unescaped(OC_Defaults::getLongFooter()); ?>
<?php print_unescaped($defaults->getLongFooter()); ?>
</p>
</footer>

4
core/templates/layout.base.php
Unescape View File

@ -6,11 +6,11 @@
<!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
<!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
<?php OC_Defaults::init(); // initialize themable default strings and urls ?>
<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
<head>
<title>
<?php p(OC_Defaults::getName()); ?>
<?php p($defaults->getName()); ?>
</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />

8
core/templates/layout.guest.php
Unescape View File

@ -6,11 +6,11 @@
<!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
<!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
<?php OC_Defaults::init(); // initialize themable default strings and urls ?>
<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
<head data-requesttoken="<?php p($_['requesttoken']); ?>">
<title>
<?php p(OC_Defaults::getName()); ?>
<?php p($defaults->getName()); ?>
</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="apple-itunes-app" content="app-id=543672169">
@ -38,13 +38,13 @@
<div id="login">
<header><div id="header">
<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
<div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div>
<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
</div></header>
<?php print_unescaped($_['content']); ?>
</div>
<footer>
<p class="info">
<?php print_unescaped(OC_Defaults::getLongFooter()); ?>
<?php print_unescaped($defaults->getLongFooter()); ?>
</p></footer>
</body>
</html>

6
core/templates/layout.user.php
Unescape View File

@ -6,12 +6,12 @@
<!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
<!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
<?php OC_Defaults::init(); // initialize themable default strings and urls ?>
<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
<title>
<?php p(!empty($_['application'])?$_['application'].' | ':'');
p(OC_Defaults::getName());
p($defaults->getName());
p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?>
</title>
<meta charset="utf-8">
@ -46,7 +46,7 @@
<header><div id="header">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
<div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div>
<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
<ul id="settings" class="svg">
<span id="expand" tabindex="0" role="link">
<span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>

111
lib/defaults.php
Unescape View File

@ -5,115 +5,118 @@
* community edition. Use the get methods to always get the right strings.
*/
if (file_exists(OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php')) {
require_once 'themes/' . OC_Util::getTheme() . '/defaults.php';
}
class OC_Defaults {
private static $defaultEntity;
private static $defaultName;
private static $defaultBaseUrl;
private static $defaultSyncClientUrl;
private static $defaultDocBaseUrl;
private static $defaultSlogan;
private static $defaultLogoClaim;
private $theme;
private $defaultEntity;
private $defaultName;
private $defaultBaseUrl;
private $defaultSyncClientUrl;
private $defaultDocBaseUrl;
private $defaultSlogan;
private $defaultLogoClaim;
public static function init() {
function __construct() {
$l = OC_L10N::get('core');
self::$defaultEntity = "ownCloud";
self::$defaultName = "ownCloud";
self::$defaultBaseUrl = "http://owncloud.org";
self::$defaultSyncClientUrl = " http://owncloud.org/sync-clients/";
self::$defaultDocBaseUrl = "http://doc.owncloud.org";
self::$defaultSlogan = $l->t("web services under your control");
self::$defaultLogoClaim = "";
$this->defaultEntity = "ownCloud";
$this->defaultName = "ownCloud";
$this->defaultBaseUrl = "http://owncloud.org";
$this->defaultSyncClientUrl = " http://owncloud.org/sync-clients/";
$this->defaultDocBaseUrl = "http://doc.owncloud.org";
$this->defaultSlogan = $l->t("web services under your control");
$this->defaultLogoClaim = "";
if (class_exists("OC_Theme")) {
OC_Theme::init();
$this->theme = new OC_Theme();
}
}
private static function themeExist($method) {
private function themeExist($method) {
if (OC_Util::getTheme() !== '' && method_exists('OC_Theme', $method)) {
return true;
}
return false;
}
public static function getBaseUrl() {
if (self::themeExist('getBaseUrl')) {
return OC_Theme::getBaseUrl();
public function getBaseUrl() {
if ($this->themeExist('getBaseUrl')) {
return $this->theme->getBaseUrl();
} else {
return self::$defaultBaseUrl;
return $this->defaultBaseUrl;
}
}
public static function getSyncClientUrl() {
if (self::themeExist('getSyncClientUrl')) {
return OC_Theme::getSyncClientUrl();
public function getSyncClientUrl() {
if ($this->themeExist('getSyncClientUrl')) {
return $this->theme->getSyncClientUrl();
} else {
return self::$defaultSyncClientUrl;
return $this->defaultSyncClientUrl;
}
}
public static function getDocBaseUrl() {
if (self::themeExist('getDocBaseUrl')) {
return OC_Theme::getDocBaseUrl();
public function getDocBaseUrl() {
if ($this->themeExist('getDocBaseUrl')) {
return $this->theme->getDocBaseUrl();
} else {
return self::$defaultDocBaseUrl;
return $this->defaultDocBaseUrl;
}
}
public static function getName() {
if (self::themeExist('getName')) {
return OC_Theme::getName();
public function getName() {
if ($this->themeExist('getName')) {
return $this->theme->getName();
} else {
return self::$defaultName;
return $this->defaultName;
}
}
public static function getEntity() {
if (self::themeExist('getEntity')) {
return OC_Theme::getEntity();
public function getEntity() {
if ($this->themeExist('getEntity')) {
return $this->theme->getEntity();
} else {
return self::$defaultEntity;
return $this->defaultEntity;
}
}
public static function getSlogan() {
if (self::themeExist('getSlogan')) {
return OC_Theme::getSlogan();
public function getSlogan() {
if ($this->themeExist('getSlogan')) {
return $this->theme->getSlogan();
} else {
return self::$defaultSlogan;
return $this->defaultSlogan;
}
}
public static function getLogoClaim() {
if (self::themeExist('getLogoClaim')) {
return OC_Theme::getLogoClaim();
public function getLogoClaim() {
if ($this->themeExist('getLogoClaim')) {
return $this->theme->getLogoClaim();
} else {
return self::$defaultLogoClaim;
return $this->defaultLogoClaim;
}
}
public static function getShortFooter() {
if (self::themeExist('getShortFooter')) {
$footer = OC_Theme::getShortFooter();
public function getShortFooter() {
if ($this->themeExist('getShortFooter')) {
$footer = $this->theme->getShortFooter();
} else {
$footer = "<a href=\"". self::getBaseUrl() . "\" target=\"_blank\">" .self::getEntity() . "</a>".
' – ' . self::getSlogan();
$footer = "<a href=\"". $this->getBaseUrl() . "\" target=\"_blank\">" .$this->getEntity() . "</a>".
' – ' . $this->getSlogan();
}
return $footer;
}
public static function getLongFooter() {
if (self::themeExist('getLongFooter')) {
$footer = OC_Theme::getLongFooter();
public function getLongFooter() {
if ($this->themeExist('getLongFooter')) {
$footer = $this->theme->getLongFooter();
} else {
$footer = self::getShortFooter();
$footer = $this->getShortFooter();
}
return $footer;

6
lib/mail.php
Unescape View File

@ -113,11 +113,11 @@ class OC_Mail {
*/
public static function getfooter() {
OC_Defaults::init();
$defaults = new OC_Defaults();
$txt="\n--\n";
$txt.=OC_Defaults::getName() . "\n";
$txt.=OC_Defaults::getSlogan() . "\n";
$txt.=$defaults->getName() . "\n";
$txt.=$defaults->getSlogan() . "\n";
return($txt);

2
lib/util.php
Unescape View File

@ -98,7 +98,7 @@ class OC_Util {
* @return string
*/
public static function getEditionString() {
return '';
return 'Enteerprise';
}
/**

4
settings/personal.php
Unescape View File

@ -8,7 +8,7 @@
OC_Util::checkLoggedIn();
OC_App::loadApps();
OC_Defaults::init(); // initialize themable default strings and urls
$defaults = new OC_Defaults(); // initialize themable default strings and urls
// Highlight navigation entry
OC_Util::addScript( 'settings', 'personal' );
@ -62,7 +62,7 @@ usort( $languages, function ($a, $b) {
//links to clients
$clients = array(
'desktop' => OC_Config::getValue('customclient_desktop', OC_Defaults::getSyncClientUrl()),
'desktop' => OC_Config::getValue('customclient_desktop', $defaults->getSyncClientUrl()),
'android' => OC_Config::getValue('customclient_android', 'https://play.google.com/store/apps/details?id=com.owncloud.android'),
'ios' => OC_Config::getValue('customclient_ios', 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8')
);

6
settings/templates/admin.php
Unescape View File

@ -5,7 +5,7 @@
*/
$levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
OC_Defaults::init(); // initialize themable default strings and urls
$defaults = new OC_Defaults(); // initialize themable default strings and urls
?>
<?php
@ -234,7 +234,7 @@ endfor;?>
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Version'));?></strong></legend>
<strong><?php p(OC_Defaults::getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?>
<strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?>
<?php if (OC_Util::getEditionString() === ''): ?>
(<?php print_unescaped(OC_Updater::ShowUpdatingHint()); ?>)<br/>
<?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>.')); ?>
@ -242,6 +242,6 @@ endfor;?>
</fieldset>
<fieldset class="personalblock credits-footer">
<p>
<?php print_unescaped(OC_Defaults::getShortFooter()); ?>
<?php print_unescaped($defaults->getShortFooter()); ?>
</p>
</fieldset>

6
settings/templates/personal.php
Unescape View File

@ -4,7 +4,7 @@
* See the COPYING-README file.
*/?>
<?php OC_Defaults::init(); // initialize themable default strings and urls ?>
<?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>
@ -114,13 +114,13 @@ if($_['passwordChangeSupported']) {
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Version'));?></strong></legend>
<strong><?php p(OC_Defaults::getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/>
<strong><?php p($defaults->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(OC_Defaults::getShortFooter()); ?>
<?php print_unescaped($defaults->getShortFooter()); ?>
</p>
</fieldset>

Write Preview
Loading…
Cancel
Save