Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into d…
Browse files Browse the repository at this point in the history 
…evelop-api
  • Loading branch information
Neil Orley committed Dec 15, 2017
2 parents ea971fd + fb0169c commit f4e8ce0
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 24 deletions.
31 changes: 19 additions & 12 deletions htdocs/admin/modules.php
View file
Expand Up @@ -428,14 +428,14 @@
{
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;
Expand Down Expand Up @@ -700,22 +700,29 @@
print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value=' . $modName . '&amp;mode=' . $mode . $param . '">';
print img_picto($langs->trans("Activated"),'switch_on');
print '</a>';

}
else {

print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value=' . $modName . '&amp;mode=' . $mode .'&amp;confirm=yes' . $param . '">';
print img_picto($langs->trans("Activated"),'switch_on');
print '</a>';

}

}
print '</td>'."\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 '<td class="tdsetuppicto right" width="60px">';
Expand All @@ -732,23 +739,23 @@
{
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
{
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>';
}
}
}
print "</td>\n";
}
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
{
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
Expand Down
11 changes: 6 additions & 5 deletions htdocs/admin/user.php
View file
Expand Up @@ -40,9 +40,12 @@
$extrafields = new ExtraFields($db);

$action = GETPOST('action','alpha');
$backtopage = GETPOST('backtopage', 'alpha');

$value = GETPOST('value','alpha');
$type='user';


/*
* Action
*/
Expand Down Expand Up @@ -130,10 +133,12 @@
* 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');


Expand All @@ -148,8 +153,6 @@
print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
print '</tr>';

$var=true;
$form = new Form($db);

// Mail required for members

Expand Down Expand Up @@ -218,7 +221,6 @@

clearstatcache();

$var=true;
foreach ($dirmodels as $reldir)
{
foreach (array('','/doc') as $valdir)
Expand Down Expand Up @@ -255,7 +257,6 @@

if ($modulequalified)
{
$var = !$var;
print '<tr class="oddeven"><td width="100">';
print (empty($module->name)?$name:$module->name);
print "</td><td>\n";
Expand Down
6 changes: 4 additions & 2 deletions htdocs/admin/website.php
View file
Expand Up @@ -37,6 +37,8 @@

$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
$confirm=GETPOST('confirm','alpha');
$backtopage = GETPOST('backtopage', 'alpha');

$rowid=GETPOST('rowid','alpha');

$id=1;
Expand Down Expand Up @@ -394,10 +396,10 @@
$form = new Form($db);
$formadmin=new FormAdmin($db);

llxHeader();
llxHeader('', $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 $langs->trans("WebsiteSetupDesc").'<br>';
Expand Down
3 changes: 2 additions & 1 deletion htdocs/blockedlog/admin/blockedlog.php
View file
Expand Up @@ -33,6 +33,7 @@
if (! $user->admin) accessforbidden();

$action = GETPOST('action','alpha');
$backtopage = GETPOST('backtopage', 'alpha');


/*
Expand Down Expand Up @@ -81,7 +82,7 @@

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);

$head=blockedlogadmin_prepare_head();
Expand Down
4 changes: 2 additions & 2 deletions htdocs/core/lib/functions.lib.php
View file
Expand Up @@ -3762,8 +3762,8 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so

// Right
print '<td class="nobordernopadding valignmiddle" align="right">';
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))
Expand Down
3 changes: 2 additions & 1 deletion htdocs/modulebuilder/template/admin/about.php
View file
Expand Up @@ -53,6 +53,7 @@

// Parameters
$action = GETPOST('action', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');


/*
Expand All @@ -72,7 +73,7 @@
llxHeader('', $langs->trans($page_name));

// 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');

Expand Down
3 changes: 2 additions & 1 deletion htdocs/modulebuilder/template/admin/setup.php
View file
Expand Up @@ -51,6 +51,7 @@

// Parameters
$action = GETPOST('action', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');

$arrayofparameters=array('MYMODULE_MYPARAM1'=>array('css'=>'minwidth200'), 'MYMODULE_MYPARAM2'=>array('css'=>'minwidth500'));

Expand All @@ -70,7 +71,7 @@
llxHeader('', $langs->trans($page_name));

// 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');

Expand Down

0 comments on commit f4e8ce0

Please sign in to comment.