|
|
|
@ -27,6 +27,7 @@ use \OC_SubAdmin; |
|
|
|
use \OC_User; |
|
|
|
use \OC_Group; |
|
|
|
use \OC_Helper; |
|
|
|
use OCP\Files\NotFoundException; |
|
|
|
|
|
|
|
class Users { |
|
|
|
|
|
|
|
@ -92,16 +93,8 @@ class Users { |
|
|
|
$config = \OC::$server->getConfig(); |
|
|
|
|
|
|
|
// Find the data
|
|
|
|
$data = array(); |
|
|
|
\OC_Util::tearDownFS(); |
|
|
|
\OC_Util::setupFS($userId); |
|
|
|
$storage = OC_Helper::getStorageInfo('/'); |
|
|
|
$data['quota'] = array( |
|
|
|
'free' => $storage['free'], |
|
|
|
'used' => $storage['used'], |
|
|
|
'total' => $storage['total'], |
|
|
|
'relative' => $storage['relative'], |
|
|
|
); |
|
|
|
$data = []; |
|
|
|
$data = self::fillStorageInfo($userId, $data); |
|
|
|
$data['enabled'] = $config->getUserValue($userId, 'core', 'enabled', 'true'); |
|
|
|
$data['email'] = $config->getUserValue($userId, 'settings', 'email'); |
|
|
|
$data['displayname'] = OC_User::getDisplayName($parameters['userid']); |
|
|
|
@ -350,4 +343,27 @@ class Users { |
|
|
|
return new OC_OCS_Result($groups); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @param $userId |
|
|
|
* @param $data |
|
|
|
* @return mixed |
|
|
|
* @throws \OCP\Files\NotFoundException |
|
|
|
*/ |
|
|
|
private static function fillStorageInfo($userId, $data) { |
|
|
|
try { |
|
|
|
\OC_Util::tearDownFS(); |
|
|
|
\OC_Util::setupFS($userId); |
|
|
|
$storage = OC_Helper::getStorageInfo('/'); |
|
|
|
$data['quota'] = [ |
|
|
|
'free' => $storage['free'], |
|
|
|
'used' => $storage['used'], |
|
|
|
'total' => $storage['total'], |
|
|
|
'relative' => $storage['relative'], |
|
|
|
]; |
|
|
|
} catch (NotFoundException $ex) { |
|
|
|
$data['quota'] = []; |
|
|
|
} |
|
|
|
return $data; |
|
|
|
} |
|
|
|
} |