Add ability to theme iOS and Android client URLs just like desktop URLs.

* added to personal settings page.
* fix uppercase issue
* remove escaping because it's unneeded

diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index a439bf0d6db67d97aa38948917684deafb0cdaf2..dfd114cd2fe8aecc2b7bb35b2e7b37e838758557 100644 (file)
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -18,6 +18,8 @@ class OC_Defaults {
        private $defaultTitle;
        private $defaultBaseUrl;
        private $defaultSyncClientUrl;
+       private $defaultiOSClientUrl;
+       private $defaultAndroidClientUrl;
        private $defaultDocBaseUrl;
        private $defaultDocVersion;
        private $defaultSlogan;
@@ -28,18 +30,20 @@ class OC_Defaults {
                $this->l = OC_L10N::get('lib');
                $version = OC_Util::getVersion();
 
-               $this->defaultEntity = "ownCloud"; /* e.g. company name, used for footers and copyright notices */
-               $this->defaultName = "ownCloud"; /* short name, used when referring to the software */
-               $this->defaultTitle = "ownCloud"; /* can be a longer name, for titles */
-               $this->defaultBaseUrl = "https://owncloud.org";
-               $this->defaultSyncClientUrl = "https://owncloud.org/sync-clients/";
-               $this->defaultDocBaseUrl = "http://doc.owncloud.org";
-               $this->defaultDocVersion = $version[0] . ".0"; // used to generate doc links
-               $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->defaultEntity = 'ownCloud'; /* e.g. company name, used for footers and copyright notices */
+               $this->defaultName = 'ownCloud'; /* short name, used when referring to the software */
+               $this->defaultTitle = 'ownCloud'; /* can be a longer name, for titles */
+               $this->defaultBaseUrl = 'https://owncloud.org';
+               $this->defaultSyncClientUrl = 'https://owncloud.org/sync-clients/';
+               $this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8';
+               $this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.owncloud.android';
+               $this->defaultDocBaseUrl = 'http://doc.owncloud.org';
+               $this->defaultDocVersion = $version[0] . '.0'; // used to generate doc links
+               $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();
                }
        }
@@ -78,6 +82,30 @@ class OC_Defaults {
                }
        }
 
+       /**
+        * Returns the URL to the App Store for the iOS Client
+        * @return string URL
+        */
+       public function getiOSClientUrl() {
+               if ($this->themeExist('getiOSClientUrl')) {
+                       return $this->theme->getiOSClientUrl();
+               } else {
+                       return $this->defaultiOSClientUrl;
+               }
+       }
+
+       /**
+        * Returns the URL to Google Play for the Android Client
+        * @return string URL
+        */
+       public function getAndroidClientUrl() {
+               if ($this->themeExist('getAndroidClientUrl')) {
+                       return $this->theme->getAndroidClientUrl();
+               } else {
+                       return $this->defaultAndroidClientUrl;
+               }
+       }
+
        /**
         * Returns the documentation URL
         * @return string URL
@@ -158,7 +186,7 @@ class OC_Defaults {
                if ($this->themeExist('getShortFooter')) {
                        $footer = $this->theme->getShortFooter();
                } else {
-                       $footer = "<a href=\"". $this->getBaseUrl() . "\" target=\"_blank\">" .$this->getEntity() . "</a>".
+                       $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank">' .$this->getEntity() . '</a>'.
                                ' – ' . $this->getSlogan();
                }
 

diff --git a/lib/public/defaults.php b/lib/public/defaults.php
index 34b68903ee815d5d1238a149d5f72b4c90b81971..9af31245ff40b926c178638dfd21c9948e6f5bbd 100644 (file)
--- a/lib/public/defaults.php
+++ b/lib/public/defaults.php
@@ -65,6 +65,22 @@ class Defaults {
                return $this->defaults->getSyncClientUrl();
        }
 
+       /**
+        * link to the iOS client
+        * @return string
+        */
+       public function getiOSClientUrl() {
+               return $this->defaults->getiOSClientUrl();
+       }
+
+       /**
+        * link to the Android client
+        * @return string
+        */
+       public function getAndroidClientUrl() {
+               return $this->defaults->getAndroidClientUrl();
+       }
+
        /**
         * base URL to the documentation of your ownCloud instance
         * @return string

diff --git a/settings/personal.php b/settings/personal.php
index 36e8ea016deec73d3f27964dcd1b198408310f71..ddebcc0302444845b841d6eaf21fee326bf90296 100644 (file)
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -76,8 +76,8 @@ usort( $languages, function ($a, $b) {
 //links to clients
 $clients = array(
        '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')
+       'android' => OC_Config::getValue('customclient_android', $defaults->getAndroidClientUrl()),
+       'ios'     => OC_Config::getValue('customclient_ios', $defaults->getiOSClientUrl())
 );
 
 // Return template