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 e24b9ad24a32f59e2b4f60f73a15e62b246dffd2 (commit)
via 4f34445b8a8ede868be029fe78cba256931a8b77 (commit)
via 548affd0c0679e37991af073da8beab3a263aa31 (commit)
from 1945072b1159aa5615c733a250314a6cc43898b8 (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=e24b9ad24a32f59e2b4f60f73a15e62b246dffd2
commit e24b9ad24a32f59e2b4f60f73a15e62b246dffd2
Author: Franck Villaume <[email protected]>
Date: Mon May 3 10:30:32 2021 +0200
rename quotamanagement plugin. fix packaging
diff --git a/src/plugins/quotamanagement/action/update.php
b/src/plugins/quotamanagement/action/update.php
index e7a777a..9ae80ad 100644
--- a/src/plugins/quotamanagement/action/update.php
+++ b/src/plugins/quotamanagement/action/update.php
@@ -4,7 +4,7 @@
*
* Copyright 2005, Fabio Bertagnin
* Copyright 2011,2016, Franck Villaume - Capgemini
- * Copyright 2019, Franck Villaume - TrivialDev
+ * Copyright 2019,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -24,12 +24,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-global $quota_management;
+global $quotamanagement;
global $group_id;
if ( !forge_check_global_perm('forge_admin')) {
$warning_msg = _('Quota Management Action Denied.');
-
session_redirect('/plugins/'.$quota_management->name.'/?group_id='.$group_id,
false);
+
session_redirect('/plugins/'.$quotamanagement->name.'/?group_id='.$group_id,
false);
}
require_once $gfcommon.'include/SysTasksQ.class.php';
@@ -47,12 +47,12 @@ $qdh = $_POST["qdh"] * 1024;
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, quota_db_soft = $3, quota_db_hard = $4 WHERE group_id = $5',
+ db_query_params('UPDATE plugin_quotamanagement 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);
+ $systasksq->add($quotamanagement->getID(), 'QUOTAMANAGEMENT_SET_QUOTA',
$group_id);
$feedback = _('Quota updated successfully');
}
-$redirect_url = '/plugins/'.$quota_management->name.'/?type='.$type;
+$redirect_url = '/plugins/'.$quotamanagement->name.'/?type='.$type;
session_redirect($redirect_url, false);
diff --git
a/src/plugins/quotamanagement/common/quota_managementPlugin.class.php
b/src/plugins/quotamanagement/common/quotamanagementPlugin.class.php
similarity index 98%
rename from src/plugins/quotamanagement/common/quota_managementPlugin.class.php
rename to src/plugins/quotamanagement/common/quotamanagementPlugin.class.php
index 82ab174..bc472a8 100644
--- a/src/plugins/quotamanagement/common/quota_managementPlugin.class.php
+++ b/src/plugins/quotamanagement/common/quotamanagementPlugin.class.php
@@ -4,6 +4,7 @@
*
* Copyright 2005, Fabio Bertagnin
* Copyright 2011, Franck Villaume - Capgemini
+ * Copyright 2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -25,7 +26,7 @@
class quotamanagementPlugin extends Plugin {
public $systask_types = array(
- 'QUOTAMANAGEMENT_SET_QUOTA' => 'quota_management-set_quota.php',
+ 'QUOTAMANAGEMENT_SET_QUOTA' => 'quotamanagement-set_quota.php',
);
var $data_array;
@@ -46,7 +47,7 @@ to monitor disk and database usage per user, project.");
$returned = false;
switch ($hookname) {
case "project_admin_plugins": {
- // this displays the link in the project admin
options page to it's quota_management administration
+ // this displays the link in the project admin
options page to it's quotamanagement administration
echo html_e('p', array(),
util_make_link('/plugins/'.$this->name.'/?type=projectadmin&group_id='.$params['group_id'],
_('Quota Management
Administration')));
$returned = true;
diff --git
a/src/plugins/quotamanagement/cronjobs/quota_management-set_quota.php
b/src/plugins/quotamanagement/cronjobs/quotamanagement-set_quota.php
similarity index 92%
rename from src/plugins/quotamanagement/cronjobs/quota_management-set_quota.php
rename to src/plugins/quotamanagement/cronjobs/quotamanagement-set_quota.php
index d7256e5..b054390 100644
--- a/src/plugins/quotamanagement/cronjobs/quota_management-set_quota.php
+++ b/src/plugins/quotamanagement/cronjobs/quotamanagement-set_quota.php
@@ -1,8 +1,8 @@
<?php
/**
- * quota_management set quota
+ * quotamanagement set quota
*
- * Copyright 2019, Franck Villaume - Capgemini
+ * Copyright 2019, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge.
diff --git a/src/plugins/quotamanagement/cronjobs/quota_management.php
b/src/plugins/quotamanagement/cronjobs/quotamanagement.php
similarity index 80%
rename from src/plugins/quotamanagement/cronjobs/quota_management.php
rename to src/plugins/quotamanagement/cronjobs/quotamanagement.php
index 0fad34f..7d18592 100644
--- a/src/plugins/quotamanagement/cronjobs/quota_management.php
+++ b/src/plugins/quotamanagement/cronjobs/quotamanagement.php
@@ -1,8 +1,8 @@
<?php
/**
- * quota_management cronjob
+ * quotamanagement cronjob
*
- * Copyright 2019, Franck Villaume - Capgemini
+ * Copyright 2019,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -27,7 +27,7 @@ require_once $gfcommon.'include/pre.php';
require_once $gfcommon.'include/cron_utils.php';
require_once $gfcommon.'include/Group.class.php';
-$quota_management = plugin_get_object('quota_management');
+$quotamanagement = plugin_get_object('quotamanagement');
#compute the storage per project and per directory
$activegroups = group_get_active_projects();
@@ -36,8 +36,8 @@ if (forge_get_config('use_shell')) {
$ghome = forge_get_config('groupdir_prefix') . '/' .
$activegroup->getUnixName();
if (is_dir($ghome)) {
#compute Group Home dir
- $dirsize = $quota_management->get_dir_size($ghome);
- $quota_management->setDirSize($activegroup->getID(),
'home', $dirsize);
+ $dirsize = $quotamanagement->get_dir_size($ghome);
+ $quotamanagement->setDirSize($activegroup->getID(),
'home', $dirsize);
}
}
}
@@ -47,8 +47,8 @@ if (forge_get_config('use_ftp')) {
$ftphome = forge_get_config('ftp_upload_dir') . '/' .
$activegroup->getUnixName();
if ($activegroup->usesFTP() && is_dir($ftphome)) {
#compute FTP dir
- $dirsize = $quota_management->get_dir_size($ftphome);
- $quota_management->setDirSize($activegroup->getID(),
'ftp', $dirsize);
+ $dirsize = $quotamanagement->get_dir_size($ftphome);
+ $quotamanagement->setDirSize($activegroup->getID(),
'ftp', $dirsize);
}
}
}
diff --git a/src/plugins/quotamanagement/db/20190616_move_to_dedicate_table.sql
b/src/plugins/quotamanagement/db/20190616_move_to_dedicate_table.sql
index 1fa61f5..6851fd3 100644
--- a/src/plugins/quotamanagement/db/20190616_move_to_dedicate_table.sql
+++ b/src/plugins/quotamanagement/db/20190616_move_to_dedicate_table.sql
@@ -1,4 +1,4 @@
-CREATE TABLE plugin_quota_management (
+CREATE TABLE plugin_quotamanagement (
group_id int NOT NULL,
quota_soft int NOT NULL,
quota_hard int NOT NULL,
@@ -7,9 +7,9 @@ CREATE TABLE plugin_quota_management (
FOREIGN KEY (group_id) REFERENCES groups (group_id) ON DELETE CASCADE
ON UPDATE CASCADE
);
-CREATE INDEX plugin_quota_management_gid_idx ON
plugin_quota_management(group_id);
+CREATE INDEX plugin_quotamanagement_gid_idx ON
plugin_quotamanagement(group_id);
-INSERT INTO plugin_quota_management (SELECT group_id, 0, 0, 0, 0 FROM groups);
+INSERT INTO plugin_quotamanagement (SELECT group_id, 0, 0, 0, 0 FROM groups);
ALTER TABLE groups DROP COLUMN IF EXISTS quota_soft;
ALTER TABLE groups DROP COLUMN IF EXISTS quota_hard;
diff --git
a/src/plugins/quotamanagement/db/20190618_quota_management-add_storage_columns_for_compute.sql
b/src/plugins/quotamanagement/db/20190618_quota_management-add_storage_columns_for_compute.sql
deleted file mode 100644
index e39ea9f..0000000
---
a/src/plugins/quotamanagement/db/20190618_quota_management-add_storage_columns_for_compute.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE plugin_quota_management ADD COLUMN home_usage INT DEFAULT 0;
-ALTER TABLE plugin_quota_management ADD COLUMN ftp_usage INT DEFAULT 0;
diff --git
a/src/plugins/quotamanagement/db/20190618_quotamanagement-add_storage_columns_for_compute.sql
b/src/plugins/quotamanagement/db/20190618_quotamanagement-add_storage_columns_for_compute.sql
new file mode 100644
index 0000000..d7c2349
--- /dev/null
+++
b/src/plugins/quotamanagement/db/20190618_quotamanagement-add_storage_columns_for_compute.sql
@@ -0,0 +1,2 @@
+ALTER TABLE plugin_quotamanagement ADD COLUMN home_usage INT DEFAULT 0;
+ALTER TABLE plugin_quotamanagement ADD COLUMN ftp_usage INT DEFAULT 0;
diff --git a/src/plugins/quotamanagement/db/quota_management-init.sql
b/src/plugins/quotamanagement/db/quotamanagement-init.sql
similarity index 100%
rename from src/plugins/quotamanagement/db/quota_management-init.sql
rename to src/plugins/quotamanagement/db/quotamanagement-init.sql
diff --git
a/src/plugins/quotamanagement/etc/cron.d/fusionforge-plugin-quota_management
b/src/plugins/quotamanagement/etc/cron.d/fusionforge-plugin-quota_management
deleted file mode 100644
index acd9b3f..0000000
--- a/src/plugins/quotamanagement/etc/cron.d/fusionforge-plugin-quota_management
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Regular cron jobs for the plugin-quota_management package
-#
-PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-# calculate quota every night
-55 2 * * * root forge_run_plugin_job quota_management quota_management.php
diff --git
a/src/plugins/quotamanagement/etc/cron.d/fusionforge-plugin-quotamanagement
b/src/plugins/quotamanagement/etc/cron.d/fusionforge-plugin-quotamanagement
new file mode 100644
index 0000000..f7a41c6
--- /dev/null
+++ b/src/plugins/quotamanagement/etc/cron.d/fusionforge-plugin-quotamanagement
@@ -0,0 +1,7 @@
+#
+# Regular cron jobs for the plugin-quotamanagement package
+#
+PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+# calculate quota every night
+55 2 * * * root forge_run_plugin_job quotamanagement quotamanagement.php
diff --git a/src/plugins/quotamanagement/etc/quota_management.ini
b/src/plugins/quotamanagement/etc/quotamanagement.ini
similarity index 60%
rename from src/plugins/quotamanagement/etc/quota_management.ini
rename to src/plugins/quotamanagement/etc/quotamanagement.ini
index 7c1ec5a..a97684e 100644
--- a/src/plugins/quotamanagement/etc/quota_management.ini
+++ b/src/plugins/quotamanagement/etc/quotamanagement.ini
@@ -1,8 +1,8 @@
-[quota_management]
+[quotamanagement]
-; Current quota_management is to be validate by developers
+; Current quotamanagement is to be validate by developers
; plugin_status is a string.
; valid means : production ready.
; Any other strings means it's under work or broken and plugin
; is available in installation_environment = development only.
-plugin_status = 'to be validate by developers'
\ No newline at end of file
+plugin_status = 'under construction'
diff --git a/src/plugins/quotamanagement/view/quota.php
b/src/plugins/quotamanagement/view/quota.php
index 165b9d3..a34af5d 100644
--- a/src/plugins/quotamanagement/view/quota.php
+++ b/src/plugins/quotamanagement/view/quota.php
@@ -4,7 +4,7 @@
*
* Copyright 2005, Fabio Bertagnin
* Copyright 2011,2016, Franck Villaume - Capgemini
- * Copyright 2019, Franck Villaume - TrivialDev
+ * Copyright 2019,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -32,7 +32,7 @@ session_require_global_perm('forge_admin');
global $HTML;
-$quota_management = plugin_get_object('quota_management');
+$quotamanagement = plugin_get_object('quotamanagement');
$_quota_block_size = intval(trim(shell_exec('echo $BLOCK_SIZE'))) + 0;
if ($_quota_block_size == 0) $_quota_block_size = 1024;
@@ -41,10 +41,10 @@ $subMenuTitle = array();
$subMenuUrl = array();
$subMenuAttr = array();
$subMenuTitle[] = _('Ressources usage and quota');
-$subMenuUrl[] = '/plugins/'.$quota_management->name.'/?type=globaladmin';
+$subMenuUrl[] = '/plugins/'.$quotamanagement->name.'/?type=globaladmin';
$subMenuAttr[] = array('title' => _('View quota and usage per project and
user.'));
$subMenuTitle[] = _('Admin');
-$subMenuUrl[] =
'/plugins/'.$quota_management->name.'/?type=globaladmin&view=admin';
+$subMenuUrl[] =
'/plugins/'.$quotamanagement->name.'/?type=globaladmin&view=admin';
$subMenuAttr[] = array('title' => _('Administrate quotas per project.'));
echo $HTML->subMenu($subMenuTitle, $subMenuUrl, $subMenuAttr);
@@ -52,8 +52,8 @@ echo $HTML->subMenu($subMenuTitle, $subMenuUrl, $subMenuAttr);
$quotas = array();
// all projects list
-$res_db = db_query_params('SELECT plugin_quota_management.*,
groups.group_name, groups.unix_group_name FROM plugin_quota_management, groups
- WHERE plugin_quota_management.group_id =
groups.group_id ORDER BY group_id',
+$res_db = db_query_params('SELECT plugin_quotamanagement.*, groups.group_name,
groups.unix_group_name FROM plugin_quotamanagement, groups
+ WHERE plugin_quotamanagement.group_id = groups.group_id
ORDER BY group_id',
array());
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
@@ -72,7 +72,7 @@ if (db_numrows($res_db) > 0) {
// documents database size
if (forge_get_config('use_docman')) {
- $res_db = $quota_management->getDocumentsSizeQuery();
+ $res_db = $quotamanagement->getDocumentsSizeQuery();
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
$q = array();
@@ -84,7 +84,7 @@ if (forge_get_config('use_docman')) {
// trackers database size
if (forge_get_config('use_tracker')) {
- $res_db = $quota_management->getTrackersSizeQuery();
+ $res_db = $quotamanagement->getTrackersSizeQuery();
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
$q = array();
@@ -95,7 +95,7 @@ if (forge_get_config('use_tracker')) {
// FRS database size
if (forge_get_config('use_frs')) {
- $res_db = $quota_management->getFRSSizeQuery();
+ $res_db = $quotamanagement->getFRSSizeQuery();
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
$q = array();
@@ -106,7 +106,7 @@ if (forge_get_config('use_frs')) {
// PM database size
if (forge_get_config('use_pm')) {
- $res_db = $quota_management->getPMSizeQuery();
+ $res_db = $quotamanagement->getPMSizeQuery();
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
$q = array();
@@ -117,7 +117,7 @@ if (forge_get_config('use_pm')) {
// news database size
if (forge_get_config('use_news')) {
- $res_db = $quota_management->getNewsSizeQuery();
+ $res_db = $quotamanagement->getNewsSizeQuery();
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
$quotas["$e[group_id]"]["database_size"] += $e["size"];
@@ -127,7 +127,7 @@ if (forge_get_config('use_news')) {
// forums database size
if (forge_get_config('use_forums')) {
- $res_db = $quota_management->getForumSizeQuery();
+ $res_db = $quotamanagement->getForumSizeQuery();
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
$quotas["$e[group_id]"]["database_size"] += $e["size"];
@@ -140,12 +140,12 @@ foreach ($quotas as $p) {
$group_id = $p["group_id"];
if (forge_get_config('use_ftp')) {
// ftp dir disk space
- $size = $quota_management->getFTPSize($group_id);
+ $size = $quotamanagement->getFTPSize($group_id);
$quotas["$group_id"]["disk_size_1"] += $size;
}
if (forge_get_config('use_shell')) {
// home dir disk space
- $size = $quota_management->getHomeSize($group_id);
+ $size = $quotamanagement->getHomeSize($group_id);
$quotas["$group_id"]["disk_size_1"] += $size;
}
}
@@ -169,7 +169,7 @@ if (db_numrows($res_db) > 0) {
foreach ($users as $u) {
$user_id = $u["user_id"];
$dir = $ftp_dir.'/'.$u["user_name"];
- $size = $quota_management->get_dir_size($dir);
+ $size = $quotamanagement->get_dir_size($dir);
$users["$user_id"]["disk_size"] += human_readable_bytes($size);
}
@@ -255,7 +255,7 @@ foreach ($users as $u) {
<tr>
<td style="border-top:thin solid
#808080;background:<?php echo $color2; ?>"><?php echo $q["group_id"]; ?></td>
<td style="border-top:thin solid
#808080;background:<?php echo $color2; ?>">
- <?php echo
util_make_link('/plugins/'.$quota_management->name.'/?type=projectadmin&group_id='.$q['group_id'],
$q['unix_name']); ?>
+ <?php echo
util_make_link('/plugins/'.$quotamanagement->name.'/?type=projectadmin&group_id='.$q['group_id'],
$q['unix_name']); ?>
</td>
<td style="border-top:thin solid
#808080;background:<?php echo $color2; ?>">
<?php echo $q["name"]; ?>
@@ -388,8 +388,3 @@ foreach ($users as $u) {
<?php
site_admin_footer();
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/plugins/quotamanagement/view/quota_admin.php
b/src/plugins/quotamanagement/view/quota_admin.php
index fd0c673..1598d6b 100644
--- a/src/plugins/quotamanagement/view/quota_admin.php
+++ b/src/plugins/quotamanagement/view/quota_admin.php
@@ -4,7 +4,7 @@
*
* Copyright 2005, Fabio Bertagnin
* Copyright 2011,2016, Franck Villaume - Capgemini
- * Copyright 2019, Franck Villaume - TrivialDev
+ * Copyright 2019,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -30,7 +30,7 @@ require_once $gfwww.'admin/admin_utils.php';
$cmd = getStringFromRequest('cmd');
-$quota_management = plugin_get_object('quota_management');
+$quotamanagement = plugin_get_object('quotamanagement');
$_quota_block_size = intval(trim(shell_exec('echo $BLOCK_SIZE'))) + 0;
if ($_quota_block_size == 0) $_quota_block_size = 1024;
@@ -39,10 +39,10 @@ $subMenuTitle = array();
$subMenuUrl = array();
$subMenuAttr = array();
$subMenuTitle[] = _('Ressources usage and quota');
-$subMenuUrl[] = '/plugins/'.$quota_management->name.'/?type=globaladmin';
+$subMenuUrl[] = '/plugins/'.$quotamanagement->name.'/?type=globaladmin';
$subMenuAttr[] = array('title' => _('View quota and usage per project and
user.'));
$subMenuTitle[] = _('Admin');
-$subMenuUrl[] =
'/plugins/'.$quota_management->name.'/?type=globaladmin&view=admin';
+$subMenuUrl[] =
'/plugins/'.$quotamanagement->name.'/?type=globaladmin&view=admin';
$subMenuAttr[] = array('title' => _('Administrate quotas per project.'));
echo $HTML->subMenu($subMenuTitle, $subMenuUrl, $subMenuAttr);
@@ -50,8 +50,8 @@ echo $HTML->subMenu($subMenuTitle, $subMenuUrl, $subMenuAttr);
$quotas = array();
// all projects list
-$res_db = db_query_params('SELECT plugin_quota_management.*,
groups.group_name, groups.unix_group_name FROM plugin_quota_management, groups
- WHERE plugin_quota_management.group_id =
groups.group_id ORDER BY group_id',
+$res_db = db_query_params('SELECT plugin_quotamanagement.*, groups.group_name,
groups.unix_group_name FROM plugin_quotamanagement, groups
+ WHERE plugin_quotamanagement.group_id = groups.group_id
ORDER BY group_id',
array());
if (db_numrows($res_db) > 0) {
while($e = db_fetch_array($res_db)) {
@@ -90,13 +90,13 @@ if (db_numrows($res_db) > 0) {
{
$total_database += $q["database_size"];
$total_disk += $q["disk_size"];
- echo $HTML->openForm(array('action' =>
'/plugins/'.$quota_management->name.'/?type=globaladmin&action=update',
'method' => 'post'));
+ echo $HTML->openForm(array('action' =>
'/plugins/'.$quotamanagement->name.'/?type=globaladmin&action=update', 'method'
=> 'post'));
?>
<input type="hidden" name="group_id" value="<?php echo
$q["group_id"]; ?>" />
<tr>
<td style="border-top:thin solid #808080"><?php echo
$q["group_id"]; ?></td>
<td style="border-top:thin solid #808080">
- <?php echo
util_make_link('/plugins/quota_management/?group_id='.$q['group_id'].'&type=projectadmin',
$q['unix_name']) ?>
+ <?php echo
util_make_link('/plugins/'.$quotamanagement->name.'/?group_id='.$q['group_id'].'&type=projectadmin',
$q['unix_name']) ?>
</td>
<td style="border-top:thin solid #808080"><?php echo
$q["name"]; ?></td>
<td style="border-top:thin solid #808080;
text-align:right">
@@ -142,8 +142,3 @@ if (db_numrows($res_db) > 0) {
<?php
site_admin_footer();
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/plugins/quotamanagement/view/quota_project.php
b/src/plugins/quotamanagement/view/quota_project.php
index 1c266f7..0539067 100644
--- a/src/plugins/quotamanagement/view/quota_project.php
+++ b/src/plugins/quotamanagement/view/quota_project.php
@@ -7,7 +7,7 @@
* Copyright 2005, Fabio Bertagnin
* Copyright 2010 (c) FusionForge Team
* Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2019, Franck Villaume - TrivialDev
+ * Copyright 2019,2021, Franck Villaume - TrivialDev
* http://fusionforge.org/
*
* This file is part of FusionForge.
@@ -32,7 +32,7 @@ require_once $gfcommon.'include/pre.php';
require_once $gfwww.'project/admin/project_admin_utils.php';
global $group_id;
-global $quota_management;
+global $quotamanagement;
global $HTML;
session_require_perm('project_admin', $group_id);
@@ -47,7 +47,7 @@ if (!$group || !is_object($group)) {
$quotas = array();
if ($group->usesDocman()) {
- $res_db = $quota_management->getDocumentsSizeForProject($group_id);
+ $res_db = $quotamanagement->getDocumentsSizeForProject($group_id);
$q = array();
$q["name"] = _('Documents');
$q["nb"] = 0; $q["size"] = 0;
@@ -66,7 +66,7 @@ if ($group->usesDocman()) {
}
if ($group->usesNews()) {
- $res_db = $quota_management->getNewsSizeForProject($group_id);
+ $res_db = $quotamanagement->getNewsSizeForProject($group_id);
$q = array();
$q["name"] = _('News');
$q["nb"] = 0; $q["size"] = 0;
@@ -80,7 +80,7 @@ if ($group->usesNews()) {
}
if ($group->usesForum()) {
- $res_db = $quota_management->getForumSizeForProject($group_id);
+ $res_db = $quotamanagement->getForumSizeForProject($group_id);
$q = array();
$q["name"] = _('Forums');
$q["nb"] = 0; $q["size"] = 0;
@@ -93,7 +93,7 @@ if ($group->usesForum()) {
}
if ($group->usesTracker()) {
- $res_db = $quota_management->getTrackerSizeForProject($group_id);
+ $res_db = $quotamanagement->getTrackerSizeForProject($group_id);
$q = array();
$q["name"] = _('Trackers');
$q["nb"] = 0; $q["size"] = 0;
@@ -106,7 +106,7 @@ if ($group->usesTracker()) {
}
if ($group->usesFRS()) {
- $res_db = $quota_management->getFRSSizeForProject($group_id);
+ $res_db = $quotamanagement->getFRSSizeForProject($group_id);
$q = array();
$q["name"] = _('FRS');
$q["nb"] = 0; $q["size"] = 0;
@@ -119,7 +119,7 @@ if ($group->usesFRS()) {
}
if ($group->usesPM()) {
- $res_db = $quota_management->getPMSizeForProject($group_id);
+ $res_db = $quotamanagement->getPMSizeForProject($group_id);
$q = array();
$q["name"] = _('PM');
$q["nb"] = 0; $q["size"] = 0;
@@ -140,7 +140,7 @@ $_quota_block_size = intval(trim(shell_exec('echo
$BLOCK_SIZE'))) + 0;
if ($_quota_block_size == 0) $_quota_block_size = 1024;
$quota_soft = "";
$quota_hard = "";
-$res_db = db_query_params('SELECT * FROM plugin_quota_management WHERE
group_id = $1',
+$res_db = db_query_params('SELECT * FROM plugin_quotamanagement WHERE group_id
= $1',
array($group_id));
if (db_numrows($res_db) > 0) {
$e = db_fetch_array($res_db);
@@ -154,13 +154,13 @@ if (db_numrows($res_db) > 0) {
if (forge_get_config('use_shell')) {
$q["name"] = _('Home project directory');
- $q["size"] = $quota_management->getHomeSize($group_id);
+ $q["size"] = $quotamanagement->getHomeSize($group_id);
$quotas_disk[] = $q;
}
if ($group->usesFTP()) {
$q["name"] = _('FTP project directory');
- $q["size"] = $quota_management->getFTPSize($group_id);
+ $q["size"] = $quotamanagement->getFTPSize($group_id);
$quotas_disk[] = $q;
}
@@ -220,7 +220,7 @@ echo $HTML->listTableBottom(); ?>
<br />
<br />
<?php
-if (count($quotas_disk) > 0) {
+if (!empty($quotas_disk)) {
echo $HTML->listTableTop(array(_('Disk'), _('Quota')), array(), '',
'quota', array(), array(), array(array('colspan' => 2, 'style' => 'text-align:
center'), array('colspan' => 2, 'style' => 'text-align: center')));
?>
<tr style="font-weight:bold">
diff --git a/src/plugins/quotamanagement/www/index.php
b/src/plugins/quotamanagement/www/index.php
index a2e3d07..a7a5a4b 100644
--- a/src/plugins/quotamanagement/www/index.php
+++ b/src/plugins/quotamanagement/www/index.php
@@ -41,10 +41,10 @@ if (!$user || !is_object($user)) {
$type = getStringFromRequest('type');
if (!$type) {
- exit_missing_param($_SERVER['HTTP_REFERER'], array('No TYPE
specified'), 'quota_management');
+ exit_missing_param($_SERVER['HTTP_REFERER'], array('No TYPE
specified'), 'quotamanagement');
}
-$quota_management = plugin_get_object('quota_management');
+$quotamanagement = plugin_get_object('quotamanagement');
switch ($type) {
case 'globaladmin': {
@@ -56,16 +56,16 @@ switch ($type) {
$view = getStringFromRequest('view');
switch ($action) {
case 'update':
-
include($gfplugins.$quota_management->name.'/action/'.$action.'.php');
+
include($gfplugins.$quotamanagement->name.'/action/'.$action.'.php');
break;
}
- $quota_management->getHeader($type);
+ $quotamanagement->getHeader($type);
switch ($view) {
case 'admin':
- include
$gfplugins.$quota_management->name.'/view/quota_admin.php';
+ include
$gfplugins.$quotamanagement->name.'/view/quota_admin.php';
break;
default:
- include
$gfplugins.$quota_management->name.'/view/quota.php';
+ include
$gfplugins.$quotamanagement->name.'/view/quota.php';
break;
}
break;
@@ -84,14 +84,9 @@ switch ($type) {
}
switch ($view) {
default:
- $quota_management->getHeader($type, $group_id);
- include
$gfplugins.$quota_management->name.'/view/quota_project.php';
+ $quotamanagement->getHeader($type, $group_id);
+ include
$gfplugins.$quotamanagement->name.'/view/quota_project.php';
break;
}
}
}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/rpm/plugins b/src/rpm/plugins
index 6d5c572..32e0906 100644
--- a/src/rpm/plugins
+++ b/src/rpm/plugins
@@ -102,5 +102,5 @@ Requires: php-pear-Text-CAPTCHA
%package plugin-rest
Requires:
-%package quota_management
+%package plugin-quotamanagement
Requires: quota
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4f34445b8a8ede868be029fe78cba256931a8b77
commit 4f34445b8a8ede868be029fe78cba256931a8b77
Author: Franck Villaume <[email protected]>
Date: Mon May 3 09:48:37 2021 +0200
move quota_management to quotamanagement for debian packaging
diff --git a/src/debian/plugins b/src/debian/plugins
index 37e4a0c..64ccd10 100644
--- a/src/debian/plugins
+++ b/src/debian/plugins
@@ -107,5 +107,5 @@ Depends: php-text-captcha
Package: fusionforge-plugin-rest
Depends:
-Package: fusionforge-plugin-quota_management
+Package: fusionforge-plugin-quotamanagement
Depends: quota
diff --git
a/src/plugins/quotamanagement/common/quota_managementPlugin.class.php
b/src/plugins/quotamanagement/common/quota_managementPlugin.class.php
index 3dfb99e..82ab174 100644
--- a/src/plugins/quotamanagement/common/quota_managementPlugin.class.php
+++ b/src/plugins/quotamanagement/common/quota_managementPlugin.class.php
@@ -1,6 +1,6 @@
<?php
/**
- * quota_managementPlugin Class
+ * quotamanagementPlugin Class
*
* Copyright 2005, Fabio Bertagnin
* Copyright 2011, Franck Villaume - Capgemini
@@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-class quota_managementPlugin extends Plugin {
+class quotamanagementPlugin extends Plugin {
public $systask_types = array(
'QUOTAMANAGEMENT_SET_QUOTA' => 'quota_management-set_quota.php',
);
@@ -32,7 +32,7 @@ class quota_managementPlugin extends Plugin {
function __construct() {
parent::__construct();
- $this->name = "quota_management";
+ $this->name = "quotamanagement";
$this->text = _("Quota Management"); // To show in the tabs,
use...
$this->pkg_desc =
_("This is a Quota Management plugin within FusionForge. Provide an easy way
@@ -54,7 +54,7 @@ to monitor disk and database usage per user, project.");
}
case "groupadminmenu": {
$params['labels'][] = _ ('Quota');
- $params['links'][] =
'/plugins/quota_management/index.php?group_id='.$params['group'].'&type=projectadmin';
+ $params['links'][] =
'/plugins/'.$this->name.'/index.php?group_id='.$params['group'].'&type=projectadmin';
$params['attr_r'][] = array('title' => _('View
the Quota Management Administration'));
$returned = true;
break;
@@ -83,16 +83,16 @@ to monitor disk and database usage per user, project.");
function setDirSize($group_id, $dirtype, $dirsize) {
switch ($dirtype) {
case 'home':
- $res = db_query_params('UPDATE
plugin_quota_management SET home_usage = $1 WHERE group_id = $2',
array($dirsize, $group_id));
+ $res = db_query_params('UPDATE
plugin_quotamanagement SET home_usage = $1 WHERE group_id = $2',
array($dirsize, $group_id));
break;
case 'ftp':
- $res = db_query_params('UPDATE
plugin_quota_management SET ftp_usage = $1 WHERE group_id = $2',
array($dirsize, $group_id));
+ $res = db_query_params('UPDATE
plugin_quotamanagement SET ftp_usage = $1 WHERE group_id = $2', array($dirsize,
$group_id));
break;
}
}
function getDataArray($group_id) {
- $res = db_query_params('SELECT * from plugin_quota_management
WHERE group_id = $1', array($group_id));
+ $res = db_query_params('SELECT * from plugin_quotamanagement
WHERE group_id = $1', array($group_id));
$this->data_array = db_fetch_array($res);
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=548affd0c0679e37991af073da8beab3a263aa31
commit 548affd0c0679e37991af073da8beab3a263aa31
Author: Franck Villaume <[email protected]>
Date: Mon May 3 09:47:48 2021 +0200
clean-up
diff --git a/src/common/include/FFObject.class.php
b/src/common/include/FFObject.class.php
index 4d837ae..3f4116a 100644
--- a/src/common/include/FFObject.class.php
+++ b/src/common/include/FFObject.class.php
@@ -79,7 +79,6 @@ class FFObject extends FFError {
}
}
}
- return;
}
function getAssociatedTo() {
diff --git a/src/plugins/quota_management/README
b/src/plugins/quotamanagement/README
similarity index 100%
rename from src/plugins/quota_management/README
rename to src/plugins/quotamanagement/README
diff --git a/src/plugins/quota_management/action/update.php
b/src/plugins/quotamanagement/action/update.php
similarity index 100%
rename from src/plugins/quota_management/action/update.php
rename to src/plugins/quotamanagement/action/update.php
diff --git a/src/plugins/quota_management/bin/install.sh
b/src/plugins/quotamanagement/bin/install.sh
similarity index 100%
rename from src/plugins/quota_management/bin/install.sh
rename to src/plugins/quotamanagement/bin/install.sh
diff --git
a/src/plugins/quota_management/common/quota_managementPlugin.class.php
b/src/plugins/quotamanagement/common/quota_managementPlugin.class.php
similarity index 100%
rename from src/plugins/quota_management/common/quota_managementPlugin.class.php
rename to src/plugins/quotamanagement/common/quota_managementPlugin.class.php
diff --git
a/src/plugins/quota_management/cronjobs/quota_management-set_quota.php
b/src/plugins/quotamanagement/cronjobs/quota_management-set_quota.php
similarity index 100%
rename from src/plugins/quota_management/cronjobs/quota_management-set_quota.php
rename to src/plugins/quotamanagement/cronjobs/quota_management-set_quota.php
diff --git a/src/plugins/quota_management/cronjobs/quota_management.php
b/src/plugins/quotamanagement/cronjobs/quota_management.php
similarity index 100%
rename from src/plugins/quota_management/cronjobs/quota_management.php
rename to src/plugins/quotamanagement/cronjobs/quota_management.php
diff --git a/src/plugins/quota_management/cronjobs/quota_update.pl
b/src/plugins/quotamanagement/cronjobs/quota_update.pl
similarity index 100%
rename from src/plugins/quota_management/cronjobs/quota_update.pl
rename to src/plugins/quotamanagement/cronjobs/quota_update.pl
diff --git
a/src/plugins/quota_management/db/20190616_move_to_dedicate_table.sql
b/src/plugins/quotamanagement/db/20190616_move_to_dedicate_table.sql
similarity index 100%
rename from src/plugins/quota_management/db/20190616_move_to_dedicate_table.sql
rename to src/plugins/quotamanagement/db/20190616_move_to_dedicate_table.sql
diff --git
a/src/plugins/quota_management/db/20190618_quota_management-add_storage_columns_for_compute.sql
b/src/plugins/quotamanagement/db/20190618_quota_management-add_storage_columns_for_compute.sql
similarity index 100%
rename from
src/plugins/quota_management/db/20190618_quota_management-add_storage_columns_for_compute.sql
rename to
src/plugins/quotamanagement/db/20190618_quota_management-add_storage_columns_for_compute.sql
diff --git a/src/plugins/quota_management/db/quota_management-init.sql
b/src/plugins/quotamanagement/db/quota_management-init.sql
similarity index 100%
rename from src/plugins/quota_management/db/quota_management-init.sql
rename to src/plugins/quotamanagement/db/quota_management-init.sql
diff --git
a/src/plugins/quota_management/etc/cron.d/fusionforge-plugin-quota_management
b/src/plugins/quotamanagement/etc/cron.d/fusionforge-plugin-quota_management
similarity index 100%
rename from
src/plugins/quota_management/etc/cron.d/fusionforge-plugin-quota_management
rename to
src/plugins/quotamanagement/etc/cron.d/fusionforge-plugin-quota_management
diff --git a/src/plugins/quota_management/etc/quota_management.ini
b/src/plugins/quotamanagement/etc/quota_management.ini
similarity index 100%
rename from src/plugins/quota_management/etc/quota_management.ini
rename to src/plugins/quotamanagement/etc/quota_management.ini
diff --git a/src/plugins/quota_management/view/quota.php
b/src/plugins/quotamanagement/view/quota.php
similarity index 100%
rename from src/plugins/quota_management/view/quota.php
rename to src/plugins/quotamanagement/view/quota.php
diff --git a/src/plugins/quota_management/view/quota_admin.php
b/src/plugins/quotamanagement/view/quota_admin.php
similarity index 100%
rename from src/plugins/quota_management/view/quota_admin.php
rename to src/plugins/quotamanagement/view/quota_admin.php
diff --git a/src/plugins/quota_management/view/quota_project.php
b/src/plugins/quotamanagement/view/quota_project.php
similarity index 100%
rename from src/plugins/quota_management/view/quota_project.php
rename to src/plugins/quotamanagement/view/quota_project.php
diff --git a/src/plugins/quota_management/www/index.php
b/src/plugins/quotamanagement/www/index.php
similarity index 100%
rename from src/plugins/quota_management/www/index.php
rename to src/plugins/quotamanagement/www/index.php
-----------------------------------------------------------------------
Summary of changes:
src/common/include/FFObject.class.php | 1 -
src/debian/plugins | 2 +-
..._management-add_storage_columns_for_compute.sql | 2 --
.../etc/cron.d/fusionforge-plugin-quota_management | 7 ----
.../quota_management/etc/quota_management.ini | 8 -----
.../{quota_management => quotamanagement}/README | 0
.../action/update.php | 12 +++----
.../bin/install.sh | 0
.../common/quotamanagementPlugin.class.php} | 19 +++++------
.../cronjobs/quota_update.pl | 0
.../cronjobs/quotamanagement-set_quota.php} | 4 +--
.../cronjobs/quotamanagement.php} | 14 ++++----
.../db/20190616_move_to_dedicate_table.sql | 6 ++--
...amanagement-add_storage_columns_for_compute.sql | 2 ++
.../db/quotamanagement-init.sql} | 0
.../etc/cron.d/fusionforge-plugin-quotamanagement | 7 ++++
.../etc/quotamanagement.ini} | 6 ++--
.../view/quota.php | 37 ++++++++++------------
.../view/quota_admin.php | 21 +++++-------
.../view/quota_project.php | 24 +++++++-------
.../www/index.php | 21 +++++-------
src/rpm/plugins | 2 +-
22 files changed, 86 insertions(+), 109 deletions(-)
delete mode 100644
src/plugins/quota_management/db/20190618_quota_management-add_storage_columns_for_compute.sql
delete mode 100644
src/plugins/quota_management/etc/cron.d/fusionforge-plugin-quota_management
delete mode 100644 src/plugins/quota_management/etc/quota_management.ini
rename src/plugins/{quota_management => quotamanagement}/README (100%)
rename src/plugins/{quota_management => quotamanagement}/action/update.php
(78%)
rename src/plugins/{quota_management => quotamanagement}/bin/install.sh (100%)
rename src/plugins/{quota_management/common/quota_managementPlugin.class.php
=> quotamanagement/common/quotamanagementPlugin.class.php} (92%)
rename src/plugins/{quota_management =>
quotamanagement}/cronjobs/quota_update.pl (100%)
rename src/plugins/{quota_management/cronjobs/quota_management-set_quota.php
=> quotamanagement/cronjobs/quotamanagement-set_quota.php} (92%)
rename src/plugins/{quota_management/cronjobs/quota_management.php =>
quotamanagement/cronjobs/quotamanagement.php} (80%)
rename src/plugins/{quota_management =>
quotamanagement}/db/20190616_move_to_dedicate_table.sql (62%)
create mode 100644
src/plugins/quotamanagement/db/20190618_quotamanagement-add_storage_columns_for_compute.sql
rename src/plugins/{quota_management/db/quota_management-init.sql =>
quotamanagement/db/quotamanagement-init.sql} (100%)
create mode 100644
src/plugins/quotamanagement/etc/cron.d/fusionforge-plugin-quotamanagement
copy src/plugins/{cvstracker/etc/cvstracker.ini =>
quotamanagement/etc/quotamanagement.ini} (62%)
rename src/plugins/{quota_management => quotamanagement}/view/quota.php (91%)
rename src/plugins/{quota_management => quotamanagement}/view/quota_admin.php
(86%)
rename src/plugins/{quota_management =>
quotamanagement}/view/quota_project.php (92%)
rename src/plugins/{quota_management => quotamanagement}/www/index.php (80%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
