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 8fa47bc90a2c14fc30a7a77d54d5a58eeabeffd1 (commit)
via 4b60ddb45df60c343ab7e282481d0c004dd706be (commit)
from 366acb80f66e535585e78f5d72136bebb009166e (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=8fa47bc90a2c14fc30a7a77d54d5a58eeabeffd1
commit 8fa47bc90a2c14fc30a7a77d54d5a58eeabeffd1
Author: Franck Villaume <[email protected]>
Date: Thu Jan 18 13:28:04 2018 +0000
Reimplement util_cross_ref page2url to make it work with any wiki plugin!
diff --git a/src/common/include/utils_crossref.php
b/src/common/include/utils_crossref.php
index a409495..6ec7dd7 100644
--- a/src/common/include/utils_crossref.php
+++ b/src/common/include/utils_crossref.php
@@ -58,9 +58,16 @@ function util_gen_cross_ref($text, $group_id) {
return $text;
}
-function _page2url($group_id,$page) {
- $prj = group_getunixname ($group_id);
- return util_make_link('/wiki/g/'.$prj.'/'.rawurlencode($page), $page);
+function _page2url($group_id, $page) {
+ $params = array();
+ $params['group_id'] = $group_id;
+ $params['page'] = $page;
+ plugin_hook_by_reference('crossrefurl', $params);
+ if (isset($params['url'])) {
+ return util_make_link($params['url'], '[wiki:'.$page.']');
+ } else {
+ return '[wiki:'.$page.']';
+ }
}
function _artifactid2url($id, $mode = '') {
diff --git a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
index ea1bb94..e0e94b9 100644
--- a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
+++ b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
@@ -61,6 +61,7 @@ _('This plugin allows each project to embed Mediawiki under a
tab.');
$this->_addHook('clone_project_from_template');
$this->_addHook('group_delete');
$this->_addHook('activity');
+ $this->_addHook('crossrefurl');
}
function process() {
@@ -366,6 +367,18 @@ _('This plugin allows each project to embed Mediawiki
under a tab.');
db_query_params('drop schema $1 cascade',
array($schema));
exec('/bin/rm -rf
'.forge_get_config('projects_path',
'mediawiki').'/'.$projectObject->getUnixName());
}
+ } elseif ($hookname == 'crossrefurl') {
+ $group_id = $params['group_id'];
+ $project = group_get_object($group_id);
+ if (!$project->usesPlugin($this->name)) {
+ return false;
+ }
+ if (isset($params['page'])) {
+ $params['url'] =
'/plugins/'.$this->name.'/wiki/'.$project->getUnixName().'/index.php/'.$params['page'];
+ return true;
+ } else {
+ return false;
+ }
} elseif ($hookname == 'activity') {
$group_id = $params['group_id'];
$project = group_get_object($group_id);
diff --git a/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
b/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
index 501c3cb..365e031 100644
--- a/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
+++ b/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
@@ -46,6 +46,7 @@ _("This plugin allows each project to embed MoinMoinWiki
under a tab.");
$this->hooks[] = "role_translate_strings";
$this->hooks[] = "role_get_setting";
$this->hooks[] = "clone_project_from_template" ;
+ $this->hooks[] = 'crossrefurl';
}
function getWikiUrl($project) {
@@ -162,6 +163,18 @@ _("This plugin allows each project to embed MoinMoinWiki
under a tab.");
} elseif ($hookname == 'clone_project_from_template') {
$systasksq = new SystasksQ();
$systasksq->add($this->getID(), 'MOINMOIN_CREATE_WIKI',
$group_id);
+ } elseif ($hookname == 'crossrefurl') {
+ $project = group_get_object($group_id);
+ if (!$project || !is_object($project)) {
+ return;
+ }
+ if ($project->isError()) {
+ return;
+ }
+ if ($project->usesPlugin($this->name) &&
isset($params['page'])) {
+ $params['url'] =
'/plugins/moinmoin/'.$project->getUnixName().'/'.$params['page'];
+ }
+ return;
}
}
diff --git a/src/plugins/wiki/common/WikiPlugin.class.php
b/src/plugins/wiki/common/WikiPlugin.class.php
index 097a973..7b63a87 100644
--- a/src/plugins/wiki/common/WikiPlugin.class.php
+++ b/src/plugins/wiki/common/WikiPlugin.class.php
@@ -46,6 +46,7 @@ page edits displayed on activity tab, and multi-project wiki
preferences.");
$this->hooks[] = 'project_public_area';
$this->hooks[] = 'activity';
$this->hooks[] = 'site_admin_option_hook';
+ $this->hooks[] = 'crossrefurl';
}
function CallHook($hookname, &$params) {
@@ -140,6 +141,20 @@ page edits displayed on activity tab, and multi-project
wiki preferences.");
' '.'Wiki');
$params['result'] .= '</div>';
}
+ } elseif ($hookname == 'crossrefurl') {
+ $project = group_get_object($params['group_id']);
+ if (!$project || !is_object($project)) {
+ return;
+ }
+ if ($project->isError()) {
+ return;
+ }
+ if ($project->usesPlugin($this->name) &&
isset($params['page'])) {
+ $params['url'] =
'/wiki/g/'.$prj.'/'.rawurlencode($params['page']);
+ return true;
+ } else {
+ return;
+ }
} elseif ($hookname == 'activity') {
$group = group_get_object($params['group_id']);
if (!$group || !is_object($group)) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4b60ddb45df60c343ab7e282481d0c004dd706be
commit 4b60ddb45df60c343ab7e282481d0c004dd706be
Author: Franck Villaume <[email protected]>
Date: Thu Jan 18 13:17:56 2018 +0000
fix missing 2nd param
diff --git a/src/common/forum/ForumHTML.class.php
b/src/common/forum/ForumHTML.class.php
index 9ddc74a..773d55d 100644
--- a/src/common/forum/ForumHTML.class.php
+++ b/src/common/forum/ForumHTML.class.php
@@ -275,9 +275,9 @@ class ForumHTML extends FFError {
<td colspan="2">
';
if (strpos($msg->getBody(),'<') ===
false) {
- $ret_val .=
nl2br(util_gen_cross_ref($msg->getBody())); //backwards compatibility for non
html messages
+ $ret_val .=
nl2br(util_gen_cross_ref($msg->getBody(), $group_id)); //backwards
compatibility for non html messages
} else {
- $ret_val .=
util_gen_cross_ref($msg->getBody());
+ $ret_val .=
util_gen_cross_ref($msg->getBody(), $group_id);
}
$ret_val .= '
</td>
-----------------------------------------------------------------------
Summary of changes:
src/common/forum/ForumHTML.class.php | 4 ++--
src/common/include/utils_crossref.php | 13 ++++++++++---
src/plugins/mediawiki/common/mediawikiPlugin.class.php | 13 +++++++++++++
src/plugins/moinmoin/common/MoinMoinPlugin.class.php | 13 +++++++++++++
src/plugins/wiki/common/WikiPlugin.class.php | 15 +++++++++++++++
5 files changed, 53 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
