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

FIX broken external authentication module feature and avoid warning

Browse Source
This commit is contained in:
Regis Houssin 2019-01-17 16:01:32 +01:00
parent 688311c761
commit 1d33b6ccbb
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/cashdesk/class/Facturation.class.php
View File

@ -211,8 +211,7 @@ class Facturation
$total_localtax1 = 0; $total_localtax1 = 0;
$total_localtax2 = 0; $total_localtax2 = 0;
$tab=array(); $tab = (! empty($_SESSION['poscart'])?$_SESSION['poscart']:array());
$tab = $_SESSION['poscart'];
$tab_size=count($tab); $tab_size=count($tab);
for($i=0;$i < $tab_size;$i++) for($i=0;$i < $tab_size;$i++)

29
htdocs/cashdesk/index.php
View File

@ -41,6 +41,8 @@ if ( $_SESSION['uid'] > 0 )
$usertxt=GETPOST('user','',1); $usertxt=GETPOST('user','',1);
$err=GETPOST("err"); $err=GETPOST("err");
// Instantiate hooks of thirdparty module only if not already define
$hookmanager->initHooks(array('cashdeskloginpage'));
/* /*
* View * View
@ -51,6 +53,15 @@ $formproduct=new FormProduct($db);
$arrayofcss=array('/cashdesk/css/style.css'); $arrayofcss=array('/cashdesk/css/style.css');
top_htmlhead('','',0,0,'',$arrayofcss); top_htmlhead('','',0,0,'',$arrayofcss);
// Execute hook getLoginPageOptions (for table)
$parameters=array('entity' => GETPOST('entity','int'));
$reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
$morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
} else {
$morelogincontent = $hookmanager->resPrint;
}
?> ?>
<body> <body>
@ -92,6 +103,24 @@ else
<td><input name="pwdPassword" class="texte_login" type="password" value="" /></td> <td><input name="pwdPassword" class="texte_login" type="password" value="" /></td>
</tr> </tr>
<?php
if (! empty($morelogincontent)) {
if (is_array($morelogincontent)) {
foreach ($morelogincontent as $format => $option)
{
if ($format == 'table') {
echo '<!-- Option by hook -->';
echo $option;
}
}
}
else {
echo '<!-- Option by hook -->';
echo $morelogincontent;
}
}
?>
<tr> <tr>
<td colspan="2"> <td colspan="2">
&nbsp; &nbsp;

3
htdocs/cashdesk/tpl/liste_articles.tpl.php
View File

@ -46,8 +46,7 @@ $societe = new Societe($db);
$societe->fetch($thirdpartyid); $societe->fetch($thirdpartyid);
/** end add Ditto */ /** end add Ditto */
$tab=array(); $tab = (! empty($_SESSION['poscart'])?$_SESSION['poscart']:array());
$tab = $_SESSION['poscart'];
$tab_size=count($tab); $tab_size=count($tab);
if ($tab_size <= 0) print '<div class="center">'.$langs->trans("NoArticle").'</div><br>'; if ($tab_size <= 0) print '<div class="center">'.$langs->trans("NoArticle").'</div><br>';