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, 6.1 has been updated
via d73b778ece3bb37b7ca8ce05fb7b961a0dbb9bb8 (commit)
from 76103922e6d0f3ad7d08dc1d7422d56ac43149e4 (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=d73b778ece3bb37b7ca8ce05fb7b961a0dbb9bb8
commit d73b778ece3bb37b7ca8ce05fb7b961a0dbb9bb8
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Wed Jul 4 11:16:54 2018 +0000
project stats report: fix plugin filtering
diff --git a/src/common/reporting/report_utils.php
b/src/common/reporting/report_utils.php
index 146fcbc..fb9aedb 100644
--- a/src/common/reporting/report_utils.php
+++ b/src/common/reporting/report_utils.php
@@ -715,6 +715,7 @@ function report_actgraph($type, $SPAN, $start, $end, $id,
$area) {
$hookParams['end'] = $end;
$hookParams['ids'] = &$ids;
$hookParams['texts'] = &$texts;
+ $hookParams['exclusive_area'] = $area;
plugin_hook("activity", $hookParams);
$areaname = $texts[0];
diff --git a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
index abf355c..d08d687 100644
--- a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
+++ b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
@@ -385,6 +385,9 @@ _('This plugin allows each project to embed Mediawiki under
a tab.');
if (!$project->usesPlugin($this->name)) {
return false;
}
+ if (isset($params['exclusive_area']) &&
($params['exclusive_area'] != $this->name)) {
+ return false;
+ }
if (in_array($this->name, $params['show']) ||
(count($params['show']) < 1)) {
$protocol = forge_get_config('use_ssl') ?
'https://' : 'http://';
$script_url =
$protocol.forge_get_config('web_host').forge_get_config('url_prefix').'/plugins/'.$this->name.'/wiki/'.$project->getUnixName().'/api.php'
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 5992241..fa2c51e 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -987,6 +987,9 @@ control over it to the project's administrator.");
if (!$project) {
return false;
}
+ if (isset($params['exclusive_area']) &&
($params['exclusive_area'] != $this->name)) {
+ return false;
+ }
if (in_array('scmgit', $params['show']) ||
(count($params['show']) < 1)) {
if ($project->enableAnonSCM()) {
diff --git a/src/plugins/scmhg/common/HgPlugin.class.php
b/src/plugins/scmhg/common/HgPlugin.class.php
index 0ca478d..6f31ece 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -746,6 +746,10 @@ Offer DAV or SSH access.");
if (!$project) {
return false;
}
+ if (isset($params['exclusive_area']) &&
($params['exclusive_area'] != $this->name)) {
+ return false;
+ }
+
if (in_array('scmhg', $params['show']) ||
(count($params['show']) < 1)) {
if ($project->enableAnonSCM()) {
$server_script = '/anonscm/hglog';
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index f5fb279..e010f70 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -721,6 +721,9 @@ some control over it to the project's administrator.");
if (!$project) {
return false;
}
+ if (isset($params['exclusive_area']) &&
($params['exclusive_area'] != $this->name)) {
+ return false;
+ }
if (in_array('scmsvn', $params['show']) ||
(count($params['show']) < 1)) {
$start_time = $params['begin'];
-----------------------------------------------------------------------
Summary of changes:
src/common/reporting/report_utils.php | 1 +
src/plugins/mediawiki/common/mediawikiPlugin.class.php | 3 +++
src/plugins/scmgit/common/GitPlugin.class.php | 3 +++
src/plugins/scmhg/common/HgPlugin.class.php | 4 ++++
src/plugins/scmsvn/common/SVNPlugin.class.php | 3 +++
5 files changed, 14 insertions(+)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
