summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorSam Tuke <samtuke@owncloud.com>2013-02-06 16:05:14 +0000
committerSam Tuke <samtuke@owncloud.com>2013-02-06 16:05:14 +0000
commitd9631aebfce0bb76880190d52c6574886fd65615 (patch)
treedbf791aba2b883680cfde3406cc0ce509005062a /settings
parenta8c0e3612cf12879c5f1d20832f0cfd9b6236348 (diff)
parent09a4424b1f9458bc0ee57c3b5f5c8a2d6a6c3c77 (diff)
downloadnextcloud-server-d9631aebfce0bb76880190d52c6574886fd65615.tar.gz
nextcloud-server-d9631aebfce0bb76880190d52c6574886fd65615.zip
Merge branch 'master' into files_encryption
Diffstat (limited to 'settings')
-rw-r--r--settings/personal.php7
-rw-r--r--settings/templates/personal.php6
2 files changed, 10 insertions, 3 deletions
diff --git a/settings/personal.php b/settings/personal.php
index ac2c4704edb..c2df8db1ccc 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -39,12 +39,19 @@ foreach($languageCodes as $lang) {
$languages[]=array('code'=>$lang, 'name'=>$lang);
}
}
+//links to clients
+$clients = array(
+ 'desktop' => OC_Config::getValue('customclient_desktop', 'http://owncloud.org/sync-clients/'),
+ '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')
+);
// Return template
$tmpl = new OC_Template( 'settings', 'personal', 'user');
$tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
$tmpl->assign('total_space', OC_Helper::humanFileSize($storageInfo['total']));
$tmpl->assign('usage_relative', $storageInfo['relative']);
+$tmpl->assign('clients', $clients);
$tmpl->assign('email', $email);
$tmpl->assign('languages', $languages);
$tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 0f195d86d3d..398e65c0086 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -10,9 +10,9 @@
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Clients');?></strong></legend>
- <a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a>
- <a class="button" href="https://play.google.com/store/apps/details?id=com.owncloud.android" target="_blank"><?php echo $l->t('Download Android Client');?></a>
- <a class="button" href="https://itunes.apple.com/us/app/owncloud/id543672169?mt=8" target="_blank"><?php echo $l->t('Download iOS Client');?></a>
+ <a class="button" href="<?php echo $_['clients']['desktop']; ?>" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a>
+ <a class="button" href="<?php echo $_['clients']['android']; ?>" target="_blank"><?php echo $l->t('Download Android Client');?></a>
+ <a class="button" href="<?php echo $_['clients']['ios']; ?>" target="_blank"><?php echo $l->t('Download iOS Client');?></a>
</fieldset>
<?php