lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api

Browse Source
This commit is contained in:
Neil Orley 2017-12-15 16:23:38 +01:00
commit f4e8ce0598
7 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/admin/modules.php
View File

@ -716,6 +716,13 @@ if ($mode == 'common')
// Link config // Link config
if (! empty($objMod->config_page_url) && !$disableSetup) 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)) if (is_array($objMod->config_page_url))
{ {
print '<td class="tdsetuppicto right" width="60px">'; print '<td class="tdsetuppicto right" width="60px">';
@ -732,11 +739,11 @@ if ($mode == 'common')
{ {
if (preg_match('/^([^@]+)@([^@]+)$/i',$urlpage,$regs)) if (preg_match('/^([^@]+)@([^@]+)$/i',$urlpage,$regs))
{ {
print '<a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a>'; print '<a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'?backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a>';
} }
else else
{ {
print '<a href="'.$urlpage.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a>'; print '<a href="'.$urlpage.'?backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a>';
} }
} }
} }
@ -744,11 +751,11 @@ if ($mode == 'common')
} }
else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs)) else if (preg_match('/^([^@]+)@([^@]+)$/i',$objMod->config_page_url,$regs))
{ {
print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>'; print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'?backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
} }
else else
{ {
print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.$objMod->config_page_url.'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>'; print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.$objMod->config_page_url.'?backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a></td>';
} }
} }
else else

11
htdocs/admin/user.php
View File

@ -40,9 +40,12 @@ if (! $user->admin) accessforbidden();
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
$action = GETPOST('action','alpha'); $action = GETPOST('action','alpha');
$backtopage = GETPOST('backtopage', 'alpha');
$value = GETPOST('value','alpha'); $value = GETPOST('value','alpha');
$type='user'; $type='user';
/* /*
* Action * Action
*/ */
@ -130,10 +133,12 @@ elseif ($action == 'sethideinactiveuser')
* View * View
*/ */
$form = new Form($db);
$help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios'; $help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios';
llxHeader('',$langs->trans("UsersSetup"),$help_url); 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'); 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 '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
print '</tr>'; print '</tr>';
$var=true;
$form = new Form($db);
// Mail required for members // Mail required for members
@ -218,7 +221,6 @@ print "</tr>\n";
clearstatcache(); clearstatcache();
$var=true;
foreach ($dirmodels as $reldir) foreach ($dirmodels as $reldir)
{ {
foreach (array('','/doc') as $valdir) foreach (array('','/doc') as $valdir)
@ -255,7 +257,6 @@ foreach ($dirmodels as $reldir)
if ($modulequalified) if ($modulequalified)
{ {
$var = !$var;
print '<tr class="oddeven"><td width="100">'; print '<tr class="oddeven"><td width="100">';
print (empty($module->name)?$name:$module->name); print (empty($module->name)?$name:$module->name);
print "</td><td>\n"; print "</td><td>\n";

6
htdocs/admin/website.php
View File

@ -37,6 +37,8 @@ $langs->load("website");
$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
$confirm=GETPOST('confirm','alpha'); $confirm=GETPOST('confirm','alpha');
$backtopage = GETPOST('backtopage', 'alpha');
$rowid=GETPOST('rowid','alpha'); $rowid=GETPOST('rowid','alpha');
$id=1; $id=1;
@ -394,10 +396,10 @@ if ($action == $acts[1])
$form = new Form($db); $form = new Form($db);
$formadmin=new FormAdmin($db); $formadmin=new FormAdmin($db);
llxHeader(); llxHeader('', $langs->trans("WebsiteSetup"));
$titre=$langs->trans("WebsiteSetup"); $titre=$langs->trans("WebsiteSetup");
$linkback=''; $linkback='<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($titre,$linkback,'title_setup'); print load_fiche_titre($titre,$linkback,'title_setup');
print $langs->trans("WebsiteSetupDesc").'<br>'; print $langs->trans("WebsiteSetupDesc").'<br>';

3
htdocs/blockedlog/admin/blockedlog.php
View File

@ -33,6 +33,7 @@ $langs->load("blockedlog");
if (! $user->admin) accessforbidden(); if (! $user->admin) accessforbidden();
$action = GETPOST('action','alpha'); $action = GETPOST('action','alpha');
$backtopage = GETPOST('backtopage', 'alpha');
/* /*
@ -81,7 +82,7 @@ $form=new Form($db);
llxHeader('',$langs->trans("BlockedLogSetup")); llxHeader('',$langs->trans("BlockedLogSetup"));
$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("ModuleSetup").' '.$langs->trans('BlockedLog'),$linkback); print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog'),$linkback);
$head=blockedlogadmin_prepare_head(); $head=blockedlogadmin_prepare_head();

4
htdocs/core/lib/functions.lib.php
View File

@ -3762,8 +3762,8 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
// Right // Right
print '<td class="nobordernopadding valignmiddle" align="right">'; print '<td class="nobordernopadding valignmiddle" align="right">';
if ($sortfield) $options .= "&sortfield=".$sortfield; if ($sortfield) $options .= "&sortfield=".urlencode($sortfield);
if ($sortorder) $options .= "&sortorder=".$sortorder; if ($sortorder) $options .= "&sortorder=".urlencode($sortorder);
// Show navigation bar // Show navigation bar
$pagelist = ''; $pagelist = '';
if ($savlimit != 0 && ($page > 0 || $num > $limit)) if ($savlimit != 0 && ($page > 0 || $num > $limit))

3
htdocs/modulebuilder/template/admin/about.php
View File

@ -53,6 +53,7 @@ if (! $user->admin) {
// Parameters // Parameters
$action = GETPOST('action', 'alpha'); $action = GETPOST('action', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');
/* /*
@ -72,7 +73,7 @@ $page_name = "MyModuleAbout";
llxHeader('', $langs->trans($page_name)); llxHeader('', $langs->trans($page_name));
// Subheader // Subheader
$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($page_name), $linkback, 'object_mymodule@mymodule'); print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@mymodule');

3
htdocs/modulebuilder/template/admin/setup.php
View File

@ -51,6 +51,7 @@ if (! $user->admin) accessforbidden();
// Parameters // Parameters
$action = GETPOST('action', 'alpha'); $action = GETPOST('action', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');
$arrayofparameters=array('MYMODULE_MYPARAM1'=>array('css'=>'minwidth200'), 'MYMODULE_MYPARAM2'=>array('css'=>'minwidth500')); $arrayofparameters=array('MYMODULE_MYPARAM1'=>array('css'=>'minwidth200'), 'MYMODULE_MYPARAM2'=>array('css'=>'minwidth500'));
@ -70,7 +71,7 @@ $page_name = "MyModuleSetup";
llxHeader('', $langs->trans($page_name)); llxHeader('', $langs->trans($page_name));
// Subheader // Subheader
$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($page_name), $linkback, 'object_mymodule@mymodule'); print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@mymodule');