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

Fix position of captcha

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-14 12:54:54 +01:00
parent 43bb5554d7
commit 107e58403a
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,21 +164,6 @@ if ($disablenofollow) echo '</a>';
</div></div> </div></div>
<?php <?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;
}
}
if ($captcha) { if ($captcha) {
// Add a variable param to force not using cache (jmobile) // Add a variable param to force not using cache (jmobile)
$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time $php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
@ -200,7 +185,25 @@ if ($captcha) {
</span> </span>
</div></div> </div></div>
<?php } ?> <?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;
}
}
?>
</div> </div>

37
htdocs/core/tpl/passwordforgotten.tpl.php
View File

@ -113,23 +113,7 @@ if ($disablenofollow) echo '</a>';
</div> </div>
<?php <?php
if (!empty($morelogincontent)) { if ($captcha) {
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;
}
}
?>
<?php if ($captcha) {
// Add a variable param to force not using cache (jmobile) // Add a variable param to force not using cache (jmobile)
$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time $php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog'); if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
@ -150,7 +134,24 @@ if (!empty($morelogincontent)) {
</span> </span>
</div></div> </div></div>
<?php } ?> <?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;
}
}
?>
</div> </div>