gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-20 08:31:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-08-29 17:00:14 +02:00
commit d73071b38e
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
languages/de_DE/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
// Translators: Admin (2480), dgrutsch (22) // Translators: Admin (2481), dgrutsch (22)
$text = array( $text = array(
'2_factor_auth' => '2-Faktor Authentifizierung', '2_factor_auth' => '2-Faktor Authentifizierung',
@ -1121,7 +1121,7 @@ URL: [url]',
'send_login_data_body' => 'Login-Daten 'send_login_data_body' => 'Login-Daten
Login: [login] Login: [login]
Name: [name] Name: [username]
[comment]', [comment]',
'send_login_data_subject' => '[sitename]: [login] - Ihre Login-Daten', 'send_login_data_subject' => '[sitename]: [login] - Ihre Login-Daten',

4
languages/en_GB/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // 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( $text = array(
'2_factor_auth' => '2-factor authentication', '2_factor_auth' => '2-factor authentication',
@ -1116,7 +1116,7 @@ URL: [url]',
'send_login_data_body' => 'Login data 'send_login_data_body' => 'Login data
Login: [login] Login: [login]
Name: [name] Name: [username]
[comment]', [comment]',
'send_login_data_subject' => '[sitename]: [login] - Your login data', 'send_login_data_subject' => '[sitename]: [login] - Your login data',

12
languages/fr_FR/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // 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( $text = array(
'2_factor_auth' => 'Authentification forte', '2_factor_auth' => 'Authentification forte',
@ -1063,11 +1063,11 @@ URL: [url]',
'select_workflow' => 'Choisir un workflow', 'select_workflow' => 'Choisir un workflow',
'send_email' => '', 'send_email' => '',
'send_login_data' => 'Envoyer les informations de connexion', 'send_login_data' => 'Envoyer les informations de connexion',
'send_login_data_body' => 'Informations de connexion 'send_login_data_body' => 'Informations de connexion
Identifiant : [login] Identifiant : [login]
Nom : [name] Nom : [username]
[comment]', [comment]',
'send_login_data_subject' => '[sitename] : [login] - Vos informations de connexion', 'send_login_data_subject' => '[sitename] : [login] - Vos informations de connexion',
'send_test_mail' => 'Envoyer un e-mail test', 'send_test_mail' => 'Envoyer un e-mail test',

5
op/op.UsrMgr.php
View File

@ -287,6 +287,11 @@ else if ($action == "sendlogindata" && $settings->_enableEmail) {
$userid = $_POST["userid"]; $userid = $_POST["userid"];
} }
$comment = '';
if (isset($_POST["comment"])) {
$comment = $_POST["comment"];
}
if (!isset($userid) || !is_numeric($userid) || intval($userid)<1) { if (!isset($userid) || !is_numeric($userid) || intval($userid)<1) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id")); UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
} }

5
views/bootstrap/class.SendLoginData.php
View File

@ -40,11 +40,6 @@ class SeedDMS_View_SendLoginData extends SeedDMS_Bootstrap_Style {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("send_login_data")); $this->contentHeading(getMLText("send_login_data"));
?>
<div class="alert">
<?php printMLText("confirm_transfer_objects", array ("username" => htmlspecialchars($newuser->getFullName())));?>
</div>
<?php
$this->contentContainerStart(); $this->contentContainerStart();
?> ?>
<form class="form-horizontal" action="../op/op.UsrMgr.php" name="form1" method="post"> <form class="form-horizontal" action="../op/op.UsrMgr.php" name="form1" method="post">