Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-02-24 12:39:04 +0300
committerVincent Petry <pvince81@owncloud.com>2016-02-29 16:36:20 +0300
commit11215f4e275f7e7d1aafdb8af440550d27562ad8 (patch)
tree3d133edb995e6e989d27ad02ef1e518ecb8fea52 /settings
parenta38e8b6436ccfe173b4d368d094753c71bdbd69f (diff)
Return -3 for unlimited quota
Returns -3 for unlimited quota in Webdav response. Also adjusted personal page to show unlimited quota when set.
Diffstat (limited to 'settings')
-rw-r--r--settings/personal.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/settings/personal.php b/settings/personal.php
index d2d4fc90f5e..62a718985f8 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -137,9 +137,15 @@ if ($externalStorageEnabled) {
// Return template
+$l = \OC::$server->getL10N('settings');
$tmpl = new OC_Template( 'settings', 'personal', 'user');
$tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
-$tmpl->assign('total_space', OC_Helper::humanFileSize($storageInfo['total']));
+if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+ $totalSpace = $l->t('Unlimited');
+} else {
+ $totalSpace = OC_Helper::humanFileSize($storageInfo['total']);
+}
+$tmpl->assign('total_space', $totalSpace);
$tmpl->assign('usage_relative', $storageInfo['relative']);
$tmpl->assign('clients', $clients);
$tmpl->assign('email', $email);
@@ -162,7 +168,6 @@ sort($groups2);
$tmpl->assign('groups', $groups2);
// add hardcoded forms from the template
-$l = \OC::$server->getL10N('settings');
$formsAndMore = [];
$formsAndMore[]= ['anchor' => 'avatar', 'section-name' => $l->t('Personal info')];
$formsAndMore[]= ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')];