This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via e33bef2867442fa95b8cc37bda12f6631b975b4f (commit)
from 121306328494f1e1228ad8f335bb6befe792ff79 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e33bef2867442fa95b8cc37bda12f6631b975b4f
commit e33bef2867442fa95b8cc37bda12f6631b975b4f
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sun Jun 30 10:50:01 2019 +0200
quota_management: reorg code
diff --git
a/src/plugins/quota_management/common/quota_managementPlugin.class.php
b/src/plugins/quota_management/common/quota_managementPlugin.class.php
index 1245a25..df59e7f 100644
--- a/src/plugins/quota_management/common/quota_managementPlugin.class.php
+++ b/src/plugins/quota_management/common/quota_managementPlugin.class.php
@@ -136,6 +136,36 @@ to monitor disk and database usage per user, project.");
array($group_id));
}
+ function getNewsSizeQuery() {
+ return db_query_params('SELECT group_id,
SUM(octet_length(summary) + octet_length(details)) as size
+ FROM news_bytes
+ GROUP BY group_id
+ ORDER BY group_id',
+ array());
+ }
+
+ function getNewsSizeForProject($group_id) {
+ return db_query_params('SELECT SUM(octet_length(summary) +
octet_length(details)) as size, count(*) as nb
+ FROM news_bytes
+ WHERE group_id = $1',
+ array($group_id));
+ }
+
+ function getForumSizeQuery() {
+ return db_query_params('SELECT forum_group_list.group_id as
group_id, SUM(octet_length(subject)+octet_length(body)) as size
+ FROM forum INNER JOIN forum_group_list
ON forum.group_forum_id = forum_group_list.group_forum_id
+ GROUP BY group_id
+ ORDER BY group_id',
+ array());
+ }
+
+ function getForumSizeForProject($group_id) {
+ return db_query_params('SELECT
SUM(octet_length(subject)+octet_length(body)) as size, count(*) as nb
+ FROM forum INNER JOIN forum_group_list
ON forum.group_forum_id = forum_group_list.group_forum_id
+ WHERE group_id = $1',
+ array($group_id));
+ }
+
function getTrackersSizeQuery() {
return db_query_params('SELECT artifact_group_list.group_id,
SUM(octet_length(artifact.summary)+octet_length(artifact.details)+octet_length(artifact_message.body)+artifact_file.filesize)
as size
FROM artifact, artifact_group_list,
artifact_message, artifact_file
diff --git a/src/plugins/quota_management/view/quota.php
b/src/plugins/quota_management/view/quota.php
index 9403341..f74b5d0 100644
--- a/src/plugins/quota_management/view/quota.php
+++ b/src/plugins/quota_management/view/quota.php
@@ -106,7 +106,7 @@ if (forge_get_config('use_frs')) {
}
// PM database size
-if (forge_get_config('use_frs')) {
+if (forge_get_config('use_pm')) {
$res_db = $quota_management->getPMSizeQuery();
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
@@ -118,8 +118,7 @@ if (forge_get_config('use_frs')) {
// news database size
if (forge_get_config('use_news')) {
- $res_db = db_query_params('SELECT group_id, SUM(octet_length(summary) +
octet_length(details)) as size FROM news_bytes GROUP BY group_id',
- array());
+ $res_db = $quota_management->getNewsSizeQuery();
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
$quotas["$e[group_id]"]["database_size"] += $e["size"];
@@ -129,8 +128,7 @@ if (forge_get_config('use_news')) {
// forums database size
if (forge_get_config('use_forums')) {
- $res_db = db_query_params('SELECT forum_group_list.group_id as
group_id, SUM(octet_length(subject)+octet_length(body)) as size FROM forum
INNER JOIN forum_group_list ON forum.group_forum_id =
forum_group_list.group_forum_id GROUP BY group_id',
- array ());
+ $res_db = $quota_management->getForumSizeQuery();
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
$quotas["$e[group_id]"]["database_size"] += $e["size"];
diff --git a/src/plugins/quota_management/view/quota_project.php
b/src/plugins/quota_management/view/quota_project.php
index b3e61cc..1634e3e 100644
--- a/src/plugins/quota_management/view/quota_project.php
+++ b/src/plugins/quota_management/view/quota_project.php
@@ -65,8 +65,7 @@ if ($group->usesDocman()) {
}
if ($group->usesNews()) {
- $res_db = db_query_params('SELECT SUM(octet_length(summary) +
octet_length(details)) as size, count(*) as nb FROM news_bytes WHERE group_id =
$1 ',
- array ($group_id));
+ $res_db = $quota_management->getNewsSizeForProject($group_id);
$q = array();
$q["name"] = _('News');
$q["nb"] = 0; $q["size"] = 0;
@@ -80,8 +79,7 @@ if ($group->usesNews()) {
}
if ($group->usesForum()) {
- $res_db = db_query_params('SELECT
SUM(octet_length(subject)+octet_length(body)) as size, count(*) as nb FROM
forum INNER JOIN forum_group_list ON forum.group_forum_id =
forum_group_list.group_forum_id WHERE group_id = $1 ',
- array ($group_id));
+ $res_db = $quota_management->getForumSizeForProject($group_id);
$q = array();
$q["name"] = _('Forums');
$q["nb"] = 0; $q["size"] = 0;
-----------------------------------------------------------------------
Summary of changes:
.../common/quota_managementPlugin.class.php | 30 ++++++++++++++++++++++
src/plugins/quota_management/view/quota.php | 8 +++---
.../quota_management/view/quota_project.php | 6 ++---
3 files changed, 35 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
