diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 82f1df1b7d5..49526696157 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -428,14 +428,14 @@ if ($action == 'reset_confirm' && $user->admin)
{
if(!empty($modules[$value])) {
$objMod = $modules[$value];
-
+
if(!empty($objMod->langfiles)) $langs->loadLangs($objMod->langfiles);
-
+
$form = new Form($db);
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?value='.$value.'&mode='.$mode.$param, $langs->trans('ConfirmUnactivation'), $langs->trans(GETPOST('confirm_message_code')), 'reset', '', 'no', 1);
-
+
}
-
+
}
print $formconfirm;
@@ -700,22 +700,29 @@ if ($mode == 'common')
print 'warnings_unactivation[$mysoc->country_code].'&value=' . $modName . '&mode=' . $mode . $param . '">';
print img_picto($langs->trans("Activated"),'switch_on');
print '';
-
+
}
else {
-
+
print '';
print img_picto($langs->trans("Activated"),'switch_on');
print '';
-
+
}
-
+
}
print ''."\n";
// Link config
if (! empty($objMod->config_page_url) && !$disableSetup)
{
+ $backtourlparam='';
+ if ($search_keyword != '') $backtourlparam.=($backtourlparam?'&':'?').'search_keyword='.$search_keyword; // No urlencode here, done later
+ if ($search_nature > -1) $backtourlparam.=($backtourlparam?'&':'?').'search_nature='.$search_nature;
+ if ($search_version > -1) $backtourlparam.=($backtourlparam?'&':'?').'search_version='.$search_version;
+ if ($search_status > -1) $backtourlparam.=($backtourlparam?'&':'?').'search_status='.$search_status;
+ $backtourl=$_SERVER["PHP_SELF"].$backtourlparam;
+
if (is_array($objMod->config_page_url))
{
print '| ';
@@ -732,11 +739,11 @@ if ($mode == 'common')
{
if (preg_match('/^([^@]+)@([^@]+)$/i',$urlpage,$regs))
{
- print ''.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'';
+ print ''.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'';
}
else
{
- print ''.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'';
+ print ''.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'';
}
}
}
@@ -744,11 +751,11 @@ if ($mode == 'common')
}
else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs))
{
- print ' | '.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').' | ';
+ print ''.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').' | ';
}
else
{
- print ''.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').' | ';
+ print ''.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').' | ';
}
}
else
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 2dc8a9f1423..a6dd48f1947 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -37,6 +37,8 @@ $langs->load("website");
$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
$confirm=GETPOST('confirm','alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
+
$rowid=GETPOST('rowid','alpha');
$id=1;
@@ -394,10 +396,10 @@ if ($action == $acts[1])
$form = new Form($db);
$formadmin=new FormAdmin($db);
-llxHeader();
+llxHeader('', $langs->trans("WebsiteSetup"));
$titre=$langs->trans("WebsiteSetup");
-$linkback='';
+$linkback=''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($titre,$linkback,'title_setup');
print $langs->trans("WebsiteSetupDesc").'
';
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 8d4fe48a20f..5aa202e2806 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -33,6 +33,7 @@ $langs->load("blockedlog");
if (! $user->admin) accessforbidden();
$action = GETPOST('action','alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
/*
@@ -81,7 +82,7 @@ $form=new Form($db);
llxHeader('',$langs->trans("BlockedLogSetup"));
-$linkback=''.$langs->trans("BackToModuleList").'';
+$linkback=''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog'),$linkback);
$head=blockedlogadmin_prepare_head();
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1ee42f0e88e..61f85b88a12 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3762,8 +3762,8 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
// Right
print '';
- if ($sortfield) $options .= "&sortfield=".$sortfield;
- if ($sortorder) $options .= "&sortorder=".$sortorder;
+ if ($sortfield) $options .= "&sortfield=".urlencode($sortfield);
+ if ($sortorder) $options .= "&sortorder=".urlencode($sortorder);
// Show navigation bar
$pagelist = '';
if ($savlimit != 0 && ($page > 0 || $num > $limit))
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index c2adc8040d1..89e31539d5e 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -72,7 +72,7 @@ $page_name = "MyModuleAbout";
llxHeader('', $langs->trans($page_name));
// Subheader
-$linkback = '' . $langs->trans("BackToModuleList") . '';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@mymodule');
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index c031e67a346..fb7785041f9 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -70,7 +70,7 @@ $page_name = "MyModuleSetup";
llxHeader('', $langs->trans($page_name));
// Subheader
-$linkback = '' . $langs->trans("BackToModuleList") . '';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@mymodule');
|