diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 1c316eabe..0052b399f 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2480), dgrutsch (22) +// Translators: Admin (2481), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -1121,7 +1121,7 @@ URL: [url]', 'send_login_data_body' => 'Login-Daten Login: [login] -Name: [name] +Name: [username] [comment]', 'send_login_data_subject' => '[sitename]: [login] - Ihre Login-Daten', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 61f2c8853..a17a10b05 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1607), dgrutsch (9), netixw (14) +// Translators: Admin (1608), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -1116,7 +1116,7 @@ URL: [url]', 'send_login_data_body' => 'Login data Login: [login] -Name: [name] +Name: [username] [comment]', 'send_login_data_subject' => '[sitename]: [login] - Your login data', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index a4cc74a6b..a49bbca37 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1062), jeromerobert (50), lonnnew (9), Oudiceval (275) +// Translators: Admin (1063), jeromerobert (50), lonnnew (9), Oudiceval (275) $text = array( '2_factor_auth' => 'Authentification forte', @@ -1063,11 +1063,11 @@ URL: [url]', 'select_workflow' => 'Choisir un workflow', 'send_email' => '', 'send_login_data' => 'Envoyer les informations de connexion', -'send_login_data_body' => 'Informations de connexion - -Identifiant : [login] -Nom : [name] - +'send_login_data_body' => 'Informations de connexion + +Identifiant : [login] +Nom : [username] + [comment]', 'send_login_data_subject' => '[sitename] : [login] - Vos informations de connexion', 'send_test_mail' => 'Envoyer un e-mail test', diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index aa618a17b..31a22c261 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -287,6 +287,11 @@ else if ($action == "sendlogindata" && $settings->_enableEmail) { $userid = $_POST["userid"]; } + $comment = ''; + if (isset($_POST["comment"])) { + $comment = $_POST["comment"]; + } + if (!isset($userid) || !is_numeric($userid) || intval($userid)<1) { UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id")); } diff --git a/views/bootstrap/class.SendLoginData.php b/views/bootstrap/class.SendLoginData.php index 0a79e7861..cb7e50655 100644 --- a/views/bootstrap/class.SendLoginData.php +++ b/views/bootstrap/class.SendLoginData.php @@ -40,11 +40,6 @@ class SeedDMS_View_SendLoginData extends SeedDMS_Bootstrap_Style { $this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->contentHeading(getMLText("send_login_data")); -?> -
- htmlspecialchars($newuser->getFullName())));?> -
-contentContainerStart(); ?>