); ?>)
-
+
t('%s shared the folder %s with you',
@@ -91,6 +91,6 @@
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 51bac790741..09e1006d507 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -6,11 +6,11 @@
-
+
); ?>)
-
+
-
+
-
diff --git a/lib/defaults.php b/lib/defaults.php
index 1c3f8ffd056..196bb5cf14d 100644
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -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;
- public static function init() {
+ private $defaultEntity;
+ private $defaultName;
+ private $defaultBaseUrl;
+ private $defaultSyncClientUrl;
+ private $defaultDocBaseUrl;
+ private $defaultSlogan;
+ private $defaultLogoClaim;
+
+ 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 = "" .self::getEntity() . "".
- ' – ' . self::getSlogan();
+ $footer = "getBaseUrl() . "\" target=\"_blank\">" .$this->getEntity() . "".
+ ' – ' . $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;
diff --git a/lib/mail.php b/lib/mail.php
index 7c786ecc290..b339b33e962 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -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);
diff --git a/lib/util.php b/lib/util.php
index 4bc02daf36e..4ec115c9028 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -98,7 +98,7 @@ class OC_Util {
* @return string
*/
public static function getEditionString() {
- return '';
+ return 'Enteerprise';
}
/**
diff --git a/settings/personal.php b/settings/personal.php
index d68de4d570a..2c0b4b9e33f 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -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')
);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index fd79f88af1c..6b211b957dc 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -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
?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 4cf2b2393b3..d4396407525 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -4,7 +4,7 @@
* See the COPYING-README file.
*/?>
-
+