Menu
▾
▴
[Gemstracker-svn] SF.net SVN: gemstracker:[1060] trunk/library
|
From: <gem...@li...> - 2012-12-13 14:42:49
|
Revision: 1060
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1060&view=rev
Author: matijsdejong
Date: 2012-12-13 14:42:39 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
Fix for #535: password request can only be done from allowed addresses and when user is not blocked
Added logging to password reset actionLink(s)
Clarified reset password button in staff overview
Modified Paths:
--------------
trunk/library/classes/Gems/Default/IndexAction.php
trunk/library/classes/Gems/Default/StaffAction.php
trunk/library/classes/Gems/User/User.php
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/classes/Gems/Default/IndexAction.php
===================================================================
--- trunk/library/classes/Gems/Default/IndexAction.php 2012-12-13 13:13:53 UTC (rev 1059)
+++ trunk/library/classes/Gems/Default/IndexAction.php 2012-12-13 14:42:39 UTC (rev 1060)
@@ -326,6 +326,7 @@
{
$errors = array();
$form = $this->createResetRequestForm();
+ $logger = Gems_AccessLog::getLog($this->db);
$request = $this->getRequest();
if ($key = $this->_getParam('key')) {
@@ -333,8 +334,43 @@
if ($user->hasValidResetKey()) {
$form = $user->getChangePasswordForm(array('askOld' => false, 'askCheck' => true, 'labelWidthFactor' => $this->labelWidthFactor));
+
+ $result = $user->authenticate(null, false);
+ if (! $result->isValid()) {
+ $this->addMessage($result->getMessages());
+ $this->addMessage($this->_('For that reason you cannot reset your password.'));
+ return;
+ }
+
+ if (! $request->isPost()) {
+ $logger->log(
+ "index.resetpassword.clicked",
+ $request,
+ sprintf("User %s opened valid reset link.", $user->getLoginName()),
+ $user->getUserId(),
+ true
+ );
+ }
} else {
if (! $request->isPost()) {
+ if ($user->getLoginName()) {
+ $logger->log(
+ "index.resetpassword.old",
+ $request,
+ sprintf("User %s used old reset key.", $user->getLoginName()),
+ $user->getUserId(),
+ true
+ );
+ } else {
+ $logger->log(
+ "index.resetpassword.false",
+ $request,
+ sprintf("Someone used a non existent reset key.", $user->getLoginName()),
+ $user->getUserId(),
+ true
+ );
+ }
+
if ($user->hasPassword() || (! $user->isActive())) {
$errors[] = $this->_('Your password reset request is no longer valid, please request a new link.');
} else {
@@ -354,11 +390,42 @@
if ($form instanceof Gems_User_Form_ResetRequestForm) {
$user = $form->getUser();
+ $result = $user->authenticate(null, false);
+ if (! $result->isValid()) {
+ $this->addMessage($result->getMessages());
+ $this->addMessage($this->_('For that reason you cannot request a password reset.'));
+ return;
+ }
+
$errors = $this->sendUserResetEMail($user);
- if (! $errors) {
+ if ($errors) {
+ $logger->log(
+ "index.resetpassword.request.error",
+ $request,
+ sprintf(
+ "User %s requested reset password but got %d error(s). %s",
+ $form->getUserNameElement()->getValue(),
+ count($errors),
+ implode(' ', $errors)
+ ),
+ $user->getUserId(),
+ true
+ );
+
+ } else {
// Everything went OK!
- $this->addMessage($this->_('We sent you an e-mail with a reset link. Click on the link in the e-mail.'));
+ $this->addMessage($this->_(
+ 'We sent you an e-mail with a reset link. Click on the link in the e-mail.'
+ ));
+ $logger->log(
+ "index.resetpassword.request",
+ $request,
+ sprintf("User %s requested reset password.", $form->getUserNameElement()->getValue()),
+ $user->getUserId(),
+ true
+ );
+
if ($this->returnToLoginAfterReset) {
$this->setCurrentOrganizationTo($user);
$this->loader->getCurrentUser()->gotoStartPage($this->menu, $request);
@@ -370,7 +437,20 @@
// User set before this form was initiated
$user->setAsCurrentUser();
+
+ /**
+ * Log the login
+ */
+ $logger->log(
+ "index.loginreset",
+ $request,
+ "User logged in through reset password.",
+ $user->getUserId(),
+ true
+ );
+
$user->gotoStartPage($this->menu, $this->getRequest());
+ return;
}
}
Modified: trunk/library/classes/Gems/Default/StaffAction.php
===================================================================
--- trunk/library/classes/Gems/Default/StaffAction.php 2012-12-13 13:13:53 UTC (rev 1059)
+++ trunk/library/classes/Gems/Default/StaffAction.php 2012-12-13 14:42:39 UTC (rev 1060)
@@ -119,7 +119,7 @@
}
// Add reset button if allowed
if ($menuItem = $this->findAllowedMenuItem('reset')) {
- $bridge->addItemLink($menuItem->toActionLink($this->getRequest(), $bridge, $this->_('reset')));
+ $bridge->addItemLink($menuItem->toActionLink($this->getRequest(), $bridge, $this->_('password')));
}
}
Modified: trunk/library/classes/Gems/User/User.php
===================================================================
--- trunk/library/classes/Gems/User/User.php 2012-12-13 13:13:53 UTC (rev 1059)
+++ trunk/library/classes/Gems/User/User.php 2012-12-13 14:42:39 UTC (rev 1060)
@@ -331,11 +331,12 @@
* Authenticate a users credentials using the submitted form
*
* @param string $password The password to test
+ * @param boolean $testPassword Set to false to test the non-password checks only
* @return Zend_Auth_Result
*/
- public function authenticate($password)
+ public function authenticate($password, $testPassword = true)
{
- $auths = $this->loadAuthorizers($password);
+ $auths = $this->loadAuthorizers($password, $testPassword);
$lastAuthorizer = null;
foreach ($auths as $lastAuthorizer => $result) {
@@ -1146,9 +1147,10 @@
* is boolean, string or array it is converted into a Zend_Auth_Result.
*
* @param string $password
+ * @param boolean $testPassword Set to false to test on the non-password checks only
* @return array Of Callable|Zend_Auth_Adapter_Interface|Zend_Auth_Result|boolean|string|array
*/
- protected function loadAuthorizers($password)
+ protected function loadAuthorizers($password, $testPassword = true)
{
if ($this->isBlockable()) {
$auths['block'] = array($this, 'authorizeBlock');
@@ -1160,10 +1162,12 @@
// group ip restriction
$auths['ip'] = array($this, 'authorizeIp');
- if ($this->isActive()) {
- $auths['pwd'] = $this->definition->getAuthAdapter($this, $password);
- } else {
- $auths['pwd'] = false;
+ if ($testPassword) {
+ if ($this->isActive()) {
+ $auths['pwd'] = $this->definition->getAuthAdapter($this, $password);
+ } else {
+ $auths['pwd'] = false;
+ }
}
return $auths;
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-12-13 13:13:53 UTC (rev 1059)
+++ trunk/library/languages/default-en.po 2012-12-13 14:42:39 UTC (rev 1060)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-29 12:04+0100\n"
+"POT-Creation-Date: 2012-12-13 15:39+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -380,7 +380,7 @@
#: classes/Gems/Menu.php:578 classes/Gems/Default/GroupAction.php:122
#: classes/Gems/Default/OrganizationAction.php:154
-#: classes/Gems/Default/RespondentAction.php:470
+#: classes/Gems/Default/RespondentAction.php:462
msgid "Respondents"
msgstr "Patients"
@@ -404,7 +404,7 @@
msgid "Mail"
msgstr "Mail"
-#: classes/Gems/Menu.php:608 classes/Gems/Default/RespondentAction.php:364
+#: classes/Gems/Menu.php:608 classes/Gems/Default/RespondentAction.php:356
#: classes/Gems/Default/RespondentExportAction.php:60
msgid "Export respondent"
msgstr "Export respondent"
@@ -526,11 +526,11 @@
msgid "Unable to run PDF conversion (%s): \"%s\""
msgstr "Unable to run PDF conversion (%s): \"%s\""
-#: classes/Gems/Upgrades.php:90
+#: classes/Gems/Upgrades.php:91
msgid "Syncing surveys for all sources"
msgstr "Syncing surveys for all sources"
-#: classes/Gems/Upgrades.php:150 classes/Gems/Upgrades.php:162
+#: classes/Gems/Upgrades.php:151 classes/Gems/Upgrades.php:163
msgid "Make sure to read the changelog as it contains important instructions"
msgstr "Make sure to read the changelog as it contains important instructions"
@@ -649,9 +649,9 @@
msgstr "No"
#: classes/Gems/Controller/BrowseEditAction.php:875
-#: classes/Gems/Default/RespondentAction.php:254
-#: classes/Gems/Default/RespondentAction.php:347
-#: classes/Gems/Default/RespondentAction.php:540
+#: classes/Gems/Default/RespondentAction.php:246
+#: classes/Gems/Default/RespondentAction.php:339
+#: classes/Gems/Default/RespondentAction.php:515
#: classes/Gems/Default/TrackAction.php:554
#, php-format
msgid "Unknown %s requested"
@@ -681,7 +681,7 @@
msgstr "No changes to save."
#: classes/Gems/Controller/BrowseEditAction.php:954
-#: classes/Gems/Default/RespondentAction.php:315
+#: classes/Gems/Default/RespondentAction.php:307
msgid "Input error! No changes saved!"
msgstr "Input error! No changes saved!"
@@ -1330,35 +1330,43 @@
msgid "Good bye: %s."
msgstr "Good bye: %s."
-#: classes/Gems/Default/IndexAction.php:339
+#: classes/Gems/Default/IndexAction.php:341
+msgid "For that reason you cannot reset your password."
+msgstr "For that reason you cannot reset your password."
+
+#: classes/Gems/Default/IndexAction.php:375
msgid ""
"Your password reset request is no longer valid, please request a new link."
msgstr ""
"Your password reset request is no longer valid, please request a new link."
-#: classes/Gems/Default/IndexAction.php:341
+#: classes/Gems/Default/IndexAction.php:377
msgid ""
"Your password input request is no longer valid, please request a new link."
msgstr ""
"Your password input request is no longer valid, please request a new link."
-#: classes/Gems/Default/IndexAction.php:360
+#: classes/Gems/Default/IndexAction.php:396
+msgid "For that reason you cannot request a password reset."
+msgstr "For that reason you cannot request a password reset."
+
+#: classes/Gems/Default/IndexAction.php:418
msgid ""
"We sent you an e-mail with a reset link. Click on the link in the e-mail."
msgstr ""
"We sent you an e-mail with a reset link. Click on the link in the e-mail."
-#: classes/Gems/Default/IndexAction.php:369
+#: classes/Gems/Default/IndexAction.php:436
#: classes/Gems/Default/OptionAction.php:94
#: classes/Gems/Default/StaffAction.php:510
msgid "New password is active."
msgstr "New password is active."
-#: classes/Gems/Default/IndexAction.php:390
+#: classes/Gems/Default/IndexAction.php:470
msgid "Password reset requested"
msgstr "Password reset requested"
-#: classes/Gems/Default/IndexAction.php:393
+#: classes/Gems/Default/IndexAction.php:473
msgid ""
"Dear {greeting},\n"
"\n"
@@ -1721,7 +1729,7 @@
msgstr "Email servers"
#: classes/Gems/Default/MailTemplateAction.php:76
-#: classes/Gems/Default/RespondentAction.php:394
+#: classes/Gems/Default/RespondentAction.php:386
#: classes/Gems/Default/StaffAction.php:335
#: classes/Gems/Default/StaffAction.php:405
msgid "(all organizations)"
@@ -1747,7 +1755,7 @@
#: classes/Gems/Default/OptionAction.php:136
#: classes/Gems/Default/OrganizationAction.php:147
-#: classes/Gems/Default/RespondentAction.php:203
+#: classes/Gems/Default/RespondentAction.php:195
#: classes/Gems/Default/StaffAction.php:351
msgid "Language"
msgstr "Language"
@@ -2151,69 +2159,69 @@
msgstr[0] "reception code"
msgstr[1] "reception codes"
-#: classes/Gems/Default/RespondentAction.php:135
+#: classes/Gems/Default/RespondentAction.php:127
#, php-format
msgid "Random Example BSN: %s"
msgstr "Random Example BSN: %s"
-#: classes/Gems/Default/RespondentAction.php:137
+#: classes/Gems/Default/RespondentAction.php:129
msgid "Enter a 9-digit SSN number."
msgstr "Enter a 9-digit BSN number."
-#: classes/Gems/Default/RespondentAction.php:151
+#: classes/Gems/Default/RespondentAction.php:143
msgid "Identification"
msgstr "Identification"
-#: classes/Gems/Default/RespondentAction.php:162
+#: classes/Gems/Default/RespondentAction.php:154
msgid "SSN"
msgstr "BSN"
-#: classes/Gems/Default/RespondentAction.php:166
+#: classes/Gems/Default/RespondentAction.php:158
msgid "Patient number"
msgstr "Patient number"
-#: classes/Gems/Default/RespondentAction.php:175
+#: classes/Gems/Default/RespondentAction.php:167
msgid "Medical data"
msgstr "Medical data"
-#: classes/Gems/Default/RespondentAction.php:182
+#: classes/Gems/Default/RespondentAction.php:174
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:185
+#: classes/Gems/Default/RespondentAction.php:177
msgid "Contact information"
msgstr "Contact information"
-#: classes/Gems/Default/RespondentAction.php:190
+#: classes/Gems/Default/RespondentAction.php:182
msgid "Respondent has no e-mail"
msgstr "Patient has no e-mail"
-#: classes/Gems/Default/RespondentAction.php:191
+#: classes/Gems/Default/RespondentAction.php:183
msgid "With housenumber"
msgstr "With housenumber"
-#: classes/Gems/Default/RespondentAction.php:198
+#: classes/Gems/Default/RespondentAction.php:190
msgid "Country"
msgstr "Country"
-#: classes/Gems/Default/RespondentAction.php:202
+#: classes/Gems/Default/RespondentAction.php:194
msgid "Settings"
msgstr "Settings"
-#: classes/Gems/Default/RespondentAction.php:204
+#: classes/Gems/Default/RespondentAction.php:196
msgid "Has the respondent signed the informed consent letter?"
msgstr "Has the patient signed the informed consent letter?"
-#: classes/Gems/Default/RespondentAction.php:236
+#: classes/Gems/Default/RespondentAction.php:228
#: classes/Gems/Tracker/Model/StandardTokenModel.php:203
msgid "Comments"
msgstr "Comments"
-#: classes/Gems/Default/RespondentAction.php:237
+#: classes/Gems/Default/RespondentAction.php:229
msgid "Treatment"
msgstr "Treatment"
-#: classes/Gems/Default/RespondentAction.php:265
+#: classes/Gems/Default/RespondentAction.php:257
#: classes/Gems/Default/TrackAction.php:132
#: classes/Gems/Default/TrackAction.php:482
#: classes/Gems/Tracker/Model/StandardTokenModel.php:212
@@ -2222,30 +2230,30 @@
msgid "Rejection code"
msgstr "Rejection code"
-#: classes/Gems/Default/RespondentAction.php:272
+#: classes/Gems/Default/RespondentAction.php:264
msgid "Delete respondent"
msgstr "Delete patient"
-#: classes/Gems/Default/RespondentAction.php:304
+#: classes/Gems/Default/RespondentAction.php:296
msgid "Respondent deleted."
msgstr "Patient deleted"
-#: classes/Gems/Default/RespondentAction.php:308
+#: classes/Gems/Default/RespondentAction.php:300
msgid "Respondent tracks stopped."
msgstr "Patient tracks stopped."
-#: classes/Gems/Default/RespondentAction.php:312
+#: classes/Gems/Default/RespondentAction.php:304
#: classes/Gems/Default/TrackAction.php:405
msgid "Choose a reception code to delete."
msgstr "Choose a reception code to delete."
-#: classes/Gems/Default/RespondentAction.php:465
+#: classes/Gems/Default/RespondentAction.php:457
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patient"
msgstr[1] "patients"
-#: classes/Gems/Default/RespondentAction.php:557
+#: classes/Gems/Default/RespondentAction.php:532
msgid "Please settle the informed consent form for this respondent."
msgstr "Please settle the informed consent form for this patient."
@@ -2515,8 +2523,8 @@
msgstr "Synchronize all sources."
#: classes/Gems/Default/StaffAction.php:122
-msgid "reset"
-msgstr "reset"
+msgid "password"
+msgstr "password"
#: classes/Gems/Default/StaffAction.php:164
msgid "Unsupported User Definition"
@@ -2543,7 +2551,7 @@
"User with id %s already exists but is deleted, do you want to reactivate the "
"account?"
-#: classes/Gems/Default/StaffAction.php:327 classes/Gems/User/User.php:1208
+#: classes/Gems/Default/StaffAction.php:327 classes/Gems/User/User.php:1212
#: classes/Gems/User/Form/OrganizationFormAbstract.php:232
msgid "Username"
msgstr "Username"
@@ -4471,33 +4479,33 @@
msgid "Shared secret"
msgstr "Shared secret"
-#: classes/Gems/User/User.php:407
+#: classes/Gems/User/User.php:408
#, php-format
msgid "Your account is temporarily blocked, please wait a minute."
msgid_plural "Your account is temporarily blocked, please wait %d minutes."
msgstr[0] "Your account is temporarily blocked, please wait a minute."
msgstr[1] "Your account is temporarily blocked, please wait %d minutes."
-#: classes/Gems/User/User.php:446 classes/Gems/User/User.php:473
+#: classes/Gems/User/User.php:447 classes/Gems/User/User.php:474
#: languages/FakeTranslations.php:47
msgid "You are not allowed to login from this location."
msgstr "You are not allowed to login from this location."
-#: classes/Gems/User/User.php:1187
+#: classes/Gems/User/User.php:1191
msgid "Your birthday"
msgstr "Your birthday"
-#: classes/Gems/User/User.php:1203
+#: classes/Gems/User/User.php:1207
#: classes/Gems/User/Form/ChangePasswordForm.php:163
#, php-format
msgid "%s is not correct."
msgstr "%s is not correct."
-#: classes/Gems/User/User.php:1288
+#: classes/Gems/User/User.php:1292
msgid "Trying to send a password reset to a user that cannot be reset."
msgstr "Trying to send a password reset to a user that cannot be reset."
-#: classes/Gems/User/User.php:1316
+#: classes/Gems/User/User.php:1320
msgid "Unable to send e-mail."
msgstr "Unable to send e-mail."
@@ -5176,6 +5184,9 @@
msgstr[1] ""
"After this survey there are another %d surveys we would like you to answer."
+#~ msgid "reset"
+#~ msgstr "reset"
+
#~ msgid "Show all stand alone surveys for this type"
#~ msgstr "Show all stand alone surveys for this type"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-12-13 13:13:53 UTC (rev 1059)
+++ trunk/library/languages/default-nl.po 2012-12-13 14:42:39 UTC (rev 1060)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-29 12:04+0100\n"
+"POT-Creation-Date: 2012-12-13 15:38+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -380,7 +380,7 @@
#: classes/Gems/Menu.php:578 classes/Gems/Default/GroupAction.php:122
#: classes/Gems/Default/OrganizationAction.php:154
-#: classes/Gems/Default/RespondentAction.php:470
+#: classes/Gems/Default/RespondentAction.php:462
msgid "Respondents"
msgstr "Patiënten"
@@ -404,7 +404,7 @@
msgid "Mail"
msgstr "Email"
-#: classes/Gems/Menu.php:608 classes/Gems/Default/RespondentAction.php:364
+#: classes/Gems/Menu.php:608 classes/Gems/Default/RespondentAction.php:356
#: classes/Gems/Default/RespondentExportAction.php:60
msgid "Export respondent"
msgstr "Exporteer patiënt"
@@ -526,11 +526,11 @@
msgid "Unable to run PDF conversion (%s): \"%s\""
msgstr "Kan PDF conversie (%s) niet starten: \"%s\""
-#: classes/Gems/Upgrades.php:90
+#: classes/Gems/Upgrades.php:91
msgid "Syncing surveys for all sources"
msgstr "Vragenlijsten synchroniseren voor alle bronnen."
-#: classes/Gems/Upgrades.php:150 classes/Gems/Upgrades.php:162
+#: classes/Gems/Upgrades.php:151 classes/Gems/Upgrades.php:163
msgid "Make sure to read the changelog as it contains important instructions"
msgstr "Lees de wijzigingen, er kunnen belangrijke aanwijzingen in staan"
@@ -649,9 +649,9 @@
msgstr "Nee"
#: classes/Gems/Controller/BrowseEditAction.php:875
-#: classes/Gems/Default/RespondentAction.php:254
-#: classes/Gems/Default/RespondentAction.php:347
-#: classes/Gems/Default/RespondentAction.php:540
+#: classes/Gems/Default/RespondentAction.php:246
+#: classes/Gems/Default/RespondentAction.php:339
+#: classes/Gems/Default/RespondentAction.php:515
#: classes/Gems/Default/TrackAction.php:554
#, php-format
msgid "Unknown %s requested"
@@ -681,7 +681,7 @@
msgstr "Geen verandering om op te slaan."
#: classes/Gems/Controller/BrowseEditAction.php:954
-#: classes/Gems/Default/RespondentAction.php:315
+#: classes/Gems/Default/RespondentAction.php:307
msgid "Input error! No changes saved!"
msgstr "Invoer fout! Veranderingen niet opgeslagen!"
@@ -1336,37 +1336,45 @@
msgid "Good bye: %s."
msgstr "Tot ziens: %s."
-#: classes/Gems/Default/IndexAction.php:339
+#: classes/Gems/Default/IndexAction.php:341
+msgid "For that reason you cannot reset your password."
+msgstr "Om die reden kunt u uw wachtwoord niet wijzigen."
+
+#: classes/Gems/Default/IndexAction.php:375
msgid ""
"Your password reset request is no longer valid, please request a new link."
msgstr ""
"Uw verzoek om een nieuw wachtwoord is niet meer geldig, maar u kan hieronder "
"een nieuwe link aanvragen."
-#: classes/Gems/Default/IndexAction.php:341
+#: classes/Gems/Default/IndexAction.php:377
msgid ""
"Your password input request is no longer valid, please request a new link."
msgstr ""
"Uw link om een wachtwoord in te voeren is niet meer geldig, maar u kan "
"hieronder een nieuwe link aanvragen."
-#: classes/Gems/Default/IndexAction.php:360
+#: classes/Gems/Default/IndexAction.php:396
+msgid "For that reason you cannot request a password reset."
+msgstr "Om die reden kunt u geen wachtwoord wijziging aanvragen."
+
+#: classes/Gems/Default/IndexAction.php:418
msgid ""
"We sent you an e-mail with a reset link. Click on the link in the e-mail."
msgstr ""
"We hebben u een email met reset link gestuurd. Klik op de link in de email."
-#: classes/Gems/Default/IndexAction.php:369
+#: classes/Gems/Default/IndexAction.php:436
#: classes/Gems/Default/OptionAction.php:94
#: classes/Gems/Default/StaffAction.php:510
msgid "New password is active."
msgstr "Nieuwe wachtwoord geactiveerd."
-#: classes/Gems/Default/IndexAction.php:390
+#: classes/Gems/Default/IndexAction.php:470
msgid "Password reset requested"
-msgstr "Wachtwoord reset aangevraagd"
+msgstr "Wachtwoord wijziging aangevraagd"
-#: classes/Gems/Default/IndexAction.php:393
+#: classes/Gems/Default/IndexAction.php:473
msgid ""
"Dear {greeting},\n"
"\n"
@@ -1730,7 +1738,7 @@
msgstr "Email servers"
#: classes/Gems/Default/MailTemplateAction.php:76
-#: classes/Gems/Default/RespondentAction.php:394
+#: classes/Gems/Default/RespondentAction.php:386
#: classes/Gems/Default/StaffAction.php:335
#: classes/Gems/Default/StaffAction.php:405
msgid "(all organizations)"
@@ -1756,7 +1764,7 @@
#: classes/Gems/Default/OptionAction.php:136
#: classes/Gems/Default/OrganizationAction.php:147
-#: classes/Gems/Default/RespondentAction.php:203
+#: classes/Gems/Default/RespondentAction.php:195
#: classes/Gems/Default/StaffAction.php:351
msgid "Language"
msgstr "Taal"
@@ -2162,69 +2170,69 @@
msgstr[0] "Ontvangst code"
msgstr[1] "Ontvangst code"
-#: classes/Gems/Default/RespondentAction.php:135
+#: classes/Gems/Default/RespondentAction.php:127
#, php-format
msgid "Random Example BSN: %s"
msgstr "Willekeurig voorbeeld BSN: %s"
-#: classes/Gems/Default/RespondentAction.php:137
+#: classes/Gems/Default/RespondentAction.php:129
msgid "Enter a 9-digit SSN number."
msgstr "Voer een BSN nummer van 9 cijfers in."
-#: classes/Gems/Default/RespondentAction.php:151
+#: classes/Gems/Default/RespondentAction.php:143
msgid "Identification"
msgstr "Identificatie"
-#: classes/Gems/Default/RespondentAction.php:162
+#: classes/Gems/Default/RespondentAction.php:154
msgid "SSN"
msgstr "SSN"
-#: classes/Gems/Default/RespondentAction.php:166
+#: classes/Gems/Default/RespondentAction.php:158
msgid "Patient number"
msgstr "Patiënt nummer"
-#: classes/Gems/Default/RespondentAction.php:175
+#: classes/Gems/Default/RespondentAction.php:167
msgid "Medical data"
msgstr "Medische gegevens"
-#: classes/Gems/Default/RespondentAction.php:182
+#: classes/Gems/Default/RespondentAction.php:174
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:185
+#: classes/Gems/Default/RespondentAction.php:177
msgid "Contact information"
msgstr "Contact informatie"
-#: classes/Gems/Default/RespondentAction.php:190
+#: classes/Gems/Default/RespondentAction.php:182
msgid "Respondent has no e-mail"
msgstr "Patiënt zonder email"
-#: classes/Gems/Default/RespondentAction.php:191
+#: classes/Gems/Default/RespondentAction.php:183
msgid "With housenumber"
msgstr "Met huisnummer"
-#: classes/Gems/Default/RespondentAction.php:198
+#: classes/Gems/Default/RespondentAction.php:190
msgid "Country"
msgstr "Land"
-#: classes/Gems/Default/RespondentAction.php:202
+#: classes/Gems/Default/RespondentAction.php:194
msgid "Settings"
msgstr "Instellingen"
-#: classes/Gems/Default/RespondentAction.php:204
+#: classes/Gems/Default/RespondentAction.php:196
msgid "Has the respondent signed the informed consent letter?"
msgstr "Heeft de patiënt het \"informed consent\" formulier ondertekend?"
-#: classes/Gems/Default/RespondentAction.php:236
+#: classes/Gems/Default/RespondentAction.php:228
#: classes/Gems/Tracker/Model/StandardTokenModel.php:203
msgid "Comments"
msgstr "Opmerkingen"
-#: classes/Gems/Default/RespondentAction.php:237
+#: classes/Gems/Default/RespondentAction.php:229
msgid "Treatment"
msgstr "Behandeling"
-#: classes/Gems/Default/RespondentAction.php:265
+#: classes/Gems/Default/RespondentAction.php:257
#: classes/Gems/Default/TrackAction.php:132
#: classes/Gems/Default/TrackAction.php:482
#: classes/Gems/Tracker/Model/StandardTokenModel.php:212
@@ -2233,30 +2241,30 @@
msgid "Rejection code"
msgstr "Afkeuringscode"
-#: classes/Gems/Default/RespondentAction.php:272
+#: classes/Gems/Default/RespondentAction.php:264
msgid "Delete respondent"
msgstr "Verwijder patiënt"
-#: classes/Gems/Default/RespondentAction.php:304
+#: classes/Gems/Default/RespondentAction.php:296
msgid "Respondent deleted."
msgstr "Patiënt verwijderd"
-#: classes/Gems/Default/RespondentAction.php:308
+#: classes/Gems/Default/RespondentAction.php:300
msgid "Respondent tracks stopped."
msgstr "Trajecten van patiënt zijn gestopt."
-#: classes/Gems/Default/RespondentAction.php:312
+#: classes/Gems/Default/RespondentAction.php:304
#: classes/Gems/Default/TrackAction.php:405
msgid "Choose a reception code to delete."
msgstr "Kies een ontvangst code om te verwijderen."
-#: classes/Gems/Default/RespondentAction.php:465
+#: classes/Gems/Default/RespondentAction.php:457
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patiënt"
msgstr[1] "patiënten"
-#: classes/Gems/Default/RespondentAction.php:557
+#: classes/Gems/Default/RespondentAction.php:532
msgid "Please settle the informed consent form for this respondent."
msgstr "A.u.b. het informed consent formulier doornemen met deze patiënt"
@@ -2529,8 +2537,8 @@
msgstr "Synchroniseer alle bronnen."
#: classes/Gems/Default/StaffAction.php:122
-msgid "reset"
-msgstr "herstellen"
+msgid "password"
+msgstr "wachtwoord"
#: classes/Gems/Default/StaffAction.php:164
msgid "Unsupported User Definition"
@@ -2559,7 +2567,7 @@
"Gebruiker met inlognaam %s bestaat al maar is verwijderd, wilt u het account "
"opnieuw activeren?"
-#: classes/Gems/Default/StaffAction.php:327 classes/Gems/User/User.php:1208
+#: classes/Gems/Default/StaffAction.php:327 classes/Gems/User/User.php:1212
#: classes/Gems/User/Form/OrganizationFormAbstract.php:232
msgid "Username"
msgstr "Gebruikersnaam"
@@ -3600,7 +3608,7 @@
#: classes/Gems/Menu/MenuAbstract.php:421
msgid "Reset password"
-msgstr "Reset wachtwoord"
+msgstr "Wijzig wachtwoord"
#: classes/Gems/Menu/MenuAbstract.php:448
msgid "Check status"
@@ -4511,7 +4519,7 @@
msgid "Shared secret"
msgstr "Shared secret"
-#: classes/Gems/User/User.php:407
+#: classes/Gems/User/User.php:408
#, php-format
msgid "Your account is temporarily blocked, please wait a minute."
msgid_plural "Your account is temporarily blocked, please wait %d minutes."
@@ -4520,26 +4528,26 @@
msgstr[1] ""
"Uw account is tijdelijk geblokkeerd. U kunt over %d minuten opnieuw inloggen."
-#: classes/Gems/User/User.php:446 classes/Gems/User/User.php:473
+#: classes/Gems/User/User.php:447 classes/Gems/User/User.php:474
#: languages/FakeTranslations.php:47
msgid "You are not allowed to login from this location."
msgstr "U kunt vanaf deze locatie niet inloggen."
-#: classes/Gems/User/User.php:1187
+#: classes/Gems/User/User.php:1191
msgid "Your birthday"
msgstr "Uw geboortedatum"
-#: classes/Gems/User/User.php:1203
+#: classes/Gems/User/User.php:1207
#: classes/Gems/User/Form/ChangePasswordForm.php:163
#, php-format
msgid "%s is not correct."
msgstr "%s is onjuist."
-#: classes/Gems/User/User.php:1288
+#: classes/Gems/User/User.php:1292
msgid "Trying to send a password reset to a user that cannot be reset."
msgstr "Het wachtwoord voor deze gebruiker kan niet gewijzigd worden."
-#: classes/Gems/User/User.php:1316
+#: classes/Gems/User/User.php:1320
msgid "Unable to send e-mail."
msgstr "Verzenden email mislukt."
@@ -5232,6 +5240,9 @@
msgstr[0] "Na deze vragenlijst hebben we nog één andere vragenlijst voor u."
msgstr[1] "Na deze vragenlijst hebben we nog %d andere vragenlijsten voor u."
+#~ msgid "reset"
+#~ msgstr "herstellen"
+
#~ msgid "Show all stand alone surveys for this type"
#~ msgstr "Toon alle antwoorden voor deze losse vragenlijst"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
