From fb0169cbb80b6618580c1e378b937693b2a29815 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Dec 2017 10:46:11 +0100
Subject: [PATCH] Back link to module page

---
 htdocs/admin/user.php                         | 11 ++++++-----
 htdocs/modulebuilder/template/admin/about.php |  1 +
 htdocs/modulebuilder/template/admin/setup.php |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 31efcb22474..ee5faefeaee 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -40,9 +40,12 @@ if (! $user->admin) accessforbidden();
 $extrafields = new ExtraFields($db);
 
 $action = GETPOST('action','alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
+
 $value = GETPOST('value','alpha');
 $type='user';
 
+
 /*
  * Action
  */
@@ -130,10 +133,12 @@ elseif ($action == 'sethideinactiveuser')
  * View
  */
 
+$form = new Form($db);
+
 $help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios';
 llxHeader('',$langs->trans("UsersSetup"),$help_url);
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+$linkback='<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
 
 
@@ -148,8 +153,6 @@ print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>';
 
-$var=true;
-$form = new Form($db);
 
 // Mail required for members
 
@@ -218,7 +221,6 @@ print "</tr>\n";
 
 clearstatcache();
 
-$var=true;
 foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
@@ -255,7 +257,6 @@ foreach ($dirmodels as $reldir)
 
 	                        if ($modulequalified)
 	                        {
-	                            $var = !$var;
 	                            print '<tr class="oddeven"><td width="100">';
 	                            print (empty($module->name)?$name:$module->name);
 	                            print "</td><td>\n";
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 89e31539d5e..b6584f8d909 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -53,6 +53,7 @@ if (! $user->admin) {
 
 // Parameters
 $action = GETPOST('action', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
 
 
 /*
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index fb7785041f9..19908d33546 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -51,6 +51,7 @@ if (! $user->admin) accessforbidden();
 
 // Parameters
 $action = GETPOST('action', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters=array('MYMODULE_MYPARAM1'=>array('css'=>'minwidth200'), 'MYMODULE_MYPARAM2'=>array('css'=>'minwidth500'));