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

Fix: use resprint instead resarray

Browse Source
This commit is contained in:
Regis Houssin 2017-08-27 13:19:57 +02:00
parent 7916a2a648
commit d800d10766
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/core/lib/security2.lib.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2008-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2008-2017 Regis Houssin <regis.houssin@capnetworks.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -201,11 +201,16 @@ function dol_loginfunction($langs,$conf,$mysoc)
$demopassword=$tab[1]; $demopassword=$tab[1];
} }
// Execute hook getLoginPageOptions // Execute hook getLoginPageOptions (for table)
// Should be an array with differents options in $hookmanager->resArray
$parameters=array('entity' => GETPOST('entity','int')); $parameters=array('entity' => GETPOST('entity','int'));
$reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters); // Note that $action and $object may have been modified by some hooks. resArray is filled by hook. $reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
$morelogincontent = $hookmanager->resArray['options']; // TODO Use here a resprints //$morelogincontent = $hookmanager->resArray['options']; // TODO Use here a resprints
$morelogincontent = $hookmanager->resPrint;
// Execute hook getLoginPageExtraOptions (eg for js)
$parameters=array('entity' => GETPOST('entity','int'));
$reshook = $hookmanager->executeHooks('getLoginPageExtraOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
$moreloginextracontent = $hookmanager->resPrint;
// Login // Login
$login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin)); $login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));

8
htdocs/core/tpl/login.tpl.php
View File

@ -123,7 +123,7 @@ if ($disablenofollow) echo '</a>';
</span> </span>
</td></tr> </td></tr>
<?php <?php
if (! empty($morelogincontent) && is_array($morelogincontent)) { /*if (! empty($morelogincontent) && is_array($morelogincontent)) {
foreach ($morelogincontent as $format => $option) foreach ($morelogincontent as $format => $option)
{ {
if ($format == 'table') { if ($format == 'table') {
@ -131,6 +131,9 @@ if (! empty($morelogincontent) && is_array($morelogincontent)) {
echo $option; echo $option;
} }
} }
}*/
if (! empty($morelogincontent)) {
echo $morelogincontent;
} }
?> ?>
<?php <?php
@ -287,6 +290,9 @@ if (! empty($morelogincontent) && is_array($morelogincontent)) {
} }
} }
} }
if (! empty($moreloginextracontent)) {
echo $moreloginextracontent;
}
?> ?>
<?php <?php