This commit is contained in:
Roland Gruber 2018-02-10 17:31:03 +01:00
parent 049f3760b8
commit a1fbae2f14
2 changed files with 19 additions and 4 deletions

View File

@ -2,11 +2,10 @@
namespace LAM\HELP;
use \LAM\TYPES\TypeManager;
/*
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2006 Michael Duergner
2003 - 2017 Roland Gruber
2003 - 2018 Roland Gruber
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
@ -302,6 +301,10 @@ $helpArray = array (
"Text" => _('If checked then also users who did not setup a second factor are able to login.')),
"520" => array ("Headline" => _("Generate random password"),
"Text" => _("This will set a random password and display it on the screen or send it to the user via mail. Please edit your LAM server profile to setup the mail settings.")),
"521" => array ("Headline" => _('Google reCAPTCHA'),
"Text" => _('Please enter the site and secret key you got from Google reCAPTCHA.')),
"522" => array ("Headline" => _('Secure login'),
"Text" => _('Protect the self service login with a captcha.')),
"550" => array ("Headline" => _("From address"),
"Text" => _("This email address will be set as sender address of all password mails. If empty the system default (php.ini) will be used.")),
"551" => array ("Headline" => _("Subject"),

View File

@ -1,10 +1,9 @@
<?php
use \LAM\LIB\TWO_FACTOR\TwoFactorProviderService;
/*
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2006 - 2017 Roland Gruber
Copyright (C) 2006 - 2018 Roland Gruber
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
@ -390,6 +389,15 @@ class selfServiceProfile {
public $twoFactorAuthenticationOptional = false;
public $twoFactorAuthenticationCaption = '';
/** provider for captcha (-/google) */
public $captchaProvider = '-';
/** Google reCAPTCHA site key */
public $reCaptchaSiteKey = '';
/** Google reCAPTCHA secret key */
public $reCaptchaSecretKey = '';
/** enable captcha on self service login */
public $captchaOnLogin = false;
/**
* Constructor
*
@ -433,6 +441,10 @@ class selfServiceProfile {
$this->twoFactorAuthenticationLabel = null;
$this->twoFactorAuthenticationOptional = false;
$this->twoFactorAuthenticationCaption = '';
$this->captchaProvider = '-';
$this->reCaptchaSiteKey = '';
$this->reCaptchaSecretKey = '';
$this->captchaOnLogin = false;
}
}