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 2a80639cb32c16bf4172719d9280f7c6f9c5bd57 (commit)
via 3b8130d30f498d7059506cfbbc5b1b07e3bbb211 (commit)
from 3a9747935eabc4940274c2b74b547023aff38123 (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=2a80639cb32c16bf4172719d9280f7c6f9c5bd57
commit 2a80639cb32c16bf4172719d9280f7c6f9c5bd57
Author: Franck Villaume <[email protected]>
Date: Sun Jul 7 18:22:20 2019 +0200
fix wrong comment
diff --git
a/src/plugins/quota_management/etc/cron.d/fusionforge-plugin-quota_management
b/src/plugins/quota_management/etc/cron.d/fusionforge-plugin-quota_management
index 147a6fb..acd9b3f 100644
---
a/src/plugins/quota_management/etc/cron.d/fusionforge-plugin-quota_management
+++
b/src/plugins/quota_management/etc/cron.d/fusionforge-plugin-quota_management
@@ -3,5 +3,5 @@
#
PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-# Create wiki XML dumps every night
+# calculate quota every night
55 2 * * * root forge_run_plugin_job quota_management quota_management.php
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3b8130d30f498d7059506cfbbc5b1b07e3bbb211
commit 3b8130d30f498d7059506cfbbc5b1b07e3bbb211
Author: Franck Villaume <[email protected]>
Date: Sun Jul 7 18:22:08 2019 +0200
set the structure for quota update in quota_management plugin
diff --git a/src/plugins/quota_management/action/update.php
b/src/plugins/quota_management/action/update.php
index dbd77dc..79369ff 100644
--- a/src/plugins/quota_management/action/update.php
+++ b/src/plugins/quota_management/action/update.php
@@ -27,6 +27,8 @@
global $quota_management;
global $group_id;
+require_once $gfcommon.'include/SysTasksQ.class.php';
+
$_quota_block_size = trim(shell_exec('echo $BLOCK_SIZE')) + 0;
if ($_quota_block_size == 0) $_quota_block_size = 1024;
@@ -34,13 +36,16 @@ $type = getStringFromRequest('type');
$qs = $_POST["qs"] * $_quota_block_size;
$qh = $_POST["qh"] * $_quota_block_size;
-if ($qs > $qh) {
+$qds = $_POST["qds"];
+$qdh = $_POST["qdh"];
+
+if ($qs > $qh || $qds > $qdh) {
$error_msg = _('Input error: Hard quota must be greater than soft
quota');
} else {
- db_query_params('UPDATE plugin_quota_management SET quota_soft = $1,
quota_hard = $2 WHERE group_id = $3',
- array($qs,
- $qh,
- getIntFromRequest('group_id')));
+ db_query_params('UPDATE plugin_quota_management SET quota_soft = $1,
quota_hard = $2, quota_db_soft = $3, quota_db_hard = $4 WHERE group_id = $5',
+ array($qs, $qh, $qds, $qdh, $group_id);
+ $systasksq = new SystasksQ();
+ $systasksq->add($quota_management->getID(),
'QUOTAMANAGEMENT_SET_QUOTA', $group_id);
$feedback = _('Quota updated successfully');
}
diff --git
a/src/plugins/quota_management/common/quota_managementPlugin.class.php
b/src/plugins/quota_management/common/quota_managementPlugin.class.php
index 0de9fe0..a7cbe3a 100644
--- a/src/plugins/quota_management/common/quota_managementPlugin.class.php
+++ b/src/plugins/quota_management/common/quota_managementPlugin.class.php
@@ -24,6 +24,9 @@
*/
class quota_managementPlugin extends Plugin {
+ public $systask_types = array(
+ 'QUOTAMANAGEMENT_SET_QUOTA' => 'quota_management-set_quota.php',
+ );
var $data_array;
diff --git
a/src/plugins/quota_management/cronjobs/quota_management-set_quota.php
b/src/plugins/quota_management/cronjobs/quota_management-set_quota.php
new file mode 100644
index 0000000..722422f
--- /dev/null
+++ b/src/plugins/quota_management/cronjobs/quota_management-set_quota.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * quota_management set quota
+ *
+ * Copyright 2019, Franck Villaume - Capgemini
+ * http://fusionforge.org
+ *
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+require_once dirname(__FILE__) . '/../../../www/env.inc.php';
+require_once $gfcommon.'include/pre.php';
-----------------------------------------------------------------------
Summary of changes:
src/plugins/quota_management/action/update.php | 15 ++++++++++-----
.../common/quota_managementPlugin.class.php | 3 +++
.../cronjobs/quota_management-set_quota.php} | 18 ++++++------------
.../etc/cron.d/fusionforge-plugin-quota_management | 2 +-
4 files changed, 20 insertions(+), 18 deletions(-)
copy src/plugins/{oslc/common/oslc-init.php =>
quota_management/cronjobs/quota_management-set_quota.php} (77%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
