Support HTML in logo claim

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9f94344b21b9c2f6ed114f6116dc7a1d9b66adb2..f7f2b3dc73501bf31b19cc0eaff7c0b601e18de7 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -49,7 +49,7 @@
                                                if(OC_Util::getEditionString() === '') {
                                                        p(!empty($_['application'])?$_['application']: $l->t('Apps'));
                                                } else {
-                                                       p($theme->getName());
+                                                       print_unescaped($theme->getHTMLName());
                                                }
                                        ?>
                                </div>

diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index cc6c819f03f95f90684f00726527a59f92918b18..c16ebdbe24cfbc8547771465a4582a258c26b8aa 100644 (file)
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -156,6 +156,18 @@ class OC_Defaults {
                }
        }
 
+       /**
+        * Returns the short name of the software containing HTML strings
+        * @return string title
+        */
+       public function getHTMLName() {
+               if ($this->themeExist('getHTMLName')) {
+                       return $this->theme->getHTMLName();
+               } else {
+                       return $this->defaultName;
+               }
+       }
+
        /**
         * Returns entity (e.g. company name) - used for footer, copyright
         * @return string entity name

diff --git a/lib/public/defaults.php b/lib/public/defaults.php
index 9af31245ff40b926c178638dfd21c9948e6f5bbd..662071a29a9ad023298286504470df0e0b1291f9 100644 (file)
--- a/lib/public/defaults.php
+++ b/lib/public/defaults.php
@@ -97,6 +97,14 @@ class Defaults {
                return $this->defaults->getName();
        }
 
+       /**
+        * name of your ownCloud instance containing HTML styles
+        * @return string
+        */
+       public function getHTMLName() {
+               return $this->defaults->getHTMLName();
+       }
+
        /**
         * Entity behind your onwCloud instance
         * @return string