merge master into webdav-injection

1 files changed, 21 insertions, 0 deletions

diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index 0b97497baa1..79be211b82f 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -21,6 +21,7 @@ class OC_Defaults {
 	private $defaultDocBaseUrl;
 	private $defaultSlogan;
 	private $defaultLogoClaim;
+	private $defaultMailHeaderColor;
 
 	function __construct() {
 		$this->l = OC_L10N::get('core');
@@ -33,6 +34,7 @@ class OC_Defaults {
 		$this->defaultDocBaseUrl = "http://doc.owncloud.org";
 		$this->defaultSlogan = $this->l->t("web services under your control");
 		$this->defaultLogoClaim = "";
+		$this->defaultMailHeaderColor = "#1d2d44"; /* header color of mail notifications */
 
 		if (class_exists("OC_Theme")) {
 			$this->theme = new OC_Theme();
@@ -174,4 +176,23 @@ class OC_Defaults {
 		return $footer;
 	}
 
+	public function buildDocLinkToKey($key) {
+		if ($this->themeExist('buildDocLinkToKey')) {
+			return $this->theme->buildDocLinkToKey($key);
+		}
+		return $this->getDocBaseUrl() . '/server/6.0/go.php?to=' . $key;
+	}
+
+	/**
+	 * Returns mail header color
+	 * @return mail header color
+	 */
+	public function getMailHeaderColor() {
+		if ($this->themeExist('getMailHeaderColor')) {
+			return $this->theme->getMailHeaderColor();
+		} else {
+			return $this->defaultMailHeaderColor;
+		}
+	}
+
 }