diff --git a/lib/defaults.php b/lib/defaults.php index 59f8d976fe95e5761bcbe4c8e2281d8738ea3a73..a43269dd67e293fde6de0e89867b3fdc584c68f0 100644 --- a/lib/defaults.php +++ b/lib/defaults.php @@ -5,11 +5,13 @@ class OC_Defaults { private static $communityEntity = "ownCloud"; private static $communityName = "ownCloud"; private static $communityBaseUrl = "http://owncloud.org"; + private static $communitySyncClientUrl = " http://owncloud.org/sync-clients/"; private static $communitySlogan = "web services under your control"; private static $enterpriseEntity = "ownCloud Inc."; private static $enterpriseName = "ownCloud Enterprise Edition"; private static $enterpriseBaseUrl = "https://owncloud.com"; + private static $enterpiseSyncClientUrl = "https://owncloud.com/products/desktop-clients"; private static $enterpriseSlogan = "Your Cloud, Your Data, Your Way!"; @@ -21,6 +23,14 @@ class OC_Defaults { } } + public static function getSyncClientUrl() { + if (OC_Util::getEditionString() === '') { + return self::$communitySyncClientUrl; + } else { + return self::$enterpiseSyncClientUrl; + } + } + public static function getName() { if (OC_Util::getEditionString() === '') { return self::$communityName; diff --git a/settings/personal.php b/settings/personal.php index cab6e56dada3a43c1ccc19cec6e57b90d3fbf959..cb411cacc5b218f5c6877cf0c35028a642873af6 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -60,7 +60,7 @@ usort( $languages, function ($a, $b) { //links to clients $clients = array( - 'desktop' => OC_Config::getValue('customclient_desktop', 'http://owncloud.org/sync-clients/'), + 'desktop' => OC_Config::getValue('customclient_desktop', OC_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 28254b7aa1844a5c5d9ebbb8cb51f3ca9c6314a6..a74849a2ecc45c75d462d8658dafee4e5b13123b 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -230,10 +230,15 @@ endfor;?> </fieldset> - +<?php if (OC_Util::getEditionString() === ''): ?> <fieldset class="personalblock"> <legend><strong><?php p($l->t('Version'));?></strong></legend> <strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?><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>.')); ?> </fieldset> +<?php else: ?> +<fieldset class="personalblock credits-footer"> + <p>© 2013 <a href="<?php p(OC_Defaults::getBaseUrl()); ?>" target="_blank"><?php p(OC_Defaults::getEntity()); ?></a> – <?php p(OC_Defaults::getSlogan()); ?></p> +</fieldset> +<?php endif; ?> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index f0002c505c801a13fe51d2497e35a5fbab52f479..75aab157605ca08fb65701659c78d97d3e2e3909 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -106,12 +106,15 @@ if($_['passwordChangeSupported']) { print_unescaped($form); };?> - +<?php if (OC_Util::getEditionString() === ''): ?> <fieldset class="personalblock"> <legend><strong><?php p($l->t('Version'));?></strong></legend> <strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?> <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>.')); ?> </fieldset> - - +<?php else: ?> +<fieldset class="personalblock credits-footer"> + <p>© 2013 <a href="<?php p(OC_Defaults::getBaseUrl()); ?>" target="_blank"><?php p(OC_Defaults::getEntity()); ?></a> – <?php p(OC_Defaults::getSlogan()); ?></p> +</fieldset> +<?php endif; ?>