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 8bd2bf6378a2f106f1328b57c3cb1ce6be9e9c8e (commit)
from e9e36c5a4cbba32d43842b5d79189b903218a7ee (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=8bd2bf6378a2f106f1328b57c3cb1ce6be9e9c8e
commit 8bd2bf6378a2f106f1328b57c3cb1ce6be9e9c8e
Author: Franck Villaume <[email protected]>
Date: Thu Aug 19 17:31:35 2021 +0200
quotamanagement plugin: fix update quota. list only unix valid users
diff --git a/src/plugins/quotamanagement/action/update.php
b/src/plugins/quotamanagement/action/update.php
index bfee848..97799d7 100644
--- a/src/plugins/quotamanagement/action/update.php
+++ b/src/plugins/quotamanagement/action/update.php
@@ -34,17 +34,16 @@ if ( !forge_check_global_perm('forge_admin')) {
require_once $gfcommon.'include/SysTasksQ.class.php';
-$_quota_block_size = trim(shell_exec('echo $BLOCK_SIZE')) + 0;
+$_quota_block_size = intval(trim(shell_exec('echo $BLOCK_SIZE')));
if ($_quota_block_size == 0) {
$_quota_block_size = 1024;
}
$type = getStringFromRequest('type');
-
-$qs = $_POST["qs"] * $_quota_block_size;
-$qh = $_POST["qh"] * $_quota_block_size;
-$qds = $_POST["qds"] * 1024;
-$qdh = $_POST["qdh"] * 1024;
+$qs = getIntFromRequest('qs', 0) * $_quota_block_size;
+$qh = getIntFromRequest('qh', 0) * $_quota_block_size;
+$qds = getIntFromRequest('qds', 0) * $_quota_block_size;
+$qdh = getIntFromRequest('qdh', 0) * $_quota_block_size;
if ($qs > $qh || $qds > $qdh) {
$error_msg = _('Input error: Hard quota must be greater than soft
quota');
diff --git a/src/plugins/quotamanagement/view/quota.php
b/src/plugins/quotamanagement/view/quota.php
index 3074e29..510f542 100644
--- a/src/plugins/quotamanagement/view/quota.php
+++ b/src/plugins/quotamanagement/view/quota.php
@@ -158,12 +158,12 @@ $res_db = db_query_params('SELECT user_id, user_name,
realname, unix_status FROM
array());
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
- if ($e["unix_status"] != "N") {
- $users["$e[user_id]"]["user_id"] = $e["user_id"];
- $users["$e[user_id]"]["user_name"] = "$e[user_name]";
- $users["$e[user_id]"]["realname"] = "$e[realname]";
- $users["$e[user_id]"]["unix_status"] =
"$e[unix_status]";
- $users["$e[user_id]"]["disk_size"] = 0;
+ if ($e['unix_status'] == 'A') {
+ $users["$e[user_id]"]['user_id'] = $e['user_id'];
+ $users["$e[user_id]"]['user_name'] = "$e[user_name]";
+ $users["$e[user_id]"]['realname'] = "$e[realname]";
+ $users["$e[user_id]"]['unix_status'] =
"$e[unix_status]";
+ $users["$e[user_id]"]['disk_size'] = 0;
}
}
}
diff --git a/src/plugins/quotamanagement/view/quota_admin.php
b/src/plugins/quotamanagement/view/quota_admin.php
index c688d3f..1e36cc8 100644
--- a/src/plugins/quotamanagement/view/quota_admin.php
+++ b/src/plugins/quotamanagement/view/quota_admin.php
@@ -57,17 +57,15 @@ $res_db = db_query_params('SELECT plugin_quotamanagement.*,
groups.group_name, g
array());
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
- $qh = $e["quota_hard"] / $_quota_block_size;
- $qs = $e["quota_soft"] / $_quota_block_size;
- $quotas["$e[group_id]"]["group_id"] = $e["group_id"];
- $quotas["$e[group_id]"]["name"] = $e["group_name"];
- $quotas["$e[group_id]"]["unix_name"] = $e["unix_group_name"];
- $quotas["$e[group_id]"]["database_size"] = 0;
- $quotas["$e[group_id]"]["disk_size"] = 0;
- $quotas["$e[group_id]"]["quota_hard"] = $qh;
- $quotas["$e[group_id]"]["quota_soft"] = $qs;
- $quotas["$e[group_id]"]["quota_db_hard"] = $e["quota_db_hard"];
- $quotas["$e[group_id]"]["quota_db_soft"] = $e["quota_db_soft"];
+ $quotas["$e[group_id]"]['group_id'] = $e['group_id'];
+ $quotas["$e[group_id]"]['name'] = $e['group_name'];
+ $quotas["$e[group_id]"]['unix_name'] = $e['unix_group_name'];
+ $quotas["$e[group_id]"]['database_size'] = 0;
+ $quotas["$e[group_id]"]['disk_size'] = 0;
+ $quotas["$e[group_id]"]['quota_hard'] = $e['quota_hard'] /
$_quota_block_size;
+ $quotas["$e[group_id]"]['quota_soft'] = $e['quota_soft'] /
$_quota_block_size;
+ $quotas["$e[group_id]"]['quota_db_hard'] = $e['quota_db_hard']
/ $_quota_block_size;
+ $quotas["$e[group_id]"]['quota_db_soft'] = $e['quota_db_soft']
/ $_quota_block_size;
}
}
@@ -80,13 +78,13 @@ foreach ($quotas as $q) {
$cells[][] = $q['group_id'];
$cells[][] =
util_make_link('/plugins/'.$quotamanagement->name.'/?group_id='.$q['group_id'].'&type=projectadmin',
$q['unix_name']);
$cells[][] = $q['name'];
- $cells[] = array($HTML->html_input('qds', '', '', 'numeric',
$q['quota_db_soft'], array('class' => 'align-right', 'form' => 'q'.$group_id,
'min' => 0)));
- $cells[] = array($HTML->html_input('qdh', '', '', 'numeric',
$q['quota_db_hard'], array('class' => 'align-right', 'form' => 'q'.$group_id,
'min' => 0)));
- $cells[] = array($HTML->html_input('qs', '', '', 'numeric',
$q['quota_soft'], array('class' => 'align-right', 'form' => 'q'.$group_id,
'min' => 0)));
- $cells[] = array($HTML->html_input('qh', '', '', 'numeric',
$q['quota_hard'], array('class' => 'align-right', 'form' => 'q'.$group_id,
'min' => 0)));
- $cells[] = array($HTML->openForm(array('action' =>
'/plugins/'.$quotamanagement->name.'/?type=globaladmin&action=update', 'method'
=> 'post', 'id' => 'q'.$group_id))
- .$HTML->html_input('submit', '', '', 'submit',
_('Modify'), array('form' => 'q'.$group_id))
- .$HTML->html_input('group_id', '', '', 'hidden',
$q['group_id'], array('form' => 'q'.$group_id))
+ $cells[] = array($HTML->html_input('qds', '', '', 'numeric',
$q['quota_db_soft'], array('class' => 'align-right', 'form' =>
'q'.$q['group_id'], 'min' => 0)));
+ $cells[] = array($HTML->html_input('qdh', '', '', 'numeric',
$q['quota_db_hard'], array('class' => 'align-right', 'form' =>
'q'.$q['group_id'], 'min' => 0)));
+ $cells[] = array($HTML->html_input('qs', '', '', 'numeric',
$q['quota_soft'], array('class' => 'align-right', 'form' => 'q'.$q['group_id'],
'min' => 0)));
+ $cells[] = array($HTML->html_input('qh', '', '', 'numeric',
$q['quota_hard'], array('class' => 'align-right', 'form' => 'q'.$q['group_id'],
'min' => 0)));
+ $cells[] = array($HTML->openForm(array('action' =>
'/plugins/'.$quotamanagement->name.'/?type=globaladmin&action=update', 'method'
=> 'post', 'id' => 'q'.$q['group_id']))
+ .$HTML->html_input('submit', '', '', 'submit',
_('Modify'), array('form' => 'q'.$q['group_id']))
+ .$HTML->html_input('group_id', '', '', 'hidden',
$q['group_id'], array('form' => 'q'.$q['group_id']))
.$HTML->closeForm());
echo $HTML->multiTableRow(array(), $cells);
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/quotamanagement/action/update.php | 11 ++++----
src/plugins/quotamanagement/view/quota.php | 12 ++++-----
src/plugins/quotamanagement/view/quota_admin.php | 34 +++++++++++-------------
3 files changed, 27 insertions(+), 30 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
