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 fc6ed13aa2a54f2c7056773b96c10789f8cd688a (commit)
from 94db8ae8c98b164c5ba4712b5c4691d1d224c09a (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=fc6ed13aa2a54f2c7056773b96c10789f8cd688a
commit fc6ed13aa2a54f2c7056773b96c10789f8cd688a
Author: Franck Villaume <[email protected]>
Date: Sun Sep 11 10:24:42 2016 +0200
use util_make_link to support url_prefix
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 814cf5e..18fd3b5 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -8,7 +8,7 @@
* Copyright (c) 2010, 2011, 2012
* Thorsten Glaser <[email protected]>
* Copyright 2010-2012, Alain Peyrat - Alcatel-Lucent
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2016, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -598,25 +598,23 @@ function ShowResultSet($result, $title = '', $linkify =
false, $displayHeaders =
for ($i = 0; $i < $cols; $i++) {
if (in_array($i, $colsToKeep)) {
if ($linkify && $i == 0) {
- $link = '<a
href="'.getStringFromServer('PHP_SELF').'?';
- $linkend = '</a>';
if ($linkify == "bug_cat") {
- $link .=
'group_id='.$group_id.'&bug_cat_mod=y&bug_cat_id='.db_result($result,
$j, 'bug_category_id').'">';
+ $linkUrl =
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&bug_cat_mod=y&bug_cat_id='.db_result($result,
$j, 'bug_category_id'), db_result($result, $j, $i));
} elseif ($linkify ==
"bug_group") {
- $link .=
'group_id='.$group_id.'&bug_group_mod=y&bug_group_id='.db_result($result,
$j, 'bug_group_id').'">';
+ $linkUrl =
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&bug_group_mod=y&bug_group_id='.db_result($result,
$j, 'bug_group_id'), db_result($result, $j, $i));
} elseif ($linkify ==
"patch_cat") {
- $link .=
'group_id='.$group_id.'&patch_cat_mod=y&patch_cat_id='.db_result($result,
$j, 'patch_category_id').'">';
+ $linkUrl =
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&patch_cat_mod=y&patch_cat_id='.db_result($result,
$j, 'patch_category_id'), db_result($result, $j, $i));
} elseif ($linkify ==
"support_cat") {
- $link .=
'group_id='.$group_id.'&support_cat_mod=y&support_cat_id='.db_result($result,
$j, 'support_category_id').'">';
+ $linkUrl =
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&support_cat_mod=y&support_cat_id='.db_result($result,
$j, 'support_category_id'), db_result($result, $j, $i));
} elseif ($linkify ==
"pm_project") {
- $link .=
'group_id='.$group_id.'&project_cat_mod=y&project_cat_id='.db_result($result,
$j, 'group_project_id').'">';
+ $linkUrl =
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&project_cat_mod=y&project_cat_id='.db_result($result,
$j, 'group_project_id'), db_result($result, $j, $i));
} else {
- $link = $linkend = '';
+ $linkUrl =
db_result($result, $j, $i);
}
} else {
- $link = $linkend = '';
+ $linkUrl = db_result($result,
$j, $i);
}
- echo '<td>'.$link.db_result($result,
$j, $i).$linkend.'</td>';
+ echo '<td>'.$linkUrl.'</td>';
}
}
echo '</tr>';
diff --git a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
index 6976a9d..8ab4204 100644
--- a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
+++ b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
@@ -189,7 +189,7 @@ function globalsearch_admin_table_postedit ($id) {
* globalsearch_admin_table_show() - display the specified table, sorted
by the primary key, with links to add, edit, and delete
*/
function globalsearch_admin_table_show () {
- global $HTML, $PHP_SELF;
+ global $HTML;
$result = db_query_params ('SELECT * FROM
plugin_globalsearch_assoc_site ORDER BY assoc_site_id',
array());
@@ -197,7 +197,7 @@ function globalsearch_admin_table_show () {
$rows = db_numrows($result);
$cell_data=array();
- $cell_data[]=array(ngettext('Associated forge','Associated
forges',$rows).' <a href="'.$PHP_SELF.'?function=add">['._('add new').']</a>',
+ $cell_data[]=array(ngettext('Associated forge','Associated
forges',$rows).'
'.util_make_link(getStringFromServer('PHP_SELF').'?function=add', '['._('add
new').']'),
'colspan' => 8);
echo '<table border="0" width="100%">';
@@ -218,8 +218,8 @@ function globalsearch_admin_table_show () {
echo '<tr '. $HTML->boxGetAltRowStyle($j) . '>';
$id = db_result($result,$j,0);
- echo '<td><a
href="'.$PHP_SELF.'?function=edit&id='.$id.'">['._('edit').']</a> ';
- echo '<a
href="'.$PHP_SELF.'?function=confirmdelete&id='.$id.'">['._('delete').']</a>
</td>';
+ echo
'<td>'.util_make_link(getStringFromServer('PHP_SELF').'?function=edit&id='.$id,
'['._('edit').']');
+ echo
util_make_link(getStringFromServer('PHP_SELF').'?function=confirmdelete&id='.$id,
'['._('delete').']').'</td>';
echo '<td><strong>'.db_result ($result, $j,
'assoc_site_id').'</strong></td>';
echo '<td><strong>'.db_result ($result, $j,
'title').'</strong></td>';
diff --git a/src/plugins/mailman/www/admin/index.php
b/src/plugins/mailman/www/admin/index.php
index 06483b2..22b1e00 100644
--- a/src/plugins/mailman/www/admin/index.php
+++ b/src/plugins/mailman/www/admin/index.php
@@ -228,9 +228,9 @@ if ($group_id) {
}
echo '<p>'.sprintf(_('You can administrate lists from here.
Please note that private lists can still be viewed by members of your project,
but are not listed on %s.'), forge_get_config ('forge_name')).'</p>';
echo '<ul>
- <li>
- <a
href="'.$PHP_SELF.'?group_id='.$group_id.'&add_list=1">'._('Add Mailing
List').'</a>
- </li>
+ <li>';
+ echo
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&add_list=1',
_('Add Mailing List'));
+ echo ' </li>
</ul>';
$mlCount = count($mlArray);
-----------------------------------------------------------------------
Summary of changes:
src/common/include/utils.php | 20 +++++++++-----------
.../globalsearch/common/globalsearch_edit_utils.php | 8 ++++----
src/plugins/mailman/www/admin/index.php | 6 +++---
3 files changed, 16 insertions(+), 18 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
