| '.$langs->trans("Emails").' | '; + print ''; + print ' | '; + print '
| '; print $form->textwithpicto($langs->trans("TicketsDisableCustomerEmail"), $langs->trans("TicketsDisableEmailHelp"), 1, 'help'); diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c020fdc3b2ac8..cb5a97f8c7bd5 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -556,6 +556,8 @@ public function setValues($db) $newvalue = '/'.$modulename.'/core/'.$partname.'/'; } elseif (in_array($partname, array('models', 'theme', 'websitetemplates'))) { $newvalue = '/'.$modulename.'/'; + } elseif (in_array($partname, array('captcha'))) { + $newvalue = '/'.$modulename.'/core/modules/security/'.$partname.'/'; } elseif ($value == 1) { $newvalue = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe } else { // $partname can be any other value like 'sms', ... diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 5f07cc83a50ad..de9d367f75ba8 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -569,40 +569,6 @@ function groupticketchange() { $doleditor->Create(); print ' | |
| '; - - require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; - $captcha = getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_HANDLER', 'standard'); - - $classfile = DOL_DOCUMENT_ROOT."/core/modules/security/captcha/modCaptcha".ucfirst($captcha).'.class.php'; - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $captchaobj = null; - if (dol_is_file($classfile)) { - // Charging the numbering class - $classname = "modCaptcha".ucfirst($captcha); - require_once $classfile; - - $captchaobj = new $classname($this->db, $conf, $langs, $user); - } - - if (is_object($captchaobj) && method_exists($captchaobj, 'getCaptchaCodeForForm')) { - // TODO: get this code using a method of captcha - } else { - print ' | ';
- print '';
- print '';
- print ' |
'; + + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; + $captcha = getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_HANDLER', 'standard'); + + $classfile = DOL_DOCUMENT_ROOT."/core/modules/security/captcha/modCaptcha".ucfirst($captcha).'.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + $captchaobj = null; + if (dol_is_file($classfile)) { + // Charging the numbering class + $classname = "modCaptcha".ucfirst($captcha); + require_once $classfile; + + $captchaobj = new $classname($this->db, $conf, $langs, $user); + } + + if (is_object($captchaobj) && method_exists($captchaobj, 'getCaptchaCodeForForm')) { + print $captchaobj->getCaptchaCodeForForm(); + } else { + print 'Error, the captcha handler '.get_class($captchaobj).' does not have any method getCaptchaCodeForForm()'; + } + + print ' |
 . '){kind=small}
';
}
+ /**
+ * Return the HTML content to output on a form that need the captcha
+ *
+ * @param string $php_self An URL for the a href link
+ * @return int 0 if KO, >0 if OK
+ */
+ public function getCaptchaCodeForForm($php_self = '')
+ {
+ global $langs;
+
+ // TODO Replace the a link with a post of form.
+
+ $out .= '
+
+
+
+ '."\n";
+
+ return $out;
+ }
+
+
/**
* Validate a captcha
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 631ea789dab83..6b9cefd699647 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -81,7 +81,6 @@
@phan-var-force int<0,1> $forgetpasslink
';
-
header('Cache-Control: Public, must-revalidate');
if (GETPOST('dol_hide_topmenu')) {
@@ -105,6 +104,13 @@
$conf->use_javascript_ajax = 1;
}
+// $captcha is defined
+
+
+/*
+ * View
+ */
+
$php_self = empty($php_self) ? dol_escape_htmltag($_SERVER['PHP_SELF']) : $php_self;
if (!empty($_SERVER["QUERY_STRING"]) && dol_escape_htmltag($_SERVER["QUERY_STRING"])) {
$php_self .= '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]);
@@ -313,25 +319,9 @@
}
if (is_object($captchaobj) && method_exists($captchaobj, 'getCaptchaCodeForForm')) {
- // TODO: get this code using a method of captcha
+ print $captchaobj->getCaptchaCodeForForm($php_self);
} else {
- ?>
-
-
-
- use_javascript_ajax = 1;
}
+// $captcha is defined
+
+
+/*
+ * View
+ */
+
$php_self = $_SERVER['PHP_SELF'];
$php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';
$php_self = str_replace('action=validatenewpassword', '', $php_self);
@@ -179,25 +186,9 @@
}
if (is_object($captchaobj) && method_exists($captchaobj, 'getCaptchaCodeForForm')) {
- // TODO: get this code using a method of captcha
+ print $captchaobj->getCaptchaCodeForForm($php_self);
} else {
- ?>
-
-
-
-
-
-
- 
- trans("Refresh"), 'refresh', 'id="captcha_refresh_img"'); ?>
-
-
-
-
-
- 0,
// Set this to 1 if the module provides a website template into doctemplates/websites/website_template-mytemplate
- 'websitetemplates' => 0
+ 'websitetemplates' => 0,
+ // Set this to 1 if the module provides a captcha driver
+ 'captcha' => 0
);
// Data directories to create when module is enabled.
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index ae2b656ad037e..96887dd63bcb1 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -218,15 +218,6 @@
$focus_element = 'password';
}
-// Send password button enabled ?
-$disabled = 'disabled';
-if (preg_match('/dolibarr/i', $mode)) {
- $disabled = '';
-}
-if (getDolGlobalString('MAIN_SECURITY_ENABLE_SENDPASSWORD')) {
- $disabled = ''; // To force button enabled
-}
-
// Show logo (search in order: small company logo, large company logo, theme logo, common logo)
$width = 0;
$rowspan = 2;
@@ -242,6 +233,15 @@
$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
}
+// Send password button enabled ?
+$disabled = 'disabled';
+if (preg_match('/dolibarr/i', $mode)) {
+ $disabled = '';
+}
+if (getDolGlobalString('MAIN_SECURITY_ENABLE_SENDPASSWORD')) {
+ $disabled = ''; // To force button enabled
+}
+
// Security graphical code
$captcha = '';
if (!$disabled) {
-
-
-
- " class="flat input-icon-security width125" type="text" maxlength="5" name="code" tabindex="3" autocomplete="off" />
-
-
-
- trans("Refresh"), 'refresh', 'id="captcha_refresh_img"'); ?>
-
-
-
-