diff --git a/README.md b/README.md index ed106eec5c414635137e50fd36c04dd3d1e2a66a..39233a64bcf6004910b044d2d8dba20b6eba410a 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ This app is only meant for admins, so best restrict it to the admin group in the Otherwise normal users will see it in their navigation but get an error when they try to access it. +Requires ownCloud 10 or later. + # Disclaimer This app basically does SUMs over the oc_filecache table. diff --git a/appinfo/info.xml b/appinfo/info.xml index c732a415ba3e3286de582157fd0d3f9218ff6142..5f4342cd823f33ad523cc451ca68fd1549c31a1f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,10 +5,10 @@ <description>Displays used space for all users</description> <licence>AGPL</licence> <author>Florian Kaiser</author> - <version>0.0.1</version> + <version>2.0.0</version> <namespace>StorageUsage</namespace> <category>other</category> <dependencies> - <owncloud min-version="8.1" /> + <owncloud min-version="10.0" max-version="11.0" /> </dependencies> </info> diff --git a/db/usagedao.php b/db/usagedao.php index a9e00b80505d9b65d201266acf77bf934b08aef9..e4fe58636dfb21b9f0ecd27f33ea5e4b3a1c7d00 100644 --- a/db/usagedao.php +++ b/db/usagedao.php @@ -13,16 +13,15 @@ class UsageDAO { public function getUsage() { $dbPlatform = $this->db->getDatabasePlatform(); - $join_storage_expr = $dbPlatform->getConcatExpression('"home::"', '*PREFIX*preferences.userid'); - - $sql = 'SELECT *PREFIX*preferences.userid AS username, *PREFIX*preferences.configvalue as quotastring, *PREFIX*filecache.size as bytes, sub.num as objects - FROM *PREFIX*preferences - LEFT JOIN *PREFIX*storages ON (*PREFIX*storages.id=' . $join_storage_expr . ') - LEFT JOIN *PREFIX*filecache ON (*PREFIX*storages.numeric_id=*PREFIX*filecache.storage) - LEFT JOIN (SELECT storage, COUNT(*) as num FROM *PREFIX*filecache GROUP BY storage) sub ON (sub.storage=*PREFIX*storages.numeric_id) - WHERE *PREFIX*preferences.appid="files" and *PREFIX*preferences.configkey="quota" - AND *PREFIX*filecache.path="files" - ORDER BY *PREFIX*filecache.size DESC;'; + $join_storage_expr = $dbPlatform->getConcatExpression('"home::"', '*PREFIX*accounts.user_id'); + + $sql = 'SELECT *PREFIX*accounts.user_id AS username, *PREFIX*accounts.quota as quotastring, *PREFIX*filecache.size as bytes, sub.num as objects + FROM *PREFIX*accounts + LEFT JOIN *PREFIX*storages ON (*PREFIX*storages.id=' . $join_storage_expr . ') + LEFT JOIN *PREFIX*filecache ON (*PREFIX*storages.numeric_id=*PREFIX*filecache.storage) + LEFT JOIN (SELECT storage, COUNT(*) as num FROM *PREFIX*filecache GROUP BY storage) sub ON (sub.storage=*PREFIX*storages.numeric_id) + WHERE *PREFIX*filecache.path="files" + ORDER BY *PREFIX*filecache.size DESC;'; $stmt = $this->db->prepare($sql); $stmt->execute();