From 4c1e28a9602783a7a689802324185e600d89d483 Mon Sep 17 00:00:00 2001
From: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Date: Fri, 6 Jan 2012 15:08:56 +1300
Subject: [PATCH] Display used quota to admin on account settings page (bug
 #909831)

Change-Id: Id5cf59438b2399d1d7a6d28766523dfff0ea997f
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
---
 htdocs/admin/users/edit.php   | 5 +++--
 htdocs/lang/en.utf8/admin.php | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/users/edit.php b/htdocs/admin/users/edit.php
index 4c39e21208..a283826bd8 100644
--- a/htdocs/admin/users/edit.php
+++ b/htdocs/admin/users/edit.php
@@ -117,11 +117,12 @@ $elements['expiry'] = array(
     'maxyear'      => $currentdate['year'] + 20,
     'defaultvalue' => $user->expiry
 );
+$quotaused = get_string('quotaused', 'admin') . ': ' . display_size($user->quotaused);
 if ($USER->get('admin') || get_config_plugin('artefact', 'file', 'institutionaloverride')) {
     $elements['quota'] = array(
         'type'         => 'bytes',
         'title'        => get_string('filequota','admin'),
-        'description'  => get_string('filequotadescription','admin'),
+        'description'  => get_string('filequotadescription','admin') . '<br>' . $quotaused,
         'rules'        => array('integer' => true),
         'defaultvalue' => $user->quota,
     );
@@ -131,7 +132,7 @@ else {
         'type'         => 'text',
         'disabled'     => true,
         'title'        => get_string('filequota', 'admin'),
-        'description'  => get_string('filequotadescription', 'admin'),
+        'description'  => get_string('filequotadescription', 'admin') . '<br>' . $quotaused,
         'value'        => display_size($user->quota),
     );
 }
diff --git a/htdocs/lang/en.utf8/admin.php b/htdocs/lang/en.utf8/admin.php
index 1c1146ba18..e65b5815c7 100644
--- a/htdocs/lang/en.utf8/admin.php
+++ b/htdocs/lang/en.utf8/admin.php
@@ -622,6 +622,7 @@ $string['deleteuser'] = 'Delete User';
 $string['userdeletedsuccessfully'] = 'User deleted successfully';
 $string['confirmdeleteuser'] = 'Are you sure you want to delete this user?';
 $string['filequota'] = 'File quota (MB)';
+$string['quotaused'] = 'Quota used';
 $string['filequotadescription'] = 'Total storage available in the user\'s files area.';
 $string['addusertoinstitution'] = 'Add User to Institution';
 $string['removeuserfrominstitution'] = 'Remove user from this institution';
-- 
GitLab