Debug v23

This commit is contained in:
Laurent Destailleur 2025-12-28 19:59:23 +01:00
parent 87e05c4aee
commit 1400d0dd93
5 changed files with 17 additions and 8 deletions

View file

@ -52,6 +52,8 @@ if (!defined('NOBROWSERNOTIF')) {
* @var string $titletruedolibarrversion
* @var string $urllogo
* @var int<0,1> $forgetpasslink
* @var string $morelogincontent
* @var string $moreloginextracontent
*/
// Protection to avoid direct call of template
if (empty($conf) || !is_object($conf)) {
@ -301,7 +303,7 @@ if ($disablenofollow) {
} ?>
<!-- <span class="span-icon-user">-->
<span class="fa fa-user"></span>
<input type="text" id="username" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150 input-nobottom" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" autocapitalize="off" autocomplete="on" spellcheck="false" autocorrect="off" />
<input type="text" id="username" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150 input-nobottom" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" autocapitalize="off" autocomplete="on" spellcheck="false" />
</div>
</div>
@ -396,7 +398,7 @@ if (!empty($morelogincontent)) {
<?php if (!isset($conf->file->main_authentication) || $conf->file->main_authentication != 'googleoauth') { ?>
<br>
<div id="login-submit-wrapper">
<input type="submit" class="button" value="&nbsp; <?php echo $langs->trans('Connection'); ?> &nbsp;" tabindex="5" />
<input type="submit" class="butAction butActionLogin" value="&nbsp; <?php echo $langs->trans('Connection'); ?> &nbsp;" tabindex="5" />
</div>
<?php } ?>
@ -450,22 +452,27 @@ if (getDolGlobalInt('MAIN_AUTHENTICATION_OIDC_ON', 0) > 0 && isset($conf->file->
$langs->load("users");
print '<div class="center" style="margin-top: 20px; margin-bottom: 10px">';
print '<div class="loginbuttonexternal">';
if (!getDolGlobalString("MAIN_AUTHENTICATION_OPENID_URL")) {
$url = openid_connect_get_url();
} else {
$url = getDolGlobalString('MAIN_AUTHENTICATION_OPENID_URL').'&state=' . openid_connect_get_state();
}
if (!empty($url)) {
print '<a class="alogin" href="'.$url.'">'.$langs->trans("LoginUsingOpenID").'</a>';
print '<a class="alogin" href="'.$url.'">';
print '<div class="loginbuttonexternal">';
print $langs->trans("LoginUsingOpenID");
print '</div>';
print '</a>';
} else {
$langs->load("errors");
print '<div class="loginbuttonexternal">';
print '<span class="warning">'.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'</span>';
print '</div>';
}
print '</div>';
print '</div>';
}
if (isset($conf->file->main_authentication) && preg_match('/google/', $conf->file->main_authentication) && strpos($conf->browser->ua, 'DoliDroid') === false) {
@ -605,7 +612,7 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) {
// Can add extra content
$parameters = array();
$dummyobject = new stdClass();
$result = $hookmanager->executeHooks('getLoginPageExtraContent', $parameters, $dummyobject, $action);
$hookmanager->executeHooks('getLoginPageExtraContent', $parameters, $dummyobject, $action);
print $hookmanager->resPrint;
?>

View file

@ -262,7 +262,7 @@ if (!empty($morelogincontent)) {
<div id="login_line2" style="clear: both">
<!-- Button "Regenerate and Send password" -->
<br><input type="submit" <?php echo $disabled; ?> class="button small" id="button_password" name="button_password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
<br><input type="submit" <?php echo $disabled; ?> class="butAction butActionlogin small" id="button_password" name="button_password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
<br>
<div class="center" style="margin-top: 15px;">

View file

@ -308,7 +308,7 @@ if (!empty($morelogincontent)) {
<div id="login_line2" style="clear: both">
<!-- Button "Regenerate and Send password" -->
<br><input type="submit" <?php echo $disabled; ?> class="button small" name="button_password" value="<?php echo $langs->trans('Save'); ?>" tabindex="4" />
<br><input type="submit" <?php echo $disabled; ?> class="butAction butActionLogin small" name="button_password" value="<?php echo $langs->trans('Save'); ?>" tabindex="4" />
<br>
<div class="center" style="margin-top: 15px;">

View file

@ -3600,6 +3600,7 @@ table.login_table_securitycode tr td {
#img_logo, .img_logo {
max-width: 160px;
max-height: 90px;
border-radius: 4px;
}
div.backgroundsemitransparent {

View file

@ -3676,6 +3676,7 @@ table.login_table_securitycode tr td {
#img_logo, .img_logo {
max-width: 160px;
max-height: 90px;
border-radius: 4px;
}
.loginbuttonexternal {
width: 300px;