[Fusionforge-commits] FusionForge branch master updated. 6.0.4-812-ge6d1105

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Aug 28 17:30:17 CEST 2016


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  e6d1105258fe897da398121a3009ec9524fc9cb9 (commit)
      from  472ea5174867cd3f596768fbed98beca6cc1cba0 (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=e6d1105258fe897da398121a3009ec9524fc9cb9

commit e6d1105258fe897da398121a3009ec9524fc9cb9
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Aug 28 17:21:08 2016 +0200

    fix usage openForm, use HTML helpers

diff --git a/src/common/docman/views/addfile.php b/src/common/docman/views/addfile.php
index f157ffb..d9be4c2 100644
--- a/src/common/docman/views/addfile.php
+++ b/src/common/docman/views/addfile.php
@@ -93,7 +93,7 @@ if ($dgf->getNested($stateidArr) == NULL) {
 	echo $HTML->warning_msg(_('You MUST first create at least one folder to store your document.'));
 } else {
 	/* display the add new documentation form */
-	echo $HTML->openForm(array('name' => 'adddata', 'action' => util_make_uri($actionurl), 'method' => 'post', 'enctype' => 'multipart/form-data'));
+	echo $HTML->openForm(array('name' => 'adddata', 'action' => $actionurl, 'method' => 'post', 'enctype' => 'multipart/form-data'));
 	echo $HTML->listTableTop(array(), array(), 'infotable');
 	$cells = array();
 	$cells[][] = _('Document Title').utils_requiredField();
diff --git a/src/common/docman/views/additem.php b/src/common/docman/views/additem.php
index f21e715..4e2141c 100644
--- a/src/common/docman/views/additem.php
+++ b/src/common/docman/views/additem.php
@@ -81,7 +81,7 @@ if (forge_check_perm('docman', $group_id, 'approve')) {
 	if ($dgf->getNested($stateidArr) == NULL) {
 		echo $HTML->warning_msg(_('You MUST first create at least one folder to upload your archive.'));
 	} else {
-		echo $HTML->openForm(array('id' => 'injectzip', 'name' => 'injectzip', 'method' => 'post', 'action' => util_make_uri('/docman/?group_id='.$group_id.'&action=injectzip&dirid='.$dirid), 'enctype' => 'multipart/form-data'));
+		echo $HTML->openForm(array('id' => 'injectzip', 'name' => 'injectzip', 'method' => 'post', 'action' => '/docman/?group_id='.$group_id.'&action=injectzip&dirid='.$dirid, 'enctype' => 'multipart/form-data'));
 		echo html_ao('p');
 		echo html_e('label', array(), _('Upload archive:'), false);
 		echo html_e('input', array('type' => 'file', 'name' => 'uploaded_zip', 'required' => 'required'));
diff --git a/src/common/docman/views/addsubdocgroup.php b/src/common/docman/views/addsubdocgroup.php
index b819c3a..59deb2c 100644
--- a/src/common/docman/views/addsubdocgroup.php
+++ b/src/common/docman/views/addsubdocgroup.php
@@ -59,7 +59,7 @@ function doItAddSubGroup() {
 <?php
 echo html_ac(html_ap() - 1);
 echo html_ao('div', array('class' => 'docmanDivIncluded'));
-echo $HTML->openForm(array('id' => 'addsubgroup', 'name' => 'addsubgroup', 'method' => 'post', 'action' => util_make_uri($actionurl)));
+echo $HTML->openForm(array('id' => 'addsubgroup', 'name' => 'addsubgroup', 'method' => 'post', 'action' => $actionurl));
 if ($dirid) {
 	$folderMessage = _('Name of the document subfolder to create');
 } else {
diff --git a/src/common/docman/views/admin.php b/src/common/docman/views/admin.php
index 60e15f2..1fe4927 100644
--- a/src/common/docman/views/admin.php
+++ b/src/common/docman/views/admin.php
@@ -49,14 +49,14 @@ function doIt(formid) {
 <?php
 echo html_ac(html_ap() - 1);
 if (extension_loaded('zip')) {
-	echo $HTML->openForm(array('id' => 'backup', 'name' => 'backup', 'method' => 'post', 'action' => util_make_uri('/docman/view.php/'.$group_id.'/backup')));
+	echo $HTML->openForm(array('id' => 'backup', 'name' => 'backup', 'method' => 'post', 'action' => '/docman/view.php/'.$group_id.'/backup'));
 	echo html_ao('ul');
 	echo html_e('li', array(), html_e('input', array('id' => 'submitbackup', 'type' => 'button', 'value' => _('Extract documents and directories as an archive'), 'onclick' => 'javascript:doIt("backup")')), false);
 	echo html_ac(html_ap() -1);
 	echo $HTML->closeForm();
 }
 
-echo $HTML->openForm(array('id' => 'createonline', 'name' => 'createonline', 'method' => 'post', 'action' => util_make_uri('/docman/?group_id='.$group_id.'&action=updatecreateonline')));
+echo $HTML->openForm(array('id' => 'createonline', 'name' => 'createonline', 'method' => 'post', 'action' => '/docman/?group_id='.$group_id.'&action=updatecreateonline'));
 echo html_ao('ul');
 $createOnlineStatus = '1';
 $labelCreateOnline = _('Enable Create Online Documents');
@@ -68,7 +68,7 @@ echo html_e('li', array(), html_e('input', array('name' => 'status', 'type' => '
 echo html_ac(html_ap() -1);
 echo $HTML->closeForm();
 
-echo $HTML->openForm(array('id' => 'searchengine', 'name' => 'searchengine', 'method' => 'post', 'action' => util_make_uri('/docman/?group_id='.$group_id.'&action=updateenginesearch')));
+echo $HTML->openForm(array('id' => 'searchengine', 'name' => 'searchengine', 'method' => 'post', 'action' => '/docman/?group_id='.$group_id.'&action=updateenginesearch'));
 echo html_ao('ul');
 $searchEngineStatus = '1';
 $labelSearchEngine = _('Enable Search Engine');
@@ -81,7 +81,7 @@ echo html_ac(html_ap() -1);
 echo $HTML->closeForm();
 
 if ($g->useDocmanSearch()) {
-	echo $HTML->openForm(array('id' => 'reindexword', 'name' => 'reindexword', 'method' => 'post', 'action' => util_make_uri('/docman/?group_id='.$group_id.'&action=forcereindexenginesearch')));
+	echo $HTML->openForm(array('id' => 'reindexword', 'name' => 'reindexword', 'method' => 'post', 'action' => '/docman/?group_id='.$group_id.'&action=forcereindexenginesearch'));
 	echo html_ao('ul');
 	echo html_e('li', array(), html_e('input', array('name' => 'status', 'type' => 'hidden', 'value' => '1')).html_e('input', array('id' => 'submitreindexword', 'type' => 'button', 'value' => _('Force reindexation search engine'), 'onclick' => 'javascript:doIt("reindexword")')), false);
 	echo html_ac(html_ap() -1);
@@ -89,7 +89,7 @@ if ($g->useDocmanSearch()) {
 }
 
 if (forge_get_config('use_webdav')) {
-	echo $HTML->openForm(array('id' => 'webdavinterface', 'name' => 'webdavinterface', 'method' => 'post', 'action' => util_make_uri('/docman/?group_id='.$group_id.'&action=updatewebdavinterface')));
+	echo $HTML->openForm(array('id' => 'webdavinterface', 'name' => 'webdavinterface', 'method' => 'post', 'action' => '/docman/?group_id='.$group_id.'&action=updatewebdavinterface'));
 	echo html_ao('ul');
 	$webdavStatus = '1';
 	$labelWebdavInterface = _('Enable Webdav Interface');
diff --git a/src/common/docman/views/editdocgroup.php b/src/common/docman/views/editdocgroup.php
index 97382f5..baa62a3 100644
--- a/src/common/docman/views/editdocgroup.php
+++ b/src/common/docman/views/editdocgroup.php
@@ -56,7 +56,7 @@ if ($dg->isError()) {
 }
 
 echo html_ao('div', array('class' => 'docmanDivIncluded'));
-echo $HTML->openForm(array('name' => 'editgroup', 'action' => util_make_uri($actionurl), 'method' => 'post'));
+echo $HTML->openForm(array('name' => 'editgroup', 'action' => $actionurl, 'method' => 'post'));
 echo html_e('input', array('type' => 'hidden', 'name' => 'dirid', 'value' => $dirid));
 echo $HTML->listTableTop();
 $cells[][] = _('Folder Name');
diff --git a/src/common/docman/views/listtrashfile.php b/src/common/docman/views/listtrashfile.php
index 2e2309a..ef70991 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -97,7 +97,7 @@ if (is_array($d_arr) && count($d_arr) > 0) {
 
 echo html_ao('div', array('id' => 'rightdiv'));
 echo html_ao('div', array('style' => 'padding:5px'));
-echo $HTML->openForm(array('id' => 'emptytrash', 'name' => 'emptytrash', 'method' => 'post', 'action' => util_make_uri('/docman/?group_id='.$group_id.'&action=emptytrash')));
+echo $HTML->openForm(array('id' => 'emptytrash', 'name' => 'emptytrash', 'method' => 'post', 'action' => '/docman/?group_id='.$group_id.'&action=emptytrash'));
 echo html_e('input', array('id' => 'submitemptytrash', 'type' => 'submit', 'value' => _('Delete permanently all documents and folders with deleted status.')));
 echo $HTML->closeForm();
 echo html_ac(html_ap() - 1);
diff --git a/src/common/docman/views/movefile.php b/src/common/docman/views/movefile.php
index 4aa4f5c..8c9ce57 100644
--- a/src/common/docman/views/movefile.php
+++ b/src/common/docman/views/movefile.php
@@ -45,7 +45,7 @@ if (!forge_check_perm('docman', $g->getID(), 'approve')) {
 }
 
 echo html_ao('div', array('class' => 'docmanDivIncluded'));
-echo $HTML->openForm(array('name' => 'movefile', 'action' => util_make_uri($actionurl), 'method' => 'post'));
+echo $HTML->openForm(array('name' => 'movefile', 'action' => $actionurl, 'method' => 'post'));
 echo html_e('input', array('type' => 'hidden', 'name' => 'fileid', 'id' => 'movefileinput'));
 echo html_e('p', array(), _('Move files to').
 			$dm->showSelectNestedGroups($dgf->getNested(array(1, 5)), 'moveto_dirid', false).
diff --git a/src/common/docman/views/search.php b/src/common/docman/views/search.php
index 9d3f2d1..84ad878 100644
--- a/src/common/docman/views/search.php
+++ b/src/common/docman/views/search.php
@@ -89,7 +89,7 @@ jQuery(document).ready(function() {
 //]]>
 <?php
 echo html_ac(html_ap() - 1);
-echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/docman/?group_id='.$group_id.'&view=search')));
+echo $HTML->openForm(array('method' => 'post', 'action' => '/docman/?group_id='.$group_id.'&view=search'));
 echo html_e('div', array('id' => 'docman_search_query_words'),
 		html_e('span', array('id' => 'docman_search_query_label'), _('Query').utils_requiredField()._(': ')).
 		html_e('input', array('type' => 'text', 'name' => 'textsearch', 'id' => 'textsearch', 'size' => 48, 'value' => $searchString, 'required' => 'required', 'placeholder' => _('Searched words'))).
diff --git a/src/common/forum/ForumAdmin.class.php b/src/common/forum/ForumAdmin.class.php
index c378222..52d9709 100644
--- a/src/common/forum/ForumAdmin.class.php
+++ b/src/common/forum/ForumAdmin.class.php
@@ -294,7 +294,7 @@ class ForumAdmin extends FFError {
 				}
 			}
 			/* ]]> */</script>';
-			echo $HTML->openForm(array('name' => 'pending', 'action' => util_make_uri('forum/admin/pending.php'), 'method' => 'post'));
+			echo $HTML->openForm(array('name' => 'pending', 'action' => '/forum/admin/pending.php', 'method' => 'post'));
 			echo '
 			<input type="hidden" name="action" value="update_pending" />
 			<input type="hidden" name="form_key" value="' . form_generate_key() . '" />
diff --git a/src/common/frs/views/qrs.php b/src/common/frs/views/qrs.php
index 5f237f5..668484e 100644
--- a/src/common/frs/views/qrs.php
+++ b/src/common/frs/views/qrs.php
@@ -37,7 +37,7 @@ if (!count($packages)) {
 }
 
 echo html_e('h2', array(), _('Quick Release System'));
-echo $HTML->openForm(array('enctype' => 'multipart/form-data', 'method' => 'post', 'action' => util_make_uri('/frs/?group_id='.$group_id.'&action=addrelease')));
+echo $HTML->openForm(array('enctype' => 'multipart/form-data', 'method' => 'post', 'action' => '/frs/?group_id='.$group_id.'&action=addrelease'));
 echo $HTML->listTableTop();
 $cells = array();
 $cells[][] = html_e('strong', array(), _('Package ID')._(':'));
diff --git a/src/common/widget/Widget.class.php b/src/common/widget/Widget.class.php
index e7c7910..79a03d6 100644
--- a/src/common/widget/Widget.class.php
+++ b/src/common/widget/Widget.class.php
@@ -91,7 +91,7 @@ require_once $gfcommon.'widget/Widget_HomeVersion.class.php';
 	}
 	function getPreferencesForm($layout_id, $owner_id, $owner_type) {
 		global $HTML;
-		$prefs  = $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/widgets/widget.php?owner='. $owner_type.$owner_id .'&action=update&name['. $this->id .']='. $this->getInstanceId() .'&content_id='. $this->getInstanceId() .'&layout_id='. $layout_id)));
+		$prefs  = $HTML->openForm(array('method' => 'post', 'action' => '/widgets/widget.php?owner='.$owner_type.$owner_id.'&action=update&name['.$this->id.']='.$this->getInstanceId().'&content_id='.$this->getInstanceId().'&layout_id='.$layout_id));
 		$prefs .= html_ao('fieldset').html_e('legend', array(), _('Preferences'));
 		$prefs .= $this->getPreferences();
 		$prefs .= html_e('br');
diff --git a/src/plugins/authopenid/www/index.php b/src/plugins/authopenid/www/index.php
index 08030d3..f78fdeb 100644
--- a/src/plugins/authopenid/www/index.php
+++ b/src/plugins/authopenid/www/index.php
@@ -1,8 +1,9 @@
 <?php
-
-/** External authentication via OpenID for FusionForge
+/**
+ * External authentication via OpenID for FusionForge
  * Copyright 2011, Roland Mas
  * Copyright 2011, Olivier Berger & Institut Telecom
+ * Copyright 2016, Franck Villaume - TrivialDev
  *
  * This program was developped in the frame of the COCLICO project
  * (http://www.coclico-project.org/) with financial support of the Paris
@@ -128,14 +129,13 @@ echo $HTML->boxTop(_('My OpenID identities'));
 <h2><?php echo _('Add new identity'); ?></h2>
 
 <p><?php echo _('You can add your own OpenID identities in the form below.') ?></p>
-
-<form name="new_identity" action="<?php echo util_make_uri ('/plugins/authopenid/'); ?>" method="post">
+<?php echo $HTML->openForm(array('name' => 'new_identity', 'action' => '/plugins/authopenid/', 'method' => 'post')); ?>
 <fieldset>
 <legend><?php echo _('Add new identity'); ?></legend>
 <p>
 <input type="hidden" name="user_id" value="<?php echo $u->getID() ?>" />
 <input type="hidden" name="addidentity" value="1" />
-<strong><?php echo _('OpenID identity URL:') ?></strong><?php echo utils_requiredField(); ?>
+<strong><?php echo _('OpenID identity URL')._(': ') ?></strong><?php echo utils_requiredField(); ?>
 <br />
 <input type="text" size="150" name="openid_identity" value="<?php echo $openid_identity ?>" /><br />
 </p>
@@ -143,9 +143,8 @@ echo $HTML->boxTop(_('My OpenID identities'));
 <input type="submit" value="<?php echo _('Add identity') ?>" />
 </p>
 </fieldset>
-</form>
 <?php
-
+echo $HTML->closeForm();
 echo $HTML->listTableTop(array(_('Identity'), ''));
 
 $res = db_query_params('SELECT openid_identity FROM plugin_authopenid_user_identities WHERE user_id =$1',
@@ -158,16 +157,14 @@ if($res) {
 
 		echo '<tr '.$HTML->boxGetAltRowStyle($i).'>';
 		echo '<td>'. $openid_identity .'</td>';
-		echo '<td><a href="'.util_make_uri ('/plugins/authopenid/').'?openid_identity='. urlencode($openid_identity) .'&delete=1">delete</a></td>';
+		echo '<td>'.util_make_link('/plugins/authopenid/?openid_identity='.urlencode($openid_identity).'&delete=1', _('delete')).'</td>';
 		echo '</tr>';
 		$i++;
 	}
 }
 
 echo $HTML->listTableBottom();
-
 echo $HTML->boxBottom();
-
 site_user_footer();
 
 // Local Variables:
diff --git a/src/plugins/authwebid/include/AuthWebIDPlugin.class.php b/src/plugins/authwebid/include/AuthWebIDPlugin.class.php
index cd37ec6..299825d 100644
--- a/src/plugins/authwebid/include/AuthWebIDPlugin.class.php
+++ b/src/plugins/authwebid/include/AuthWebIDPlugin.class.php
@@ -81,9 +81,7 @@ class AuthWebIDPlugin extends ForgeAuthPlugin {
 		if (!$message) {
 			$message = sprintf( _('Click here to delegate authentication of your WebID to %s'), $this->delegate_webid_auth_to);
 		}
-		$html = '<a href="' . $this->idp_delegation_link . '?authreqissuer='. $callback .'">';
-		$html .=  $message .'</a>';
-		return $html;
+		return util_make_link($this->idp_delegation_link.'?authreqissuer='.$callback, $message, array(), true);
 	}
 
 	/**
@@ -106,7 +104,7 @@ class AuthWebIDPlugin extends ForgeAuthPlugin {
 		// TODO Use a trusted IdP that was configured previously by the forge admin, and which is trusted by the libAuthentication checks
 		//$result .= '<a href="https://foafssl.org/srv/idp?authreqissuer='. util_make_url('/plugins/authwebid/post-login.php') .'">Click here to Login via foafssl.org</a>';
 		//echo "<br />";
-		$result .= '<b>'. $this->displayAuthentifyViaIdPLink( util_make_url('/plugins/authwebid/post-login.php') ) . '</b>';
+		$result .= '<b>'. $this->displayAuthentifyViaIdPLink(util_make_uri('/plugins/authwebid/post-login.php')) . '</b>';
 		$result .= ' ('. _('You need to have bound such a WebID to your existing fusionforge account in advance') .')';
 
 		$params['html_snippets'][$this->name] = $result;
diff --git a/src/plugins/authwebid/www/index.php b/src/plugins/authwebid/www/index.php
index a3fb03f..47cf539 100644
--- a/src/plugins/authwebid/www/index.php
+++ b/src/plugins/authwebid/www/index.php
@@ -109,16 +109,16 @@ echo $HTML->boxTop(_('My WebID identities'));
 			foreach($pendingwebids as $webid_identity) {
 				echo '<tr '.$HTML->boxGetAltRowStyle($i).'>';
 				echo '<td><i>'. $webid_identity .'</i></td>';
-				echo '<td><b>'. $plugin->displayAuthentifyViaIdPLink( util_make_url('/plugins/authwebid/index.php'), _('Confirm binding')) . '</b></td>';
-				echo '<td><a href="'.util_make_uri ('/plugins/authwebid/').'?webid_identity='. urlencode('pending:'.$webid_identity) .'&delete=1">'. _('remove') . '</a></td>';
+				echo '<td><b>'. $plugin->displayAuthentifyViaIdPLink(util_make_uri('/plugins/authwebid/index.php'), _('Confirm binding')) . '</b></td>';
+				echo '<td>'.util_make_link('/plugins/authwebid/?webid_identity='.urlencode('pending:'.$webid_identity).'&delete=1', _('remove')).'</td>';
 				echo '</tr>';
 				$i++;
 			}
 			echo $HTML->listTableBottom();
 		}
+		//This form isn't one any more actually, but decorations is nice like this
+		echo $HTML->openForm(array('name' => 'new_identity', 'action' => '/plugins/authwebid/', 'method' => 'post'))
 		?>
-		<!-- This form isn't one any more actually, but decorations is nice like this -->
-		<form name="new_identity" action="<?php echo util_make_uri ('/plugins/authwebid/'); ?>" method="post">
 			<fieldset>
 				<legend><?php echo _('Bind a new WebID'); ?></legend>
 				<p>
@@ -126,16 +126,16 @@ echo $HTML->boxTop(_('My WebID identities'));
 						echo '</p><p>';
 						// redirect link to the IdP
 						// This might as well confirm binding just as if using the Confirm link, if user has only one WebID recognized by the IdP
-						echo '<b>'. $plugin->displayAuthentifyViaIdPLink( util_make_url('/plugins/authwebid/index.php'),
+						echo '<b>'. $plugin->displayAuthentifyViaIdPLink(util_make_uri('/plugins/authwebid/index.php'),
 																		sprintf( _('Click here to initiate the addition of a new WebID validated via %s'),
 																				 $plugin->delegate_webid_auth_to)) . '</b>';
 				?>
 				</p>
 			</fieldset>
-		</form>
-
+		<?php
+		echo $HTML->closeForm();
+		?>
 		<h2><?php echo _('My WebIDs'); ?></h2>
-
 		<?php
 
 		// now display existing bound identities
@@ -150,7 +150,7 @@ echo $HTML->boxTop(_('My WebID identities'));
 			foreach($boundwebids as $webid_identity) {
 				echo '<tr '.$HTML->boxGetAltRowStyle($i).'>';
 				echo '<td>'. $webid_identity .'</td>';
-				echo '<td><a href="'.util_make_uri ('/plugins/authwebid/').'?webid_identity='. urlencode($webid_identity) .'&delete=1">'. _('remove') . '</a></td>';
+				echo '<td>'.util_make_link('/plugins/authwebid/?webid_identity='.urlencode($webid_identity).'&delete=1', _('remove')).'</td>';
 				echo '</tr>';
 				$i++;
 			}
diff --git a/src/plugins/blocks/www/index.php b/src/plugins/blocks/www/index.php
index 4708b44..565241e 100644
--- a/src/plugins/blocks/www/index.php
+++ b/src/plugins/blocks/www/index.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2006 Alain Peyrat, Alcatel-Lucent
  * Copyright (C) 2010 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2012-2014 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2016, Franck Villaume - TrivialDev
  *
  * This file is part of FusionForge.
  *
@@ -52,6 +53,8 @@ require_once $gfcommon.'mail/MailingListFactory.class.php';
 require_once $gfcommon.'pm/ProjectGroupFactory.class.php';
 require_once $gfcommon.'survey/SurveyFactory.class.php';
 
+global $HTML;
+
 function getAvailableBlocks($group) {
 	$blocks = array(
 		'summary_description' =>
@@ -176,7 +179,7 @@ if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the bloc
 session_require_perm ('project_admin', $id) ;
 
 if ($type == 'admin') {
-	blocks_Project_Header(array('title'=>'Blocks Administration','pagename'=>"$pluginname",'sectionvals'=>array(group_getname($id))));
+	blocks_Project_Header(array('title' => _('Blocks Administration'), 'pagename'=>"$pluginname",'sectionvals'=>array(group_getname($id))));
 
 	$res = db_query_params('SELECT name, status FROM plugin_blocks WHERE group_id=$1',
 			array($id));
@@ -185,32 +188,15 @@ if ($type == 'admin') {
 	}
 
 	print _("Blocks are customizable HTML boxes in the left or right side of the pages the web site. They are created manually.");
-
-	print "<form action=\"/plugins/blocks/\" method=\"post\">";
+	echo $HTML->openForm(array('action' => '/plugins/blocks/', 'method' => 'post'));
 	print "<input type=\"hidden\" name=\"id\" value=\"$id\" />\n";
 	print "<input type=\"hidden\" name=\"pluginname\" value=\"$pluginname\" />\n";
 	print "<input type=\"hidden\" name=\"type\" value=\"admin_post\" />\n";
 
-	print "<table class=\"centered listing\">";
-	print "<thead><tr><th>".
-			_("Name").
-			"</th>" .
-			"<th>".
-			_("Active").
-			"</th>" .
-			"<th>" .
-			_("Description").
-			"</th>" .
-			"<th>" .
-			_("Operation") .
-			"</th>" .
-			"</tr></thead>";
+	$thArray = array(_('Name'), _('Active'), _('Description'), _('Operation'));
+	echo $HTML->listTableTop($thArray, array(), 'centered listing');
 	$blocks = getAvailableBlocks($group);
-	$class = 'even';
 	foreach ($blocks as $b => $help) {
-
-		$class = ($class == 'even') ? "odd" : "even";
-
 		$match = '';
 		if (preg_match('/(.*) index$/', $b, $match)) {
 			print '<tr><td colspan="4"><b>'.$blocks_text[$match[1]].'</b></td></tr>';
@@ -218,17 +204,17 @@ if ($type == 'admin') {
 
 		$checked = (isset($status[$b]) && $status[$b] == 1) ? ' checked="checked"' : '';
 
-		print "<tr class=\"$class\"><td>$b</td>\n" .
+		print "<tr ".$HTML->boxGetAltRowStyle($b)."><td>$b</td>\n" .
 		"<td class=\"align-center\">" .
 		"<input type=\"checkbox\" name=\"activate[$b]\" value=\"1\"$checked /></td>\n" .
 		"<td>$help</td>\n" .
-		"<td><a href=\"/plugins/blocks/index.php?id=$id&type=configure&pluginname=blocks&name=".urlencode($b)."\">"._('Configure')."</a></td>\n</tr>\n";
+		"<td>".util_make_link('/plugins/blocks/?id='.$id.'&type=configure&pluginname=blocks&name='.urlencode($b), _('Configure'))."</td>\n</tr>\n";
 	}
-	print "</table>\n";
+	echo $HTML->listTableBottom();
 	print '<p class="align-center"><input type="submit" value="' .
 			_("Save Blocks") .
 			'" /></p>';
-	print "</form>\n";
+	echo $HTML->closeForm();
 } elseif ($type == 'admin_post') {
 	$res = db_query_params('SELECT name, status FROM plugin_blocks WHERE group_id=$1',
 			array($id));
@@ -267,9 +253,9 @@ if ($type == 'admin') {
 		}
 	}
 	$feedback = _('Block Saved');
-	session_redirect('/plugins/blocks/index.php?id='.$id.'&type=admin&pluginname=blocks');
+	session_redirect('/plugins/blocks/?id='.$id.'&type=admin&pluginname=blocks');
 } elseif ($type == 'configure') {
-	blocks_Project_Header(array('title'=>'Edit Block','pagename'=>"$pluginname",'sectionvals'=>array(group_getname($id))));
+	blocks_Project_Header(array('title'=>_('Edit Block'), 'pagename'=>"$pluginname",'sectionvals'=>array(group_getname($id))));
 	// DO THE STUFF FOR THE PROJECT ADMINISTRATION PART HERE
 
 	$blocks = getAvailableBlocks($group);
@@ -281,7 +267,7 @@ if ($type == 'admin') {
 
 	print '<div class="align-center">';
 	print "<p><b>$blocks[$name]</b> ($name)</p>";
-	print "<form action=\"/plugins/blocks/\" method=\"post\">";
+	echo $HTML->openForm(array('action' => '/plugins/blocks', 'method' => 'post'));
 	print "<input type=\"hidden\" name=\"id\" value=\"$id\" />\n";
 	print "<input type=\"hidden\" name=\"pluginname\" value=\"$pluginname\" />\n";
 	print "<input type=\"hidden\" name=\"type\" value=\"configure_post\" />\n";
@@ -315,7 +301,7 @@ if ($type == 'admin') {
 	print "<br /><input type=\"submit\" value=\"" .
 			_("Save") .
 			"\" />";
-	print "</form>";
+	echo $HTML->closeForm();
 	print "</div>";
 
 	print "<fieldset><legend>".
@@ -354,7 +340,7 @@ if ($type == 'admin') {
 				array($body, $id, htmlspecialchars($name)));
 	}
 	$feedback = $name .' : '. _('Block configuration saved');
-	session_redirect('/plugins/blocks/index.php?id='.$id.'&type=admin&pluginname=blocks');
+	session_redirect('/plugins/blocks/?id='.$id.'&type=admin&pluginname=blocks');
 }
 
 site_project_footer();
diff --git a/src/plugins/globalsearch/common/globalsearch_edit_utils.php b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
index bd48520..6976a9d 100644
--- a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
+++ b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
@@ -5,6 +5,7 @@
  * Copyright 1999-2001, VA Linux Systems, Inc.
  * Copyright 2003-2004, GForge, LLC
  * Copyright 2007-2009, Roland Mas
+ * Copyright 2016, Franck Villaume - TrivialDev
  *
  * This file is part of FusionForge.
  *
@@ -26,23 +27,19 @@
 /**
  *      globalsearch_admin_table_add() - present a form for adding a record to the specified table
  */
-function globalsearch_admin_table_add () {
-        global $PHP_SELF;
-
+function globalsearch_admin_table_add() {
+        global $HTML;
 	echo _('Create a new associated forge below');
-	echo '<form name="add" action="'.$PHP_SELF.'?function=postadd" method="post">
-                        <table>';
-
-	echo '<tr><td><strong>'._('Title').'</strong></td><td><input type="text" name="title" /></td></tr>';
-	echo '<tr><td><strong>'._('Link').'</strong></td><td><input type="text" name="link" /></td></tr>';
+	echo $HTML->openForm(array('name' => 'add', 'action' => '/plugins/globalsearch/edit_assoc_sites.php?function=postadd', 'method' => 'post'));
+	echo '<table>';
+	echo '<tr><td><strong>'._('Title').'</strong></td><td><input type="text" name="title" required="required" /></td></tr>';
+	echo '<tr><td><strong>'._('Link').'</strong></td><td><input type="text" name="link" required="required" /></td></tr>';
 	echo '<tr><td><strong>'._('Software only').'</strong></td><td><input type="checkbox" checked name="onlysw" value="t"/></td></tr>';
 	echo '<tr><td><strong>'._('Enabled').'</strong></td><td><input type="checkbox" checked name="enabled" value="t"/></td></tr>';
 	echo '<tr><td><strong>'._('Rank').'</strong></td><td><input type="text" name="rank" /></td></tr>';
-
-	echo '</table><input type="submit" value="'._('Submit new associated forge').'" /></form>
-                        <form name="cancel" action="'.$PHP_SELF.'" method="post">
-                        <input type="submit" value="Cancel" />
-                        </form>';
+	echo '</table><input type="submit" value="'._('Submit new associated forge').'" />
+                        <input type="reset" value="'._('Cancel').'" />';
+	echo $HTML->closeForm();
 }
 
 /**
@@ -80,7 +77,7 @@ VALUES ($1, $2, $3, $4, $5)',
  *      @param $id - the id of the record to act on
  */
 function globalsearch_admin_table_confirmdelete ($id) {
-        global $PHP_SELF;
+        global $HTML;
 
         $result = db_query_params ('SELECT * FROM plugin_globalsearch_assoc_site WHERE assoc_site_id=$1',
 				   array($id));
@@ -99,12 +96,10 @@ function globalsearch_admin_table_confirmdelete ($id) {
 		echo '<tr><td><strong>'._('Enabled').'</strong></td><td>'.(($enabled == 't')?_('Yes'):_('No')) .'</td></tr>';
 		echo '<tr><td><strong>'._('Rank').'</strong></td><td>'.$rank.'</td></tr>';
 		echo '</table>' ;
-		echo '<form name="delete" action="'.$PHP_SELF.'?function=delete&id='.$id.'" method="post">
-                        <input type="submit" value="'._('Delete').'" />
-                        </form>
-                        <form name="cancel" action="'.$PHP_SELF.'" method="post">
-                        <input type="submit" value="'._('Cancel').'" />
-                        </form>';
+		echo $HTML->openForm(array('name' => 'delete', 'action' => '/plugins/globalsearch/edit_assoc_sites.php?function=delete&id='.$id, 'method' => 'post'));
+		echo '<input type="submit" value="'._('Delete').'" />';
+		echo util_make_link('/plugins/globalsearch/edit_assoc_sites.php', '<input type="button" value="'._('Cancel').'" />');
+		echo $HTML->closeForm();
         } else {
                 echo db_error();
         }
@@ -130,7 +125,7 @@ function globalsearch_admin_table_delete ($id) {
  *      @param $id - the id of the record to act on
  */
 function globalsearch_admin_table_edit ($id) {
-        global $PHP_SELF;
+        global $HTML;
 
         $result = db_query_params ('SELECT * FROM plugin_globalsearch_assoc_site WHERE assoc_site_id=$1',
 				   array($id));
@@ -141,9 +136,9 @@ function globalsearch_admin_table_edit ($id) {
 		$old_enabled   =  db_result ($result, 0, 'enabled');
 		$old_rank      =  db_result ($result, 0, 'rank', 1);
 
-                echo _('Modify the associated forge below');
-		echo '<form name="edit" action="'.$PHP_SELF.'?function=postedit&id='.$id.'" method="post">
-                        <table>';
+		echo _('Modify the associated forge below');
+		echo $HTML->openForm(array('name' => 'edit', 'action' => '/plugins/globalsearch/edit_assoc_sites.php?function=postedit&id='.$id, 'method' => 'post'));
+		echo '<table>';
 
 		echo '<tr><td><strong>'._('Title').'</strong></td><td><input type="text" name="title" value="'.$old_title.'"/></td></tr>';
 		echo '<tr><td><strong>'._('Link').'</strong></td><td><input type="text" name="link" value="'.$old_link.'"/></td></tr>';
@@ -151,10 +146,9 @@ function globalsearch_admin_table_edit ($id) {
 		echo '<tr><td><strong>'._('Enabled').'</strong></td><td><input type="checkbox" '.(($old_enabled == 't')?'checked':'') .' name="enabled" value="t"/></td></tr>';
 		echo '<tr><td><strong>'._('Rank').'</strong></td><td><input type="text" name="rank" value="'.$old_rank.'"/></td></tr>';
 
-		echo '</table><input type="submit" value="'._('Submit Changes').'" /></form>
-                        <form name="cancel" action="'.$PHP_SELF.'" method="post">
-                        <input type="submit" value="'._('Cancel').'" />
-                        </form>';
+		echo '</table><input type="submit" value="'._('Submit Changes').'" />';
+		echo $HTML->closeForm();
+		echo util_make_link('/plugins/globalsearch/edit_assoc_sites.php', '<input type="button" value="'._('Cancel').'" />');
         } else {
                 echo db_error();
         }
diff --git a/src/plugins/globalsearch/www/edit_assoc_sites.php b/src/plugins/globalsearch/www/edit_assoc_sites.php
index 75b0719..705f27f 100644
--- a/src/plugins/globalsearch/www/edit_assoc_sites.php
+++ b/src/plugins/globalsearch/www/edit_assoc_sites.php
@@ -4,6 +4,7 @@
  *
  * Copyright 2003-2004, GForge, LLC
  * Copyright 2007-2009, Roland Mas
+ * Copyright 2016, Franck Villaume - TrivialDev
  *
  * This file is part of FusionForge.
  *
@@ -31,7 +32,7 @@ include_once(forge_get_config('plugins_path').'/globalsearch/common/globalsearch
 $HTML->header(array('title'=>_('Edit associated forges for global search')));
 
 echo '<h3>'._('Edit associated forges for global search').'</h3>
-<p><a href="/admin/">'._("Site Admin Home").'</a></p>';
+<p>'.util_make_link('/admin/', _('Site Admin Home')).'</p>';
 
 $function = getStringFromRequest ('function');
 $id = getIntFromRequest ('id');
diff --git a/src/plugins/globalsearch/www/index.php b/src/plugins/globalsearch/www/index.php
index 28acccc..0ccd53a 100644
--- a/src/plugins/globalsearch/www/index.php
+++ b/src/plugins/globalsearch/www/index.php
@@ -4,7 +4,7 @@
  *
  * Copyright 2003-2004 GForge, LLC
  * Copyright 2007-2009, Roland Mas
- *
+ * Copyright 2016, Franck Villaume - TrivialDev
  * This file is part of FusionForge.
  *
  * FusionForge is free software; you can redistribute it and/or modify
@@ -23,14 +23,12 @@
  */
 
 /**
-  *
-  * Parameters:
-  *   $gwords     = target words to search
-  *   $gexact     = 1 for search ing all words (AND), 0 - for any word (OR)
-  *   $otherfreeknowledge = 1 for search in Free/Libre Knowledge Gforge Initiatives
-  *   $order = "project_title" or "title"    -  criteria for ordering results: if empty or not allowed results are ordered by rank
-  *
-  */
+ * Parameters:
+ *   $gwords     = target words to search
+ *   $gexact     = 1 for search ing all words (AND), 0 - for any word (OR)
+ *   $otherfreeknowledge = 1 for search in Free/Libre Knowledge Gforge Initiatives
+ *   $order = "project_title" or "title"    -  criteria for ordering results: if empty or not allowed results are ordered by rank
+ */
 
 require_once '../../env.inc.php';
 require_once $gfcommon.'include/pre.php';
@@ -72,21 +70,21 @@ $gwords = preg_replace("/\s+/", ' ', $gwords);
 
 // show search box which will return results on
 // this very page (default is to open new window)
-$gsplugin = plugin_get_object ('globalsearch') ;
-echo $gsplugin->search_box ();
+$gsplugin = plugin_get_object('globalsearch');
+echo $gsplugin->search_box();
 
 /*
         Force them to enter at least three characters
 */
 
 if ($gwords && (strlen($gwords) < 3)) {
-        echo "<h2>"._("Search must be at least three characters")."</h2>";
+        echo $HTML->warning(_('Search must be at least three characters'));
         $HTML->footer();
         exit;
 }
 
 if (!$gwords) {
-        echo "<br /><b>"._("Enter Your Search Words Above")."</b></p>";
+        echo $HTML->information(_('Enter Your Search Words Above'));
         $HTML->footer();
         exit;
 }
@@ -122,7 +120,6 @@ foreach ($array as $val) {
 		}
 	}
 	$i++ ;
-
 	$qpa = db_construct_qpa($qpa, 'lower(project_title) LIKE $1', array ("%$val%")) ;
 }
 
@@ -138,35 +135,32 @@ foreach ($array as $val) {
 		}
 	}
 	$i++ ;
-
 	$qpa = db_construct_qpa($qpa, 'lower(project_description) LIKE $1', array ("%$val%")) ;
 }
-$qpa = db_construct_qpa($qpa, ')) ORDER BY '.$order) ;
+$qpa = db_construct_qpa($qpa, ')) ORDER BY '.$order);
 
-$limit=25;
+$limit = 25;
 
 $result = db_query_qpa ($qpa, $limit+1, $offset);
 $rows = $rows_returned = db_numrows($result);
 
 if (!$result || $rows < 1) {
-        $no_rows = 1;
-        echo "<h2>".sprintf (_('No matches found for “%s”'), $gwords)."</h2>";
-        echo db_error();
-
+	$no_rows = 1;
+	echo "<h2>".sprintf (_('No matches found for “%s”'), $gwords)."</h2>";
+	echo db_error();
 } else {
+	if ( $rows_returned > $limit) {
+		$rows = $limit;
+	}
 
-        if ( $rows_returned > $limit) {
-                $rows = $limit;
-        }
-
-        echo "<h3>".sprintf (_('Search results for “%s”'), $gwords)."</h3><p>\n\n";
+	echo "<h3>".sprintf (_('Search results for “%s”'), $gwords)."</h3><p>\n\n";
 
-        $title_arr = array();
-        $title_arr[] = util_make_link ('/plugins/globalsearch/?gwords='.urlencode($gwords).'&order=project_title&gexact='.$gexact,
+	$title_arr = array();
+	$title_arr[] = util_make_link('/plugins/'.$gsplugin->name.'/?gwords='.urlencode($gwords).'&order=project_title&gexact='.$gexact,
 				       _("Project Name")) ;
-        $title_arr[] = util_make_link ('/plugins/globalsearch/?gwords='.urlencode($gwords).'&order=project_description&gexact='.$gexact,
+        $title_arr[] = util_make_link('/plugins/'.$gsplugin->name.'/?gwords='.urlencode($gwords).'&order=project_description&gexact='.$gexact,
 				       _('Description')) ;
-        $title_arr[] = util_make_link ('/plugins/globalsearch/?gwords='.urlencode($gwords).'&order=title&gexact='.$gexact,
+        $title_arr[] = util_make_link('/plugins/'.$gsplugin->name.'/?gwords='.urlencode($gwords).'&order=title&gexact='.$gexact,
 				       _('Forge')) ;
 
         echo $GLOBALS['HTML']->listTableTop($title_arr);
@@ -194,28 +188,28 @@ if (!$result || $rows < 1) {
    // This code puts the nice next/prev.
 if ( !$no_rows && ( ($rows_returned > $rows) || ($offset != 0) ) ) {
 
-        echo "<br />\n";
-
-        echo "<table style=\"background-color:".$HTML->COLOR_LTBACK1."\" width=\"100%\" cellpadding=\"5\" cellspacing=\"0\">\n";
-        echo "<tr>\n";
-        echo "\t<td align=\"left\">";
-        if ($offset != 0) {
-                echo "<span style=\"font-family:arial, helvetica;text-decoration: none\">";
-                echo "<a href=\"/plugins/globalsearch/?gwords=".urlencode($gwords)."&order=".urlencode($order)."&gexact=$gexact&offset=".($offset-25);
-                echo "\"><strong>"._("Previous Results")."</strong></a></span>";
-        } else {
-                echo " ";
-        }
-        echo "</td>\n\t<td align=\"right\">";
-        if ( $rows_returned > $rows) {
-                echo "<span style=\"font-family:arial, helvetica;text-decoration: none\">";
-                echo "<a href=\"/plugins/globalsearch/?gwords=".urlencode($gwords)."&order=".urlencode($order)."&gexact=$gexact&offset=".($offset+25);
-                echo "\"><strong>"._("Next Results") . html_image("t.png", 15, 15, array("align"=>"middle")) . "</strong></a></span>";
-        } else {
-                echo " ";
-        }
-        echo "</td>\n</tr>\n";
-        echo "</table>\n";
+	echo "<br />\n";
+
+	echo "<table style=\"background-color:".$HTML->COLOR_LTBACK1."\" width=\"100%\" cellpadding=\"5\" cellspacing=\"0\">\n";
+	echo "<tr>\n";
+	echo "\t<td align=\"left\">";
+	if ($offset != 0) {
+		echo "<span style=\"font-family:arial, helvetica;text-decoration: none\">";
+		echo util_make_link('/plugins/'.$gsplugin->name.'/?gwords='.urlencode($gwords).'&order='.urlencode($order).'&gexact='.$gexact.'&offset='.($offset-25),
+			'<strong>'._('Previous Results').'</strong>').'</span>';
+	} else {
+		echo " ";
+	}
+	echo "</td>\n\t<td align=\"right\">";
+	if ( $rows_returned > $rows) {
+		echo "<span style=\"font-family:arial, helvetica;text-decoration: none\">";
+		echo util_make_link('/plugins/'.$gsplugin->name.'/?gwords='.urlencode($gwords).'&order='.urlencode($order).'&gexact='.$gexact.'&offset='.($offset+25),
+			'<strong>'._('Next Results').html_image('t.png', 15, 15, array("align"=>"middle")).'</strong>').'</span>';
+	} else {
+		echo " ";
+	}
+	echo "</td>\n</tr>\n";
+	echo "</table>\n";
 }
 
 $HTML->footer();
diff --git a/src/plugins/headermenu/view/admin/updateLinkValue.php b/src/plugins/headermenu/view/admin/updateLinkValue.php
index 11778d0..1292f68 100644
--- a/src/plugins/headermenu/view/admin/updateLinkValue.php
+++ b/src/plugins/headermenu/view/admin/updateLinkValue.php
@@ -2,7 +2,7 @@
 /**
  * headermenu plugin : updateLinkValue view
  *
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -56,7 +56,7 @@ echo html_ac(html_ap() - 1);
 $linkValues = $headermenu->getLink($linkId);
 if (is_array($linkValues)) {
 	echo html_e('h2', array(), _('Update this link'));
-	echo $HTML->openForm(array('method' => 'POST', 'name' => 'updateLink', 'action' => util_make_uri($action_url)));
+	echo $HTML->openForm(array('method' => 'POST', 'name' => 'updateLink', 'action' => $action_url));
 	echo $HTML->listTableTop();
 	$cells = array();
 	$cells[] = array(_('Displayed Name').utils_requiredField()._(':'), 'style' => 'text-align:right');
diff --git a/src/plugins/headermenu/view/admin/viewGlobalConfiguration.php b/src/plugins/headermenu/view/admin/viewGlobalConfiguration.php
index 4efce5b..d9a7680 100644
--- a/src/plugins/headermenu/view/admin/viewGlobalConfiguration.php
+++ b/src/plugins/headermenu/view/admin/viewGlobalConfiguration.php
@@ -2,7 +2,7 @@
 /**
  * headermenu : viewGlobalConfiguration page
  *
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -125,7 +125,7 @@ if (sizeof($linksOuterMenuArray)) {
 
 echo html_e('h2', array(), _('Add new tab'), false);
 echo $HTML->information(_('You can add specific tabs in outermenu (main tab) or headermenu (next to the login) with the form below.'));
-echo $HTML->openForm(array('method' => 'POST', 'name' => 'addLink', 'action' => util_make_uri($actionurl.'&action=addLink')));
+echo $HTML->openForm(array('method' => 'POST', 'name' => 'addLink', 'action' => $actionurl.'&action=addLink'));
 echo $HTML->listTableTop();
 $cells = array();
 $cells[] = array(_('Displayed Name').utils_requiredField()._(':'), 'style' => 'text-align:right');
diff --git a/src/plugins/headermenu/view/admin/viewProjectConfiguration.php b/src/plugins/headermenu/view/admin/viewProjectConfiguration.php
index 881b166..bf5ade5 100644
--- a/src/plugins/headermenu/view/admin/viewProjectConfiguration.php
+++ b/src/plugins/headermenu/view/admin/viewProjectConfiguration.php
@@ -2,7 +2,7 @@
 /**
  * headermenu : viewProjectConfiguration page
  *
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -88,7 +88,7 @@ if (sizeof($linksArray)) {
 
 echo html_e('h2', array(), _('Add new tab'));
 echo $HTML->information(_('You can add your own tabs in the menu bar with the form below.'));
-echo $HTML->openForm(array('method' => 'POST', 'name' => 'addLink', 'action' => util_make_uri('/plugins/'.$headermenu->name.'/?type=projectadmin&group_id='.$group_id.'&action=addLink')));
+echo $HTML->openForm(array('method' => 'POST', 'name' => 'addLink', 'action' => '/plugins/'.$headermenu->name.'/?type=projectadmin&group_id='.$group_id.'&action=addLink'));
 echo $HTML->listTableTop();
 $cells = array();
 $cells[] = array(_('Displayed Name').utils_requiredField()._(':'), 'style' => 'text-align:right');
diff --git a/src/plugins/mantisbt/common/MantisBTPlugin.class.php b/src/plugins/mantisbt/common/MantisBTPlugin.class.php
index 7a270ee..45f9aba 100644
--- a/src/plugins/mantisbt/common/MantisBTPlugin.class.php
+++ b/src/plugins/mantisbt/common/MantisBTPlugin.class.php
@@ -65,13 +65,13 @@ _('Use Mantis Bugtracker as another ticket management tool.');
 				}
 				if ($project->usesPlugin($this->name)) {
 					$params['TITLES'][] = $this->text;
-					$params['DIRS'][] = '/plugins/'.$this->name.'/?type=group&group_id=' . $group_id;
+					$params['DIRS'][] = util_make_uri('/plugins/'.$this->name.'/?type=group&group_id=' . $group_id);
 					$params['TOOLTIPS'][] = _('Tickets Management');
 					if (session_loggedin()) {
 						$user = session_get_user();
 						$userperm = $project->getPermission();
 						if ($userperm->isAdmin()) {
-							$params['ADMIN'][] = '/plugins/'.$this->name.'/?type=admin&group_id=' . $group_id;
+							$params['ADMIN'][] = util_make_uri('/plugins/'.$this->name.'/?type=admin&group_id=' . $group_id);
 						}
 					}
 					if (isset($params['toptab'])) {
diff --git a/src/plugins/mantisbt/view/addAttachment.php b/src/plugins/mantisbt/view/addAttachment.php
index 63b34ba..96adb91 100644
--- a/src/plugins/mantisbt/view/addAttachment.php
+++ b/src/plugins/mantisbt/view/addAttachment.php
@@ -3,7 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -27,7 +27,7 @@ global $mantisbt;
 global $type;
 global $idBug;
 
-echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&idBug='.$idBug.'&action=addAttachment&view=viewIssue'), 'enctype' => 'multipart/form-data'));
+echo $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&idBug='.$idBug.'&action=addAttachment&view=viewIssue', 'enctype' => 'multipart/form-data'));
 echo	'<table>';
 echo		'<tr><td>';
 echo		_('File')._(': ').'<input type="file" name="attachment" />';
diff --git a/src/plugins/mantisbt/view/addIssue.php b/src/plugins/mantisbt/view/addIssue.php
index 5203530..8cbaddb 100644
--- a/src/plugins/mantisbt/view/addIssue.php
+++ b/src/plugins/mantisbt/view/addIssue.php
@@ -4,7 +4,7 @@
  *
  * Copyright 2010-2011, Franck Villaume - Capgemini
  * Copyright 2010, Antoine Mercadal - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -51,7 +51,7 @@ try {
 }
 
 if (!isset($errorPage)){
-	echo $HTML->openForm(array('name' => 'issue', 'method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&action=addIssue')));
+	echo $HTML->openForm(array('name' => 'issue', 'method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&action=addIssue'));
 	echo	'<table>';
 	echo		'<tr>';
 	echo			'<td width="16%">'._('Category').'</td>';
diff --git a/src/plugins/mantisbt/view/addOrEditNote.php b/src/plugins/mantisbt/view/addOrEditNote.php
index 1b0f9a4..be567e3 100644
--- a/src/plugins/mantisbt/view/addOrEditNote.php
+++ b/src/plugins/mantisbt/view/addOrEditNote.php
@@ -4,7 +4,7 @@
  *
  * Copyright 2010-2011, Franck Villaume - Capgemini
  * Copyright 2010, Antoine Mercadal - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -61,7 +61,7 @@ if (!isset($errorPage)){
 	}
 
 	echo 		'<div id="add_edit_note">';
-	echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&idBug='.$defect->id.'&idNote='.$idNote.'&action='.$actionform.'&view=viewIssue')));
+	echo $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&idBug='.$defect->id.'&idNote='.$idNote.'&action='.$actionform.'&view=viewIssue'));
 	echo				'<table>';
 	echo 					'<tr>';
 	(isset($noteEdit->text))? $note_value = $noteEdit->text : $note_value = '';
diff --git a/src/plugins/mantisbt/view/admin/addCategory.php b/src/plugins/mantisbt/view/admin/addCategory.php
index fc45e84..ada4378 100644
--- a/src/plugins/mantisbt/view/admin/addCategory.php
+++ b/src/plugins/mantisbt/view/admin/addCategory.php
@@ -3,7 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -28,7 +28,7 @@ global $mantisbt;
 /* add category to a dedicated project */
 
 echo $HTML->boxTop(_('Add a new category'));
-echo $HTML->openForm(array('method' => 'post', 'name' => 'addCategory', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=addCategory')));
+echo $HTML->openForm(array('method' => 'post', 'name' => 'addCategory', 'action' => '/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=addCategory'));
 echo $HTML->listTableTop();
 $cells = array();
 $cells[] = array(_('Name').utils_requiredField()._(':'), 'class' => 'align-right');
diff --git a/src/plugins/mantisbt/view/admin/addVersion.php b/src/plugins/mantisbt/view/admin/addVersion.php
index d5ede6e..33672ef 100644
--- a/src/plugins/mantisbt/view/admin/addVersion.php
+++ b/src/plugins/mantisbt/view/admin/addVersion.php
@@ -3,7 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012,2014 Franck Villaume - TrivialDev
+ * Copyright 2012,2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -29,7 +29,7 @@ global $group;
 global $group_id;
 global $mantisbt;
 echo $HTML->boxTop(_('Add a new version'));
-echo $HTML->openForm(array('method' => 'post', 'name' => 'addVersion', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=addVersion')));
+echo $HTML->openForm(array('method' => 'post', 'name' => 'addVersion', 'action' => '/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=addVersion'));
 echo $HTML->listTableTop();
 $cells = array();
 $cells[] = array(_('Name').utils_requiredField()._(':'), 'class' => 'align-right');
diff --git a/src/plugins/mantisbt/view/admin/editVersion.php b/src/plugins/mantisbt/view/admin/editVersion.php
index 83a461c..f1cae02 100644
--- a/src/plugins/mantisbt/view/admin/editVersion.php
+++ b/src/plugins/mantisbt/view/admin/editVersion.php
@@ -3,7 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012,2014, Franck Villaume - TrivialDev
+ * Copyright 2012,2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -52,7 +52,7 @@ foreach ($arrVersions as $key => $currentVersion) {
 
 if (!isset($errorPage)){
 	echo $HTML->boxTop(_('Version Detail'));
-	echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=updateVersion')));
+	echo $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=updateVersion'));
 	$titleArr = array(_('Version'), _('Description'), _('Target Date'), _('Type'));
 	echo $HTML->listTableTop($titleArr);
 	echo	'<tr>';
@@ -84,7 +84,7 @@ if (!isset($errorPage)){
 	echo $HTML->closeForm();
 	echo $HTML->boxBottom();
 
-	echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=deleteVersion')));
+	echo $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=deleteVersion'));
 	echo '<input type="hidden" name="deleteVersion" value="'.$idVersion.'" />';
 	echo '<input type="submit" value="'. _('Delete') .'" />';
 	echo $HTML->closeForm();
diff --git a/src/plugins/mantisbt/view/admin/viewCategorie.php b/src/plugins/mantisbt/view/admin/viewCategorie.php
index 859ac5c..71f6990 100644
--- a/src/plugins/mantisbt/view/admin/viewCategorie.php
+++ b/src/plugins/mantisbt/view/admin/viewCategorie.php
@@ -3,7 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -54,12 +54,12 @@ if (!isset($errorPage)){
 			$cells = array();
 			if ( $category != 'General' ) {
 				$cells[][] = $category;
-				$cells[][] = $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=renameCategory'))).
+				$cells[][] = $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=renameCategory')).
 						'<input type="hidden" name="renameCategory" value="'.htmlspecialchars($category).'" />'.
 						'<input name="newCategoryName" type="text" />'.
 						'<input type="submit" value="'._('Rename').'" />'.
 						$HTML->closeForm();
-				$cells[][] = $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=deleteCategory'))).
+				$cells[][] = $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=deleteCategory')).
 						'<input type="hidden" name="deleteCategory" value="'.htmlspecialchars($category).'" />'.
 						'<input type="submit" value="'._('Delete').'" />'.
 						$HTML->closeForm();
diff --git a/src/plugins/mantisbt/view/admin/viewConfiguration.php b/src/plugins/mantisbt/view/admin/viewConfiguration.php
index f25bf14..729e8d2 100644
--- a/src/plugins/mantisbt/view/admin/viewConfiguration.php
+++ b/src/plugins/mantisbt/view/admin/viewConfiguration.php
@@ -3,7 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2011-2014, Franck Villaume - TrivialDev
+ * Copyright 2011-2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -45,7 +45,7 @@ jQuery(document).ready(function() {
 <?php
 
 echo $HTML->boxTop(_('Manage configuration'));
-echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=updateConf')));
+echo $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type=admin&group_id='.$group_id.'&action=updateConf'));
 echo '<table>';
 echo '<tr><td><label id="mantisbtinit-global" title="'._('Use the global configuration defined at forge level').'"';
 echo ' >'._('Use global configuration').'</label></td><td><input id="mantisbtglobalconf" type="checkbox" name="global_conf" value="1" ';
diff --git a/src/plugins/mantisbt/view/admin/viewGlobalConfiguration.php b/src/plugins/mantisbt/view/admin/viewGlobalConfiguration.php
index 3527590..761d01a 100644
--- a/src/plugins/mantisbt/view/admin/viewGlobalConfiguration.php
+++ b/src/plugins/mantisbt/view/admin/viewGlobalConfiguration.php
@@ -3,7 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2011-2014, Franck Villaume - TrivialDev
+ * Copyright 2011-2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -28,7 +28,7 @@ global $mantisbt;
 $mantisbtGlobalConf = $mantisbt->getGlobalconf();
 
 echo $HTML->boxTop(_('Manage configuration'));
-echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type=globaladmin&action=updateGlobalConf')));
+echo $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type=globaladmin&action=updateGlobalConf'));
 echo $HTML->listTableTop();
 $cells = array();
 $cells[] = array(_('URL').utils_requiredField()._(':'), 'class' => 'align-right');
diff --git a/src/plugins/mantisbt/view/adminuser.php b/src/plugins/mantisbt/view/adminuser.php
index 431bb05..9b44389 100644
--- a/src/plugins/mantisbt/view/adminuser.php
+++ b/src/plugins/mantisbt/view/adminuser.php
@@ -3,6 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2011, Franck Villaume - Capgemini
+ * Copyright 2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -30,7 +31,7 @@ global $userMantisBTConf;
 
 foreach ($userMantisBTConf as $userConf) {
 	echo $HTML->boxTop(_('Manage your account for the URL')._(': ').$userConf['url']);
-	echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type=user&action=updateuserConf')));
+	echo $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type=user&action=updateuserConf'));
 	echo $HTML->listTableTop();
 	$cells = array();
 	$cells[] = array(_('MantisBT User').utils_requiredField()._(':'), 'class' => 'align-right');
diff --git a/src/plugins/mantisbt/view/editIssue.php b/src/plugins/mantisbt/view/editIssue.php
index ab9ef1b..82ddf1a 100644
--- a/src/plugins/mantisbt/view/editIssue.php
+++ b/src/plugins/mantisbt/view/editIssue.php
@@ -4,7 +4,7 @@
  *
  * Copyright 2010-2011, Franck Villaume - Capgemini
  * Copyright 2010, Antoine Mercadal - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -68,7 +68,7 @@ if (!isset($errorPage)){
 	global $additional_value;
 
 	$boxTitle = _('Edit ticket')._(': ').sprintf($format,$defect->id);
-	echo $HTML->openForm(array('name' => 'issue', 'method' => 'post', 'action' => util_make_uri('plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&idBug='.$defect->id.'&action=updateIssue&view=viewIssue')));
+	echo $HTML->openForm(array('name' => 'issue', 'method' => 'post', 'action' => 'plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&idBug='.$defect->id.'&action=updateIssue&view=viewIssue'));
 	echo $HTML->listTableTop();
 	echo		'<tr>';
 	echo 			'<td width="20%">'._('Category').'</td>';
diff --git a/src/plugins/mantisbt/view/init.php b/src/plugins/mantisbt/view/init.php
index 87eece1..ce01e5a 100644
--- a/src/plugins/mantisbt/view/init.php
+++ b/src/plugins/mantisbt/view/init.php
@@ -3,7 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2011-2012,2014 Franck Villaume - TrivialDev
+ * Copyright 2011-2012,2014,2016 Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -48,7 +48,7 @@ jQuery(document).ready(function() {
 
 <?php
 
-echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&action=init')));
+echo $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&action=init'));
 echo $HTML->listTableTop();
 $cells = array();
 $cells[] = array(_('Use global configuration')._(':'), 'class' => 'align-right');
diff --git a/src/plugins/mantisbt/view/inituser.php b/src/plugins/mantisbt/view/inituser.php
index 20b24b3..df54655 100644
--- a/src/plugins/mantisbt/view/inituser.php
+++ b/src/plugins/mantisbt/view/inituser.php
@@ -3,7 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2011,2014 Franck Villaume - TrivialDev
+ * Copyright 2011,2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -46,7 +46,7 @@ echo html_e('p', array(), _('You need to setup your mantisbt account per URL.'))
 
 foreach ($uniqueMantisBTUrls as $uniqueMantisBTUrl) {
 	echo $HTML->boxTop(_('User configuration for URL')._(': ').$uniqueMantisBTUrl);
-	echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type='.$type.'&action=inituser')));
+	echo $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type='.$type.'&action=inituser'));
 	echo $HTML->listTableTop();
 	$cells[] = array(_('MantisBT User').utils_requiredField()._(':'), 'class' => 'align-right');
 	$cells[][] = html_e('input', array('title' => _('Specify your MantisBT user to be used. This user MUST already exists.'), 'id' => 'mantisbt_user', 'type' => 'text', 'size' => 50, 'maxlength' => 255, 'name' => 'mantisbt_user', 'required' => 'required'));
diff --git a/src/plugins/mantisbt/view/jumpToIssue.php b/src/plugins/mantisbt/view/jumpToIssue.php
index 9f886c2..ef234a6 100644
--- a/src/plugins/mantisbt/view/jumpToIssue.php
+++ b/src/plugins/mantisbt/view/jumpToIssue.php
@@ -3,7 +3,7 @@
  * MantisBT plugin
  *
  * Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016 Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -27,7 +27,7 @@ global $mantisbt;
 global $HTML;
 
 echo '<div style="width:98%; text-align:right; padding:5px;" >';
-echo $HTML->openForm(array('name' => 'jump',  'method' => 'post', 'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&view=viewIssue')));
+echo $HTML->openForm(array('name' => 'jump',  'method' => 'post', 'action' => '/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&view=viewIssue'));
 echo '<span>'. _('Jump to ticket')._(':'). '</span>';
 echo '<input type="text" name="idBug" />';
 echo '<input type="submit" value="'._('Ok').'" />';
diff --git a/src/plugins/mantisbt/view/roadmap.php b/src/plugins/mantisbt/view/roadmap.php
index 2ba40c8..e215872 100644
--- a/src/plugins/mantisbt/view/roadmap.php
+++ b/src/plugins/mantisbt/view/roadmap.php
@@ -4,6 +4,7 @@
  *
  * Copyright 2010-2011, Franck Villaume - Capgemini
  * Copyright 2010, Antoine Mercadal - Capgemini
+ * Copyright 2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -67,7 +68,7 @@ if (!isset($errorPage)) {
 
 <div id='expandable_filter' class="notice_content" style='clear: both'>
 <?php
-	include 'mantisbt/controler/filter_roadmap.php';
+	include ($gfplugins.$mantisbt->name.'/controler/filter_roadmap.php');
 ?>
 </div>
 
@@ -110,7 +111,7 @@ if (!isset($errorPage)) {
 				if ( $defect->status->id >= 80 ) {
 					echo '<strike>';
 				}
-				echo	'<a href="?type=group&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&idBug='.$defect->id.'&view=viewIssue">'.$defect->id.'</a>: '.$defect->summary.' ('.$defect->resolution->name.') - ('.$defect_handler_name.')';
+				echo	util_make_link('/plugins/'.$mantisbt->name.'/?type=group&group_id='.$group_id.'&idBug='.$defect->id.'&view=viewIssue', $defect->id)._(': ').$defect->summary.' ('.$defect->resolution->name.') - ('.$defect_handler_name.')';
 				if ( $defect->status->id >= 80 ) {
 					echo '</strike>';
 				}
@@ -127,7 +128,7 @@ if (!isset($errorPage)) {
 											where groups.group_id = plugin_mantisbt.id_group and plugin_mantisbt.id_mantisbt = $1',
 											array($child));
 					$rowGroupNameFusionForge = db_fetch_array($resultGroupNameFusionForge);
-					echo $HTML->boxTop('<a style="color:white;" href="?type=group&group_id='.$rowGroupNameFusionForge['group_id'].'&pluginname='.$mantisbt->name.'">'.$rowGroupNameFusionForge['group_name'].'</a>');
+					echo $HTML->boxTop(util_make_link('/plugins/'.$mantisbt->name.'/?type=group&group_id='.$rowGroupNameFusionForge['group_id'], $rowGroupNameFusionForge['group_name']));
 					echo '<fieldset>';
 					$listChildVersions = $clientSOAP->__soapCall('mc_project_get_versions', array("username" => $username, "password" => $password, "project_id" => $child));
 					if (!empty($listChildVersions)){
@@ -159,7 +160,7 @@ if (!isset($errorPage)) {
 									if ( $defect->status->id >= 80 ) {
 										echo '<strike>';
 									}
-									echo    '<a href="?type=group&group_id='.$rowGroupNameFusionForge['group_id'].'&pluginname='.$mantisbt->name.'&idBug='.$defect->id.'&view=viewIssue">'.$defect->id.'</a>: '.$defect->summary.' ('.$defect->resolution->name.') - ('.$defect_handler_name.')';
+									echo util_make_link('/plugins/'.$mantisbt->name.'/?type=group&group_id='.$rowGroupNameFusionForge['group_id'].'&idBug='.$defect->id.'&view=viewIssue', $defect->id)._(': ').$defect->summary.' ('.$defect->resolution->name.') - ('.$defect_handler_name.')';
 									if ( $defect->status->id >= 80 ) {
 										echo '</strike>';
 									}
diff --git a/src/plugins/mantisbt/view/viewIssues.php b/src/plugins/mantisbt/view/viewIssues.php
index 8ed3c1e..96e9ad9 100644
--- a/src/plugins/mantisbt/view/viewIssues.php
+++ b/src/plugins/mantisbt/view/viewIssues.php
@@ -5,7 +5,7 @@
  * Copyright 2009, Fabien Dubois - Capgemini
  * Copyright 2009-2011, Franck Villaume - Capgemini
  * Copyright 2010, Antoine Mercadal - Capgemini
- * Copyright 2011,2014 Franck Villaume - TrivialDev
+ * Copyright 2011,2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -195,7 +195,7 @@ if (!isset($clientSOAP) && !isset($errorPage)) {
 	?>
 		<p class="notice_title" onclick='jQuery("#expandable_ticket").slideToggle(300);'><?php echo _('Add a new ticket') ?></p>
 		<div id='expandable_ticket' class="notice_content">
-		<?php include("addIssue.php") ?>
+		<?php include ($gfplugins.$mantisbt->name.'/view/addIssue.php'); ?>
 		</div>
 		<br/>
 	<?php
@@ -209,7 +209,7 @@ if (!isset($clientSOAP) && !isset($errorPage)) {
 		{
 			echo '| <b>'.$i.'</b>';
 		} else {
-			echo $HTML->openForm(array('style' => 'display:inline', 'name' => 'page'.$i, 'method' => 'post',  'action' => util_make_uri('/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&page='.$i)));
+			echo $HTML->openForm(array('style' => 'display:inline', 'name' => 'page'.$i, 'method' => 'post',  'action' => '/plugins/'.$mantisbt->name.'/?type='.$type.'&group_id='.$group_id.'&page='.$i));
 			echo 	'<input type="hidden" name="sort" value="'.$bugfilter['sort'].'" />';
 			echo 	'<input type="hidden" name="dir" value="'.$bugfilter['dir'].'" />';
 			if ( isset($bugfilter['show_status'])) {
diff --git a/src/plugins/phpcaptcha/common/phpcaptchaPlugin.class.php b/src/plugins/phpcaptcha/common/phpcaptchaPlugin.class.php
index f38bc7d..28710f7 100644
--- a/src/plugins/phpcaptcha/common/phpcaptchaPlugin.class.php
+++ b/src/plugins/phpcaptcha/common/phpcaptchaPlugin.class.php
@@ -1,10 +1,9 @@
 <?php
-
 /**
  * phpcaptchaPlugin Class
  *
  * Copyright 2010, Luis Daniel Ibáñez
- * Copyright 2013-2015, Franck Villaume - TrivialDev
+ * Copyright 2013-2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -49,12 +48,13 @@ class phpcaptchaPlugin extends Plugin {
 	function captcha_form(&$html) {
 		global $HTML;
 		if ($this->checkConfig()) {
+			$src = util_make_uri('/plugins/'.$this->name.'/securimage_show.php');
 			$html .= '<p>
-				<img id="captcha" src="/plugins/'.$this->name.'/securimage_show.php" alt="CAPTCHA Image" />
-				<a href="#" onclick="document.getElementById(\'captcha\').src = \'/plugins/'.$this->name.'/securimage_show.php?\' + Math.random(); return false">';
+				<img id="captcha" src="'.$src.'" alt="'._('CAPTCHA Image').'" />
+				<a href="#" onclick="document.getElementById(\'captcha\').src = \''.$src.'\' + Math.random(); return false">';
 			$html .= _('Reload image.').'</a>';
 			$html .= '</p><p>';
-			$html .= _('Write captcha here:').'<br />';
+			$html .= _('Write captcha here')._(': ').'<br />';
 			$html .= '<input type="text" name="captcha_code" size="10" maxlength="6" required="required" />';
 			$html .= '</p>';
 		} else {
diff --git a/src/plugins/projects-hierarchy/view/docman_project_link.php b/src/plugins/projects-hierarchy/view/docman_project_link.php
index 0418523..b8a2e32 100644
--- a/src/plugins/projects-hierarchy/view/docman_project_link.php
+++ b/src/plugins/projects-hierarchy/view/docman_project_link.php
@@ -28,7 +28,7 @@ $projectsHierarchy = plugin_get_object('projects-hierarchy');
 $globalConfArray = $projectsHierarchy->getGlobalConf();
 
 if ($globalConfArray['docman']) {
-	echo html_ao('form', array('id' => 'projectsHierarchyDocman', 'name' => 'projectsHierarchyDocman', 'method' => 'post', 'action' => util_make_uri('/plugins/'.$projectsHierarchy->name.'/?action=projectsHierarchyDocman&id='.$group_id.'&type=group')));
+	echo html_ao('form', array('id' => 'projectsHierarchyDocman', 'name' => 'projectsHierarchyDocman', 'method' => 'post', 'action' => '/plugins/'.$projectsHierarchy->name.'/?action=projectsHierarchyDocman&id='.$group_id.'&type=group'));
 	echo html_ao('ul');
 	$label = _('Enable hierarchical browsing');
 	$status = 1;
diff --git a/src/plugins/quota_management/www/quota.php b/src/plugins/quota_management/www/quota.php
index 5a09d8f..b1bfd79 100644
--- a/src/plugins/quota_management/www/quota.php
+++ b/src/plugins/quota_management/www/quota.php
@@ -3,7 +3,7 @@
  * Project Admin page to manage quotas disk and database
  *
  * Copyright 2005, Fabio Bertagnin
- * Copyright 2011, Franck Villaume - Capgemini
+ * Copyright 2011,2016, Franck Villaume - Capgemini
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -38,7 +38,7 @@ site_admin_header(array('title'=>_('Site Admin')));
 <h4>
 	<?php echo _('Ressources usage and quota'); ?>
 	    
-	<a href="quota_admin.php">Admin</a>
+	<?php echo util_make_link('/plugins/'.$quota_management->name.'/quota_admin.php', _('Admin')) ?>
 </h4>
 <?php
 // stock projects infos in array
@@ -123,8 +123,7 @@ foreach ($quotas as $p) {
 }
 
 // users disk space size
-$chroot_dir = forge_get_config('chroot');
-$ftp_dir = $chroot_dir."/home/users/";
+$ftp_dir = forge_get_config('homedir_prefix');
 $users = array();
 $res_db = db_query_params('SELECT user_id, user_name, realname, unix_status FROM users ORDER BY user_id ',
 			array());
@@ -236,9 +235,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; ?>">
-				<a href="quota_project.php?group_id=<?php echo $q["group_id"]; ?>">
-					<?php echo $q["unix_name"]; ?>
-				</a>
+				<?php echo util_make_link('/plugins/'.$quota_management->name.'/quota_project.php?group_id='.$q['group_id'], $q['unix_name']); ?>
 			</td>
 			<td style="border-top:thin solid #808080;background:<?php echo $color2; ?>">
 				<?php echo $q["name"]; ?>
diff --git a/src/plugins/quota_management/www/quota_admin.php b/src/plugins/quota_management/www/quota_admin.php
index 71b5b6d..da0beaf 100644
--- a/src/plugins/quota_management/www/quota_admin.php
+++ b/src/plugins/quota_management/www/quota_admin.php
@@ -3,7 +3,7 @@
  * Project Admin page to manage quotas disk and database
  *
  * Copyright 2005, Fabio Bertagnin
- * Copyright 2011, Franck Villaume - Capgemini
+ * Copyright 2011,2016, Franck Villaume - Capgemini
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -39,7 +39,7 @@ site_admin_header(array('title'=>_('Site Admin')));
 
 ?>
 <h4>
-	<a href="quota.php"><?php echo _('Ressources usage and quota'); ?></a>
+	<?php echo util_make_link('/plugins/'.$quota_management->name.'/quota.php', _('Ressources usage and quota')); ?>
 	  
 	<?php echo _('Quota Manager Admin'); ?>
 </h4>
@@ -102,15 +102,15 @@ 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.'/quota_admin.php', 'method' => 'post'));
 		?>
-		<form action="quota_admin.php" method="POST">
 		<input type="hidden" name="cmd" value="maj" />
 		<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"><a href="<?php echo util_make_url('/plugins/quota_management/index.php?id='.$q['group_id'].'&type=admin&pluginname='.$quota_management->name); ?>">
-				<?php echo $q["unix_name"]; ?>
-			</a></td>
+			<td style="border-top:thin solid #808080">
+			<?php echo util_make_link('/plugins/quota_management/index.php?id='.$q['group_id'].'&type=admin&pluginname='.$quota_management->name, $q['unix_name']) ?>
+			</td>
 			<td style="border-top:thin solid #808080"><?php echo $q["name"]; ?></td>
 			<td style="border-top:thin solid #808080" align="right">
 				<input type="text" name="qs"
@@ -130,8 +130,8 @@ if (db_numrows($res_db) > 0) {
 				<input type="submit" value="<?php echo _('Modify'); ?>" />
 			</td>
 		</tr>
-		</form>
 		<?php
+		echo $HTML->closeForm();
 	}
 ?>
 	<tr style="font-weight:bold">
diff --git a/src/plugins/taskboard/common/TaskBoardPlugin.class.php b/src/plugins/taskboard/common/TaskBoardPlugin.class.php
index 17282cd..6343fdb 100644
--- a/src/plugins/taskboard/common/TaskBoardPlugin.class.php
+++ b/src/plugins/taskboard/common/TaskBoardPlugin.class.php
@@ -41,7 +41,7 @@ _('Agile TaskBoard: Supports Scrum and Kanban methodologies.');
 			$group_id = $params['group_id'];
 			$group = group_get_object($group_id);
 			if ( $group->usesPlugin($this->name)) {
-				echo html_e('p', array(), util_make_uri('/plugins/'.$this->name.'/admin/index.php?group_id='.$group_id, _('Task Board Admin')));
+				echo html_e('p', array(), util_make_link('/plugins/'.$this->name.'/admin/index.php?group_id='.$group_id, _('Task Board Admin')));
 			}
 		} elseif ($hookname == 'groupmenu') {
 			$group_id = $params['group'];
diff --git a/src/plugins/taskboard/common/views/ind.php b/src/plugins/taskboard/common/views/ind.php
index d945ee1..1c56306 100644
--- a/src/plugins/taskboard/common/views/ind.php
+++ b/src/plugins/taskboard/common/views/ind.php
@@ -55,7 +55,7 @@ if (!$tb_arr || count($tb_arr) < 1) {
 				echo $tb_arr[$j]->getErrorMessage();
 			} else {
 				$cells = array();
-				$cells[][] = util_make_uri('/plugins/'.$pluginTaskboard->name.'/?group_id='.$group_id.'&taskboard_id='.$tb_arr[$j]->getID(),
+				$cells[][] = util_make_link('/plugins/'.$pluginTaskboard->name.'/?group_id='.$group_id.'&taskboard_id='.$tb_arr[$j]->getID(),
 								html_image("ic/tracker20w.png", 20, 20).' '.$tb_arr[$j]->getName());
 				$cells[][] = $tb_arr[$j]->getDescription();
 				echo $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle($j, true)), $cells);
diff --git a/src/plugins/webanalytics/view/admin/updateLinkValue.php b/src/plugins/webanalytics/view/admin/updateLinkValue.php
index 781744c..544b1b8 100644
--- a/src/plugins/webanalytics/view/admin/updateLinkValue.php
+++ b/src/plugins/webanalytics/view/admin/updateLinkValue.php
@@ -2,7 +2,7 @@
 /**
  * webanalyticsPlugin Class
  *
- * Copyright 2012, 2014, Franck Villaume - TrivialDev
+ * Copyright 2012,2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -29,7 +29,7 @@ $linkId = getIntFromRequest('linkid');
 
 $linkValues = $webanalytics->getLink($linkId);
 if (is_array($linkValues)) {
-	echo $HTML->openForm(array('method' => 'POST', 'name' => 'updateLink', 'action' => util_make_uri('/plugins/'.$webanalytics->name.'/?type=globaladmin&action=updateLinkValue')));
+	echo $HTML->openForm(array('method' => 'POST', 'name' => 'updateLink', 'action' => '/plugins/'.$webanalytics->name.'/?type=globaladmin&action=updateLinkValue'));
 	echo $HTML->boxTop(_('Update this link'));
 	echo $HTML->listTableTop();
 	$cells = array();
diff --git a/src/plugins/webanalytics/view/admin/viewGlobalConfiguration.php b/src/plugins/webanalytics/view/admin/viewGlobalConfiguration.php
index 695a5ec..4a45dca 100644
--- a/src/plugins/webanalytics/view/admin/viewGlobalConfiguration.php
+++ b/src/plugins/webanalytics/view/admin/viewGlobalConfiguration.php
@@ -2,7 +2,7 @@
 /**
  * webanalyticsPlugin Global Configuration View
  *
- * Copyright 2012, 2014, Franck Villaume - TrivialDev
+ * Copyright 2012,2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -53,7 +53,7 @@ if (sizeof($linksArray)) {
 	echo html_e('br');
 }
 
-echo $HTML->openForm(array('method' => 'POST', 'name' => 'addLink', 'action' => util_make_uri('/plugins/'.$webanalytics->name.'/?type=globaladmin&action=addLink')));
+echo $HTML->openForm(array('method' => 'post', 'name' => 'addLink', 'action' => '/plugins/'.$webanalytics->name.'/?type=globaladmin&action=addLink'));
 echo $HTML->boxTop(_('Add a new webanalytics reference'));
 echo $HTML->listTableTop();
 $cells = array();
diff --git a/src/www/admin/index.php b/src/www/admin/index.php
index 733483f..230c87c 100644
--- a/src/www/admin/index.php
+++ b/src/www/admin/index.php
@@ -51,7 +51,7 @@ for ($i = 0; $i < count($abc_array); $i++) {
 	$localcontent .= util_make_link('/admin/userlist.php?user_name_search='.$abc_array[$i], $abc_array[$i]).'|';
 }
 $localcontent .= html_e('br');
-$localcontent .= $HTML->openForm(array('name' => 'usersrch', 'action' => util_make_uri('/admin/search.php'), 'method' => 'post'));
+$localcontent .= $HTML->openForm(array('name' => 'usersrch', 'action' => '/admin/search.php', 'method' => 'post'));
 $localcontent .= _('Search <em>(userid, username, realname, email)</em>');
 $localcontent .= html_e('input', array('type' => 'text', 'name' => 'search'));
 $localcontent .= html_e('input', array('type' => 'hidden', 'name' => 'substr', 'value' => 1));
@@ -137,7 +137,7 @@ echo html_ac(html_ap() - 1);
 		echo util_make_link('/admin/grouplist.php?group_name_search='.$abc_array[$i], $abc_array[$i]).'|';
 	}
 	echo html_e('br');
-	echo $HTML->openForm(array('name'=> 'gpsrch', 'action' => util_make_uri('/admin/search.php'), 'method' => 'post'));
+	echo $HTML->openForm(array('name'=> 'gpsrch', 'action' => '/admin/search.php', 'method' => 'post'));
 		echo _('Search <em>(groupid, project Unix name, project full name)</em>'); ?>:
 		<input type="text" name="search" />
 		<input type="hidden" name="substr" value="1" />
diff --git a/src/www/my/bookmark_add.php b/src/www/my/bookmark_add.php
index b0a2b67..ae1ceb3 100644
--- a/src/www/my/bookmark_add.php
+++ b/src/www/my/bookmark_add.php
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2014, Stéphane-Eymeric Bredthauer
+ * Copyright 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
@@ -25,6 +26,8 @@ require_once '../env.inc.php';
 require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'include/bookmarks.php';
 
+global $HTML;
+
 site_user_header(array("title"=>_('Add a new Bookmark')));
 
 $bookmark_url = trim(getStringFromRequest('bookmark_url'));
@@ -40,7 +43,7 @@ if (getStringFromRequest('submit') && $bookmark_url && $bookmark_title) {
 	echo util_make_link('/my/',_('Back to your homepage'));
 	echo html_ac(html_ap()-1);
 } else {
-	echo html_ao('form', array('action' => util_make_uri('/my/bookmark_add.php'), 'method' => 'post'));
+	echo $HTML->openForm(array('action' => '/my/bookmark_add.php', 'method' => 'post');
 	echo html_ao('p');
 	echo html_e('label', array('for' => 'bookmark_url'), _('Bookmark URL')._(':').html_e('br'));
 	echo html_e('input', array('id' => 'bookmark_url', 'required' => 'required', 'type' => 'url', 'name' => 'bookmark_url', 'value' => 'http://'));
@@ -51,7 +54,8 @@ if (getStringFromRequest('submit') && $bookmark_url && $bookmark_title) {
 	echo html_ac(html_ap()-1);
 	echo html_ao('p');
 	echo html_e('input', array('type' => 'submit', 'name' => 'submit', 'value' => _('Submit')));
-	echo html_ac(html_ap()-2);
+	echo html_ac(html_ap()-1);
+	echo $HTML->closeForm();
 }
 
 site_user_footer();
diff --git a/src/www/my/bookmark_edit.php b/src/www/my/bookmark_edit.php
index 95e6327..85356d5 100644
--- a/src/www/my/bookmark_edit.php
+++ b/src/www/my/bookmark_edit.php
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2014, Stéphane-Eymeric Bredthauer
+ * Copyright 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
@@ -25,6 +26,8 @@ require_once '../env.inc.php';
 require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'include/bookmarks.php';
 
+global $HTML;
+
 $bookmark_id = getIntFromRequest('bookmark_id');
 if (!$bookmark_id) {
 	exit_missing_param('',array(_('Bookmark ID')),'my');
@@ -52,7 +55,7 @@ if ($result) {
 	$bookmark_title = db_result($result,0,'bookmark_title');
 }
 
-echo html_ao('form', array('action' => util_make_uri('/my/bookmark_edit.php'), 'method' => 'post'));
+echo $HTML->openForm(array('action' => '/my/bookmark_edit.php', 'method' => 'post');
 echo html_e('input', array('type' => 'hidden', 'name' => 'bookmark_id', 'value' => $bookmark_id));
 echo html_ao('p');
 echo html_e('label', array('for' => 'bookmark_url'), _('Bookmark URL')._(':').html_e('br'));
@@ -62,9 +65,8 @@ echo html_ao('p');
 echo html_e('label', array('for' => 'bookmark_title'), _('Bookmark Title')._(':').html_e('br'));
 echo html_e('input', array('id' => 'bookmark_title', 'required' => 'required', 'type' => 'text', 'name' => 'bookmark_title', 'value' => $bookmark_title));
 echo html_ac(html_ap()-1);
-echo html_ao('p');
-echo html_e('input', array('type' => 'submit', 'name' => 'submit', 'value' => _('Submit')));
-echo html_ac(html_ap()-2);
+echo html_e('p', array(), html_e('input', array('type' => 'submit', 'name' => 'submit', 'value' => _('Submit'))));
+echo $HTML->closeForm();
 echo html_e('p', array(), util_make_link('/my/', _('Return')));
 
 site_user_footer();
diff --git a/src/www/my/rmproject.php b/src/www/my/rmproject.php
index 862c642..d81c995 100644
--- a/src/www/my/rmproject.php
+++ b/src/www/my/rmproject.php
@@ -6,6 +6,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2014, Stéphane-Eymeric Bredthauer
+ * Copyright 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
@@ -26,6 +27,8 @@
 require_once '../env.inc.php';
 require_once $gfcommon.'include/pre.php';
 
+global $HTML;
+
 if (!session_loggedin()) {
 	exit_not_logged_in();
 }
@@ -82,17 +85,18 @@ echo html_ao('table');
 echo html_ao('tr');
 echo html_ao('td');
 
-echo html_ao('form', array('action' => util_make_uri('/my/rmproject.php'), 'method' => 'post'));
+echo $HTML->openForm(array('action' => '/my/rmproject.php', 'method' => 'post'));
 echo html_e('input',array('type' => 'hidden', 'name' => 'confirm', 'value' => '1'));
 echo html_e('input',array('type' => 'hidden', 'name' => 'group_id', 'value' => $group_id));
 echo html_e('input',array('type' => 'submit', 'value' => _('Remove')));
-echo html_ac(html_ap()-2);
+echo $HTML->closeForm();
+echo html_ac(html_ap()-1);
 
 echo html_ao('td');
-
-echo html_ao('form', array('action' => util_make_uri('/my/'), 'method' => 'get'));
+echo $HTML->openForm(array('action' => '/my/', 'method' => 'get'));
 echo html_e('input',array('type' => 'submit', 'value' => _('Cancel')));
-echo html_ac(html_ap()-4);
+echo $HTML->closeForm();
+echo html_ac(html_ap()-3);
 
 site_user_footer();
 
diff --git a/src/www/scm/admin/index.php b/src/www/scm/admin/index.php
index 01f9211..2522975 100644
--- a/src/www/scm/admin/index.php
+++ b/src/www/scm/admin/index.php
@@ -158,7 +158,7 @@ echo html_ao('script', array('type' => 'text/javascript'));
 //]]>
 <?php
 echo html_ac(html_ap() - 1);
-echo $HTML->openForm(array('method' => 'post', 'action' => util_make_uri('/scm/admin/?group_id='.$group_id)));
+echo $HTML->openForm(array('method' => 'post', 'action' => '/scm/admin/?group_id='.$group_id));
 $hook_params = array () ;
 $hook_params['group_id'] = $group_id ;
 
diff --git a/src/www/tracker/roadmap.php b/src/www/tracker/roadmap.php
index ef126c1..a25ca7f 100644
--- a/src/www/tracker/roadmap.php
+++ b/src/www/tracker/roadmap.php
@@ -3,7 +3,7 @@
  * FusionForge trackers
  *
  * Copyright 2011, Alcatel-Lucent
- * Copyright 2012,2015, Franck Villaume - TrivialDev
+ * Copyright 2012,2015-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
@@ -646,7 +646,7 @@ if (!$at_arr || count($at_arr) < 1) {
 					url: 'roadmap.php',
 					data: '<?php echo 'group_id='.$group_id.'&roadmap_id='.$roadmap_id ?>&ajax=1&template=1&release='+release,
 					success: function(rep) {
-						jQuery('#div_options').empty().append('<a href="<?php echo '/tracker/roadmap.php?group_id='.$group_id ?>&roadmap_id='+selected_roadmap+'&nb_release='+selected_nb_release+'&display_graph='+selected_display_graph+'" ><?php echo _('Return to last release(s)') ?></a>');
+						jQuery('#div_options').empty().append('<a href="<?php echo util_make_uri('/tracker/roadmap.php?group_id='.$group_id) ?>&roadmap_id='+selected_roadmap+'&nb_release='+selected_nb_release+'&display_graph='+selected_display_graph+'" ><?php echo _('Return to last release(s)') ?></a>');
 						jQuery('#div_roadmap').empty().append(rep);
 					}
 				});

-----------------------------------------------------------------------

Summary of changes:
 src/common/docman/views/addfile.php                |  2 +-
 src/common/docman/views/additem.php                |  2 +-
 src/common/docman/views/addsubdocgroup.php         |  2 +-
 src/common/docman/views/admin.php                  | 10 +--
 src/common/docman/views/editdocgroup.php           |  2 +-
 src/common/docman/views/listtrashfile.php          |  2 +-
 src/common/docman/views/movefile.php               |  2 +-
 src/common/docman/views/search.php                 |  2 +-
 src/common/forum/ForumAdmin.class.php              |  2 +-
 src/common/frs/views/qrs.php                       |  2 +-
 src/common/widget/Widget.class.php                 |  2 +-
 src/plugins/authopenid/www/index.php               | 17 ++--
 .../authwebid/include/AuthWebIDPlugin.class.php    |  6 +-
 src/plugins/authwebid/www/index.php                | 18 ++--
 src/plugins/blocks/www/index.php                   | 46 ++++------
 .../common/globalsearch_edit_utils.php             | 50 +++++------
 src/plugins/globalsearch/www/edit_assoc_sites.php  |  3 +-
 src/plugins/globalsearch/www/index.php             | 98 ++++++++++------------
 .../headermenu/view/admin/updateLinkValue.php      |  4 +-
 .../view/admin/viewGlobalConfiguration.php         |  4 +-
 .../view/admin/viewProjectConfiguration.php        |  4 +-
 .../mantisbt/common/MantisBTPlugin.class.php       |  4 +-
 src/plugins/mantisbt/view/addAttachment.php        |  4 +-
 src/plugins/mantisbt/view/addIssue.php             |  4 +-
 src/plugins/mantisbt/view/addOrEditNote.php        |  4 +-
 src/plugins/mantisbt/view/admin/addCategory.php    |  4 +-
 src/plugins/mantisbt/view/admin/addVersion.php     |  4 +-
 src/plugins/mantisbt/view/admin/editVersion.php    |  6 +-
 src/plugins/mantisbt/view/admin/viewCategorie.php  |  6 +-
 .../mantisbt/view/admin/viewConfiguration.php      |  4 +-
 .../view/admin/viewGlobalConfiguration.php         |  4 +-
 src/plugins/mantisbt/view/adminuser.php            |  3 +-
 src/plugins/mantisbt/view/editIssue.php            |  4 +-
 src/plugins/mantisbt/view/init.php                 |  4 +-
 src/plugins/mantisbt/view/inituser.php             |  4 +-
 src/plugins/mantisbt/view/jumpToIssue.php          |  4 +-
 src/plugins/mantisbt/view/roadmap.php              |  9 +-
 src/plugins/mantisbt/view/viewIssues.php           |  6 +-
 .../phpcaptcha/common/phpcaptchaPlugin.class.php   | 10 +--
 .../view/docman_project_link.php                   |  2 +-
 src/plugins/quota_management/www/quota.php         | 11 +--
 src/plugins/quota_management/www/quota_admin.php   | 14 ++--
 .../taskboard/common/TaskBoardPlugin.class.php     |  2 +-
 src/plugins/taskboard/common/views/ind.php         |  2 +-
 .../webanalytics/view/admin/updateLinkValue.php    |  4 +-
 .../view/admin/viewGlobalConfiguration.php         |  4 +-
 src/www/admin/index.php                            |  4 +-
 src/www/my/bookmark_add.php                        |  8 +-
 src/www/my/bookmark_edit.php                       | 10 ++-
 src/www/my/rmproject.php                           | 14 ++--
 src/www/scm/admin/index.php                        |  2 +-
 src/www/tracker/roadmap.php                        |  4 +-
 52 files changed, 214 insertions(+), 235 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list