Menu
▾
▴
gemstracker-svn — Receive updates on svn commits
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(84) |
Oct
(70) |
Nov
(164) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(52) |
Feb
(77) |
Mar
(70) |
Apr
(58) |
May
(81) |
Jun
(74) |
Jul
(87) |
Aug
(30) |
Sep
(45) |
Oct
(37) |
Nov
(51) |
Dec
(31) |
| 2013 |
Jan
(47) |
Feb
(29) |
Mar
(40) |
Apr
(33) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gem...@li...> - 2012-05-03 09:15:28
|
Revision: 656
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=656&view=rev
Author: matijsdejong
Date: 2012-05-03 09:15:14 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Adapted inPasswordList() to respond correctly when asking for password rules instead of checking.
Improved display of violated rules for the current password.
Added warning / documentation for Versions.php / gems__patch_levels.10.sql link for new installations
Modified Paths:
--------------
trunk/library/classes/Gems/Default/IndexAction.php
trunk/library/classes/Gems/User/PasswordChecker.php
trunk/library/classes/Gems/Versions.php
trunk/library/configs/db/tables/gems__patch_levels.10.sql
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-05-03 09:05:15 UTC (rev 655)
+++ trunk/library/classes/Gems/Default/IndexAction.php 2012-05-03 09:15:14 UTC (rev 656)
@@ -214,6 +214,9 @@
if ($messages = $user->reportPasswordWeakness($request->getParam($form->passwordFieldName))) {
$user->setPasswordResetRequired(true);
$this->addMessage($this->_('Your password must be changed.'));
+ foreach ($messages as &$message) {
+ $message = ucfirst($message) . '.';
+ }
$this->addMessage($messages);
}
Modified: trunk/library/classes/Gems/User/PasswordChecker.php
===================================================================
--- trunk/library/classes/Gems/User/PasswordChecker.php 2012-05-03 09:05:15 UTC (rev 655)
+++ trunk/library/classes/Gems/User/PasswordChecker.php 2012-05-03 09:15:14 UTC (rev 656)
@@ -57,7 +57,7 @@
* @var Gems_Project_ProjectSettings
*/
protected $project;
-
+
/**
* @var Zend_Cache
*/
@@ -103,6 +103,44 @@
}
/**
+ * Tests if the password appears on a (weak) password list. The list should
+ * be a simpe newline separated list of (lowercase) passwords.
+ *
+ * @param string $parameter Filename of the password list, relative to APPLICATION_PATH
+ * @param string $password The password
+ */
+ protected function inPasswordList($parameter, $password)
+ {
+ if (empty($parameter)) {
+ return;
+ }
+
+ if ($this->cache) {
+ $passwordList = $this->cache->load('weakpasswordlist');
+ }
+
+ if (empty($passwordList)) {
+ $filename = APPLICATION_PATH . '/' . ltrim($parameter, '/');;
+
+ if (! file_exists($filename)) {
+ throw new Gems_Exception("Unable to load password list '{$filename}'");
+ }
+
+ $passwordList = explode("\n", file_get_contents($filename));
+
+ if ($this->cache) {
+ $this->cache->save($passwordList, 'weakpasswordlist');
+ }
+ }
+
+ if (null === $password) {
+ $this->_addError($this->translate->_('should not appear in the list of common passwords'));
+ } elseif (in_array(strtolower($password), $passwordList)) {
+ $this->_addError($this->translate->_('appears in the list of common passwords'));
+ }
+ }
+
+ /**
* Test the password for minimum number of lower case characters.
*
* @param mixed $parameter
@@ -216,42 +254,6 @@
}
}
}
-
- /**
- * Tests if the password appears on a (weak) password list. The list should
- * be a simpe newline separated list of (lowercase) passwords.
- *
- * @param string $parameter Filename of the password list, relative to APPLICATION_PATH
- * @param string $password The password
- */
- protected function inPasswordList($parameter, $password)
- {
- if (empty($parameter)) {
- return;
- }
-
- if ($this->cache) {
- $passwordList = $this->cache->load('weakpasswordlist');
- }
-
- if (empty($passwordList)) {
- $filename = APPLICATION_PATH . $parameter;
-
- if (!file_exists($filename)) {
- throw new Gems_Exception("Unable to load password list '{$filename}'");
- }
-
- $passwordList = explode("\n", file_get_contents($filename));
- }
-
- if (in_array(strtolower($password), $passwordList)) {
- $this->_addError($this->translate->_('should not appear in a list of common passwords'));
- }
-
- if ($this->cache) {
- $this->cache->save($passwordList, 'weakpasswordlist');
- }
- }
/**
* Check for password weakness.
Modified: trunk/library/classes/Gems/Versions.php
===================================================================
--- trunk/library/classes/Gems/Versions.php 2012-05-03 09:05:15 UTC (rev 655)
+++ trunk/library/classes/Gems/Versions.php 2012-05-03 09:15:14 UTC (rev 656)
@@ -41,21 +41,54 @@
*/
class Gems_Versions
{
+ /**
+ * Build number
+ *
+ * Primarily used for database patches
+ *
+ * @return int
+ */
public final function getBuild()
{
+ /**
+ * DO NOT FORGET !!! to update gems__patch_levels:
+ *
+ * For new installations the initial patch level should
+ * be THIS LEVEL.
+ *
+ * This means that future patches for the current level
+ * will be loaded, but that previous patches are ignored.
+ */
return 47;
}
+ /**
+ * The official Gems version number
+ *
+ * @return string
+ */
public final function getGemsVersion()
{
return '1.5.4';
}
+ /**
+ * An optionally project specific version number
+ *
+ * Can be overruled at project level
+ *
+ * @return string
+ */
public function getProjectVersion()
{
return $this->getGemsVersion();
}
+ /**
+ * The long string versions
+ *
+ * @return string
+ */
public function getVersion()
{
$version = $this->getProjectVersion();
Modified: trunk/library/configs/db/tables/gems__patch_levels.10.sql
===================================================================
--- trunk/library/configs/db/tables/gems__patch_levels.10.sql 2012-05-03 09:05:15 UTC (rev 655)
+++ trunk/library/configs/db/tables/gems__patch_levels.10.sql 2012-05-03 09:15:14 UTC (rev 656)
@@ -11,5 +11,5 @@
INSERT INTO gems__patch_levels (gpl_level, gpl_created)
VALUES
- (42, CURRENT_TIMESTAMP);
+ (47, CURRENT_TIMESTAMP);
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-05-03 09:05:15 UTC (rev 655)
+++ trunk/library/languages/default-en.po 2012-05-03 09:15:14 UTC (rev 656)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-26 13:30+0100\n"
+"POT-Creation-Date: 2012-05-03 10:48+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -620,7 +620,7 @@
msgid "The token %s does not exist (any more)."
msgstr "The token %s does not exist (any more)."
-#: classes/Gems/Default/AskAction.php:270
+#: classes/Gems/Default/AskAction.php:269
#, php-format
msgid "The survey for token %s is no longer active."
msgstr "The survey for token %s is no longer active."
@@ -3436,7 +3436,7 @@
msgstr "This survey can be answered until %s."
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:376
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1156
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1162
#, php-format
msgid "The '%s' survey is no longer active. The survey was removed from LimeSurvey!"
msgstr "The '%s' survey is no longer active. The survey was removed from LimeSurvey!"
@@ -3466,37 +3466,37 @@
msgstr "Required fields: %s"
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:466
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1309
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1315
#, php-format
msgid "The status of the '%s' survey has changed."
msgstr "The status of the '%s' survey has changed."
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:472
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1315
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1321
#, php-format
msgid "Survey '%s' IS NO LONGER ACTIVE!!!"
msgstr "Survey '%s' IS NO LONGER ACTIVE!!!"
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:478
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1321
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1327
#, php-format
msgid "The status of the '%s' survey has changed to '%s'."
msgstr "The status of the '%s' survey has changed to '%s'."
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:481
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1324
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1330
#, php-format
msgid "The status warning for the '%s' survey was removed."
msgstr "The status warning for the '%s' survey was removed."
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:487
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1330
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1336
#, php-format
msgid "The name of the '%s' survey has changed to '%s'."
msgstr "The name of the '%s' survey has changed to '%s'."
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:498
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1340
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1346
#, php-format
msgid "Imported the '%s' survey."
msgstr "Imported the '%s' survey."
@@ -3505,12 +3505,12 @@
msgid "Submitdate"
msgstr "Submitdate"
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1136
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1142
#, php-format
msgid "Updated %d Gems tokens to new token definition."
msgstr "Updated %d Gems tokens to new token definition."
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1291
+#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1297
#, php-format
msgid "Updated %d token to new token definition in survey '%s'."
msgid_plural "Updated %d tokens to new token definition in survey '%s'."
@@ -3605,59 +3605,67 @@
msgid "Unknown token."
msgstr "Unknown token."
-#: classes/Gems/User/PasswordChecker.php:95
+#: classes/Gems/User/PasswordChecker.php:100
#, php-format
msgid "should contain at least one uppercase character"
msgid_plural "should contain at least %d uppercase characters"
msgstr[0] "should contain at least one uppercase character"
msgstr[1] "should contain at least %d uppercase characters"
-#: classes/Gems/User/PasswordChecker.php:112
+#: classes/Gems/User/PasswordChecker.php:137
+msgid "should not appear in the list of common passwords"
+msgstr "should not appear in the list of common passwords"
+
+#: classes/Gems/User/PasswordChecker.php:139
+msgid "appears in the list of common passwords"
+msgstr "appears in the list of common passwords"
+
+#: classes/Gems/User/PasswordChecker.php:155
#, php-format
msgid "should contain at least one lowercase character"
msgid_plural "should contain at least %d lowercase characters"
msgstr[0] "should contain at least one lowercase character"
msgstr[1] "should contain at least %d lowercase characters"
-#: classes/Gems/User/PasswordChecker.php:127
+#: classes/Gems/User/PasswordChecker.php:170
#, php-format
msgid "should be at least %d characters long"
msgstr "should be at least %d characters long"
-#: classes/Gems/User/PasswordChecker.php:145
+#: classes/Gems/User/PasswordChecker.php:188
#, php-format
msgid "should contain at least one non alphabetic character"
msgid_plural "should contain at least %d non alphabetic characters"
msgstr[0] "should contain at least one non alphabetic character"
msgstr[1] "should contain at least %d non alphabetic characters"
-#: classes/Gems/User/PasswordChecker.php:148
+#: classes/Gems/User/PasswordChecker.php:191
msgid "should not contain non alphabetic characters"
msgstr "should not contain non alphabetic characters"
-#: classes/Gems/User/PasswordChecker.php:167
+#: classes/Gems/User/PasswordChecker.php:210
#, php-format
msgid "should contain at least one non alphanumeric character"
msgid_plural "should contain at least %d non alphanumeric characters"
msgstr[0] "should contain at least one non alphanumeric character"
msgstr[1] "should contain at least %d non alphanumeric characters"
-#: classes/Gems/User/PasswordChecker.php:170
+#: classes/Gems/User/PasswordChecker.php:213
msgid "should not contain non alphanumeric characters"
msgstr "should not contain non alphanumeric characters"
-#: classes/Gems/User/PasswordChecker.php:188
+#: classes/Gems/User/PasswordChecker.php:231
msgid "should not contain your login name"
msgstr "should not contain your login name"
-#: classes/Gems/User/PasswordChecker.php:207
+#: classes/Gems/User/PasswordChecker.php:250
#, php-format
msgid "should contain at least one number"
msgid_plural "should contain at least %d numbers"
msgstr[0] "should contain at least one number"
msgstr[1] "should contain at least %d numbers"
-#: classes/Gems/User/PasswordChecker.php:210
+#: classes/Gems/User/PasswordChecker.php:253
msgid "may not contain numbers"
msgstr "may not contain numbers"
@@ -3778,7 +3786,7 @@
msgid "Stop (per respondent or track only)"
msgstr "Stop (per patient or track only)"
-#: classes/Gems/Util/TrackData.php:132
+#: classes/Gems/Util/TrackData.php:147
msgid "Inactive"
msgstr "Inactive"
@@ -4048,24 +4056,19 @@
msgstr "Edit track"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:172
-#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:143
-#: snippets/DeleteTrackTokenSnippet.php:193
msgid "Edit token"
msgstr "Edit token"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:225
-#: snippets/DeleteTrackTokenSnippet.php:245
#, php-format
msgid "Redo of token %s."
msgstr "Redo of token %s."
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:228
-#: snippets/DeleteTrackTokenSnippet.php:248
msgid "Old comment:"
msgstr "Old comment:"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:249
-#: snippets/DeleteTrackTokenSnippet.php:269
#, php-format
msgid "Created replacement token %2$s for token %1$s."
msgstr "Created replacement token %2$s for token %1$s."
@@ -4092,6 +4095,7 @@
msgstr "Lists choices changed."
#: snippets/EditSingleSurveyTokenSnippet.php:132
+#: snippets/ShowSingleSurveyTokenSnippet.php:150
msgid "Show survey"
msgstr "Show survey"
@@ -4142,7 +4146,6 @@
msgstr "Selected surveys"
#: snippets/ShowSingleSurveyTokenSnippet.php:76
-#: snippets/ShowTrackTokenSnippet.php:77
msgid "Actions"
msgstr "Actions"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-05-03 09:05:15 UTC (rev 655)
+++ trunk/library/languages/default-nl.po 2012-05-03 09:15:14 UTC (rev 656)
@@ -1,5000 +1,5029 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: GemsTracker NL\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-02 09:39+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Michiel Rook <in...@to...>\n"
-"Language-Team: Erasmus MGZ <mat...@ma...>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Poedit-Language: Dutch\n"
-"X-Poedit-Country: NETHERLANDS\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Poedit-Basepath: ../\n"
-"X-Poedit-KeywordsList: plural:1,2\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: classes/GemsEscort.php:212
-#, php-format
-msgid "Path %s not writable"
-msgstr "Path %s niet schrijfbaar"
-
-#: classes/GemsEscort.php:750
-#, php-format
-msgid "You are logged in as %s"
-msgstr "Ingelogd als %s"
-
-#: classes/GemsEscort.php:752
-msgid "Logoff"
-msgstr "Uitloggen"
-
-#: classes/GemsEscort.php:755
-msgid "You are not logged in"
-msgstr "U bent niet ingelogd"
-
-#: classes/GemsEscort.php:939
-#, php-format
-msgid "User: %s"
-msgstr "Login: %s"
-
-#: classes/GemsEscort.php:964
-msgid "version"
-msgstr "versie"
-
-#: classes/GemsEscort.php:1395
-msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
-msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer uw gegevens en probeer a.u.b. opnieuw."
-
-#: classes/GemsEscort.php:1526
-msgid "Please check back later."
-msgstr "Probeer het later opnieuw."
-
-#: classes/GemsEscort.php:1528
-#: classes/GemsEscort.php:1533
-msgid "System is in maintenance mode"
-msgstr "Systeem is in onderhoudsmodus"
-
-#: classes/GemsEscort.php:1543
-msgid "No access to site."
-msgstr "Geen toegang tot website."
-
-#: classes/GemsEscort.php:1545
-msgid "You have no access to this site."
-msgstr "U heeft geen toegang tot deze website."
-
-#: classes/GemsEscort.php:1561
-msgid "No access to page"
-msgstr "Geen toegang tot pagina"
-
-#: classes/GemsEscort.php:1563
-#, php-format
-msgid "Access to this page is not allowed for current role: %s."
-msgstr "U heeft geen toegang tot deze pagina. Uw huidige rol is: %s."
-
-#: classes/GemsEscort.php:1573
-msgid "You are no longer logged in."
-msgstr "U bent niet meer ingelogd."
-
-#: classes/GemsEscort.php:1574
-msgid "You must login to access this page."
-msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
-
-#: classes/GemsEscort.php:1714
-#, php-format
-msgid "%d survey"
-msgid_plural "%d surveys"
-msgstr[0] "%d vragenlijst"
-msgstr[1] "%d vragenlijsten"
-
-#: classes/Gems/Pdf.php:198
-#, php-format
-msgid "PDF Source File '%s' not found!"
-msgstr "PDF bron bestand %s niet gevonden!"
-
-#: classes/Gems/Pdf.php:240
-#, php-format
-msgid "Could not create '%s' directory."
-msgstr "Kon de directory '%s' niet aanmaken."
-
-#: classes/Gems/Pdf.php:283
-#, php-format
-msgid " The error message is: %s"
-msgstr "De foutmelding is: %s"
-
-#: classes/Gems/Tracker.php:771
-msgid "Checks performed"
-msgstr "Controle uitgevoerd"
-
-#: classes/Gems/Upgrades.php:77
-msgid "Syncing surveys for all sources"
-msgstr "Vragenlijsten synchroniseren voor alle bronnen."
-
-#: classes/Gems/AccessLog.php:236
-msgid "Database needs to be updated!"
-msgstr "Database dient ververst te worden!"
-
-#: classes/Gems/Html.php:154
-msgid "<< First"
-msgstr "<< Eerste"
-
-#: classes/Gems/Html.php:155
-msgid "< Previous"
-msgstr "< Terug"
-
-#: classes/Gems/Html.php:156
-msgid "Next >"
-msgstr "Verder >"
-
-#: classes/Gems/Html.php:157
-msgid "Last >>"
-msgstr "Laatste >>"
-
-#: classes/Gems/Html.php:158
-msgid " | "
-msgstr " | "
-
-#: classes/Gems/Html.php:162
-msgid "to"
-msgstr "tot"
-
-#: classes/Gems/Html.php:163
-msgid "of"
-msgstr "van"
-
-#: classes/Gems/Menu.php:140
-#, php-format
-msgid "About %s"
-msgstr "Over %s"
-
-#: classes/Gems/Menu.php:144
-msgid "Reporting bugs"
-msgstr "Meld een bug"
-
-#: classes/Gems/Menu.php:147
-msgid "Support"
-msgstr "Ondersteuning"
-
-#: classes/Gems/Menu.php:167
-msgid "Project setup"
-msgstr "Projectinfo"
-
-#: classes/Gems/Menu.php:170
-msgid "Database"
-msgstr "Database"
-
-#: classes/Gems/Menu.php:174
-msgid "Content"
-msgstr "Inhoud"
-
-#: classes/Gems/Menu.php:177
-msgid "Execute"
-msgstr "Uitvoeren"
-
-#: classes/Gems/Menu.php:182
-msgid "Patches"
-msgstr "Patches"
-
-#: classes/Gems/Menu.php:183
-msgid "Execute new"
-msgstr "Nieuwe aanmaken"
-
-#: classes/Gems/Menu.php:185
-msgid "Refresh translateables"
-msgstr "Ververs vertaalbaren"
-
-#: classes/Gems/Menu.php:187
-msgid "Run SQL"
-msgstr "SQL uitvoeren"
-
-#: classes/Gems/Menu.php:190
-msgid "Reception codes"
-msgstr "Ontvangst codes"
-
-#: classes/Gems/Menu.php:193
-msgid "Consents"
-msgstr "Toestemmingen"
-
-#: classes/Gems/Menu.php:196
-msgid "Roles"
-msgstr "Rollen"
-
-#: classes/Gems/Menu.php:197
-msgid "Assigned"
-msgstr "Toegewezen"
-
-#: classes/Gems/Menu.php:198
-msgid "Privileges"
-msgstr "Priviléges"
-
-#: classes/Gems/Menu.php:201
-msgid "Groups"
-msgstr "Groepen"
-
-#: classes/Gems/Menu.php:204
-msgid "Organizations"
-msgstr "Organisaties"
-
-#: classes/Gems/Menu.php:207
-msgid "Staff"
-msgstr "Medewerkers"
-
-#: classes/Gems/Menu.php:210
-msgid "Logging"
-msgstr "Logboek"
-
-#: classes/Gems/Menu.php:214
-msgid "Maintenance"
-msgstr "Onderhoud"
-
-#: classes/Gems/Menu.php:219
-msgid "Upgrade"
-msgstr "Upgrade"
-
-#: classes/Gems/Menu.php:220
-msgid "Show"
-msgstr "Toon"
-
-#: classes/Gems/Menu.php:221
-msgid "Execute all"
-msgstr "Alles uitvoeren"
-
-#: classes/Gems/Menu.php:222
-msgid "Execute this"
-msgstr "Dit uitvoeren"
-
-#: classes/Gems/Menu.php:223
-msgid "Execute from here"
-msgstr "Uitvoeren vanaf hier"
-
-#: classes/Gems/Menu.php:224
-msgid "Execute to here"
-msgstr "Uitvoeren tot hier"
-
-#: classes/Gems/Menu.php:236
-#, php-format
-msgid "Stand-alone privilige: %s"
-msgstr "Zelfstandig privilege: %s"
-
-#: classes/Gems/Menu.php:243
-msgid "Logon"
-msgstr "Login"
-
-#: classes/Gems/Menu.php:244
-msgid "Lost password"
-msgstr "Wachtwoord vergeten"
-
-#: classes/Gems/Menu.php:245
-msgid "Your account"
-msgstr "Uw account"
-
-#: classes/Gems/Menu.php:246
-msgid "Activity overview"
-msgstr "Activiteiten overzicht"
-
-#: classes/Gems/Menu.php:247
-msgid "Change password"
-msgstr "Uw wachtwoord"
-
-#: classes/Gems/Menu.php:248
-#: classes/Gems/Menu.php:323
-msgid "Token"
-msgstr "Kenmerk"
-
-#: classes/Gems/Menu.php:284
-msgid "Track"
-msgstr "Traject"
-
-#: classes/Gems/Menu.php:291
-#: classes/Gems/Menu.php:342
-msgid "Add"
-msgstr "Voeg toe"
-
-#: classes/Gems/Menu.php:295
-msgid "Preview"
-msgstr "Preview"
-
-#: classes/Gems/Menu.php:302
-msgid "Tracks"
-msgstr "Trajecten"
-
-#: classes/Gems/Menu.php:315
-msgid "Assignments"
-msgstr "Toewijzingen"
-
-#: classes/Gems/Menu.php:327
-msgid "Edit"
-msgstr "Wijzig"
-
-#: classes/Gems/Menu.php:331
-msgid "Delete"
-msgstr "Verwijder"
-
-#: classes/Gems/Menu.php:336
-msgid "Surveys"
-msgstr "Vragenlijsten"
-
-#: classes/Gems/Menu.php:368
-msgid "Fill in"
-msgstr "Vul in"
-
-#: classes/Gems/Menu.php:371
-msgid "Print PDF"
-msgstr "Print PDF"
-
-#: classes/Gems/Menu.php:374
-msgid "E-Mail now!"
-msgstr "Email nu!"
-
-#: classes/Gems/Menu.php:380
-msgid "Answers"
-msgstr "Antwoorden"
-
-#: classes/Gems/Menu.php:530
-msgid "Respondents"
-msgstr "Patiënten"
-
-#: classes/Gems/Menu.php:538
-msgid "Overview"
-msgstr "Overzicht"
-
-#: classes/Gems/Menu.php:545
-msgid "Project"
-msgstr "Project"
-
-#: classes/Gems/Menu.php:548
-msgid "Setup"
-msgstr "Beheer"
-
-#: classes/Gems/Menu.php:551
-msgid "Mail"
-msgstr "Email"
-
-#: classes/Gems/Menu.php:554
-msgid "Track Builder"
-msgstr "Traject bouwer"
-
-#: classes/Gems/Menu.php:563
-msgid "Contact"
-msgstr "Contact"
-
-#: classes/Gems/Menu.php:576
-msgid "Changelog"
-msgstr "Changelog"
-
-#: classes/Gems/Model.php:205
-msgid "Respondent nr"
-msgstr "Patiënt nr"
-
-#: classes/Gems/Model.php:206
-msgid "Opened"
-msgstr "Bekeken op"
-
-#: classes/Gems/Model.php:207
-msgid "Consent"
-msgstr "Toestemming"
-
-#: classes/Gems/Model.php:209
-msgid "E-Mail"
-msgstr "Email"
-
-#: classes/Gems/Model.php:214
-msgid "Gender"
-msgstr "Geslacht"
-
-#: classes/Gems/Model.php:215
-msgid "First name"
-msgstr "Voornaam"
-
-#: classes/Gems/Model.php:216
-msgid "Surname prefix"
-msgstr "Tussenvoegsel"
-
-#: classes/Gems/Model.php:217
-msgid "Last name"
-msgstr "Achternaam"
-
-#: classes/Gems/Model.php:219
-msgid "Name"
-msgstr "Naam"
-
-#: classes/Gems/Model.php:222
-msgid "Street"
-msgstr "Straat"
-
-#: classes/Gems/Model.php:223
-msgid "Zipcode"
-msgstr "Postcode"
-
-#: classes/Gems/Model.php:224
-msgid "City"
-msgstr "Woonplaats"
-
-#: classes/Gems/Model.php:226
-msgid "Phone"
-msgstr "Telefoon"
-
-#: classes/Gems/Model.php:228
-msgid "Birthday"
-msgstr "Geboren op"
-
-#: classes/Gems/UpgradesAbstract.php:154
-msgid "Already at max. level."
-msgstr "Al op het hoogste niveau."
-
-#: classes/Gems/UpgradesAbstract.php:161
-#, php-format
-msgid "Trying upgrade for %s from level %s to level %s"
-msgstr "Probeert upgrade voor %s van niveau %s naar niveau %s uit te voeren"
-
-#: classes/Gems/UpgradesAbstract.php:169
-#, php-format
-msgid "Trying upgrade for %s to level %s: %s"
-msgstr "Probeert upgrade voor %s naar niveau %s: %s"
-
-#: classes/Gems/Model/DbaModel.php:97
-msgid "created"
-msgstr "bestaat"
-
-#: classes/Gems/Model/DbaModel.php:98
-msgid "not created"
-msgstr "niet aanwezig"
-
-#: classes/Gems/Model/DbaModel.php:99
-msgid "unknown"
-msgstr "onbekend"
-
-#: classes/Gems/Model/DbaModel.php:420
-#, php-format
-msgid "Executed %2$s creation script %1$s:"
-msgstr "Uitvoerresultaat %2$s script %1$s:"
-
-#: classes/Gems/Model/DbaModel.php:430
-#, php-format
-msgid "%d record(s) returned as result set %d in step %d of %d."
-msgstr "%d rij(en) in resultaat %d in stap %d van %d."
-
-#: classes/Gems/Model/DbaModel.php:434
-#, php-format
-msgid "%d record(s) updated in step %d of %d."
-msgstr "In stap %2$d van %3$d zijn %1$d rij(en) aangepast."
-
-#: classes/Gems/Model/DbaModel.php:437
-#, php-format
-msgid "Script ran step %d of %d succesfully."
-msgstr "Stap %d van %d in het script met succes uitgevoerd."
-
-#: classes/Gems/Model/DbaModel.php:440
-msgid " in step "
-msgstr " in stap "
-
-#: classes/Gems/Model/DbaModel.php:445
-#, php-format
-msgid "No script for %1$s."
-msgstr "Geen script voor %1$s:"
-
-#: classes/Gems/Export/Spss.php:59
-msgid "Which file"
-msgstr "Kies bestand"
-
-#: classes/Gems/Export/Spss.php:60
-msgid "syntax"
-msgstr "syntax"
-
-#: classes/Gems/Export/Spss.php:61
-msgid "data"
-msgstr "data"
-
-#: classes/Gems/Export/Spss.php:66
-msgid "Some help for this export"
-msgstr "Uitleg over deze export mogelijkheid"
-
-#: classes/Gems/Export/Excel.php:60
-msgid "Excel options"
-msgstr "Excel opties"
-
-#: classes/Gems/Export/Excel.php:62
-msgid "Export questions instead of variable names"
-msgstr "Exporteer vragen in plaats van variabele namen"
-
-#: classes/Gems/Export/Excel.php:63
-msgid "Format answers"
-msgstr "Antwoorden opmaken"
-
-#: classes/Gems/Util/Translated.php:81
-msgid "-"
-msgstr "n.v.t."
-
-#: classes/Gems/Util/Translated.php:96
-msgid "forever"
-msgstr "altijd"
-
-#: classes/Gems/Util/Translated.php:105
-msgid "n/a"
-msgstr "n.v.t."
-
-#: classes/Gems/Util/Translated.php:114
-msgid "never"
-msgstr "nooit"
-
-#: classes/Gems/Util/Translated.php:139
-msgid "2 days ago"
-msgstr "Eergisteren"
-
-#: classes/Gems/Util/Translated.php:142
-msgid "Yesterday"
-msgstr "Gisteren"
-
-#: classes/Gems/Util/Translated.php:145
-msgid "Today"
-msgstr "Vandaag"
-
-#: classes/Gems/Util/Translated.php:148
-msgid "Tomorrow"
-msgstr "Morgen"
-
-#: classes/Gems/Util/Translated.php:151
-msgid "Over 2 days"
-msgstr "Overmorgen"
-
-#: classes/Gems/Util/Translated.php:156
-#, php-format
-msgid "Over %d days"
-msgstr "Over %d dagen"
-
-#: classes/Gems/Util/Translated.php:158
-#, php-format
-msgid "%d days ago"
-msgstr "%d dagen terug"
-
-#: classes/Gems/Util/Translated.php:177
-msgid "Send multiple mails per respondent, one for each checked token."
-msgstr "Verstuur meerdere emails per patiënt, één per gekozen kenmerk."
-
-#: classes/Gems/Util/Translated.php:178
-msgid "Send one mail per respondent, mark all checked tokens as send."
-msgstr "Verstuur één email per patiënt, zet alle gekozen kenmerken op verzonden."
-
-#: classes/Gems/Util/Translated.php:179
-msgid "Send one mail per respondent, mark only mailed tokens as send."
-msgstr "Verstuur één email per patiënt, zet alleen de verzonden kenmerken op verzonden."
-
-#: classes/Gems/Util/Translated.php:204
-msgid "Male"
-msgstr "Man"
-
-#: classes/Gems/Util/Translated.php:204
-msgid "Female"
-msgstr "Vrouw"
-
-#: classes/Gems/Util/Translated.php:204
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: classes/Gems/Util/Translated.php:217
-msgid "mr."
-msgstr "meneer"
-
-#: classes/Gems/Util/Translated.php:217
-msgid "mrs."
-msgstr "mevrouw"
-
-#: classes/Gems/Util/Translated.php:217
-msgid "mr./mrs."
-msgstr "de heer/mevrouw"
-
-#: classes/Gems/Util/Translated.php:230
-msgid "Mr."
-msgstr "De heer"
-
-#: classes/Gems/Util/Translated.php:230
-msgid "Mrs."
-msgstr "Mevrouw"
-
-#: classes/Gems/Util/Translated.php:230
-msgid "Mr./Mrs."
-msgstr "De heer/Mevrouw"
-
-#: classes/Gems/Util/Translated.php:238
-msgid "Yes"
-msgstr "Ja"
-
-#: classes/Gems/Util/Translated.php:238
-#: classes/Gems/Util/ReceptionCodeLibrary.php:99
-#: classes/Gems/Util/ReceptionCodeLibrary.php:123
-msgid "No"
-msgstr "Nee"
-
-#: classes/Gems/Util/TrackData.php:147
-msgid "Active"
-msgstr "Actief"
-
-#: classes/Gems/Util/TrackData.php:147
-msgid "Inactive"
-msgstr "Inactief"
-
-#: classes/Gems/Util/ReceptionCodeLibrary.php:100
-msgid "Yes (forget answers)"
-msgstr "Ja (vergeet antwoorden)"
-
-#: classes/Gems/Util/ReceptionCodeLibrary.php:101
-msgid "Yes (keep answers)"
-msgstr "Ja (met behoud van antwoorden)"
-
-#: classes/Gems/Util/ReceptionCodeLibrary.php:124
-msgid "Yes (individual surveys only)"
-msgstr "Ja (alleen zelfstandige vragenlijsten)"
-
-#: classes/Gems/Util/ReceptionCodeLibrary.php:125
-msgid "Stop (per respondent or track only)"
-msgstr "Stop (alleen per patiënt og traject)"
-
-#: classes/Gems/Controller/ModelActionAbstract.php:97
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:228
-#: classes/Gems/Controller/BrowseEditAction.php:354
-#, php-format
-msgid "New %s..."
-msgstr "Nieuwe %s..."
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:238
-#, php-format
-msgid "Do you want to delete this %s?"
-msgstr "Weet u zeker dat deze %s verwijderd moet worden?"
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:248
-#: classes/Gems/Controller/BrowseEditAction.php:387
-#, php-format
-msgid "Delete %s"
-msgstr "Verwijder %s"
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:258
-#, php-format
-msgid "Edit %s..."
-msgstr "Bewerk %s..."
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:271
-msgid "No data found."
-msgstr "Geen gegevens gevonden."
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:333
-#, php-format
-msgid "No %s found..."
-msgstr "Geen %s gevonden..."
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:343
-#, php-format
-msgid "Showing %s"
-msgstr "Toon %s"
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:379
-msgid "item"
-msgid_plural "items"
-msgstr[0] "item"
-msgstr[1] "items"
-
-#: classes/Gems/Controller/BrowseEditAction.php:391
-#, php-format
-msgid "%2$u %1$s deleted"
-msgstr "%2$u %1$s verwijderd"
-
-#: classes/Gems/Controller/BrowseEditAction.php:405
-#, php-format
-msgid "Edit %s"
-msgstr "Bewerk %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:502
-msgid "Free search text"
-msgstr "Vrije zoek tekst"
-
-#: classes/Gems/Controller/BrowseEditAction.php:573
-msgid "Search"
-msgstr "Zoeken"
-
-#: classes/Gems/Controller/BrowseEditAction.php:589
-#, php-format
-msgid "No %s found"
-msgstr "Geen %s gevonden"
-
-#: classes/Gems/Controller/BrowseEditAction.php:673
-#, php-format
-msgid "No %s found."
-msgstr "Geen %s gevonden."
-
-#: classes/Gems/Controller/BrowseEditAction.php:791
-msgid "Are you sure?"
-msgstr "Weet u het zeker?"
-
-#: classes/Gems/Controller/BrowseEditAction.php:861
-#, php-format
-msgid "Unknown %s requested"
-msgstr "Onjuist %s verzoek"
-
-#: classes/Gems/Controller/BrowseEditAction.php:884
-#, php-format
-msgid "New %1$s..."
-msgstr "Nieuwe %1$s..."
-
-#: classes/Gems/Controller/BrowseEditAction.php:892
-msgid "Save"
-msgstr "Opslaan"
-
-#: classes/Gems/Controller/BrowseEditAction.php:928
-#, php-format
-msgid "%2$u %1$s saved"
-msgstr "%2$u %1$s opgeslagen"
-
-#: classes/Gems/Controller/BrowseEditAction.php:931
-msgid "No changes to save."
-msgstr "Geen verandering om op te slaan."
-
-#: classes/Gems/Controller/BrowseEditAction.php:940
-msgid "Input error! No changes saved!"
-msgstr "Invoer fout! Veranderingen niet opgeslagen!"
-
-#: classes/Gems/Controller/BrowseEditAction.php:968
-#, php-format
-msgid "Show %s"
-msgstr "Toon %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:975
-#, php-format
-msgid "Unknown %s."
-msgstr "%s is onbekend."
-
-#: classes/Gems/Controller/Action/Helper/BatchRunner.php:65
-msgid "Prepare recheck"
-msgstr "Hercontrole voorbereiden"
-
-#: classes/Gems/Controller/Action/Helper/BatchRunner.php:68
-#, php-format
-msgid "Start %s jobs"
-msgstr "Start %s opdrachten"
-
-#: classes/Gems/Controller/Action/Helper/BatchRunner.php:71
-msgid "Nothing to do."
-msgstr "Niets te doen."
-
-#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:59
-msgid "+"
-msgstr "+"
-
-#: classes/Gems/Email/MailTemplateForm.php:56
-msgid "Send (test)"
-msgstr "Verstuur (test)"
-
-#: classes/Gems/Email/MailTemplateForm.php:81
-#: classes/Gems/Email/EmailFormAbstract.php:193
-#: classes/Gems/Email/EmailFormAbstract.php:251
-msgid "From"
-msgstr "Van"
-
-#: classes/Gems/Email/MailTemplateForm.php:95
-msgid "Test using"
-msgstr "Test met"
-
-#: classes/Gems/Email/MailTemplateForm.php:124
-msgid "To (test)"
-msgstr "Aan (test)"
-
-#: classes/Gems/Email/MailTemplateForm.php:168
-msgid "Test mail send, changes not saved!"
-msgstr "Test email verstuurd. De veranderingen zijn nog niet opgeslagen!"
-
-#: classes/Gems/Email/EmailFormAbstract.php:101
-msgid "no email adress"
-msgstr "geen email adres"
-
-#: classes/Gems/Email/EmailFormAbstract.php:145
-msgid "Available fields"
-msgstr "Beschikbare velden"
-
-#: classes/Gems/Email/EmailFormAbstract.php:153
-msgid "BBCode"
-msgstr "BBCode"
-
-#: classes/Gems/Email/EmailFormAbstract.php:168
-msgid "Message"
-msgstr "Bericht"
-
-#: classes/Gems/Email/EmailFormAbstract.php:216
-msgid "Organization does not have an e-mail address."
-msgstr "Organisatie heeft geen email adres."
-
-#: classes/Gems/Email/EmailFormAbstract.php:231
-msgid "You do not have an e-mail address."
-msgstr "U heeft geen email adres."
-
-#: classes/Gems/Email/EmailFormAbstract.php:291
-msgid "Preview HTML"
-msgstr "Html voorbeeld"
-
-#: classes/Gems/Email/EmailFormAbstract.php:300
-msgid "Preview text"
-msgstr "Tekstvoorbeeld"
-
-#: classes/Gems/Email/EmailFormAbstract.php:308
-msgid "Template"
-msgstr "Sjabloon"
-
-#: classes/Gems/Email/EmailFormAbstract.php:332
-msgid "Send"
-msgstr "Verstuur"
-
-#: classes/Gems/Email/EmailFormAbstract.php:349
-msgid "Subject"
-msgstr "Onderwerp"
-
-#: classes/Gems/Email/EmailFormAbstract.php:429
-msgid "Input error! No changes made!"
-msgstr "Invoer fout! Veranderingen niet uitgevoerd!"
-
-#: classes/Gems/Email/EmailFormAbstract.php:446
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: classes/Gems/Email/EmailFormAbstract.php:474
-msgid "Field"
-msgstr "Veld"
-
-#: classes/Gems/Email/EmailFormAbstract.php:475
-msgid "Value"
-msgstr "waarde"
-
-#: classes/Gems/Email/EmailFormAbstract.php:478
-msgid "BBCode info page"
-msgstr "BBCode info pagina"
-
-#: classes/Gems/Email/OneMailForm.php:47
-#: classes/Gems/Email/MultiMailForm.php:49
-msgid "On this test system all mail will be delivered to the from address."
-msgstr "Op dit test systeem worden alle emails gestuurd naar het \"van\" adres."
-
-#: classes/Gems/Email/OneMailForm.php:55
-msgid "Round"
-msgstr "Ronde"
-
-#: classes/Gems/Email/OneMailForm.php:57
-msgid "Survey"
-msgstr "Vragenlijst"
-
-#: classes/Gems/Email/OneMailForm.php:58
-msgid "Last contact"
-msgstr "Contactdatum"
-
-#: classes/Gems/Email/OneMailForm.php:87
-#: classes/Gems/Email/MultiMailForm.php:101
-msgid "To"
-msgstr "Aan"
-
-#: classes/Gems/Email/OneMailForm.php:131
-#: classes/Gems/Email/TemplateMailer.php:217
-msgid "The sending of emails was blocked for this installation."
-msgstr "Het versturen van emails is geblokkeerd in deze installatie."
-
-#: classes/Gems/Email/OneMailForm.php:141
-#: classes/Gems/Email/TemplateMailer.php:250
-msgid "Mail failed to send."
-msgstr "Mail sturen mislukt."
-
-#: classes/Gems/Email/OneMailForm.php:145
-#, php-format
-msgid "Sent email to %s."
-msgstr "Email naar %s verzonden."
-
-#: classes/Gems/Email/TemplateMailer.php:266
-#, php-format
-msgid "Sent %d e-mails, updated %d tokens."
-msgstr "%d emails verzonden en %d kenmerken bijgewerkt."
-
-#: classes/Gems/Email/MultiMailForm.php:75
-msgid "Method"
-msgstr "Methode"
-
-#: classes/Gems/Email/MultiMailForm.php:122
-msgid "Survey has been taken."
-msgstr "Vragenlijsten is al afgenomen"
-
-#: classes/Gems/Email/MultiMailForm.php:125
-msgid "Respondent does not have an e-mail address."
-msgstr "Patiënt heeft geen email adres"
-
-#: classes/Gems/Email/MultiMailForm.php:128
-msgid "Survey cannot be taken by a respondent."
-msgstr "Deze vragenlijst kan niet door een patiënt ingevuld worden."
-
-#: classes/Gems/Email/MultiMailForm.php:130
-msgid "Survey cannot be taken at this moment."
-msgstr "Deze vragenlijst kan op dit moment niet afgenomen worden."
-
-#: classes/Gems/Tracker/ChangeTracker.php:64
-#, php-format
-msgid "Checked %d tracks."
-msgstr "%d trajecten gecontroleerd."
-
-#: classes/Gems/Tracker/ChangeTracker.php:67
-#, php-format
-msgid "Checked %d tokens."
-msgstr "%d kenmerken gecontroleerd."
-
-#: classes/Gems/Tracker/ChangeTracker.php:72
-#, php-format
-msgid "Answers changed by survey completion event for %d tokens."
-msgstr "Bij %d kenmerken zijn de antwoorden aangepast door vragenlijst afrondingscode."
-
-#: classes/Gems/Tracker/ChangeTracker.php:75
-#, php-format
-msgid "Results and timing changed for %d tokens."
-msgstr "Bij %d kenmerken zijn de resultaten en/of de tijdstippen aangepast."
-
-#: classes/Gems/Tracker/ChangeTracker.php:78
-#, php-format
-msgid "%d token round completion events caused changed to %d tokens."
-msgstr "%2$d kenmerken zijn aangepast vanwege %1$d ronde voltooiingen."
-
-#: classes/Gems/Tracker/ChangeTracker.php:81
-#, php-format
-msgid "%2$d token date changes in %1$d tracks."
-msgstr "De datum van %2$d kenmerken is aangepast in %1$d trajecten."
-
-#: classes/Gems/Tracker/ChangeTracker.php:84
-#, php-format
-msgid "Round changes propagated to %d tokens."
-msgstr "%d kenmerken veranderd door ronde aanpassingen."
-
-#: classes/Gems/Tracker/ChangeTracker.php:87
-#, php-format
-msgid "%d tokens deleted by round changes."
-msgstr "Vanwege ronde aanpassingen zijn %d kenmerken verwijderd."
-
-#: classes/Gems/Tracker/ChangeTracker.php:90
-#, php-format
-msgid "%d tokens created to by round changes."
-msgstr "Vanwege ronde aanpassingen zijn nieuwe %d kenmerken gecreëerd."
-
-#: classes/Gems/Tracker/ChangeTracker.php:93
-msgid "No tokens were changed."
-msgstr "Geen kenmerken veranderd."
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:370
-msgid "Track start"
-msgstr "Traject start"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:371
-msgid "Track end"
-msgstr "Traject einde"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:385
-msgid "Valid from"
-msgstr "Geldig vanaf"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:386
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:217
-msgid "Valid until"
-msgstr "Geldig tot"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:387
-msgid "Start time"
-msgstr "Starten tijd"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:388
-msgid "Completion time"
-msgstr "Datum invullen"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:403
-msgid "Minutes"
-msgstr "Minuten"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:404
-msgid "Hours"
-msgstr "Uren"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:405
-msgid "Days"
-msgstr "Dagen"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:406
-msgid "Weeks"
-msgstr "Weken"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:407
-msgid "Months"
-msgstr "Maanden"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:408
-msgid "Quarters"
-msgstr "Kwartieren"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:409
-msgid "Years"
-msgstr "Jaren"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:444
-msgid "Valid from calculation"
-msgstr "Berekening datum geldig vanaf"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:445
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:453
-msgid "Date source"
-msgstr "Datum bron"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:446
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:454
-msgid "Round used"
-msgstr "Gebruikte ronde"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:447
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:455
-msgid "Date used"
-msgstr "Gebruikte datum"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:448
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:456
-msgid "Add to date"
-msgstr "Optellen bij datum"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:449
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:457
-msgid "Add to date unit"
-msgstr "Datumoptel eenheid"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:452
-msgid "Valid for calculation"
-msgstr "Berekening datum geldig tot"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:486
-msgid "Does not expire"
-msgstr "Blijft altijd geldig"
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:489
-msgid "Use an answer from a survey."
-msgstr "Gebruikt een antwoord uit een vragenlijst."
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:490
-msgid "Use a standard token date."
-msgstr "Gebruik een datum uit een kenmerk."
-
-#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:492
-msgid "Use a track level date."
-msgstr "Gebruik een op traject niveau ingestelde datum."
-
-#: classes/Gems/Tracker/Engine/AnyStepEngine.php:95
-#: classes/Gems/Tracker/Engine/NextStepEngine.php:92
-msgid "This round"
-msgstr "Deze ronde"
-
-#: classes/Gems/Tracker/Engine/AnyStepEngine.php:106
-msgid "Engine for tracks where a rounds activation can depend on any previous survey."
-msgstr "Een traject type waar de activatie van een ronde van elke willekeurige eerdere ronde afhankelijk kan zijn."
-
-#: classes/Gems/Tracker/Engine/AnyStepEngine.php:116
-msgid "Previous Survey"
-msgstr "Eerdere vragenlijst"
-
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:445
-#, php-format
-msgid "%s track engines cannot be converted to %s track engines."
-msgstr "Traject type %s kan niet geconverteerd worden naar %s."
-
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:688
-#, php-format
-msgid "%d: %s - %s"
-msgstr "%d: %s - %s"
-
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:691
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:694
-#, php-format
-msgid "%d: %s"
-msgstr "%d: %s"
-
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:697
-#, php-format
-msgid "%s - %s"
-msgstr "%s - %s"
-
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:737
-msgid "Icon"
-msgstr "Icoon"
-
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:738
-msgid "Order"
-msgstr "Volgorde"
-
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:739
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:233
-msgid "Description"
-msgstr "Omschrijving"
-
-#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:740
-msgid "After change"
-msgstr "Ronde veranderingscode"
-
-#: classes/Gems/Tracker/Engine/SingleSurveyEngine.php:117
-msgid "Engine for tracks containing a single survey."
-msgstr "Een traject type voor trajecten die bestaan uit een enkele vragenlijst."
-
-#: classes/Gems/Tracker/Engine/SingleSurveyEngine.php:127
-msgid "Single Survey"
-msgstr "Losse vragenlijst"
-
-#: classes/Gems/Tracker/Engine/SingleSurveyEngine.php:149
-msgid "This track type does not allow the creation of new rounds."
-msgstr "Dit type traject staat het niet toe dat nieuwe rondes aangemaakt worden."
-
-#: classes/Gems/Tracker/Engine/NextStepEngine.php:147
-msgid "Engine for tracks where the next round is always dependent on the previous step."
-msgstr "Een traject type waar de activatie van een volgende ronde alleen afhangt van de ronde ervoor."
-
-#: classes/Gems/Tracker/Engine/NextStepEngine.php:158
-msgid "Next Step"
-msgstr "Stap voor stap"
-
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:216
-msgid "Measure(d) on"
-msgstr "Afname op"
-
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:219
-msgid "Completed"
-msgstr "Ingevuld"
-
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:220
-msgid "Duration in seconds"
-msgstr "Antwoordtijd (in sec.)"
-
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:221
-msgid "Score"
-msgstr "Score"
-
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:222
-msgid "Comments"
-msgstr "Opmerkingen"
-
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:223
-msgid "Changed on"
-msgstr "Veranderd op"
-
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:226
-msgid "Assigned by"
-msgstr "Toewijzer"
-
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:227
-msgid "Respondent name"
-msgstr "Patiënt naam"
-
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:230
-msgid "Assigned to"
-msgstr "invuller"
-
-#: classes/Gems/Tracker/Model/StandardTokenModel.php:231
-msgid "Rejection code"
-msgstr "Afkeuringscode"
-
-#: classes/Gems/Tracker/Model/TrackModel.php:118
-msgid "Track Engine"
-msgstr "Traject type"
-
-#: classes/Gems/Tracker/Model/TrackModel.php:123
-msgid "Use until"
-msgstr "Geldig tot"
-
-#: classes/Gems/Tracker/Model/TrackModel.php:127
-msgid "After completion"
-msgstr "Na afronding"
-
-#: classes/Gems/Tracker/Token/TokenValidator.php:164
-msgid "The server is currently busy, please wait a while and try again."
-msgstr "De server is bezet, wacht u alstublieft een moment en probeer het dan nogmaals."
-
-#: classes/Gems/Tracker/Token/TokenValidator.php:199
-#, php-format
-msgid "Not a valid token. The format for valid tokens is: %s."
-msgstr "Geen geldig kenmerk. Het formaat voor geldige tokens is: %s."
-
-#: classes/Gems/Tracker/Token/TokenValidator.php:217
-#: classes/Gems/Tracker/Token/TokenValidator.php:231
-msgid "This token is no longer valid."
-msgstr "Dit kenmerk is niet meer geldig."
-
-#: classes/Gems/Tracker/Token/TokenValidator.php:224
-msgid "This token cannot (yet) be used."
-msgstr "Dit kenmerk kan (nog) niet gebruikt worden."
-
-#: classes/Gems/Tracker/Token/TokenValidator.php:238
-msgid "Unknown token."
-msgstr "Onbekend kenmerk."
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:149
-msgid "Uncertain"
-msgstr "Weet niet"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:152
-msgid "Increase"
-msgstr "Toenemend"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:153
-msgid "Same"
-msgstr "Zelfde"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:154
-msgid "Decrease"
-msgstr "Afnemend"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:162
-msgid "Checked"
-msgstr "Aangevinkt"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:163
-msgid "Not checked"
-msgstr "Niet aangevinkt"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:259
-#, php-format
-msgid "Rank %d"
-msgstr "Schaal %d"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:278
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:300
-msgid "Comment"
-msgstr "Opmerkingen"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:278
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:300
-msgid " (comment)"
-msgstr " (opmerkingen)"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:290
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:338
-msgid "Other"
-msgstr "Overige"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:472
-msgid "Date"
-msgstr "Datum"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:475
-msgid "Free number"
-msgstr "Vrij getal"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:481
-msgid "Free text (long)"
-msgstr "Vrije tekst (lang)"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:484
-msgid "Free text (very long)"
-msgstr "Vrije tekst (zeer lang)"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:487
-msgid "Free text"
-msgstr "Vrije tekst"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:628
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:678
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:732
-#, php-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:752
-#, php-format
-msgid "- %s"
-msgstr "- %s"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:376
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1162
-#, php-format
-msgid "The '%s' survey is no longer active. The survey was removed from LimeSurvey!"
-msgstr "De vragenlijst '%s' is niet meer actief. De vragenlijst is verwijderd uit LimeSurvey!"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:407
-#, php-format
-msgid "Corrected anonymization for survey '%s'"
-msgstr "Anonimizatie gecorrigeerd van vragenlijst '%s'"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:431
-msgid ", "
-msgstr ", "
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:435
-#, php-format
-msgid "Added to token table '%s' the field(s): %s"
-msgstr "Toegevoegd aan kenmerk tabel '%s', de velden: %s"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:440
-#, php-format
-msgid "Attribute fields not created for token table for '%s'"
-msgstr "Attribuut velden voor de kenmerk tabel '%s' zijn niet toegevoegd."
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:441
-#, php-format
-msgid "Required fields: %s"
-msgstr "Verplicht veld: %s"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:466
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1315
-#, php-format
-msgid "The status of the '%s' survey has changed."
-msgstr "De status van de vragenlijst '%s' is veranderd."
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:472
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1321
-#, php-format
-msgid "Survey '%s' IS NO LONGER ACTIVE!!!"
-msgstr "De vragenlijst '%s' IS NIET MEER ACTIEF!!!"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:478
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1327
-#, php-format
-msgid "The status of the '%s' survey has changed to '%s'."
-msgstr "De status van de vragenlijst '%s' is veranderd naar '%s'."
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:481
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1330
-#, php-format
-msgid "The status warning for the '%s' survey was removed."
-msgstr "De status waarschuwing voor de vragenlijst '%s' is verdwenen."
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:487
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1336
-#, php-format
-msgid "The name of the '%s' survey has changed to '%s'."
-msgstr "De naam van de vragenlijst '%s' is veranderd in '%s'."
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:498
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1346
-#, php-format
-msgid "Imported the '%s' survey."
-msgstr "De vragenlijst '%s' is geïmporteerd."
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:723
-msgid "Submitdate"
-msgstr "Invoerdatum"
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1142
-#, php-format
-msgid "Updated %d Gems tokens to new token definition."
-msgstr "%d Gems kenmerken zijn aangepast aan de nieuwe kenmerk definitie."
-
-#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1297
-#, php-format
-msgid "Updated %d token to new token definition in survey '%s'."
-msgid_plural "Updated %d tokens to new token definition in survey '%s'."
-msgstr[0] "%d kenmerk in de vragenlijst '%s' is aangepast aan de nieuwe kenmerk definitie."
-msgstr[1] "%d kenmerken in de vragenlijst '%s' zijn aangepast aan de nieuwe kenmerk definitie."
-
-#: classes/Gems/Tracker/Form/AskTokenForm.php:78
-#, php-format
-msgid "Enter tokens as %s."
-msgstr "Kenmerk invoeren als %s."
-
-#: classes/Gems/Tracker/Form/AskTokenForm.php:98
-msgid "OK"
-msgstr "OK"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenSnippetAbstract.php:164
-#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:124
-#, php-format
-msgid "Token %s not found."
-msgstr "Kenmerk %s niet gevonden"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenSnippetAbstract.php:168
-#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:128
-msgid "No token specified."
-msgstr "Geen kenmerk opgegeven."
-
-#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:149
-msgid "Enter the particulars concerning the assignment to this respondent."
-msgstr "Beschrijf de redenen om dit aan deze patiënt toe te wijzen."
-
-#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:151
-msgid "Start"
-msgstr "Aanvang"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:115
-msgid "We have received your answers today. Thank you!"
-msgstr "We hebben uw vragenlijst vandaag ingevuld ontvangen. Dank u wel!"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:118
-msgid "We have received your answers yesterday. Thank you!"
-msgstr "We hebben uw vragenlijst gisteren ingevuld ontvangen. Dank u wel!"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:121
-msgid "We have received your answers 2 days ago. Thank you."
-msgstr "We hebben uw vragenlijst eergisteren ingevuld ontvangen. Dank u wel."
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:125
-#, php-format
-msgid "We have received your answers %d days ago. Thank you."
-msgstr "We hebben uw vragenlijst %d dagen geleden ingevuld ontvangen. Dank u wel."
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:127
-#, php-format
-msgid "We have received your answers on %s. "
-msgstr "We hebben uw vragenlijst op %s ingevuld ontvangen."
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:140
-msgid "This survey has no set time limit."
-msgstr "Deze vragenlijst heeft geen eindtijd."
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
-msgid "Warning!!!"
-msgstr "Let op!!!"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
-msgid "This survey must be answered today!"
-msgstr "Deze vragenlijst moet vandaag ingevuld zijn!"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:150
-msgid "Warning!!"
-msgstr "Let op!!"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:150
-msgid "This survey must be answered tomorrow!"
-msgstr "Deze vragenlijst moet morgen ingevuld zijn!"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:153
-msgid "Warning! This survey must be answered over 2 days!"
-msgstr "Let op! Deze vragenlijst moet overmorgen ingevuld zijn!"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:158
-#, php-format
-msgid "This survey must be answered in %d days."
-msgstr "Deze vragenlijst moet binnen %d dagen ingevuld zijn!"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:160
-msgid "This survey can no longer be answered."
-msgstr "Deze vragenlijst kan niet langer worden ingevuld!"
-
-#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:163
-#, php-format
-msgid "This survey can be answered until %s."
-msgstr "Deze vragenlijst moet ingevuld worden voor %s."
-
-#: classes/Gems/Tracker/Snippets/ShowRoundSnippetAbstract.php:132
-#, php-format
-msgid "%s round"
-msgstr "%s ronde"
-
-#: classes/Gems/Tracker/Snippets/ShowRoundSnippetAbstract.php:144
-msgid "No round specified."
-msgstr "Geen ronde opgegeven."
-
-#: classes/Gems/Tracker/Snippets/ShowRoundSnippetAbstract.php:163
-msgid "< Previous"
-msgstr "< Terug"
-
-#: classes/Gems/Tracker/Snippets/ShowRoundSnippetAbstract.php:168
-msgid "Next >"
-msgstr "Verder >"
-
-#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:141
-msgid "token"
-msgid_plural "tokens"
-msgstr[0] "kenmerk"
-msgstr[1] "kenmerken"
-
-#: classes/Gems/Tracker/Snippets/EditTrackEngineSnippetGeneric.php:191
-#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:170
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "traject"
-msgstr[1] "trajecten"
-
-#: classes/Gems/Tracker/Snippets/EditTrackEngineSnippetGeneric.php:201
-#: classes/Gems/Tracker/Snippets/EditTrackEngineSnippetGeneric.php:237
-msgid "Add new track"
-msgstr "Voeg traject toe"
-
-#: classes/Gems/Tracker/Snippets/EditSingleSurveyTokenSnippetAbstract.php:157
-msgid "survey"
-msgid_plural "surveys"
-msgstr[0] "vragenlijst"
-msgstr[1] "vragenlijsten"
-
-#: classes/Gems/Tracker/Snippets/EditSingleSurveyTokenSnippetAbstract.php:179
-msgid "Add survey"
-msgstr "Vragenlijst toevoegen"
-
-#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:180
-#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:230
-msgid "Add track"
-msgstr "Voeg traject toe"
-
-#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:141
-msgid "Status"
-msgstr "Status"
-
-#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:145
-msgid "Question"
-msgstr "Vraag"
-
-#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:215
-#, php-format
-msgid "%s answers for patient number %s"
-msgstr "%s antwoorden voor patientnummer %s"
-
-#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:218
-#, php-format
-msgid "Answers for token %s, patient number %s: %s."
-msgstr "Antwoorden voor kenmerk %s, patientnummer %s: %s."
-
-#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:241
-msgid "Close"
-msgstr "Sluiten"
-
-#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:242
-msgid "Print"
-msgstr "Afdrukken"
-
-#: classes/Gems/Tracker/Snippets/EditRoundSnippetAbstract.php:119
-msgid "round"
-msgid_plural "rounds"
-msgstr[0] "ronde"
-msgstr[1] "rondes"
-
-#: classes/Gems/Tracker/Snippets/EditRoundSnippetAbstract.php:129
-msgid "Add new round"
-msgstr "Nieuwe ronde toevoegen"
-
-#: classes/Gems/Tracker/Batch/SynchronizeSourcesBatch.php:135
-msgid "No surveys were changed."
-msgstr "Geen vragenlijsten veranderd."
-
-#: classes/Gems/Tracker/Batch/SynchronizeSourcesBatch.php:137
-#, php-format
-msgid "%d surveys checked."
-msgstr "%d vragenlijsten gecontroleerd"
-
-#: classes/Gems/Tracker/Batch/SynchronizeSourcesBatch.php:139
-#, php-format
-msgid "%d sources checked."
-msgstr "%d bronnen gecontroleerd."
-
-#: classes/Gems/Menu/SubMenuItem.php:380
-msgid "New"
-msgstr "Nieuw"
-
-#: classes/Gems/Menu/SubMenuItem.php:434
-msgid "Export the current data set to Excel"
-msgstr "Exporteer de huidige gegevens naar Excel"
-
-#: classes/Gems/Menu/SubMenuItem.php:438
-msgid "Excel export"
-msgstr "Excel export"
-
-#: classes/Gems/Menu/MenuAbstract.php:247
-msgid "Activity log"
-msgstr "Activiteit"
-
-#: classes/Gems/Menu/MenuAbstract.php:253
-msgid "Automatic mail"
-msgstr "Automatische mail"
-
-#: classes/Gems/Menu/MenuAbstract.php:254
-msgid "Turn Automatic Mail Jobs OFF"
-msgstr "Automatische mail opdrachten UITzetten"
-
-#: classes/Gems/Menu/MenuAbstract.php:255
-msgid "Run"
-msgstr "Uitvoeren"
-
-#: classes/Gems/Menu/MenuAbstract.php:258
-msgid "Servers"
-msgstr "Servers"
-
-#: classes/Gems/Menu/MenuAbstract.php:262
-msgid "Templates"
-msgstr "Sjablonen"
-
-#: classes/Gems/Menu/MenuAbstract.php:294
-msgid "By period"
-msgstr "Per periode"
-
-#: classes/Gems/Menu/MenuAbstract.php:295
-msgid "By token"
-msgstr "Per kenmerk"
-
-#: classes/Gems/Menu/MenuAbstract.php:296
-msgid "By respondent"
-msgstr "Per patiënt"
-
-#: classes/Gems/Menu/MenuAbstract.php:300
-msgid "Bulk mail"
-msgstr "Bulk mail"
-
-#: classes/Gems/Menu/MenuAbstract.php:318
-msgid "Errors"
-msgstr "Foutmeldingen"
-
-#: classes/Gems/Menu/MenuAbstract.php:319
-msgid "PHP"
-msgstr "PHP"
-
-#: classes/Gems/Menu/MenuAbstract.php:321
-msgid "Session"
-msgstr "Sessie"
-
-#: classes/Gems/Menu/MenuAbstract.php:322
-msgid "Maintenance mode"
-msgstr "Onderhoudsmodus"
-
-#: classes/Gems/Menu/MenuAbstract.php:323
-msgid "Clean cache"
-msgstr "Cache opruimen"
-
-#: classes/Gems/Menu/MenuAbstract.php:390
-msgid "Reset passw...
[truncated message content] |
|
From: <gem...@li...> - 2012-05-03 09:05:26
|
Revision: 655
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=655&view=rev
Author: mennodekker
Date: 2012-05-03 09:05:15 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Unit test for project user login added
Modified Paths:
--------------
trunk/test/classes/IndexControllerTest.php
Modified: trunk/test/classes/IndexControllerTest.php
===================================================================
--- trunk/test/classes/IndexControllerTest.php 2012-05-03 08:36:45 UTC (rev 654)
+++ trunk/test/classes/IndexControllerTest.php 2012-05-03 09:05:15 UTC (rev 655)
@@ -24,4 +24,36 @@
$this->assertController('index');
$this->assertAction('login');
}
+
+ public function testValidProjectLogin()
+ {
+ $this->_fixSetup();
+ $postVars = array(
+ 'organization'=>'',
+ 'userlogin'=>'superadmin', //Valid login, this comes from project.ini in newproject
+ 'password'=>'superadmin',
+ 'submit'=>'submit'
+ );
+ $this->getRequest()->setMethod('POST')->setPost($postVars);
+
+ $this->dispatch('/index/login');
+ $response = $this->getResponse();
+ $this->assertRedirect('Valid project login not accepted');
+ }
+
+ public function testInvalidProjectLogin()
+ {
+ $this->_fixSetup();
+ $postVars = array(
+ 'organization'=>'',
+ 'userlogin'=>'superadmin',
+ 'password'=>'superpassword', //This is wrong
+ 'submit'=>'submit'
+ );
+ $this->getRequest()->setMethod('POST')->setPost($postVars);
+
+ $this->dispatch('/index/login');
+ $response = $this->getResponse();
+ $this->assertNotRedirect('Invalid project login accepted');
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-05-03 08:36:55
|
Revision: 654
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=654&view=rev
Author: mennodekker
Date: 2012-05-03 08:36:45 +0000 (Thu, 03 May 2012)
Log Message:
-----------
added missing field to table create script
Modified Paths:
--------------
trunk/library/configs/db/tables/gems__groups.20.sql
Modified: trunk/library/configs/db/tables/gems__groups.20.sql
===================================================================
--- trunk/library/configs/db/tables/gems__groups.20.sql 2012-05-02 13:00:22 UTC (rev 653)
+++ trunk/library/configs/db/tables/gems__groups.20.sql 2012-05-03 08:36:45 UTC (rev 654)
@@ -10,6 +10,7 @@
ggp_group_active boolean not null default 1,
ggp_staff_members boolean not null default 0,
ggp_respondent_members boolean not null default 1,
+ ggp_allowed_ip_ranges text CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
ggp_changed timestamp not null default current_timestamp on update current_timestamp,
ggp_changed_by bigint unsigned not null,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-05-02 13:00:33
|
Revision: 653
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=653&view=rev
Author: michieltcs
Date: 2012-05-02 13:00:22 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Add missing db property
Modified Paths:
--------------
trunk/library/classes/Gems/User/ProjectUserDefinition.php
Modified: trunk/library/classes/Gems/User/ProjectUserDefinition.php
===================================================================
--- trunk/library/classes/Gems/User/ProjectUserDefinition.php 2012-05-02 07:39:59 UTC (rev 652)
+++ trunk/library/classes/Gems/User/ProjectUserDefinition.php 2012-05-02 13:00:22 UTC (rev 653)
@@ -51,6 +51,11 @@
* @var Gems_Project_ProjectSettings
*/
protected $project;
+
+ /**
+ * @var Zend_Db_Adapter_Abstract
+ */
+ protected $db;
/**
* Returns an initialized Zend_Auth_Adapter_Interface
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-05-02 07:40:13
|
Revision: 652
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=652&view=rev
Author: michieltcs
Date: 2012-05-02 07:39:59 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Add new translation
Modified Paths:
--------------
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-05-02 07:29:07 UTC (rev 651)
+++ trunk/library/languages/default-nl.po 2012-05-02 07:39:59 UTC (rev 652)
@@ -1,5026 +1,5000 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: GemsTracker NL\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-26 13:31+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Matijs de Jong <mj...@ma...>\n"
-"Language-Team: Erasmus MGZ <mat...@ma...>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Poedit-Language: Dutch\n"
-"X-Poedit-Country: NETHERLANDS\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Poedit-Basepath: ../\n"
-"X-Poedit-KeywordsList: plural:1,2\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: classes/GemsEscort.php:212
-#, php-format
-msgid "Path %s not writable"
-msgstr "Path %s niet schrijfbaar"
-
-#: classes/GemsEscort.php:750
-#, php-format
-msgid "You are logged in as %s"
-msgstr "Ingelogd als %s"
-
-#: classes/GemsEscort.php:752
-#: classes/Gems/Menu.php:249
-msgid "Logoff"
-msgstr "Uitloggen"
-
-#: classes/GemsEscort.php:755
-msgid "You are not logged in"
-msgstr "U bent niet ingelogd"
-
-#: classes/GemsEscort.php:939
-#, php-format
-msgid "User: %s"
-msgstr "Login: %s"
-
-#: classes/GemsEscort.php:964
-msgid "version"
-msgstr "versie"
-
-#: classes/GemsEscort.php:1395
-msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
-msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer uw gegevens en probeer a.u.b. opnieuw."
-
-#: classes/GemsEscort.php:1526
-msgid "Please check back later."
-msgstr "Probeer het later opnieuw."
-
-#: classes/GemsEscort.php:1528
-#: classes/GemsEscort.php:1532
-#: classes/GemsEscort.php:1533
-msgid "System is in maintenance mode"
-msgstr "Systeem is in onderhoudsmodus"
-
-#: classes/GemsEscort.php:1543
-msgid "No access to site."
-msgstr "Geen toegang tot website."
-
-#: classes/GemsEscort.php:1545
-#: classes/GemsEscort.php:1587
-msgid "You have no access to this site."
-msgstr "U heeft geen toegang tot deze website."
-
-#: classes/GemsEscort.php:1561
-msgid "No access to page"
-msgstr "Geen toegang tot pagina"
-
-#: classes/GemsEscort.php:1563
-#, php-format
-msgid "Access to this page is not allowed for current role: %s."
-msgstr "U heeft geen toegang tot deze pagina. Uw huidige rol is: %s."
-
-#: classes/GemsEscort.php:1573
-#: classes/GemsEscort.php:1585
-msgid "You are no longer logged in."
-msgstr "U bent niet meer ingelogd."
-
-#: classes/GemsEscort.php:1574
-msgid "You must login to access this page."
-msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
-
-#: classes/GemsEscort.php:1714
-#: classes/GemsEscort.php:1716
-#, php-format
-msgid "%d survey"
-msgid_plural "%d surveys"
-msgstr[0] "%d vragenlijst"
-msgstr[1] "%d vragenlijsten"
-
-#: classes/Gems/AccessLog.php:236
-msgid "Database needs to be updated!"
-msgstr "Database dient ververst te worden!"
-
-#: classes/Gems/Html.php:154
-msgid "<< First"
-msgstr "<< Eerste"
-
-#: classes/Gems/Html.php:155
-msgid "< Previous"
-msgstr "< Terug"
-
-#: classes/Gems/Html.php:156
-msgid "Next >"
-msgstr "Verder >"
-
-#: classes/Gems/Html.php:157
-msgid "Last >>"
-msgstr "Laatste >>"
-
-#: classes/Gems/Html.php:158
-msgid " | "
-msgstr " | "
-
-#: classes/Gems/Html.php:162
-msgid "to"
-msgstr "tot"
-
-#: classes/Gems/Html.php:163
-msgid "of"
-msgstr "van"
-
-#: classes/Gems/Menu.php:140
-#, php-format
-msgid "About %s"
-msgstr "Over %s"
-
-#: classes/Gems/Menu.php:144
-msgid "Reporting bugs"
-msgstr "Meld een bug"
-
-#: classes/Gems/Menu.php:147
-msgid "Support"
-msgstr "Ondersteuning"
-
-#: classes/Gems/Menu.php:167
-msgid "Project setup"
-msgstr "Projectinfo"
-
-#: classes/Gems/Menu.php:170
-msgid "Database"
-msgstr "Database"
-
-#: classes/Gems/Menu.php:174
-msgid "Content"
-msgstr "Inhoud"
-
-#: classes/Gems/Menu.php:177
-msgid "Execute"
-msgstr "Uitvoeren"
-
-#: classes/Gems/Menu.php:182
-msgid "Patches"
-msgstr "Patches"
-
-#: classes/Gems/Menu.php:183
-msgid "Execute new"
-msgstr "Nieuwe aanmaken"
-
-#: classes/Gems/Menu.php:185
-msgid "Refresh translateables"
-msgstr "Ververs vertaalbaren"
-
-#: classes/Gems/Menu.php:187
-msgid "Run SQL"
-msgstr "SQL uitvoeren"
-
-#: classes/Gems/Menu.php:190
-msgid "Reception codes"
-msgstr "Ontvangst codes"
-
-#: classes/Gems/Menu.php:193
-msgid "Consents"
-msgstr "Toestemmingen"
-
-#: classes/Gems/Menu.php:196
-msgid "Roles"
-msgstr "Rollen"
-
-#: classes/Gems/Menu.php:197
-#: classes/Gems/Menu.php:346
-msgid "Assigned"
-msgstr "Toegewezen"
-
-#: classes/Gems/Menu.php:198
-msgid "Privileges"
-msgstr "Priviléges"
-
-#: classes/Gems/Menu.php:201
-msgid "Groups"
-msgstr "Groepen"
-
-#: classes/Gems/Menu.php:204
-msgid "Organizations"
-msgstr "Organisaties"
-
-#: classes/Gems/Menu.php:207
-msgid "Staff"
-msgstr "Medewerkers"
-
-#: classes/Gems/Menu.php:210
-msgid "Logging"
-msgstr "Logboek"
-
-#: classes/Gems/Menu.php:214
-msgid "Maintenance"
-msgstr "Onderhoud"
-
-#: classes/Gems/Menu.php:219
-msgid "Upgrade"
-msgstr "Upgrade"
-
-#: classes/Gems/Menu.php:220
-#: classes/Gems/Menu.php:319
-msgid "Show"
-msgstr "Toon"
-
-#: classes/Gems/Menu.php:221
-msgid "Execute all"
-msgstr "Alles uitvoeren"
-
-#: classes/Gems/Menu.php:222
-msgid "Execute this"
-msgstr "Dit uitvoeren"
-
-#: classes/Gems/Menu.php:223
-msgid "Execute from here"
-msgstr "Uitvoeren vanaf hier"
-
-#: classes/Gems/Menu.php:224
-msgid "Execute to here"
-msgstr "Uitvoeren tot hier"
-
-#: classes/Gems/Menu.php:236
-#, php-format
-msgid "Stand-alone privilige: %s"
-msgstr "Zelfstandig privilege: %s"
-
-#: classes/Gems/Menu.php:243
-msgid "Logon"
-msgstr "Login"
-
-#: classes/Gems/Menu.php:244
-msgid "Lost password"
-msgstr "Wachtwoord vergeten"
-
-#: classes/Gems/Menu.php:245
-msgid "Your account"
-msgstr "Uw account"
-
-#: classes/Gems/Menu.php:246
-msgid "Activity overview"
-msgstr "Activiteiten overzicht"
-
-#: classes/Gems/Menu.php:247
-msgid "Change password"
-msgstr "Uw wachtwoord"
-
-#: classes/Gems/Menu.php:248
-#: classes/Gems/Menu.php:288
-#: classes/Gems/Menu.php:323
-msgid "Token"
-msgstr "Kenmerk"
-
-#: classes/Gems/Menu.php:284
-msgid "Track"
-msgstr "Traject"
-
-#: classes/Gems/Menu.php:291
-#: classes/Gems/Menu.php:311
-#: classes/Gems/Menu.php:342
-msgid "Add"
-msgstr "Voeg toe"
-
-#: classes/Gems/Menu.php:295
-#: classes/Gems/Menu.php:377
-msgid "Preview"
-msgstr "Preview"
-
-#: classes/Gems/Menu.php:302
-msgid "Tracks"
-msgstr "Trajecten"
-
-#: classes/Gems/Menu.php:315
-msgid "Assignments"
-msgstr "Toewijzingen"
-
-#: classes/Gems/Menu.php:327
-msgid "Edit"
-msgstr "Wijzig"
-
-#: classes/Gems/Menu.php:331
-msgid "Delete"
-msgstr "Verwijder"
-
-#: classes/Gems/Menu.php:336
-msgid "Surveys"
-msgstr "Vragenlijsten"
-
-#: classes/Gems/Menu.php:368
-msgid "Fill in"
-msgstr "Vul in"
-
-#: classes/Gems/Menu.php:371
-msgid "Print PDF"
-msgstr "Print PDF"
-
-#: classes/Gems/Menu.php:374
-msgid "E-Mail now!"
-msgstr "Email nu!"
-
-#: classes/Gems/Menu.php:380
-msgid "Answers"
-msgstr "Antwoorden"
-
-#: classes/Gems/Menu.php:530
-msgid "Respondents"
-msgstr "Patiënten"
-
-#: classes/Gems/Menu.php:538
-msgid "Overview"
-msgstr "Overzicht"
-
-#: classes/Gems/Menu.php:545
-msgid "Project"
-msgstr "Project"
-
-#: classes/Gems/Menu.php:548
-msgid "Setup"
-msgstr "Beheer"
-
-#: classes/Gems/Menu.php:551
-msgid "Mail"
-msgstr "Email"
-
-#: classes/Gems/Menu.php:554
-msgid "Track Builder"
-msgstr "Traject bouwer"
-
-#: classes/Gems/Menu.php:563
-msgid "Contact"
-msgstr "Contact"
-
-#: classes/Gems/Menu.php:576
-msgid "Changelog"
-msgstr "Changelog"
-
-#: classes/Gems/Model.php:205
-msgid "Respondent nr"
-msgstr "Patiënt nr"
-
-#: classes/Gems/Model.php:206
-msgid "Opened"
-msgstr "Bekeken op"
-
-#: classes/Gems/Model.php:207
-msgid "Consent"
-msgstr "Toestemming"
-
-#: classes/Gems/Model.php:209
-msgid "E-Mail"
-msgstr "Email"
-
-#: classes/Gems/Model.php:214
-msgid "Gender"
-msgstr "Geslacht"
-
-#: classes/Gems/Model.php:215
-msgid "First name"
-msgstr "Voornaam"
-
-#: classes/Gems/Model.php:216
-msgid "Surname prefix"
-msgstr "Tussenvoegsel"
-
-#: classes/Gems/Model.php:217
-msgid "Last name"
-msgstr "Achternaam"
-
-#: classes/Gems/Model.php:219
-msgid "Name"
-msgstr "Naam"
-
-#: classes/Gems/Model.php:222
-msgid "Street"
-msgstr "Straat"
-
-#: classes/Gems/Model.php:223
-msgid "Zipcode"
-msgstr "Postcode"
-
-#: classes/Gems/Model.php:224
-msgid "City"
-msgstr "Woonplaats"
-
-#: classes/Gems/Model.php:226
-msgid "Phone"
-msgstr "Telefoon"
-
-#: classes/Gems/Model.php:228
-msgid "Birthday"
-msgstr "Geboren op"
-
-#: classes/Gems/Pdf.php:198
-#, php-format
-msgid "PDF Source File '%s' not found!"
-msgstr "PDF bron bestand %s niet gevonden!"
-
-#: classes/Gems/Pdf.php:240
-#, php-format
-msgid "Could not create '%s' directory."
-msgstr "Kon de directory '%s' niet aanmaken."
-
-#: classes/Gems/Pdf.php:283
-#, php-format
-msgid " The error message is: %s"
-msgstr "De foutmelding is: %s"
-
-#: classes/Gems/Tracker.php:771
-msgid "Checks performed"
-msgstr "Controle uitgevoerd"
-
-#: classes/Gems/Upgrades.php:77
-msgid "Syncing surveys for all sources"
-msgstr "Vragenlijsten synchroniseren voor alle bronnen."
-
-#: classes/Gems/UpgradesAbstract.php:154
-msgid "Already at max. level."
-msgstr "Al op het hoogste niveau."
-
-#: classes/Gems/UpgradesAbstract.php:161
-#, php-format
-msgid "Trying upgrade for %s from level %s to level %s"
-msgstr "Probeert upgrade voor %s van niveau %s naar niveau %s uit te voeren"
-
-#: classes/Gems/UpgradesAbstract.php:169
-#, php-format
-msgid "Trying upgrade for %s to level %s: %s"
-msgstr "Probeert upgrade voor %s naar niveau %s: %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:354
-#, php-format
-msgid "New %s..."
-msgstr "Nieuwe %s..."
-
-#: classes/Gems/Controller/BrowseEditAction.php:387
-#, php-format
-msgid "Delete %s"
-msgstr "Verwijder %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:391
-#, php-format
-msgid "%2$u %1$s deleted"
-msgstr "%2$u %1$s verwijderd"
-
-#: classes/Gems/Controller/BrowseEditAction.php:405
-#, php-format
-msgid "Edit %s"
-msgstr "Bewerk %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:502
-msgid "Free search text"
-msgstr "Vrije zoek tekst"
-
-#: classes/Gems/Controller/BrowseEditAction.php:573
-msgid "Search"
-msgstr "Zoeken"
-
-#: classes/Gems/Controller/BrowseEditAction.php:589
-#, php-format
-msgid "No %s found"
-msgstr "Geen %s gevonden"
-
-#: classes/Gems/Controller/BrowseEditAction.php:673
-#, php-format
-msgid "No %s found."
-msgstr "Geen %s gevonden."
-
-#: classes/Gems/Controller/BrowseEditAction.php:791
-msgid "Are you sure?"
-msgstr "Weet u het zeker?"
-
-#: classes/Gems/Controller/BrowseEditAction.php:807
-msgid "Yes"
-msgstr "Ja"
-
-#: classes/Gems/Controller/BrowseEditAction.php:808
-msgid "No"
-msgstr "Nee"
-
-#: classes/Gems/Controller/BrowseEditAction.php:861
-#, php-format
-msgid "Unknown %s requested"
-msgstr "Onjuist %s verzoek"
-
-#: classes/Gems/Controller/BrowseEditAction.php:884
-#, php-format
-msgid "New %1$s..."
-msgstr "Nieuwe %1$s..."
-
-#: classes/Gems/Controller/BrowseEditAction.php:892
-msgid "Save"
-msgstr "Opslaan"
-
-#: classes/Gems/Controller/BrowseEditAction.php:928
-#, php-format
-msgid "%2$u %1$s saved"
-msgstr "%2$u %1$s opgeslagen"
-
-#: classes/Gems/Controller/BrowseEditAction.php:931
-msgid "No changes to save."
-msgstr "Geen verandering om op te slaan."
-
-#: classes/Gems/Controller/BrowseEditAction.php:940
-msgid "Input error! No changes saved!"
-msgstr "Invoer fout! Veranderingen niet opgeslagen!"
-
-#: classes/Gems/Controller/BrowseEditAction.php:968
-#, php-format
-msgid "Show %s"
-msgstr "Toon %s"
-
-#: classes/Gems/Controller/BrowseEditAction.php:975
-#, php-format
-msgid "Unknown %s."
-msgstr "%s is onbekend."
-
-#: classes/Gems/Controller/ModelActionAbstract.php:97
-#: classes/Gems/Default/DatabaseAction.php:503
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:238
-#, php-format
-msgid "Do you want to delete this %s?"
-msgstr "Weet u zeker dat deze %s verwijderd moet worden?"
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:258
-#, php-format
-msgid "Edit %s..."
-msgstr "Bewerk %s..."
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:271
-msgid "No data found."
-msgstr "Geen gegevens gevonden."
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:333
-#, php-format
-msgid "No %s found..."
-msgstr "Geen %s gevonden..."
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:343
-#, php-format
-msgid "Showing %s"
-msgstr "Toon %s"
-
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:379
-msgid "item"
-msgid_plural "items"
-msgstr[0] "item"
-msgstr[1] "items"
-
-#: classes/Gems/Controller/Action/Helper/BatchRunner.php:65
-msgid "Prepare recheck"
-msgstr "Hercontrole voorbereiden"
-
-#: classes/Gems/Controller/Action/Helper/BatchRunner.php:68
-#, php-format
-msgid "Start %s jobs"
-msgstr "Start %s opdrachten"
-
-#: classes/Gems/Controller/Action/Helper/BatchRunner.php:71
-msgid "Nothing to do."
-msgstr "Niets te doen."
-
-#: classes/Gems/Default/AskAction.php:84
-#, php-format
-msgid "Enter your %s token"
-msgstr "Voer uw %s kenmerk in"
-
-#: classes/Gems/Default/AskAction.php:87
-msgid "Tokens identify a survey that was assigned to you personally."
-msgstr "Elk kenmerk verwijst naar een specifiek aan u toegekende vragenlijst."
-
-#: classes/Gems/Default/AskAction.php:87
-msgid "Entering the token and pressing OK will open that survey."
-msgstr "Vul uw kenmerk in en druk op OK om die vragenlijst te openen."
-
-#: classes/Gems/Default/AskAction.php:91
-msgid "After answering the survey you will be logged off automatically."
-msgstr "Na het invullen wordt u automatisch uitgelogd."
-
-#: classes/Gems/Default/AskAction.php:96
-msgid "A token consists of two groups of four letters and numbers, separated by an optional hyphen. Tokens are case insensitive."
-msgstr "Een kenmerk bestaat uit twee groepen van vier cijfers en letters met een (niet verplicht) streepje ertussen. Hoofdletters of gewone letters maakt niets uit."
-
-#: classes/Gems/Default/AskAction.php:97
-msgid "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
-msgstr "Er wordt geen verschil gemaakt tussen het getal nul en de letter O en ook niet tussen het getal één en de letter L."
-
-#: classes/Gems/Default/AskAction.php:132
-#, php-format
-msgid "Thank you for answering. At the moment we have no further surveys for you to take."
-msgstr "Dank u voor uw antwoorden. Op dit moment hebben we geen vragenlijsten meer voor u."
-
-#: classes/Gems/Default/AskAction.php:134
-#, php-format
-msgid "The survey for token %s has been answered and no further surveys are open."
-msgstr "De vragenlijst met het kenmerk %s is beantwoord en er staan verder geen vragenlijsten open."
-
-#: classes/Gems/Default/AskAction.php:141
-#, php-format
-msgid "The token %s does not exist (any more)."
-msgstr "Het kenmerk %s bestaat niet (meer)."
-
-#: classes/Gems/Default/AskAction.php:270
-#, php-format
-msgid "The survey for token %s is no longer active."
-msgstr "De vragenlijst voor kenmerk %s is niet meer in gebruik."
-
-#: classes/Gems/Default/ConsentAction.php:68
-#: classes/Gems/Default/GroupAction.php:88
-msgid "Description"
-msgstr "Omschrijving"
-
-#: classes/Gems/Default/ConsentAction.php:70
-#: classes/Gems/Default/DatabaseAction.php:139
-msgid "Order"
-msgstr "Volgorde"
-
-#: classes/Gems/Default/ConsentAction.php:71
-msgid "Determines order of presentation in interface."
-msgstr "Bepaald de presentatie volgorde."
-
-#: classes/Gems/Default/ConsentAction.php:73
-msgid "Consent code"
-msgstr "Consent code"
-
-#: classes/Gems/Default/ConsentAction.php:75
-msgid "Internal code, not visible to users, copied with the token information to the source."
-msgstr "Interne code, niet zichtbaar voor gebruikers maar wordt met de token informatie aan de bron doorgegeven."
-
-#: classes/Gems/Default/ConsentAction.php:92
-msgid "respondent consent"
-msgid_plural "respondent consents"
-msgstr[0] "patiënt toestemming"
-msgstr[1] "patiënt toestemmingen"
-
-#: classes/Gems/Default/ConsentAction.php:97
-msgid "Respondent consents"
-msgstr "Patiënt toestemming"
-
-#: classes/Gems/Default/ContactAction.php:71
-#, php-format
-msgid "%s is a web application."
-msgstr "%s is een web applicatie."
-
-#: classes/Gems/Default/ContactAction.php:76
-#, php-format
-msgid "The %s project is run by: "
-msgstr "%s is een project van: "
-
-#: classes/Gems/Default/ContactAction.php:82
-#, php-format
-msgid "%s is a collaboration of these organizations:"
-msgstr "Deze organisaties werken samen voor het %s project:"
-
-#: classes/Gems/Default/ContactAction.php:103
-#, php-format
-msgid "The %s project"
-msgstr "Het %s project"
-
-#: classes/Gems/Default/ContactAction.php:106
-msgid "Information on this application"
-msgstr "Information over deze website"
-
-#: classes/Gems/Default/ContactAction.php:107
-msgid "Links concerning this web application:"
-msgstr "Links met informatie over deze website:"
-
-#: classes/Gems/Default/CronAction.php:148
-msgid "Cron jobs turned off."
-msgstr "Cron opdrachten uitgezet."
-
-#: classes/Gems/Default/CronAction.php:221
-msgid "No mails sent."
-msgstr "Geen mail verzonden."
-
-#: classes/Gems/Default/CronAction.php:224
-msgid "On this test system all mail will be delivered to the from address."
-msgstr "Op dit test systeem worden alle emails gestuurd naar het \"van\" adres."
-
-#: classes/Gems/Default/DatabaseAction.php:75
-msgid "Cache cleaned"
-msgstr "Cache opgeschoond"
-
-#: classes/Gems/Default/DatabaseAction.php:105
-#, php-format
-msgid "No rows in %s."
-msgstr "Geen gegevens in %s."
-
-#: classes/Gems/Default/DatabaseAction.php:134
-msgid "Type"
-msgstr "Type"
-
-#: classes/Gems/Default/DatabaseAction.php:138
-msgid "Group"
-msgstr "Groep"
-
-#: classes/Gems/Default/DatabaseAction.php:140
-msgid "Location"
-msgstr "Locatie"
-
-#: classes/Gems/Default/DatabaseAction.php:143
-msgid "Status"
-msgstr "Status"
-
-#: classes/Gems/Default/DatabaseAction.php:146
-msgid "Script"
-msgstr "Script"
-
-#: classes/Gems/Default/DatabaseAction.php:148
-#: classes/Gems/Default/DatabaseAction.php:293
-#: classes/Gems/Default/DatabaseAction.php:340
-msgid "Changed on"
-msgstr "Veranderd op"
-
-#: classes/Gems/Default/DatabaseAction.php:167
-msgid "This database object does not exist. You cannot delete it."
-msgstr "Dit database object bestaat. Het kan dus ook niet verwijderd worden."
-
-#: classes/Gems/Default/DatabaseAction.php:172
-#, php-format
-msgid "Drop %s"
-msgstr "Verwijder %s"
-
-#: classes/Gems/Default/DatabaseAction.php:180
-#, php-format
-msgid "There are %d rows in the table."
-msgstr "Er zijn %d rijen in deze tabel."
-
-#: classes/Gems/Default/DatabaseAction.php:182
-#, php-format
-msgid "Drop table with %d rows"
-msgstr "Tabel met %d rijen aan data verwijderen"
-
-#: classes/Gems/Default/DatabaseAction.php:183
-msgid "Are you really sure?"
-msgstr "Weet u het heel erg zeker?"
-
-#: classes/Gems/Default/DatabaseAction.php:199
-#, php-format
-msgid "%1$s %2$s dropped"
-msgstr "%1$s %2$s verwijderd"
-
-#: classes/Gems/Default/DatabaseAction.php:205
-msgid " during statement "
-msgstr " tijdens het commando "
-
-#: classes/Gems/Default/DatabaseAction.php:216
-#, php-format
-msgid "%s no longer exists in the database."
-msgstr "%s bestaat niet meer in de database."
-
-#: classes/Gems/Default/DatabaseAction.php:219
-#, php-format
-msgid "%s does not yet exist in the database."
-msgstr "%s bestaat nog niet in de database."
-
-#: classes/Gems/Default/DatabaseAction.php:222
-#, php-format
-msgid "%s object does exist."
-msgstr "%s object bestaat."
-
-#: classes/Gems/Default/DatabaseAction.php:240
-msgid "Object is not a table."
-msgstr "Niet een tabel object."
-
-#: classes/Gems/Default/DatabaseAction.php:264
-msgid "Structure"
-msgstr "Structuur"
-
-#: classes/Gems/Default/DatabaseAction.php:273
-msgid "database object"
-msgid_plural "database objects"
-msgstr[0] "database object"
-msgstr[1] "database objects"
-
-#: classes/Gems/Default/DatabaseAction.php:278
-msgid "Database object overview"
-msgstr "Database object overzicht"
-
-#: classes/Gems/Default/DatabaseAction.php:287
-#: classes/Gems/Default/DatabaseAction.php:333
-msgid "Level"
-msgstr "Niveau"
-
-#: classes/Gems/Default/DatabaseAction.php:288
-#: classes/Gems/Default/DatabaseAction.php:334
-msgid "Subtype"
-msgstr "Subtype"
-
-#: classes/Gems/Default/DatabaseAction.php:290
-msgid "To be executed"
-msgstr "Uit te voeren"
-
-#: classes/Gems/Default/DatabaseAction.php:291
-#: classes/Gems/Default/DatabaseAction.php:337
-msgid "Executed"
-msgstr "Uitgevoerd"
-
-#: classes/Gems/Default/DatabaseAction.php:292
-#: classes/Gems/Default/DatabaseAction.php:338
-msgid "Finished"
-msgstr "Afgerond"
-
-#: classes/Gems/Default/DatabaseAction.php:296
-msgid "Create the patch table!"
-msgstr "De patch tabel bestaat nog niet!"
-
-#: classes/Gems/Default/DatabaseAction.php:298
-#, php-format
-msgid "%d new or changed patch(es)."
-msgstr "%d nieuwe of veranderde patch(es)."
-
-#: classes/Gems/Default/DatabaseAction.php:303
-msgid "Gems build"
-msgstr "Gems bouwnummer"
-
-#: classes/Gems/Default/DatabaseAction.php:304
-msgid "Database build"
-msgstr "Database versie"
-
-#: classes/Gems/Default/DatabaseAction.php:306
-msgid "Execute level"
-msgstr "Uit te voeren versie"
-
-#: classes/Gems/Default/DatabaseAction.php:310
-msgid "Ignore finished"
-msgstr "Afgeronde patches overslaan"
-
-#: classes/Gems/Default/DatabaseAction.php:311
-msgid "Ignore executed"
-msgstr "Uitgevoerde patches overslaan"
-
-#: classes/Gems/Default/DatabaseAction.php:312
-msgid "Show patches"
-msgstr "Toon patches"
-
-#: classes/Gems/Default/DatabaseAction.php:326
-#, php-format
-msgid "%d patch(es) executed."
-msgstr "%d patch(es) uitgevoerd."
-
-#: classes/Gems/Default/DatabaseAction.php:332
-msgid "Patch"
-msgstr "Patch"
-
-#: classes/Gems/Default/DatabaseAction.php:336
-msgid "Query"
-msgstr "Query"
-
-#: classes/Gems/Default/DatabaseAction.php:339
-msgid "Result"
-msgstr "Resultaat"
-
-#: classes/Gems/Default/DatabaseAction.php:364
-msgid "Patch maintenance"
-msgstr "Patch onderhoud"
-
-#: classes/Gems/Default/DatabaseAction.php:368
-msgid "Patch overview"
-msgstr "Patch overzicht"
-
-#: classes/Gems/Default/DatabaseAction.php:430
-msgid "This database object does not exist. You cannot create it."
-msgstr "Dit database object bestaat niet en kan ook niet aangemaakt worden."
-
-#: classes/Gems/Default/DatabaseAction.php:436
-msgid "This database object has no script. You cannot execute it."
-msgstr "Dit database object heeft geen script. Het kan dus ook niet uitgevoerd worden."
-
-#: classes/Gems/Default/DatabaseAction.php:447
-#, php-format
-msgid "Run %s"
-msgstr "Voer %s script uit"
-
-#: classes/Gems/Default/DatabaseAction.php:468
-#, php-format
-msgid "Starting %d object creation scripts."
-msgstr "Aanvang %d object aanmaak scripts."
-
-#: classes/Gems/Default/DatabaseAction.php:474
-#, php-format
-msgid "Finished %s creation script for object %d of %d"
-msgstr "Klaar %s met aanmaak script voor object %d van %d"
-
-#: classes/Gems/Default/DatabaseAction.php:479
-msgid "All objects exist. Nothing was executed."
-msgstr "Alle objects bestaan. Niets was uitgevoerd."
-
-#: classes/Gems/Default/DatabaseAction.php:486
-msgid "Create not-existing database objects"
-msgstr "Aanmaak van database objecten die nog niet bestaan"
-
-#: classes/Gems/Default/DatabaseAction.php:488
-#, php-format
-msgid "One database object does not exist."
-msgid_plural "These %d database objects do not exist."
-msgstr[0] "Één object bestaat nog niet in de database."
-msgstr[1] "%d objecten bestaan nog niet in de database."
-
-#: classes/Gems/Default/DatabaseAction.php:489
-msgid "Are you sure you want to create it?"
-msgid_plural "Are you sure you want to create them all?"
-msgstr[0] "Weet u zeker dat u dit wil aanmaken?"
-msgstr[1] "Weet u zeker dat u deze allemaal wil aanmaken?"
-
-#: classes/Gems/Default/DatabaseAction.php:502
-msgid "All database objects exist. There is nothing to create."
-msgstr "Alle database objecten bestaan. Er valt niets te maken."
-
-#: classes/Gems/Default/DatabaseAction.php:515
-msgid "Separate multiple commands with semicolons (;)."
-msgstr "Scheidt meerdere commando's met punt-comma's (;)."
-
-#: classes/Gems/Default/DatabaseAction.php:522
-msgid "Run"
-msgstr "Uitvoeren"
-
-#: classes/Gems/Default/DatabaseAction.php:531
-msgid "raw"
-msgstr "rauw"
-
-#: classes/Gems/Default/DatabaseAction.php:541
-#, php-format
-msgid "Result set %s."
-msgstr "Resultaat %s."
-
-#: classes/Gems/Default/DatabaseAction.php:564
-msgid "Execute raw SQL"
-msgstr "SQL direct uitvoeren"
-
-#: classes/Gems/Default/DatabaseAction.php:567
-msgid "Result sets"
-msgstr "Resultaten"
-
-#: classes/Gems/Default/DatabaseAction.php:592
-msgid "This database object does not exist. You cannot view it."
-msgstr "Dit database object bestaat. Het kan dus ook niet bekeken worden."
-
-#: classes/Gems/Default/DatabaseAction.php:597
-#, php-format
-msgid "The data in table %s"
-msgstr "De gegevens in tabel %s"
-
-#: classes/Gems/Default/DatabaseAction.php:598
-#, php-format
-msgid "Contents of %s %s"
-msgstr "De inhoud van %s %s"
-
-#: classes/Gems/Default/ExportAction.php:69
-msgid "Data"
-msgstr "Data"
-
-#: classes/Gems/Default/ExportAction.php:74
-msgid "Export data"
-msgstr "Exporteer gegevens"
-
-#: classes/Gems/Default/ExportAction.php:153
-msgid "Survey"
-msgstr "Vragenlijst"
-
-#: classes/Gems/Default/ExportAction.php:168
-#, php-format
-msgid "%s records found."
-msgstr "%s records gevonden."
-
-#: classes/Gems/Default/ExportAction.php:172
-#: classes/Gems/Default/LogAction.php:197
-msgid "Organization"
-msgstr "Organisatie"
-
-#: classes/Gems/Default/ExportAction.php:181
-msgid "Export to"
-msgstr "Exporteer naar"
-
-#: classes/Gems/Default/GroupAction.php:89
-#: classes/Gems/Default/LogAction.php:201
-msgid "Role"
-msgstr "Rol"
-
-#: classes/Gems/Default/GroupAction.php:92
-msgid "Active"
-msgstr "Actief"
-
-#: classes/Gems/Default/GroupAction.php:97
-msgid "Allowed IP Ranges"
-msgstr "Toegestane IP adres reeksen"
-
-#: classes/Gems/Default/GroupAction.php:98
-msgid "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
-msgstr "Scheiden met | voorbeeld: 10.0.0.0-10.0.0.255 (subnet masks worden niet ondersteund)"
-
-#: classes/Gems/Default/GroupAction.php:108
-msgid "group"
-msgid_plural "groups"
-msgstr[0] "groep"
-msgstr[1] "groepen"
-
-#: classes/Gems/Default/GroupAction.php:113
-msgid "Administrative groups"
-msgstr "Beheer groepen"
-
-#: classes/Gems/Default/IndexAction.php:156
-msgid "Request password reset"
-msgstr "Wachtwoord vergeten?"
-
-#: classes/Gems/Default/IndexAction.php:160
-msgid "Please enter your organization and your username or e-mail address. "
-msgstr "Geef uw organisatie en uw email adres of de gebruikersnaam op. "
-
-#: classes/Gems/Default/IndexAction.php:162
-msgid "Please enter your username or e-mail address. "
-msgstr "Geef uw email adres of gebruikersnaam op. "
-
-#: classes/Gems/Default/IndexAction.php:164
-msgid "We will then send you an e-mail with a link. The link will bring you to a page where you can set a new password of your choice."
-msgstr "Vervolgens sturen wij u een email met een link. De link verwijst naar een pagina waar u een zelfgekozen wachtwoord in kan voeren."
-
-#: classes/Gems/Default/IndexAction.php:170
-msgid "Execute password reset"
-msgstr "Vervang vergeten passwood"
-
-#: classes/Gems/Default/IndexAction.php:171
-msgid "We received your password reset request."
-msgstr "We hebben uw verzoek voor een nieuw wachtwoord ontvangen."
-
-#: classes/Gems/Default/IndexAction.php:174
-#, php-format
-msgid "Welcome to %s"
-msgstr "Welkom bij %s"
-
-#: classes/Gems/Default/IndexAction.php:175
-msgid "Welcome to this website."
-msgstr "Welkom op deze website."
-
-#: classes/Gems/Default/IndexAction.php:178
-msgid "Please enter your password of choice twice."
-msgstr "Geef twee keer een zelfgekozen wachtwoord op."
-
-#: classes/Gems/Default/IndexAction.php:216
-msgid "Your password must be changed."
-msgstr "Uw wachtwoord moet veranderd worden."
-
-#: classes/Gems/Default/IndexAction.php:228
-#, php-format
-msgid "Login successful, welcome %s."
-msgstr "Login in orde, welkom %s."
-
-#: classes/Gems/Default/IndexAction.php:268
-#, php-format
-msgid "Good bye: %s."
-msgstr "Tot ziens: %s."
-
-#: classes/Gems/Default/IndexAction.php:291
-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:293
-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:312
-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:321
-msgid "New password is active."
-msgstr "Nieuwe wachtwoord geactiveerd."
-
-#: classes/Gems/Default/IndexAction.php:342
-msgid "Password reset requested"
-msgstr "Wachtwoord reset aangevraagd"
-
-#: classes/Gems/Default/IndexAction.php:345
-msgid ""
-"Dear {greeting},\n"
-"\n"
-"\n"
-"A new password was requested for your [b]{organization}[/b] account on the [b]{project}[/b] site, please click within {reset_in_hours} hours on [url={reset_url}]this link[/url] to enter the password of your choice.\n"
-"\n"
-"\n"
-"{organization_signature}\n"
-"\n"
-"[url={reset_url}]{reset_url}[/url]\n"
-msgstr ""
-"Geachte {greeting},\n"
-"\n"
-"\n"
-"Voor uw [b]{organization}[/b] account op de [b]{project}[/b] site is een nieuw wachtwoord aangevraagd. Klik a.u.b. binnen {reset_in_hours} uur op [url={reset_url}]deze link[/url] om een zelfgekozen wachtwoord op te geven.\n"
-"\n"
-"\n"
-"{organization_signature}\n"
-"\n"
-"[url={reset_url}]{reset_url}[/url]\n"
-
-#: classes/Gems/Default/InvitationAction.php:52
-msgid "Invite"
-msgstr "Uitnodigen"
-
-#: classes/Gems/Default/LanguageAction.php:63
-msgid "Cookies must be enabled for setting the language."
-msgstr "Zonder cookies kan de taal niet ingesteld worden."
-
-#: classes/Gems/Default/LanguageAction.php:66
-msgid "Invalid language setting."
-msgstr "Ongeldige taal instelling."
-
-#: classes/Gems/Default/LogAction.php:78
-msgid "from"
-msgstr "vanaf"
-
-#: classes/Gems/Default/LogAction.php:83
-msgid "until"
-msgstr "tot"
-
-#: classes/Gems/Default/LogAction.php:89
-msgid "days"
-msgstr "dagen"
-
-#: classes/Gems/Default/LogAction.php:90
-msgid "weeks"
-msgstr "weken"
-
-#: classes/Gems/Default/LogAction.php:91
-msgid "months"
-msgstr "maanden"
-
-#: classes/Gems/Default/LogAction.php:92
-msgid "years"
-msgstr "jaren"
-
-#: classes/Gems/Default/LogAction.php:113
-msgid "Organization:"
-msgstr "Organisatie:"
-
-#: classes/Gems/Default/LogAction.php:115
-msgid "All organizations"
-msgstr "Alle organisaties"
-
-#: classes/Gems/Default/LogAction.php:117
-msgid "Staff:"
-msgstr "Medewerkers:"
-
-#: classes/Gems/Default/LogAction.php:124
-msgid "All staff"
-msgstr "Alle medewerkers"
-
-#: classes/Gems/Default/LogAction.php:127
-msgid "Patient:"
-msgstr "Patiënt:"
-
-#: classes/Gems/Default/LogAction.php:134
-msgid "All patients"
-msgstr "Alle patiënten"
-
-#: classes/Gems/Default/LogAction.php:136
-msgid "Action:"
-msgstr "Actie:"
-
-#: classes/Gems/Default/LogAction.php:139
-msgid "All actions"
-msgstr "Alle acties"
-
-#: classes/Gems/Default/LogAction.php:190
-msgid "Date"
-msgstr "Datum"
-
-#: classes/Gems/Default/LogAction.php:191
-#: classes/Gems/Default/LogMaintenanceAction.php:52
-msgid "Action"
-msgstr "Actie"
-
-#: classes/Gems/Default/LogAction.php:192
-msgid "Message"
-msgstr "Bericht"
-
-#: classes/Gems/Default/LogAction.php:198
-msgid "Respondent"
-msgstr "Patiënt"
-
-#: classes/Gems/Default/LogAction.php:202
-msgid "IP address"
-msgstr "IP adres"
-
-#: classes/Gems/Default/LogAction.php:209
-#: classes/Gems/Default/LogMaintenanceAction.php:53
-msgid "Log"
-msgstr "Logboek"
-
-#: classes/Gems/Default/LogMaintenanceAction.php:71
-msgid "Log:"
-msgstr "Logboek:"
-
-#: classes/Gems/Default/LogMaintenanceAction.php:72
-msgid "All"
-msgstr "Alles"
-
-#: classes/Gems/Default/LogMaintenanceAction.php:78
-msgid "Log action"
-msgstr "Logboek actie"
-
-#: classes/Gems/Default/LogMaintenanceAction.php:82
-msgid "Log maintenance"
-msgstr "Logboek onderhoud"
-
-#: classes/Gems/Default/MailJobAction.php:78
-#: classes/Gems/Default/MailLogAction.php:118
-msgid "Template"
-msgstr "Sjabloon"
-
-#: classes/Gems/Default/MailJobAction.php:79
-msgid "By staff member"
-msgstr "Door medewerke"
-
-#: classes/Gems/Default/MailJobAction.php:81
-msgid "Used for logging and possibly from address."
-msgstr "Gebruikt voor activiteiten log en eventueel voor vanaf adres."
-
-#: classes/Gems/Default/MailJobAction.php:84
-msgid "Job is only run when active."
-msgstr "Een opdracht wordt alleen uitgevoerd als deze actief is."
-
-#: classes/Gems/Default/MailJobAction.php:87
-msgid "From address used"
-msgstr "Gebruikte vanaf adres"
-
-#: classes/Gems/Default/MailJobAction.php:89
-msgid "From other"
-msgstr "Vanaf overig"
-
-#: classes/Gems/Default/MailJobAction.php:90
-#, php-format
-msgid "Only when '%s' is '%s'."
-msgstr "Aleen als '%s' is '%s'."
-
-#: classes/Gems/Default/MailJobAction.php:92
-msgid "Processing Method"
-msgstr "Verwerkings methode"
-
-#: classes/Gems/Default/MailJobAction.php:93
-msgid "Filter for"
-msgstr "Selecteer op"
-
-#: classes/Gems/Default/MailJobAction.php:94
-msgid "Days between reminders"
-msgstr "Aantal dagen tussen herinneringen"
-
-#: classes/Gems/Default/MailJobAction.php:113
-msgid "First mail"
-msgstr "Eerste mail"
-
-#: classes/Gems/Default/MailJobAction.php:114
-msgid "Reminder"
-msgstr "Herinnering"
-
-#: classes/Gems/Default/MailJobAction.php:125
-msgid "Use organizational from address"
-msgstr "Gebruik vanaf adres van organisatie"
-
-#: classes/Gems/Default/MailJobAction.php:128
-#, php-format
-msgid "Use site %s address"
-msgstr "Gebruik %s adres van de site"
-
-#: classes/Gems/Default/MailJobAction.php:131
-msgid "Use the 'By staff member' address"
-msgstr "Gebruik 'Door medewerker' adres"
-
-#: classes/Gems/Default/MailJobAction.php:132
-msgid "Other"
-msgstr "Overige"
-
-#: classes/Gems/Default/MailJobAction.php:144
-msgid "Automatic mail jobs"
-msgstr "Automatische mail opdrachten "
-
-#: classes/Gems/Default/MailJobAction.php:155
-msgid "automatic mail job"
-msgid_plural "automatic mail jobs"
-msgstr[0] "automatische mail opdracht"
-msgstr[1] "automatische mail opdrachten"
-
-#: classes/Gems/Default/MailJobAction.php:165
-#, php-format
-msgid "Automatic mails have been turned off since %s."
-msgstr "Automatische mail opdrachten staan sinds %s uit."
-
-#: classes/Gems/Default/MailJobAction.php:169
-msgid "Turn Automatic Mail Jobs ON"
-msgstr "Automatische mail opdrachten AANzetten"
-
-#: classes/Gems/Default/MailJobAction.php:175
-msgid "With automatic mail jobs and a cron job on the server, mails can be sent without manual user action."
-msgstr "Met automatische mail opdrachten en een cron opdracht op de server, kunnen mails verstuurd worden zonder dat een gebruiker actie hoeft te ondernemen."
-
-#: classes/Gems/Default/MailLogAction.php:109
-msgid "Date sent"
-msgstr "Verzend datum"
-
-#: classes/Gems/Default/MailLogAction.php:110
-msgid "Receiver"
-msgstr "Ontvanger"
-
-#: classes/Gems/Default/MailLogAction.php:111
-msgid "To address"
-msgstr "Adres aan"
-
-#: classes/Gems/Default/MailLogAction.php:112
-msgid "Sender"
-msgstr "Verzender"
-
-#: classes/Gems/Default/MailLogAction.php:113
-msgid "From address"
-msgstr "Adres van"
-
-#: classes/Gems/Default/MailLogAction.php:115
-#: classes/Gems/Default/MailTemplateAction.php:62
-msgid "Subject"
-msgstr "Onderwerp"
-
-#: classes/Gems/Default/MailLogAction.php:143
-msgid "Mail Activity Log"
-msgstr "Logboek Mail Activiteit"
-
-#: classes/Gems/Default/MailLogAction.php:154
-msgid "mail activity"
-msgid_plural "mail activities"
-msgstr[0] "mail activiteit"
-msgstr[1] "mail activiteiten"
-
-#: classes/Gems/Default/MailServerAction.php:68
-msgid "From address [part]"
-msgstr "Vanaf adres [gedeelte]"
-
-#: classes/Gems/Default/MailServerAction.php:70
-msgid "E.g.: '%', '%.org' or '%@gemstracker.org' or 'ro...@ge...'."
-msgstr "Bijvoorbeeld: '%', '%.nl' of '%@gemstracker.nl' of 'ro...@ge...'."
-
-#: classes/Gems/Default/MailServerAction.php:71
-msgid "Server"
-msgstr "Server"
-
-#: classes/Gems/Default/MailServerAction.php:73
-msgid "Encryption"
-msgstr "Encryptie"
-
-#: classes/Gems/Default/MailServerAction.php:76
-msgid "None"
-msgstr "Geen"
-
-#: classes/Gems/Default/MailServerAction.php:77
-msgid "SSL"
-msgstr "SSL"
-
-#: classes/Gems/Default/MailServerAction.php:78
-msgid "TLS"
-msgstr "TLS"
-
-#: classes/Gems/Default/MailServerAction.php:80
-msgid "Port"
-msgstr "Poort"
-
-#: classes/Gems/Default/MailServerAction.php:82
-msgid "Normal values: 25 for TLS and no encryption, 465 for SSL"
-msgstr "Standaard waardes: 25 voor TLS en voor geen encryptie, 465 voor SSL"
-
-#: classes/Gems/Default/MailServerAction.php:84
-msgid "User ID"
-msgstr "Gebruikers ID"
-
-#: classes/Gems/Default/MailServerAction.php:88
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: classes/Gems/Default/MailServerAction.php:90
-#: classes/Gems/Default/SourceAction.php:95
-msgid "Repeat password"
-msgstr "Herhaal wachtwoord"
-
-#: classes/Gems/Default/MailServerAction.php:91
-#: classes/Gems/Default/SourceAction.php:74
-msgid "Enter only when changing"
-msgstr "Alleen invoeren om het wachtwoord te wijzigen"
-
-#: classes/Gems/Default/MailServerAction.php:100
-msgid "email server"
-msgid_plural "email servers"
-msgstr[0] "email server"
-msgstr[1] "email servers"
-
-#: classes/Gems/Default/MailServerAction.php:105
-msgid "Email servers"
-msgstr "Email servers"
-
-#: classes/Gems/Default/MailTemplateAction.php:76
-#: classes/Gems/Default/StaffAction.php:278
-#: classes/Gems/Default/StaffAction.php:311
-msgid "(all organizations)"
-msgstr "(alle organisaties)"
-
-#: classes/Gems/Default/MailTemplateAction.php:95
-msgid "email template"
-msgid_plural "email templates"
-msgstr[0] "email sjabloon"
-msgstr[1] "email sjablonen"
-
-#: classes/Gems/Default/MailTemplateAction.php:100
-msgid "Email templates"
-msgstr "Email sjabloon"
-
-#: classes/Gems/Default/OptionAction.php:81
-msgid "You are not allowed to change your password."
-msgstr "U mag uw wachtwoord niet wijzigen."
-
-#: classes/Gems/Default/OptionAction.php:129
-msgid "Login Name"
-msgstr "Login Naam"
-
-#: classes/Gems/Default/OptionAction.php:136
-#: classes/Gems/Default/OrganizationAction.php:132
-#: classes/Gems/Default/RespondentAction.php:175
-#: classes/Gems/Default/StaffAction.php:294
-msgid "Language"
-msgstr "Taal"
-
-#: classes/Gems/Default/OptionAction.php:146
-#, php-format
-msgid "Options"
-msgstr "Instellingen"
-
-#: classes/Gems/Default/OptionAction.php:155
-msgid "This overview provides information about the last login activity on your account."
-msgstr "Dit overzicht geeft informatie over de recente inlog activiteit op uw account."
-
-#: classes/Gems/Default/OptionAction.php:175
-msgid "Date / time"
-msgstr "Datum / tijd"
-
-#: classes/Gems/Default/OptionAction.php:186
-msgid "Item"
-msgstr "Item"
-
-#: classes/Gems/Default/OrganizationAction.php:91
-msgid "Invalid organization."
-msgstr "Ongeldige organisatie."
-
-#: classes/Gems/Default/OrganizationAction.php:113
-msgid "Url"
-msgstr "Url"
-
-#: classes/Gems/Default/OrganizationAction.php:114
-msgid "Task"
-msgstr "Taak"
-
-#: classes/Gems/Default/OrganizationAction.php:115
-msgid "Contact name"
-msgstr "Contact naam"
-
-#: classes/Gems/Default/OrganizationAction.php:116
-msgid "Contact email"
-msgstr "Contact email"
-
-#: classes/Gems/Default/OrganizationAction.php:119
-msgid "Style"
-msgstr "Stijl"
-
-#: classes/Gems/Default/OrganizationAction.php:124
-msgid "Default url's"
-msgstr "Standaard url's"
-
-#: classes/Gems/Default/OrganizationAction.php:126
-#, php-format
-msgid "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
-msgstr "Altijd naar deze organisatie overschakelen als %s vanaf één van deze door spatie gescheiden url's wordt aangeroepen. De eerste url wordt gebruikt voor emails."
-
-#: classes/Gems/Default/OrganizationAction.php:136
-msgid "Can the organization be used?"
-msgstr "Is de organisatie in gebruik?"
-
-#: classes/Gems/Default/OrganizationAction.php:137
-msgid "Login"
-msgstr "Inloggen"
-
-#: classes/Gems/Default/OrganizationAction.php:137
-msgid "Can people login for this organization?"
-msgstr "Kunnen personen inloggen voor deze organisatie?"
-
-#: classes/Gems/Default/OrganizationAction.php:138
-msgid "Accepting"
-msgstr "Accepteert"
-
-#: classes/Gems/Default/OrganizationAction.php:138
-msgid "Can new respondents be added to the organization?"
-msgstr "Accepteert de organisatie nieuwe patiënten?"
-
-#: classes/Gems/Default/OrganizationAction.php:139
-msgid "Does the organization have respondents?"
-msgstr "Heeft de organisatie patiënten?"
-
-#: classes/Gems/Default/OrganizationAction.php:140
-msgid "Respondent group"
-msgstr "Patiënt groep"
-
-#: classes/Gems/Default/OrganizationAction.php:140
-msgid "Allows respondents to login."
-msgstr "Patiënten toestaan in te loggen."
-
-#: classes/Gems/Default/OrganizationAction.php:144
-msgid "Greeting"
-msgstr "Begroeting"
-
-#: classes/Gems/Default/OrganizationAction.php:144
-#: classes/Gems/Default/OrganizationAction.php:145
-msgid "For emails and token forward screen."
-msgstr "Voor emails en kenmerk scherm."
-
-#: classes/Gems/Default/OrganizationAction.php:145
-msgid "Signature"
-msgstr "Handtekening"
-
-#: classes/Gems/Default/OrganizationAction.php:147
-msgid "Accessible by"
-msgstr "Toegankelijk voor"
-
-#: classes/Gems/Default/OrganizationAction.php:147
-msgid "Checked organizations see this organizations respondents."
-msgstr "Geselecteerde organizaties kunnen de patiënten van deze organisatie bekijken."
-
-#: classes/Gems/Default/OrganizationAction.php:157
-msgid "Code name"
-msgstr "Code naam"
-
-#: classes/Gems/Default/OrganizationAction.php:157
-msgid "Only for programmers."
-msgstr "Uitsluitend voor programmeurs."
-
-#: classes/Gems/Default/OrganizationAction.php:167
-msgid "This can not be changed yet"
-msgstr "Dit kan nog niet gewijzigd worden"
-
-#: classes/Gems/Default/OrganizationAction.php:169
-#: classes/Gems/Default/StaffAction.php:119
-msgid "User Definition"
-msgstr "User Definition"
-
-#: classes/Gems/Default/OrganizationAction.php:189
-msgid "Participating organizations"
-msgstr "Deelnemende organisaties"
-
-#: classes/Gems/Default/OrganizationAction.php:200
-msgid "organization"
-msgid_plural "organizations"
-msgstr[0] "organisatie"
-msgstr[1] "organisaties"
-
-#: classes/Gems/Default/OverviewPlanAction.php:115
-#: classes/Gems/Default/ProjectSurveysAction.php:88
-msgid "survey"
-msgid_plural "surveys"
-msgstr[0] "vragenlijst"
-msgstr[1] "vragenlijsten"
-
-#: classes/Gems/Default/OverviewPlanAction.php:120
-msgid "Planning overview"
-msgstr "Planning overzicht"
-
-#: classes/Gems/Default/ProjectInformationAction.php:83
-msgid "empty file"
-msgstr "leeg bestand"
-
-#: classes/Gems/Default/ProjectInformationAction.php:87
-msgid "file not found"
-msgstr "bestand niet gevonden"
-
-#: classes/Gems/Default/ProjectInformationAction.php:120
-msgid "Logged errors"
-msgstr "Opgeslagen foutmeldingen"
-
-#: classes/Gems/Default/ProjectInformationAction.php:120
-msgid "Empty logfile"
-msgstr "Verwijder alle foutmeldingen"
-
-#: classes/Gems/Default/ProjectInformationAction.php:125
-msgid "Project information"
-msgstr "Project informatie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:129
-msgid "Project name"
-msgstr "Project naam"
-
-#: classes/Gems/Default/ProjectInformationAction.php:130
-msgid "Project version"
-msgstr "Project versie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:131
-msgid "Gems version"
-msgstr "Gems versie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:133
-msgid "Gems project"
-msgstr "Gems project"
-
-#: classes/Gems/Default/ProjectInformationAction.php:134
-msgid "Gems web directory"
-msgstr "Gems web folder"
-
-#: classes/Gems/Default/ProjectInformationAction.php:135
-msgid "Gems code directory"
-msgstr "Gems code folder"
-
-#: classes/Gems/Default/ProjectInformationAction.php:136
-msgid "Gems project path"
-msgstr "Gems project folder"
-
-#: classes/Gems/Default/ProjectInformationAction.php:137
-msgid "MUtil version"
-msgstr "MUtil versie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:138
-msgid "Zend version"
-msgstr "Zend versie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:139
-msgid "Application environment"
-msgstr "Applicatie omgeving"
-
-#: classes/Gems/Default/ProjectInformationAction.php:140
-msgid "Application baseuri"
-msgstr "Applicatie baseuri"
-
-#: classes/Gems/Default/ProjectInformationAction.php:141
-msgid "Application directory"
-msgstr "Applicatie folder"
-
-#: classes/Gems/Default/ProjectInformationAction.php:142
-msgid "PHP version"
-msgstr "PHP versie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:143
-msgid "Server Hostname"
-msgstr "Webserver naam"
-
-#: classes/Gems/Default/ProjectInformationAction.php:144
-msgid "Server OS"
-msgstr "Server besturingssysteem"
-
-#: classes/Gems/Default/ProjectInformationAction.php:145
-msgid "Time on server"
-msgstr "De tijd op de server"
-
-#: classes/Gems/Default/ProjectInformationAction.php:149
-msgid "Turn Maintenance Mode OFF"
-msgstr "Onderhoudsmodus UITzetten"
-
-#: classes/Gems/Default/ProjectInformationAction.php:151
-msgid "Turn Maintenance Mode ON"
-msgstr "Onderhoudsmodus AANzetten"
-
-#: classes/Gems/Default/ProjectInformationAction.php:161
-msgid "Version information"
-msgstr "Versie informatie"
-
-#: classes/Gems/Default/ProjectInformationAction.php:195
-msgid "Server PHP Info"
-msgstr "Server PHP Info"
-
-#: classes/Gems/Default/ProjectInformationAction.php:212
-msgid "Project settings"
-msgstr "Project instellingen"
-
-#: classes/Gems/Default/ProjectInformationAction.php:219
-msgid "Session content"
-msgstr "Sessie inhoud"
-
-#: classes/Gems/Default/ProjectInformationAction.php:220
-msgid "Session"
-msgstr "Sessie"
-
-#: classes/Gems/Default/ProjectSurveysAction.php:68
-msgid "By"
-msgstr "Door"
-
-#: classes/Gems/Default/ProjectSurveysAction.php:69
-#: classes/Gems/Default/ProjectTracksAction.php:67
-msgid "From"
-msgstr "Van"
-
-#: classes/Gems/Default/ProjectSurveysAction.php:70
-#: classes/Gems/Default/ProjectTracksAction.php:68
-msgid "Until"
-msgstr "Tot"
-
-#: classes/Gems/Default/ProjectSurveysAction.php:93
-msgid "Active surveys"
-msgstr "Beschikbare vragenlijsten"
-
-#: classes/Gems/Default/ProjectTracksAction.php:65
-msgid "Survey #"
-msgstr "Vragenlijsten"
-
-#: classes/Gems/Default/ProjectTracksAction.php:85
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "traject"
-msgstr[1] "trajecten"
-
-#: classes/Gems/Default/ProjectTracksAction.php:90
-msgid "Active tracks"
-msgstr "Beschikbare trajecten"
-
-#: classes/Gems/Default/ProjectTracksAction.php:110
-#, php-format
-msgid "Questions in survey %s"
-msgstr "Vragen in vragenlijsten %s"
-
-#: classes/Gems/Default/ProjectTracksAction.php:118
-#, php-format
-msgid "Survey %s does not exist."
-msgstr "Vragenlijst %s bestaat niet."
-
-#: classes/Gems/Default/ProjectTracksAction.php:121
-msgid "Survey not specified."
-msgstr "Vragenlijst niet opgegeven."
-
-#: classes/Gems/Default/ProjectTracksAction.php:132
-#, php-format
-msgid "Track %s does not exist."
-msgstr "Trajectnummer %s bestaat niet."
-
-#: classes/Gems/Default/ReceptionAction.php:55
-msgid "Can be assigned to"
-msgstr "Kan toegewezen worden aan"
-
-#: classes/Gems/Default/ReceptionAction.php:56
-msgid "Additional action"
-msgstr "Aanvullende actie"
-
-#: classes/Gems/Default/ReceptionAction.php:80
-msgid "Code"
-msgstr "Code"
-
-#: classes/Gems/Default/ReceptionAction.php:83
-msgid "Is success code"
-msgstr "Is succes code"
-
-#: classes/Gems/Default/ReceptionAction.php:87
-msgid "This reception code is a success code."
-msgstr "Aanzetten als deze ontvangst code positief is."
-
-#: classes/Gems/Default/ReceptionAction.php:91
-msgid "Only active codes can be selected."
-msgstr "Alleen actieve codes kunnen geselecteerd worden."
-
-#: classes/Gems/Default/ReceptionAction.php:92
-msgid "For respondents"
-msgstr "Voor patiënten"
-
-#: classes/Gems/Default/ReceptionAction.php:95
-msgid "This reception code can be assigned to a respondent."
-msgstr "Deze ontvangstcode kan aan een patiënt toegewezen worden."
-
-#: classes/Gems/Default/ReceptionAction.php:96
-msgid "For tracks"
-msgstr "Voor trajecten"
-
-#: classes/Gems/Default/ReceptionAction.php:99
-msgid "This reception code can be assigned to a track."
-msgstr "Deze ontvangstcode kan aan een traject toegewezen worden."
-
-#: classes/Gems/Default/ReceptionAction.php:100
-msgid "For surveys"
-msgstr "Voor vragenlijsten"
-
-#: classes/Gems/Default/ReceptionAction.php:102
-msgid "This reception code can be assigned to a survey."
-msgstr "Deze ontvangstcode kan aan een vragenlijst toegewezen worden."
-
-#: classes/Gems/Default/ReceptionAction.php:103
-msgid "Redo survey"
-msgstr "Vragenlijsten herhalen"
-
-#: classes/Gems/Default/ReceptionAction.php:105
-msgid "Redo a survey on this reception code."
-msgstr "Herhaal vragenlijst bij deze ontvangstcode."
-
-#: classes/Gems/Default/ReceptionAction.php:106
-msgid "Overwrite ansers"
-msgstr "Overschrijf bestaande antwoorden"
-
-#: classes/Gems/Default/ReceptionAction.php:109
-msgid "Remove the consent from already answered surveys."
-msgstr "Verwijder \"informed consent\" van beantwoorde vragenlijsten"
-
-#: classes/Gems/Default/ReceptionAction.php:127
-msgid "reception code"
-msgid_plural "reception codes"
-msgstr[0] "Ontvangst code"
-msgstr[1] "Ontvangst code"
-
-#: classes/Gems/Default/RespondentAction.php:119
-#, php-format
-msgid "Random Example BSN: %s"
-msgstr "Willekeurig voorbeeld BSN: %s"
-
-#: classes/Gems/Default/RespondentAction.php:122
-msgid "Enter a 9-digit SSN number."
-msgstr "Voer een BSN nummer van 9 cijfers in."
-
-#: classes/Gems/Default/RespondentAction.php:127
-msgid "Identification"
-msgstr "Identificatie"
-
-#: classes/Gems/Default/RespondentAction.php:134
-msgid "SSN"
-msgstr "SSN"
-
-#: classes/Gems/Default/RespondentAction.php:138
-msgid "Patient number"
-msgstr "Patiënt nummer"
-
-#: classes/Gems/Default/RespondentAction.php:147
-msgid "Medical data"
-msgstr "Medische gegevens"
-
-#: classes/Gems/Default/RespondentAction.php:154
-msgid "DBC's, etc..."
-msgstr "DBC's, etc..."
-
-#: classes/Gems/Default/RespondentAction.php:157
-msgid "Contact information"
-msgstr "Contact informatie"
-
-#: classes/Gems/Default/RespondentAction.php:162
-msgid "Respondent has no e-mail"
-msgstr "Patiënt zonder email"
-
-#: classes/Gems/Default/RespondentAction.php:163
-msgid "With housenumber"
-msgstr "Met huisnummer"
-
-#: classes/Gems/Default/RespondentAction.php:170
-msgid "Country"
-msgstr "Land"
-
-#: classes/Gems/Default/RespondentAction.php:174
-msgid "Settings"
-msgstr "Instellingen"
-
-#: classes/Gems/Default/RespondentAction.php:176
-msgid "Has the respondent signed the informed consent letter?"
-msgstr "Heeft de patiënt het \"informed consent\" formulier ondertekend?"
-
-#: classes/Gems/Default/RespondentAction.php:206
-msgid "Comments"
-msgstr "Opmerkingen"
-
-#: classes/Gems/Default/RespondentAction.php:207
-msgid "Treatment"
-msgstr "Behandeling"
-
-#: classes/Gems/Default/RespondentAction.php:235
-msgid "Rejection code"
-msgstr "Afkeuringscode"
-
-#: classes/Gems/Default/RespondentAction.php:242
-msgid "Delete respondent"
-msgstr "Verwijder patiënt"
-
-#: classes/Gems/Default/RespondentAction.php:274
-msgid "Respondent deleted."
-msgstr "Patiënt verwijderd"
-
-#: classes/Gems/Default/RespondentAction.php:278
-msgid "Respondent tracks stopped."
-msgstr "Trajecten van patiënt zijn gestopt."
-
-#: classes/Gems/Default/RespondentAction.php:282
-msgid "Choose a reception code to delete."
-msgstr "Kies een ontvangst code om te verwijderen."
-
-#: classes/Gems/Default/RespondentAction.php:326
-msgid "respondent"
-msgid_plural "respondents"
-msgstr[0] "patiënt"
-msgstr[1] "patiënten"
-
-#: classes/Gems/Default/RespondentAction.php:399
-msgid "Please settle the informed consent form for this respondent."
-msgstr "A.u.b. het informed consent formulier doornemen met deze patiënt"
-
-#: classes/Gems/Default/RespondentPlanAction.php:67
-msgid "Show respondent"
-msgstr "Toon patiënt"
-
-#: classes/Gems/Default/RespondentPlanAction.php:73
-msgid "Show track"
-msgstr "Toon traject"
-
-#: classes/Gems/Default/RespondentPlanAction.php:136
-msgid " of "
-msgstr " van "
-
-#: classes/Gems/Default/RespondentPlanAction.php:137
-msgid "Progress"
-msgstr "Voortgang"
-
-#: classes/Gems/Default/RespondentPlanAction.php:144
-msgid "Respondent planning"
-msgstr "Per patiënt plannen"
-
-#: classes/Gems/Default/RoleAction.php:175
-msgid "Illegal name"
-msgstr "Naam niet toegestaan"
-
-#: classes/Gems/Default/RoleAction.php:199
-#: classes/Gems/Default/RoleAction.php:258
-msgid "Parents"
-msgstr "Afgeleid van"
-
-#: classes/Gems/Default/RoleAction.php:214
-msgid "Editing `master` is not allowed"
-msgstr "Het wijzigen van `master` is niet toegestaan"
-
-#: classes/Gems/Default/RoleAction.php:232
-msgid "role"
-msgid_plural "roles"
-msgstr[0] "Rol"
-msgstr[1] "Rollen"
-
-#: classes/Gems/Default/RoleAction.php:237
-msgid "Administrative roles"
-msgstr "Beheer rollen en rechten"
-
-#: classes/Gems/Default/RoleAction.php:259
-#: classes/Gems/Default/RoleAction.php:275
-msgid "Allowed"
-msgstr "Toegestaan"
-
-#: classes/Gems/Default/RoleAction.php:260
-#: classes/Gems/Default/RoleAction.php:276
-msgid "Denied"
-msgstr "Geweigerd"
-
-#: classes/Gems/Default/RoleAction.php:264
-msgid "Project role overview"
-msgstr "Project rollen"
-
-#: classes/Gems/Default/RoleAction.php:274
-msgid "Privilege"
-msgstr "Privilége"
-
-#: classes/Gems/Default/RoleAction.php:280
-msgid "Project privileges"
-msgstr "Project priviléges"
-
-#: classes/Gems/Default/SourceAction.php:69
-msgid "Leave empty for the Gems database."
-msgstr "Leeglaten bij gebruik van de Gems database."
-
-#: classes/Gems/Default/SourceAction.php:79
-msgid "E.g. the name of the project - for single source projects."
-msgstr "Bijvoorbeeld de project naam - bij projecten met maar één bron."
-
-#: classes/Gems/Default/SourceAction.php:81
-msgid "For creating token-survey url."
-msgstr "Voor kenmerk-vragenlijst url."
-
-#: classes/Gems/Default/SourceAction.php:86
-msgid "The database server used by the source."
-msgstr "Het merk database server gebruikt door deze bron."
-
-#: classes/Gems/Default/SourceAction.php:88
-msgid "Do not forget the underscores."
-msgstr "Vergeet de underscores niet."
-
-#: classes/Gems/Default/SourceAction.php:91
-msgid "Database Username"
-msgstr "Database gebruikersnaam"
-
-#: classes/Gems/Default/SourceAction.php:93
-msgid "Database Password"
-msgstr "Database wachtwoord"
-
-#: classes/Gems/Default/SourceAction.php:116
-#, php-format
-msgid "Refreshing token attributes for %s source."
-msgstr "Kenmerk attributen verversing voor %s bron."
-
-#: classes/Gems/Default/SourceAction.php:132
-#, php-format
-msgid "Checking survey results for %s source."
-msgstr "Controle vragenlijstresultaten voor %s bron."
-
-#: classes/Gems/Default/SourceAction.php:144
-msgid "Checking survey results for all sources."
-msgstr "Controle vragenlijstresultaten voor alle bronnen."
-
-#: classes/Gems/Default/SourceAction.php:165
-msgid "Source Url"
-msgstr "Bron Url"
-
-#: classes/Gems/Default/SourceAction.php:167
-msgid "Adaptor class"
-msgstr "Adaptor klasse"
-
-#: classes/Gems/Default/SourceAction.php:169
-msgid "Database Server"
-msgstr "Database Server"
-
-#: classes/Gems/Default/SourceAction.php:171
-msgid "Database host"
-msgstr "Database machine"
-
-#: classes/Gems/Default/SourceAction.php:173
-msgid "Charset"
-msgstr "Tekenset"
-
-#: classes/Gems/Default/SourceAction.php:176
-msgid "Table prefix"
-msgstr "Voorvoegsel tabel"
-
-#: classes/Gems/Default/SourceAction.php:180
-msgid "Last check"
-msgstr "Laatste controle"
-
-#: classes/Gems/Default/SourceAction.php:213
-msgid "source"
-msgid_plural "sources"
-msgstr[0] "bron"
-msgstr[1] "bronnen"
-
-#: classes/Gems/Default/SourceAction.php:218
-msgid "Survey Sources"
-msgstr "Bronnen"
-
-#: classes/Gems/Default/SourceAction.php:226
-msgid "This installation is active."
-msgstr "Deze installatie is actief"
-
-#: classes/Gems/Default/SourceAction.php:228
-msgid "Inactive installation."
-msgstr "Deze installatie is inactief"
-
-#: classes/Gems/Default/SourceAction.php:243
-#, php-format
-msgid "Synchronize the %s source."
-msgstr "Synchroniseer de %s bron"
-
-#: classes/Gems/Default/SourceAction.php:256
-msgid "Synchronize all sources."
-msgstr "Synchroniseer alle bronnen."
-
-#: classes/Gems/Default/StaffAction.php:125
-msgid "Unsupported User Definition"
-msgstr "Onbekende User Definition"
-
-#: classes/Gems/Default/StaffAction.php:154
-msgid "Users can only login when this box is checked."
-msgstr "Gebruikers kunnen alleen inloggen als dit is aangevinkt."
-
-#: classes/Gems/Default/StaffAction.php:155
-msgid "If checked the user will logoff when answering a survey."
-msgstr "Indien actief, dan logt de gebruiker uit voor het beantwoorden van een vragenlijst."
-
-#: classes/Gems/Default/StaffAction.php:172
-msgid "You are not allowed to edit this staff member."
-msgstr "U mag deze medewerker niet wijzigen."
-
-#: classes/Gems/Default/StaffAction.php:229
-#, php-format
-msgid "User with id %s already exists but is deleted, do you want to reactivate the account?"
-msgstr "Gebruiker met inlognaam %s bestaat al maar is verwijderd, wilt u het account opnieuw activeren?"
-
-#: classes/Gems/Default/StaffAction.php:270
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-#: classes/Gems/Default/StaffAction.php:285
-msgid "Primary function"
-msgstr "Primaire functie"
-
-#: classes/Gems/Default/StaffAction.php:295
-msgid "Can login"
-msgstr "Kan inloggen"
-
-#: classes/Gems/Default/StaffAction.php:296
-msgid "Logout on survey"
-msgstr "Logout bij beantwoorden vragenlijst"
-
-#: classes/Gems/Default/StaffAction.php:371
-msgid "staff member"
-msgid_plural "staff members"
-msgstr[0] "medewerker"
-msgstr[1] "medewerkers"
-
-#: classes/Gems/Default/StaffAction.php:403
-#, php-format
-msgid "Reset password for: %s"
-msgstr "Verander het wachtwoord voor: %s"
-
-#: classes/Gems/Default/StaffAction.php:406
-msgid "You are not allowed to change this password."
-msgstr "U mag dit wachtwoord niet wijzigen."
-
-#: classes/Gems/Default/SurveyAction.php:64
-msgid "Add survey"
-msgstr "Vragenlijst toevoegen"
-
-#: classes/Gems/Default/SurveyAction.php:67
-#, php-format
-msgid "Add another %s survey"
-msgstr "Nog een %s vragenlijst toevoegen"
-
-#: classes/Gems/Default/SurveyAction.php:70
-#, php-format
-msgid "Adding the %s survey to respondent %s"
-msgstr "Vragenlijst %s toevoegen aan patiënt %s."
-
-#: classes/Gems/Default/SurveyAction.php:73
-msgid "Available surveys"
-msgstr "Beschikbare vragenlijsten"
-
-#: classes/Gems/Default/SurveyAction.php:76
-msgid "No surveys found"
-msgstr "Geen vragenlijsten gevonden"
-
-#: classes/Gems/Default/SurveyAction.php:79
-#, php-format
-msgid "Overview of %s survey for respondent %s"
-msgstr "Overzicht van vragenlijst %s voor patiënt %s "
-
-#: classes/Gems/Default/SurveyAction.php:82
-msgid "This survey has not been assigned to this respondent."
-msgstr "Deze vragenlijst is nog niet aan deze patiënt toegewezen."
-
-#: classes/Gems/Default/SurveyAction.p...
[truncated message content] |
|
From: <gem...@li...> - 2012-05-02 07:29:14
|
Revision: 651
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=651&view=rev
Author: michieltcs
Date: 2012-05-02 07:29:07 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Initial implementation of inPasswordList()
Modified Paths:
--------------
trunk/library/classes/Gems/User/PasswordChecker.php
Modified: trunk/library/classes/Gems/User/PasswordChecker.php
===================================================================
--- trunk/library/classes/Gems/User/PasswordChecker.php 2012-05-01 14:41:29 UTC (rev 650)
+++ trunk/library/classes/Gems/User/PasswordChecker.php 2012-05-02 07:29:07 UTC (rev 651)
@@ -57,6 +57,11 @@
* @var Gems_Project_ProjectSettings
*/
protected $project;
+
+ /**
+ * @var Zend_Cache
+ */
+ protected $cache;
/**
*
@@ -211,6 +216,42 @@
}
}
}
+
+ /**
+ * Tests if the password appears on a (weak) password list. The list should
+ * be a simpe newline separated list of (lowercase) passwords.
+ *
+ * @param string $parameter Filename of the password list, relative to APPLICATION_PATH
+ * @param string $password The password
+ */
+ protected function inPasswordList($parameter, $password)
+ {
+ if (empty($parameter)) {
+ return;
+ }
+
+ if ($this->cache) {
+ $passwordList = $this->cache->load('weakpasswordlist');
+ }
+
+ if (empty($passwordList)) {
+ $filename = APPLICATION_PATH . $parameter;
+
+ if (!file_exists($filename)) {
+ throw new Gems_Exception("Unable to load password list '{$filename}'");
+ }
+
+ $passwordList = explode("\n", file_get_contents($filename));
+ }
+
+ if (in_array(strtolower($password), $passwordList)) {
+ $this->_addError($this->translate->_('should not appear in a list of common passwords'));
+ }
+
+ if ($this->cache) {
+ $this->cache->save($passwordList, 'weakpasswordlist');
+ }
+ }
/**
* Check for password weakness.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-05-01 14:41:35
|
Revision: 650
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=650&view=rev
Author: mennodekker
Date: 2012-05-01 14:41:29 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Merged revision(s) 649 from trunk:
fixed error where project user could not login when db not yet created
........
Modified Paths:
--------------
tags/1.5.3/library/classes/Gems/User/ProjectUserDefinition.php
tags/1.5.3/library/classes/Gems/User/UserLoader.php
tags/1.5.3/library/configs/db/tables/gems__organizations.20.sql
Property Changed:
----------------
tags/1.5.3/
tags/1.5.3/library/
Property changes on: tags/1.5.3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/trunk:620-625
+ /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/trunk:620-625,649
Property changes on: tags/1.5.3/library
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/trunk/library:620-625
+ /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/trunk/library:620-625,649
Modified: tags/1.5.3/library/classes/Gems/User/ProjectUserDefinition.php
===================================================================
--- tags/1.5.3/library/classes/Gems/User/ProjectUserDefinition.php 2012-05-01 14:30:29 UTC (rev 649)
+++ tags/1.5.3/library/classes/Gems/User/ProjectUserDefinition.php 2012-05-01 14:41:29 UTC (rev 650)
@@ -74,6 +74,14 @@
*/
public function getUserData($login_name, $organization)
{
+ try {
+ $orgs = $this->db->fetchPairs("SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active = 1 ORDER BY gor_name");
+ natsort($orgs);
+ } catch (Zend_Db_Exception $zde) {
+ // Table might not exist, so do something failsafe
+ $orgs = array($organization => 'create db first');
+ }
+
return array(
'user_id' => 1,
'user_login' => $login_name,
@@ -84,6 +92,7 @@
'user_base_org_id' => $organization,
'user_allowed_ip_ranges' => $this->project->getSuperAdminIPRanges(),
'user_blockable' => false,
+ '__allowedOrgs' => $orgs
);
}
}
\ No newline at end of file
Modified: tags/1.5.3/library/classes/Gems/User/UserLoader.php
===================================================================
--- tags/1.5.3/library/classes/Gems/User/UserLoader.php 2012-05-01 14:30:29 UTC (rev 649)
+++ tags/1.5.3/library/classes/Gems/User/UserLoader.php 2012-05-01 14:41:29 UTC (rev 650)
@@ -487,12 +487,14 @@
*/
protected function getUserClass($login_name, $organization)
{
+ //First check for project user, as this one can run without a db
+ if ($this->isProjectUser($login_name)) {
+ return $this->loadUser(self::USER_PROJECT, $organization, $login_name);
+ }
+
if ((null == $login_name) || (null == $organization)) {
return $this->loadUser(self::USER_NOLOGIN, $organization, $login_name);
}
- if ($this->isProjectUser($login_name)) {
- return $this->loadUser(self::USER_PROJECT, $organization, $login_name);
- }
try {
$select = $this->getUserClassSelect($login_name, $organization);
Modified: tags/1.5.3/library/configs/db/tables/gems__organizations.20.sql
===================================================================
--- tags/1.5.3/library/configs/db/tables/gems__organizations.20.sql 2012-05-01 14:30:29 UTC (rev 649)
+++ tags/1.5.3/library/configs/db/tables/gems__organizations.20.sql 2012-05-01 14:41:29 UTC (rev 650)
@@ -4,7 +4,7 @@
gor_name varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
gor_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
- gor_user_class varchar(30) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null default 'StaffUser'
+ gor_user_class varchar(30) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null default 'StaffUser',
gor_location varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
gor_url varchar(127) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
gor_url_base varchar(1270) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
@@ -25,7 +25,7 @@
gor_has_login boolean not null default 1,
gor_has_respondents boolean not null default 0,
gor_add_respondents boolean not null default 1,
- gor_respondent_group bigint unsigned references gems__groups (ggp_id_group) null,
+ gor_respondent_group bigint unsigned null references gems__groups (ggp_id_group),
gor_active boolean not null default 1,
gor_changed timestamp not null default current_timestamp on update current_timestamp,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-05-01 14:30:35
|
Revision: 649
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=649&view=rev
Author: mennodekker
Date: 2012-05-01 14:30:29 +0000 (Tue, 01 May 2012)
Log Message:
-----------
fixed error where project user could not login when db not yet created
Modified Paths:
--------------
trunk/library/classes/Gems/User/ProjectUserDefinition.php
trunk/library/classes/Gems/User/UserLoader.php
trunk/library/configs/db/tables/gems__organizations.20.sql
Modified: trunk/library/classes/Gems/User/ProjectUserDefinition.php
===================================================================
--- trunk/library/classes/Gems/User/ProjectUserDefinition.php 2012-05-01 12:17:24 UTC (rev 648)
+++ trunk/library/classes/Gems/User/ProjectUserDefinition.php 2012-05-01 14:30:29 UTC (rev 649)
@@ -74,6 +74,14 @@
*/
public function getUserData($login_name, $organization)
{
+ try {
+ $orgs = $this->db->fetchPairs("SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active = 1 ORDER BY gor_name");
+ natsort($orgs);
+ } catch (Zend_Db_Exception $zde) {
+ // Table might not exist, so do something failsafe
+ $orgs = array($organization => 'create db first');
+ }
+
return array(
'user_id' => 1,
'user_login' => $login_name,
@@ -84,6 +92,7 @@
'user_base_org_id' => $organization,
'user_allowed_ip_ranges' => $this->project->getSuperAdminIPRanges(),
'user_blockable' => false,
+ '__allowedOrgs' => $orgs
);
}
}
\ No newline at end of file
Modified: trunk/library/classes/Gems/User/UserLoader.php
===================================================================
--- trunk/library/classes/Gems/User/UserLoader.php 2012-05-01 12:17:24 UTC (rev 648)
+++ trunk/library/classes/Gems/User/UserLoader.php 2012-05-01 14:30:29 UTC (rev 649)
@@ -487,12 +487,14 @@
*/
protected function getUserClass($login_name, $organization)
{
+ //First check for project user, as this one can run without a db
+ if ($this->isProjectUser($login_name)) {
+ return $this->loadUser(self::USER_PROJECT, $organization, $login_name);
+ }
+
if ((null == $login_name) || (null == $organization)) {
return $this->loadUser(self::USER_NOLOGIN, $organization, $login_name);
}
- if ($this->isProjectUser($login_name)) {
- return $this->loadUser(self::USER_PROJECT, $organization, $login_name);
- }
try {
$select = $this->getUserClassSelect($login_name, $organization);
Modified: trunk/library/configs/db/tables/gems__organizations.20.sql
===================================================================
--- trunk/library/configs/db/tables/gems__organizations.20.sql 2012-05-01 12:17:24 UTC (rev 648)
+++ trunk/library/configs/db/tables/gems__organizations.20.sql 2012-05-01 14:30:29 UTC (rev 649)
@@ -4,7 +4,7 @@
gor_name varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
gor_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
- gor_user_class varchar(30) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null default 'StaffUser'
+ gor_user_class varchar(30) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null default 'StaffUser',
gor_location varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
gor_url varchar(127) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
gor_url_base varchar(1270) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
@@ -25,7 +25,7 @@
gor_has_login boolean not null default 1,
gor_has_respondents boolean not null default 0,
gor_add_respondents boolean not null default 1,
- gor_respondent_group bigint unsigned references gems__groups (ggp_id_group) null,
+ gor_respondent_group bigint unsigned null references gems__groups (ggp_id_group),
gor_active boolean not null default 1,
gor_changed timestamp not null default current_timestamp on update current_timestamp,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-30 18:10:32
|
Revision: 647
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=647&view=rev
Author: matijsdejong
Date: 2012-04-30 18:10:26 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
30 april release
Added Paths:
-----------
tags/1.5.4-pulse-20120430/
Property changes on: tags/1.5.4-pulse-20120430
___________________________________________________________________
Added: svn:ignore
+ nbproject
Added: svn:mergeinfo
+ /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616,618
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-30 18:06:49
|
Revision: 646
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=646&view=rev
Author: matijsdejong
Date: 2012-04-30 18:06:43 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Extra filter that is often used.
Modified Paths:
--------------
trunk/library/classes/Gems/Tracker/Token/TokenSelect.php
Modified: trunk/library/classes/Gems/Tracker/Token/TokenSelect.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token/TokenSelect.php 2012-04-26 15:44:13 UTC (rev 645)
+++ trunk/library/classes/Gems/Tracker/Token/TokenSelect.php 2012-04-30 18:06:43 UTC (rev 646)
@@ -398,6 +398,21 @@
}
/**
+ * Select only completed tokens
+ *
+ * Comleted is token has a completiondate
+ *
+ * @return Gems_Tracker_Token_TokenSelect
+ */
+ public function onlyCompleted() {
+
+ $this->sql_select
+ ->where('gto_completion_time IS NOT NULL');
+
+ return $this;
+ }
+
+ /**
* Select tokens with receptioncodes with the success status 1
*
* @return Gems_Tracker_Token_TokenSelect
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-26 15:44:22
|
Revision: 645
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=645&view=rev
Author: matijsdejong
Date: 2012-04-26 15:44:13 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
New support functions for TrackData.php
Made the use of the round editor slightly simpler
Modified Paths:
--------------
trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php
trunk/library/classes/Gems/Util/TrackData.php
Modified: trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php 2012-04-26 14:51:22 UTC (rev 644)
+++ trunk/library/classes/Gems/Tracker/Engine/StepEngineAbstract.php 2012-04-26 15:44:13 UTC (rev 645)
@@ -442,17 +442,17 @@
// Calculate valid from
$model->set('valid_after', 'elementClass', 'html', 'label', ' ', 'value', MUTil_Html::create()->h4($this->_('Valid from calculation')));
- $model->set('grp_valid_after_source', 'label', $this->_('Date source'), 'default', self::TOKEN_TABLE, 'elementClass', 'Radio', 'escape', false, 'required', true);
- $model->set('grp_valid_after_id', 'label', $this->_('Round used'));
- $model->set('grp_valid_after_field', 'label', $this->_('Date used'), 'default', 'gto_valid_from');
+ $model->set('grp_valid_after_source', 'label', $this->_('Date source'), 'default', self::TOKEN_TABLE, 'elementClass', 'Radio', 'escape', false, 'required', true, 'onchange', 'this.form.submit();');
+ $model->set('grp_valid_after_id', 'label', $this->_('Round used'), 'onchange', 'this.form.submit();');
+ $model->set('grp_valid_after_field', 'label', $this->_('Date used'), 'default', 'gto_valid_from', 'onchange', 'this.form.submit();');
$model->set('grp_valid_after_length', 'label', $this->_('Add to date'), 'required', false);
$model->set('grp_valid_after_unit', 'label', $this->_('Add to date unit'), 'multiOptions', $this->getDateUnitsList(true));
// Calculate valid until
$model->set('valid_for', 'elementClass', 'html', 'label', ' ', 'value', MUTil_Html::create()->h4($this->_('Valid for calculation')));
- $model->set('grp_valid_for_source', 'label', $this->_('Date source'), 'default', self::TOKEN_TABLE, 'elementClass', 'Radio', 'escape', false, 'required', true);
- $model->set('grp_valid_for_id', 'label', $this->_('Round used'), 'default', '');
- $model->set('grp_valid_for_field', 'label', $this->_('Date used'), 'default', 'gto_valid_from');
+ $model->set('grp_valid_for_source', 'label', $this->_('Date source'), 'default', self::TOKEN_TABLE, 'elementClass', 'Radio', 'escape', false, 'required', true, 'onchange', 'this.form.submit();');
+ $model->set('grp_valid_for_id', 'label', $this->_('Round used'), 'default', '', 'onchange', 'this.form.submit();');
+ $model->set('grp_valid_for_field', 'label', $this->_('Date used'), 'default', 'gto_valid_from', 'onchange', 'this.form.submit();');
$model->set('grp_valid_for_length', 'label', $this->_('Add to date'), 'required', false, 'default', 2);
$model->set('grp_valid_for_unit', 'label', $this->_('Add to date unit'), 'multiOptions', $this->getDateUnitsList(false));
Modified: trunk/library/classes/Gems/Util/TrackData.php
===================================================================
--- trunk/library/classes/Gems/Util/TrackData.php 2012-04-26 14:51:22 UTC (rev 644)
+++ trunk/library/classes/Gems/Util/TrackData.php 2012-04-26 15:44:13 UTC (rev 645)
@@ -97,6 +97,21 @@
/**
+ * Returns array (id => name) of all ronds in all tracks, sorted by order
+ *
+ * @return array
+ */
+ public function getAllRounds()
+ {
+ static $rounds;
+ if (! $rounds) {
+ $rounds = $this->db->fetchPairs("SELECT gro_id_round, CONCAT(gro_id_order, ' - ', SUBSTR(gsu_survey_name, 1, 80)) AS name FROM gems__rounds INNER JOIN gems__surveys ON gro_id_survey = gsu_id_survey ORDER BY gro_id_order");
+ }
+
+ return $rounds;
+ }
+
+ /**
* Retrieve an array of key/value pairs for gsu_id_survey and gsu_survey_name
*
* @staticvar array $surveys
@@ -124,13 +139,13 @@
static $surveys;
if (! $surveys) {
- $surveys = $this->db->fetchPairs('SELECT gsu_id_survey,
+ $surveys = $this->db->fetchPairs('SELECT gsu_id_survey,
CONCAT(
LEFT(CONCAT_WS(
" - ", gsu_survey_name, CASE WHEN LENGTH(TRIM(gsu_survey_description)) = 0 THEN NULL ELSE gsu_survey_description END
), 50),
CASE WHEN gsu_active = 1 THEN " (' . $this->translate->_('Active') . ')" ELSE " (' . $this->translate->_('Inactive') . ')" END
- )
+ )
FROM gems__surveys ORDER BY gsu_survey_name');
}
@@ -151,4 +166,30 @@
return $tracks;
}
+
+ /**
+ * Returns array (id => name) of all ronds in a track, sorted by order
+ *
+ * @param int $trackId
+ * @return array
+ */
+ public function getRoundsFor($trackId)
+ {
+ return $this->db->fetchPairs("SELECT gro_id_round, CONCAT(gro_id_order, ' - ', SUBSTR(gsu_survey_name, 1, 80)) AS name FROM gems__rounds INNER JOIN gems__surveys ON gro_id_survey = gsu_id_survey WHERE gro_id_track = ? ORDER BY gro_id_order", $trackId);
+ }
+
+ /**
+ * Returns array (id => name) of all 'T' tracks, sorted alphabetically
+ * @return array
+ */
+ public function getSteppedTracks()
+ {
+ static $tracks;
+
+ if (! $tracks) {
+ $tracks = $this->db->fetchPairs("SELECT gtr_id_track, gtr_track_name FROM gems__tracks WHERE gtr_track_type = 'T' ORDER BY gtr_track_name");
+ }
+
+ return $tracks;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-26 14:51:33
|
Revision: 644
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=644&view=rev
Author: mennodekker
Date: 2012-04-26 14:51:22 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
fixed a notice when gor_url_base does not yet exist
Modified Paths:
--------------
trunk/library/classes/Gems/User/Organization.php
Modified: trunk/library/classes/Gems/User/Organization.php
===================================================================
--- trunk/library/classes/Gems/User/Organization.php 2012-04-26 14:35:14 UTC (rev 643)
+++ trunk/library/classes/Gems/User/Organization.php 2012-04-26 14:51:22 UTC (rev 644)
@@ -309,7 +309,7 @@
// MUtil_Echo::track($sql, $data['can_access']);
- if ($baseUrls = explode(' ', $data['gor_url_base'])) {
+ if (array_key_exists('gor_url_base', $data) && $baseUrls = explode(' ', $data['gor_url_base'])) {
$data['base_url'] = reset($baseUrls);
}
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-26 14:35:23
|
Revision: 643
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=643&view=rev
Author: mennodekker
Date: 2012-04-26 14:35:14 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Copied fix from [631] as otherwise 1.5.3 is unusable
Modified Paths:
--------------
tags/1.5.3/library/classes/Gems/User/UserLoader.php
Modified: tags/1.5.3/library/classes/Gems/User/UserLoader.php
===================================================================
--- tags/1.5.3/library/classes/Gems/User/UserLoader.php 2012-04-26 13:49:09 UTC (rev 642)
+++ tags/1.5.3/library/classes/Gems/User/UserLoader.php 2012-04-26 14:35:14 UTC (rev 643)
@@ -357,7 +357,12 @@
}
if (! $urls) {
- $data = $this->db->fetchPairs("SELECT gor_id_organization, gor_url_base FROM gems__organizations WHERE gor_active=1 AND gor_url_base IS NOT NULL");
+ try {
+ $data = $this->db->fetchPairs("SELECT gor_id_organization, gor_url_base FROM gems__organizations WHERE gor_active=1 AND gor_url_base IS NOT NULL");
+ } catch (Zend_Db_Exception $zde) {
+ // Table might not be filled
+ $data = array();
+ }
$urls = array();
foreach ($data as $orgId => $urlsBase) {
foreach (explode(' ', $urlsBase) as $url) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-26 13:49:19
|
Revision: 642
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=642&view=rev
Author: mennodekker
Date: 2012-04-26 13:49:09 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Fix for crash on survey sync with ls install without any surveys
Modified Paths:
--------------
trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php
Modified: trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php 2012-04-26 12:47:52 UTC (rev 641)
+++ trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php 2012-04-26 13:49:09 UTC (rev 642)
@@ -1085,8 +1085,14 @@
$select->from($this->_getSurveysTableName(), 'sid')
->order('sid');
$lsSurveys = $lsDb->fetchCol($select);
- $lsSurveys = array_combine($lsSurveys, $lsSurveys);
+ if (!$lsSurveys) {
+ //If no surveys present, just use an empty array as array_combine fails
+ $lsSurveys = array();
+ } else {
+ $lsSurveys = array_combine((array) $lsSurveys, (array) $lsSurveys);
+ }
+
// Surveys in Gems
$gemsSurveys = $this->_getGemsSurveysForSynchronisation();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-26 12:48:03
|
Revision: 641
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=641&view=rev
Author: matijsdejong
Date: 2012-04-26 12:47:52 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
When the organization id is empty or non-existent
Modified Paths:
--------------
trunk/library/classes/Gems/User/Form/OrganizationFormAbstract.php
Modified: trunk/library/classes/Gems/User/Form/OrganizationFormAbstract.php
===================================================================
--- trunk/library/classes/Gems/User/Form/OrganizationFormAbstract.php 2012-04-26 12:07:35 UTC (rev 640)
+++ trunk/library/classes/Gems/User/Form/OrganizationFormAbstract.php 2012-04-26 12:47:52 UTC (rev 641)
@@ -164,6 +164,7 @@
} elseif (! $element instanceof Zend_Form_Element_Select) {
$element = new Zend_Form_Element_Select($this->organizationFieldName);
$element->setLabel($this->translate->_('Organization'));
+ $element->setRegisterInArrayValidator(true);
$element->setRequired(true);
$element->setMultiOptions($orgs);
@@ -171,6 +172,7 @@
$element->setAttrib('size', max(count($orgs) + 1, $this->organizationMaxLines));
}
$this->addElement($element);
+
$element->setValue($orgId);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-26 12:07:44
|
Revision: 640
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=640&view=rev
Author: matijsdejong
Date: 2012-04-26 12:07:35 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
When the organization id is empty, the cookie should not be set because it throws an exception
Modified Paths:
--------------
trunk/library/classes/Gems/User/Organization.php
Modified: trunk/library/classes/Gems/User/Organization.php
===================================================================
--- trunk/library/classes/Gems/User/Organization.php 2012-04-26 11:36:42 UTC (rev 639)
+++ trunk/library/classes/Gems/User/Organization.php 2012-04-26 12:07:35 UTC (rev 640)
@@ -339,7 +339,7 @@
{
$organizationId = $this->getId();
- if (! Gems_Cookies::setOrganization($organizationId, $this->basepath->getBasePath())) {
+ if ($organizationId && (! Gems_Cookies::setOrganization($organizationId, $this->basepath->getBasePath()))) {
throw new Exception('Cookies must be enabled for this site.');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-26 11:36:53
|
Revision: 639
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=639&view=rev
Author: matijsdejong
Date: 2012-04-26 11:36:42 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Fix for #12 screen where patients return
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-new.css
trunk/new_project/htdocs/gems/css/gems.css
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2012-04-26 11:36:37 UTC (rev 638)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2012-04-26 11:36:42 UTC (rev 639)
@@ -105,6 +105,18 @@
padding-right: 20px !important;
}
+.askRound {
+ margin-left: 2em;
+}
+
+.askSurvey {
+ margin: 0.1em 0 0.1em 4em;
+}
+
+.askTrack {
+ margin-top: 0.8em;
+}
+
body {
margin: 0;
padding: 0;
Modified: trunk/new_project/htdocs/gems/css/gems.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems.css 2012-04-26 11:36:37 UTC (rev 638)
+++ trunk/new_project/htdocs/gems/css/gems.css 2012-04-26 11:36:42 UTC (rev 639)
@@ -44,16 +44,28 @@
padding-right: 20px !important;
}
+.actionbox {
+ margin: .5em 0;
+ float: right;
+}
+
#all, #all_full_width {
margin: 0 auto;
max-width: 1012px;
}
-.actionbox {
- margin: .5em 0;
- float: right;
+.askRound {
+ margin-left: 2em;
}
+.askSurvey {
+ margin: 0.1em 0 0.1em 4em;
+}
+
+.askTrack {
+ margin-top: 0.8em;
+}
+
body {
margin: 0;
padding: 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-26 11:36:48
|
Revision: 638
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=638&view=rev
Author: matijsdejong
Date: 2012-04-26 11:36:37 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Bugfixes for Organization.php and OnClickArrayAttribute.php
Fix for #12 screen where patients return
Modified Paths:
--------------
trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php
trunk/library/classes/Gems/User/Organization.php
trunk/library/classes/MUtil/Html/OnClickArrayAttribute.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
Added Paths:
-----------
trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php
Modified: trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php 2012-04-26 09:10:32 UTC (rev 637)
+++ trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php 2012-04-26 11:36:37 UTC (rev 638)
@@ -47,6 +47,12 @@
class Gems_Tracker_Snippets_ShowTokenLoopAbstract extends MUtil_Snippets_SnippetAbstract
{
/**
+ * General date format
+ * @var string
+ */
+ protected $dateFormat = 'd MMMM yyyy';
+
+ /**
* Required
*
* @var Zend_Controller_Request_Abstract
@@ -95,6 +101,70 @@
}
/**
+ * Formats an completion date for this display
+ *
+ * @param MUtil_Date $dateTime
+ * @return string
+ */
+ public function formatCompletion(MUtil_Date $dateTime)
+ {
+ $days = abs($dateTime->diffDays());
+
+ switch ($days) {
+ case 0:
+ return $this->_('We have received your answers today. Thank you!');
+
+ case 1:
+ return $this->_('We have received your answers yesterday. Thank you!');
+
+ case 2:
+ return $this->_('We have received your answers 2 days ago. Thank you.');
+
+ default:
+ if ($days <= 14) {
+ return sprintf($this->_('We have received your answers %d days ago. Thank you.'), $days);
+ }
+ return sprintf($this->_('We have received your answers on %s. '), $dateTime->toString($this->dateFormat));
+ }
+ }
+
+ /**
+ * Formats an until date for this display
+ *
+ * @param MUtil_Date $dateTime
+ * @return string
+ */
+ public function formatUntil(MUtil_Date $dateTime = null)
+ {
+ if (null === $dateTime) {
+ return $this->_('This survey has no set time limit.');
+ }
+
+ $days = $dateTime->diffDays();
+
+ switch ($days) {
+ case 0:
+ return array(MUtil_Html::create('strong', $this->_('Warning!!!')), ' ', $this->_('This survey must be answered today!'));
+
+ case 1:
+ return array(MUtil_Html::create('strong', $this->_('Warning!!')), ' ', $this->_('This survey must be answered tomorrow!'));
+
+ case 2:
+ return $this->_('Warning! This survey must be answered over 2 days!');
+
+ default:
+ if (abs($days) <= 14) {
+ if ($days >= 0) {
+ return sprintf($this->_('This survey must be answered in %d days.'), $days);
+ } else {
+ return $this->_('This survey can no longer be answered.');
+ }
+ }
+ return sprintf($this->_('This survey can be answered until %s.'), $dateTime->toString($this->dateFormat));
+ }
+ }
+
+ /**
* Get the href for a token
*
* @param Gems_Tracker_Token $token
Modified: trunk/library/classes/Gems/User/Organization.php
===================================================================
--- trunk/library/classes/Gems/User/Organization.php 2012-04-26 09:10:32 UTC (rev 637)
+++ trunk/library/classes/Gems/User/Organization.php 2012-04-26 11:36:37 UTC (rev 638)
@@ -340,7 +340,7 @@
$organizationId = $this->getId();
if (! Gems_Cookies::setOrganization($organizationId, $this->basepath->getBasePath())) {
- throw new Exception($this->translate->_('Cookies must be enabled for this site.'));
+ throw new Exception('Cookies must be enabled for this site.');
}
$escort = GemsEscort::getInstance();
Modified: trunk/library/classes/MUtil/Html/OnClickArrayAttribute.php
===================================================================
--- trunk/library/classes/MUtil/Html/OnClickArrayAttribute.php 2012-04-26 09:10:32 UTC (rev 637)
+++ trunk/library/classes/MUtil/Html/OnClickArrayAttribute.php 2012-04-26 11:36:37 UTC (rev 638)
@@ -95,9 +95,14 @@
*/
public function addUrl($href)
{
- $this->add("location.href='");
- $this->add($href);
- $this->add("';");
+ $last = is_array($this->_values) ? end($this->_values) : null;
+ if (false === strpos($last, 'location.href')) {
+ $this->_values[] = "location.href='";
+ $this->_values[] = $href;
+ $this->_values[] = "';";
+ } else {
+ $this->_values[] = $href;
+ }
return $this;
}
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-04-26 09:10:32 UTC (rev 637)
+++ trunk/library/languages/default-en.po 2012-04-26 11:36:37 UTC (rev 638)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-25 16:16+0100\n"
+"POT-Creation-Date: 2012-04-26 13:30+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -3375,6 +3375,66 @@
msgid "Next >"
msgstr "Next >"
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:115
+msgid "We have received your answers today. Thank you!"
+msgstr "We have received your answers today. Thank you!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:118
+msgid "We have received your answers yesterday. Thank you!"
+msgstr "We have received your answers yesterday. Thank you!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:121
+msgid "We have received your answers 2 days ago. Thank you."
+msgstr "We have received your answers 2 days ago. Thank you."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:125
+#, php-format
+msgid "We have received your answers %d days ago. Thank you."
+msgstr "We have received your answers %d days ago. Thank you."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:127
+#, php-format
+msgid "We have received your answers on %s. "
+msgstr "We have received your answers on %s. "
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:140
+msgid "This survey has no set time limit."
+msgstr "This survey has no set time limit."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
+msgid "Warning!!!"
+msgstr "Warning!!!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
+msgid "This survey must be answered today!"
+msgstr "This survey must be answered today!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:150
+msgid "Warning!!"
+msgstr "Warning!!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:150
+msgid "This survey must be answered tomorrow!"
+msgstr "This survey must be answered tomorrow!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:153
+msgid "Warning! This survey must be answered over 2 days!"
+msgstr "Warning! This survey must be answered over 2 days!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:158
+#, php-format
+msgid "This survey must be answered in %d days."
+msgstr "This survey must be answered in %d days."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:160
+msgid "This survey can no longer be answered."
+msgstr "This survey can no longer be answered."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:163
+#, php-format
+msgid "This survey can be answered until %s."
+msgstr "This survey can be answered until %s."
+
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:376
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1156
#, php-format
@@ -3545,10 +3605,6 @@
msgid "Unknown token."
msgstr "Unknown token."
-#: classes/Gems/User/Organization.php:342
-msgid "Cookies must be enabled for this site."
-msgstr "Cookies must be enabled for this site."
-
#: classes/Gems/User/PasswordChecker.php:95
#, php-format
msgid "should contain at least one uppercase character"
@@ -3992,19 +4048,24 @@
msgstr "Edit track"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:172
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:143
+#: snippets/DeleteTrackTokenSnippet.php:193
msgid "Edit token"
msgstr "Edit token"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:225
+#: snippets/DeleteTrackTokenSnippet.php:245
#, php-format
msgid "Redo of token %s."
msgstr "Redo of token %s."
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:228
+#: snippets/DeleteTrackTokenSnippet.php:248
msgid "Old comment:"
msgstr "Old comment:"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:249
+#: snippets/DeleteTrackTokenSnippet.php:269
#, php-format
msgid "Created replacement token %2$s for token %1$s."
msgstr "Created replacement token %2$s for token %1$s."
@@ -4031,7 +4092,6 @@
msgstr "Lists choices changed."
#: snippets/EditSingleSurveyTokenSnippet.php:132
-#: snippets/ShowSingleSurveyTokenSnippet.php:150
msgid "Show survey"
msgstr "Show survey"
@@ -4082,6 +4142,7 @@
msgstr "Selected surveys"
#: snippets/ShowSingleSurveyTokenSnippet.php:76
+#: snippets/ShowTrackTokenSnippet.php:77
msgid "Actions"
msgstr "Actions"
@@ -4168,16 +4229,42 @@
msgid "Can access"
msgstr "Can access"
+#: snippets/Track/Token/ShowAllOpenSnippet.php:89
#: snippets/Track/Token/ShowFirstOpenSnippet.php:111
#, php-format
msgid "Welcome %s,"
msgstr "Welcome %s,"
+#: snippets/Track/Token/ShowAllOpenSnippet.php:94
#: snippets/Track/Token/ShowFirstOpenSnippet.php:114
#, php-format
msgid "Thank you for answering the \"%s\" survey."
msgstr "Thank you for answering the \"%s\" survey."
+#: snippets/Track/Token/ShowAllOpenSnippet.php:152
+#, php-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: snippets/Track/Token/ShowAllOpenSnippet.php:160
+#, php-format
+msgid "Round: %s"
+msgstr "Round: %s"
+
+#: snippets/Track/Token/ShowAllOpenSnippet.php:188
+msgid "Please answer the open survey."
+msgid_plural "Please answer the open surveys."
+msgstr[0] "Please answer the open survey."
+msgstr[1] "Please answer the open surveys."
+
+#: snippets/Track/Token/ShowAllOpenSnippet.php:190
+msgid "Thank you for answering all open surveys."
+msgstr "Thank you for answering all open surveys."
+
+#: snippets/Track/Token/ShowAllOpenSnippet.php:193
+msgid "There are no surveys to show for this token."
+msgstr "There are no surveys to show for this token."
+
#: snippets/Track/Token/ShowFirstOpenSnippet.php:115
msgid "Please click the button below to answer the next survey."
msgstr "Please click the button below to answer the next survey."
@@ -4201,6 +4288,9 @@
msgstr[0] "After this survey there is one other survey we would like you to answer."
msgstr[1] "After this survey there are another %d surveys we would like you to answer."
+#~ msgid "Cookies must be enabled for this site."
+#~ msgstr "Cookies must be enabled for this site."
+
#~ msgid "Combination of organization, username and password not found."
#~ msgstr "Combination of organization, username and password not found."
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-04-26 09:10:32 UTC (rev 637)
+++ trunk/library/languages/default-nl.po 2012-04-26 11:36:37 UTC (rev 638)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-25 16:16+0100\n"
+"POT-Creation-Date: 2012-04-26 13:31+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -3375,6 +3375,66 @@
msgid "Next >"
msgstr "Verder >"
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:115
+msgid "We have received your answers today. Thank you!"
+msgstr "We hebben uw vragenlijst vandaag ingevuld ontvangen. Dank u wel!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:118
+msgid "We have received your answers yesterday. Thank you!"
+msgstr "We hebben uw vragenlijst gisteren ingevuld ontvangen. Dank u wel!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:121
+msgid "We have received your answers 2 days ago. Thank you."
+msgstr "We hebben uw vragenlijst eergisteren ingevuld ontvangen. Dank u wel."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:125
+#, php-format
+msgid "We have received your answers %d days ago. Thank you."
+msgstr "We hebben uw vragenlijst %d dagen geleden ingevuld ontvangen. Dank u wel."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:127
+#, php-format
+msgid "We have received your answers on %s. "
+msgstr "We hebben uw vragenlijst op %s ingevuld ontvangen."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:140
+msgid "This survey has no set time limit."
+msgstr "Deze vragenlijst heeft geen eindtijd."
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
+msgid "Warning!!!"
+msgstr "Let op!!!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:147
+msgid "This survey must be answered today!"
+msgstr "Deze vragenlijst moet vandaag ingevuld zijn!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:150
+msgid "Warning!!"
+msgstr "Let op!!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:150
+msgid "This survey must be answered tomorrow!"
+msgstr "Deze vragenlijst moet morgen ingevuld zijn!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:153
+msgid "Warning! This survey must be answered over 2 days!"
+msgstr "Let op! Deze vragenlijst moet overmorgen ingevuld zijn!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:158
+#, php-format
+msgid "This survey must be answered in %d days."
+msgstr "Deze vragenlijst moet binnen %d dagen ingevuld zijn!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:160
+msgid "This survey can no longer be answered."
+msgstr "Deze vragenlijst kan niet langer worden ingevuld!"
+
+#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:163
+#, php-format
+msgid "This survey can be answered until %s."
+msgstr "Deze vragenlijst moet ingevuld worden voor %s."
+
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:376
#: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1156
#, php-format
@@ -3545,10 +3605,6 @@
msgid "Unknown token."
msgstr "Onbekend kenmerk."
-#: classes/Gems/User/Organization.php:342
-msgid "Cookies must be enabled for this site."
-msgstr "Zonder cookies heeft u geen toegang tot deze site."
-
#: classes/Gems/User/PasswordChecker.php:95
#, php-format
msgid "should contain at least one uppercase character"
@@ -3992,19 +4048,24 @@
msgstr "Bewerk traject"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:172
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:143
+#: snippets/DeleteTrackTokenSnippet.php:193
msgid "Edit token"
msgstr "Kenmerk bewerken"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:225
+#: snippets/DeleteTrackTokenSnippet.php:245
#, php-format
msgid "Redo of token %s."
msgstr "Herkansing voor kenmerk %s."
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:228
+#: snippets/DeleteTrackTokenSnippet.php:248
msgid "Old comment:"
msgstr "Oude opmerkingen"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:249
+#: snippets/DeleteTrackTokenSnippet.php:269
#, php-format
msgid "Created replacement token %2$s for token %1$s."
msgstr "Kenmerk %s is vervangen door het nieuwe kenmerk %s."
@@ -4031,7 +4092,6 @@
msgstr "Keuzelijst is veranderd."
#: snippets/EditSingleSurveyTokenSnippet.php:132
-#: snippets/ShowSingleSurveyTokenSnippet.php:150
msgid "Show survey"
msgstr "Toon vragenlijst"
@@ -4082,6 +4142,7 @@
msgstr "Geselecteerde vragenlijsten"
#: snippets/ShowSingleSurveyTokenSnippet.php:76
+#: snippets/ShowTrackTokenSnippet.php:77
msgid "Actions"
msgstr "Acties"
@@ -4168,16 +4229,42 @@
msgid "Can access"
msgstr "Toegang tot"
+#: snippets/Track/Token/ShowAllOpenSnippet.php:89
#: snippets/Track/Token/ShowFirstOpenSnippet.php:111
#, php-format
msgid "Welcome %s,"
msgstr "Welkom %s,"
+#: snippets/Track/Token/ShowAllOpenSnippet.php:94
#: snippets/Track/Token/ShowFirstOpenSnippet.php:114
#, php-format
msgid "Thank you for answering the \"%s\" survey."
msgstr "Dank u voor het invullen van de \"%s\" vragenlijst."
+#: snippets/Track/Token/ShowAllOpenSnippet.php:152
+#, php-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: snippets/Track/Token/ShowAllOpenSnippet.php:160
+#, php-format
+msgid "Round: %s"
+msgstr "Ronde: %s"
+
+#: snippets/Track/Token/ShowAllOpenSnippet.php:188
+msgid "Please answer the open survey."
+msgid_plural "Please answer the open surveys."
+msgstr[0] "Wij verzoeken u de openstaande vragenlijst nu in te vullen."
+msgstr[1] "Wij verzoeken u de openstaande vragenlijsten nu in te vullen."
+
+#: snippets/Track/Token/ShowAllOpenSnippet.php:190
+msgid "Thank you for answering all open surveys."
+msgstr "Dank u voor het beantwoorden van alle openstaande vragenlijsten."
+
+#: snippets/Track/Token/ShowAllOpenSnippet.php:193
+msgid "There are no surveys to show for this token."
+msgstr "U heeft geen open vragenlijsten voor dit kenmerk."
+
#: snippets/Track/Token/ShowFirstOpenSnippet.php:115
msgid "Please click the button below to answer the next survey."
msgstr "Klik op de onderstaande knop om de volgende vragenlijst in te vullen."
@@ -4201,6 +4288,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 "Cookies must be enabled for this site."
+#~ msgstr "Zonder cookies heeft u geen toegang tot deze site."
+
#~ msgid "Combination of organization, username and password not found."
#~ msgstr ""
#~ "Combinatie van organisatie, gebruikersnaam en wachtwoord niet gevonden."
Added: trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php
===================================================================
--- trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php (rev 0)
+++ trunk/library/snippets/Track/Token/ShowAllOpenSnippet.php 2012-04-26 11:36:37 UTC (rev 638)
@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * Copyright (c) 2012, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package Gems
+ * @subpackage Tracker\Snippets
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @version $id: ShowAllOpenSnippet.php 203 2012-01-01t 12:51:32Z matijs $
+ */
+
+/**
+ *
+ *
+ * @package Gems
+ * @subpackage Tracker\Snippets
+ * @copyright Copyright (c) 2012 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.4
+ */
+class Track_Token_ShowAllOpenSnippet extends Gems_Tracker_Snippets_ShowTokenLoopAbstract
+{
+ /**
+ *
+ * @var Zend_Db_Adapter_Abstract
+ */
+ protected $db;
+
+ /**
+ *
+ * @var Gems_Loader
+ */
+ protected $loader;
+
+ /**
+ * Show completed surveys answered in last X hours
+ *
+ * @var int
+ */
+ protected $lookbackInHours = 24;
+
+ /**
+ *
+ * @var Gems_Util
+ */
+ protected $util;
+
+ /**
+ * Create the snippets content
+ *
+ * This is a stub function either override getHtmlOutput() or override render()
+ *
+ * @param Zend_View_Abstract $view Just in case it is needed here
+ * @return MUtil_Html_HtmlInterface Something that can be rendered
+ */
+ public function getHtmlOutput(Zend_View_Abstract $view)
+ {
+ $html = $this->getHtmlSequence();
+ $org = $this->token->getOrganization();
+ $tracker = $this->loader->getTracker();
+
+ $html->h3($this->_('Token'));
+ $p = $html->pInfo(sprintf($this->_('Welcome %s,'), $this->token->getRespondentName()));
+ $p->br();
+ $p->br();
+
+ if ($this->wasAnswered) {
+ $html->pInfo(sprintf($this->_('Thank you for answering the "%s" survey.'), $this->token->getSurveyName()));
+ // $html->pInfo($this->_('Please click the button below to answer the next survey.'));
+ } else {
+ if ($welcome = $org->getWelcome()) {
+ $html->pInfo()->raw(MUtil_Markup::render($this->_($welcome), 'Bbcode', 'Html'));
+ }
+ // $html->pInfo(sprintf($this->_('Please click the button below to answer the survey for token %s.'), strtoupper($this->token->getTokenId())));
+ }
+
+ // Only valid or answerd in the last
+ $where = "(gto_completion_time IS NULL AND gto_valid_from <= CURRENT_TIMESTAMP AND (gto_valid_until IS NULL OR gto_valid_until >= CURRENT_TIMESTAMP))";
+
+ // Do we always look back
+ if ($this->lookbackInHours) {
+ $where .= $this->db->quoteInto("OR DATE_ADD(gto_completion_time, INTERVAL ? HOUR) >= CURRENT_TIMESTAMP", $this->lookbackInHours, Zend_Db::INT_TYPE);
+ }
+
+ // We always look back from the entered token
+ if ($this->token->isCompleted()) {
+ $filterTime = $this->token->getCompletionTime();
+ $filterTime->subHour(1);
+ $where .= $this->db->quoteInto(" OR gto_completion_time >= ?", $filterTime->toString('yyyy-MM-dd HH:mm:ss'));
+ }
+
+ // Get the tokens
+ $select = $tracker->getTokenSelect();
+ $select->andReceptionCodes()
+ ->andRespondentTracks()
+ ->andRounds()
+ ->andSurveys()
+ ->andTracks()
+ ->forGroupId($this->token->getSurvey()->getGroupId())
+ ->forRespondent($this->token->getRespondentId(), $this->token->getOrganizationId())
+ ->onlySucces()
+ ->forWhere($where)
+ ->order('gtr_track_type')
+ ->order('gtr_track_name')
+ ->order('gr2t_track_info')
+ ->order('gto_valid_until')
+ ->order('gto_valid_from');
+
+ if ($tokens = $select->fetchAll()) {
+ $currentToken = $this->token->isCompleted() ? false : $this->token->getTokenId();
+ $lastRound = false;
+ $lastTrack = false;
+ $open = 0;
+ $pStart = $html->pInfo();
+
+ foreach ($tokens as $row) {
+ if (('T' == $row['gtr_track_type']) && ($row['gtr_track_name'] !== $lastTrack)) {
+ $lastTrack = $row['gtr_track_name'];
+
+ $div = $html->div();
+ $div->class = 'askTrack';
+ $div->append($this->_('Track'));
+ $div->append(' ');
+ $div->strong($row['gtr_track_name']);
+ if ($row['gr2t_track_info']) {
+ $div->small(sprintf($this->_(' (%s)'), $row['gr2t_track_info']));
+ }
+ }
+
+ if ($row['gto_round_description'] && ($row['gto_round_description'] !== $lastRound)) {
+ $lastRound = $row['gto_round_description'];
+ $div = $html->div();
+ $div->class = 'askRound';
+ $div->append(sprintf($this->_('Round: %s'), $row['gto_round_description']));
+ $div->br();
+ }
+ $token = $tracker->getToken($row);
+
+ $div = $html->div();
+ $div->class = 'askSurvey';
+ if ($token->isCompleted()) {
+ $div->actionDisabled($token->getSurveyName());
+ $div->append(' ');
+ $div->append($this->formatCompletion($token->getCompletionTime()));
+
+ } else {
+ $open++;
+
+ $a = $div->actionLink($this->getTokenHref($token), $token->getSurveyName());
+ $div->append(' ');
+ $div->append($this->formatUntil($token->getValidUntil()));
+
+ if (false === $currentToken) {
+ $currentToken = $token->getTokenId();
+ }
+ if ($token->getTokenId() == $currentToken) {
+ $a->appendAttrib('class', 'currentRow');
+ }
+ }
+ }
+ if ($open) {
+ $pStart->append($this->plural('Please answer the open survey.', 'Please answer the open surveys.', $open));
+ } else {
+ $html->pInfo($this->_('Thank you for answering all open surveys.'));
+ }
+ } else {
+ $html->pInfo($this->_('There are no surveys to show for this token.'));
+ }
+
+ if ($sig = $org->getSignature()) {
+ $p = $html->pInfo();
+ $p->br();
+ $p->raw(MUtil_Markup::render($this->_($sig), 'Bbcode', 'Html'));
+ }
+ return $html;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-26 09:10:41
|
Revision: 637
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=637&view=rev
Author: matijsdejong
Date: 2012-04-26 09:10:32 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Fixes for attack pattern identified by Michiel
Modified Paths:
--------------
trunk/library/classes/Gems/User/Organization.php
Modified: trunk/library/classes/Gems/User/Organization.php
===================================================================
--- trunk/library/classes/Gems/User/Organization.php 2012-04-26 09:07:54 UTC (rev 636)
+++ trunk/library/classes/Gems/User/Organization.php 2012-04-26 09:10:32 UTC (rev 637)
@@ -314,6 +314,7 @@
}
} else {
$data = $this->_noOrganization;
+ $data['gor_id_organization'] = $id;
}
return $data;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-26 09:08:05
|
Revision: 636
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=636&view=rev
Author: matijsdejong
Date: 2012-04-26 09:07:54 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Fixes for attack pattern identified by Michiel
Modified Paths:
--------------
trunk/library/classes/Gems/Registry/CachedArrayTargetAbstract.php
trunk/library/classes/Gems/User/Organization.php
Modified: trunk/library/classes/Gems/Registry/CachedArrayTargetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Registry/CachedArrayTargetAbstract.php 2012-04-25 14:43:30 UTC (rev 635)
+++ trunk/library/classes/Gems/Registry/CachedArrayTargetAbstract.php 2012-04-26 09:07:54 UTC (rev 636)
@@ -102,7 +102,7 @@
* @return string
*/
private function _getCacheId() {
- return GEMS_PROJECT_NAME . '__' . get_class($this) . '__' . $this->_id;
+ return GEMS_PROJECT_NAME . '__' . get_class($this) . '__' . preg_replace('/[^a-zA-Z0-9_]/', '_', $this->_id);
}
/**
Modified: trunk/library/classes/Gems/User/Organization.php
===================================================================
--- trunk/library/classes/Gems/User/Organization.php 2012-04-25 14:43:30 UTC (rev 635)
+++ trunk/library/classes/Gems/User/Organization.php 2012-04-26 09:07:54 UTC (rev 636)
@@ -285,7 +285,7 @@
{
try {
$sql = "SELECT * FROM gems__organizations WHERE gor_id_organization = ? LIMIT 1";
- $data = $this->db->fetchRow($sql, $id);
+ $data = $this->db->fetchRow($sql, intval($id));
} catch (Exception $e) {
$data = false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-25 14:43:42
|
Revision: 635
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=635&view=rev
Author: matijsdejong
Date: 2012-04-25 14:43:30 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
Made OnClickArrayAttribute.php easier to use for common tasks
Documented ArrayAttribute.php
Updated translations
Modified Paths:
--------------
trunk/library/classes/MUtil/Html/ArrayAttribute.php
trunk/library/classes/MUtil/Html/OnClickArrayAttribute.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
trunk/library/snippets/Track/Token/ShowFirstOpenSnippet.php
Modified: trunk/library/classes/MUtil/Html/ArrayAttribute.php
===================================================================
--- trunk/library/classes/MUtil/Html/ArrayAttribute.php 2012-04-24 14:01:21 UTC (rev 634)
+++ trunk/library/classes/MUtil/Html/ArrayAttribute.php 2012-04-25 14:43:30 UTC (rev 635)
@@ -49,14 +49,28 @@
* @license New BSD License
* @since Class available since version 1.0
*/
-
class MUtil_Html_ArrayAttribute extends MUtil_Html_AttributeAbstract
implements ArrayAccess, Countable, IteratorAggregate
{
+ /**
+ * String used to glue items together
+ *
+ * @var string
+ */
protected $_separator = ' ';
+ /**
+ * Specially treated types for a specific subclass
+ *
+ * @var array function name => class
+ */
protected $_specialTypes;
+ /**
+ * Specially treated types as used for each subclass
+ *
+ * @var array function name => class
+ */
private $_specialTypesDefault = array(
'setRequest' => 'Zend_Controller_Request_Abstract',
'setView' => 'Zend_View',
@@ -174,6 +188,16 @@
return null;
}
+ /**
+ * Function that allows subclasses to define their own
+ * mechanism for redering the key/value combination.
+ *
+ * E.g. key=value instead of just the value.
+ *
+ * @param scalar $key
+ * @param string $value Output escaped value
+ * @return string
+ */
public function getKeyValue($key, $value)
{
return $value;
Modified: trunk/library/classes/MUtil/Html/OnClickArrayAttribute.php
===================================================================
--- trunk/library/classes/MUtil/Html/OnClickArrayAttribute.php 2012-04-24 14:01:21 UTC (rev 634)
+++ trunk/library/classes/MUtil/Html/OnClickArrayAttribute.php 2012-04-25 14:43:30 UTC (rev 635)
@@ -1,51 +1,107 @@
<?php
-
-/**
- * Copyright (c) 2011, Erasmus MC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Erasmus MC nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
+
/**
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package MUtil
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package MUtil
* @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
+/**
+ * Default attribute for onclicks with extra functions for common tasks
+ *
+ * @package MUtil
+ * @subpackage Html
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
+ */
class MUtil_Html_OnClickArrayAttribute extends MUtil_Html_ArrayAttribute
{
+ /**
+ * String used to glue items together
+ *
+ * Empty string as not each array element corresponds to a single command.
+ *
+ * @var string
+ */
protected $_separator = '';
+ /**
+ * Specially treated types for a specific subclass
+ *
+ * @var array function name => class
+ */
+ protected $_specialTypes = array(
+ 'addUrl' => 'MUtil_Html_UrlArrayAttribute',
+ );
+
public function __construct($arg_array = null)
{
$args = func_get_args();
parent::__construct('onclick', $args);
}
+ /**
+ * Add a cancel bubble command
+ *
+ * @param boolean $cancelBubble
+ * @return MUtil_Html_OnClickArrayAttribute (continuation pattern)
+ */
+ public function addCancelBubble($cancelBubble = true)
+ {
+ if ($cancelBubble) {
+ $this->add("event.cancelBubble = true;");
+ } else {
+ $this->add("event.cancelBubble = false;");
+ }
+ return $this;
+ }
+
+ /**
+ * Add a url open command by specifying only the link
+ *
+ * @param mixed $href Anything, e.g. a MUtil_Html_UrlArrayAttribute that the code will transform to an url
+ * @return MUtil_Html_OnClickArrayAttribute (continuation pattern)
+ */
+ public function addUrl($href)
+ {
+ $this->add("location.href='");
+ $this->add($href);
+ $this->add("';");
+
+ return $this;
+ }
+
public static function onclickAttribute(array $commands = null)
{
return new self($commands);
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-04-24 14:01:21 UTC (rev 634)
+++ trunk/library/languages/default-en.po 2012-04-25 14:43:30 UTC (rev 635)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-12 15:06+0100\n"
+"POT-Creation-Date: 2012-04-25 16:16+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -18,77 +18,77 @@
"X-Poedit-KeywordsList: plural:1,2\n"
"X-Poedit-SearchPath-0: .\n"
-#: classes/GemsEscort.php:211
+#: classes/GemsEscort.php:212
#, php-format
msgid "Path %s not writable"
msgstr "Path %s not writable"
-#: classes/GemsEscort.php:745
+#: classes/GemsEscort.php:750
#, php-format
msgid "You are logged in as %s"
msgstr "You are logged in as %s"
-#: classes/GemsEscort.php:747
+#: classes/GemsEscort.php:752
#: classes/Gems/Menu.php:249
msgid "Logoff"
msgstr "Logoff"
-#: classes/GemsEscort.php:750
+#: classes/GemsEscort.php:755
msgid "You are not logged in"
msgstr "You are not logged in"
-#: classes/GemsEscort.php:934
+#: classes/GemsEscort.php:939
#, php-format
msgid "User: %s"
msgstr "User: %s"
-#: classes/GemsEscort.php:959
+#: classes/GemsEscort.php:964
msgid "version"
msgstr "version"
-#: classes/GemsEscort.php:1390
+#: classes/GemsEscort.php:1395
msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
msgstr "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
-#: classes/GemsEscort.php:1521
+#: classes/GemsEscort.php:1526
msgid "Please check back later."
msgstr "Please check back later."
-#: classes/GemsEscort.php:1523
-#: classes/GemsEscort.php:1527
#: classes/GemsEscort.php:1528
+#: classes/GemsEscort.php:1532
+#: classes/GemsEscort.php:1533
msgid "System is in maintenance mode"
msgstr "System is in maintenance mode"
-#: classes/GemsEscort.php:1538
+#: classes/GemsEscort.php:1543
msgid "No access to site."
msgstr "No access to site."
-#: classes/GemsEscort.php:1540
-#: classes/GemsEscort.php:1582
+#: classes/GemsEscort.php:1545
+#: classes/GemsEscort.php:1587
msgid "You have no access to this site."
msgstr "You have no access to this site."
-#: classes/GemsEscort.php:1556
+#: classes/GemsEscort.php:1561
msgid "No access to page"
msgstr "No access to page"
-#: classes/GemsEscort.php:1558
+#: classes/GemsEscort.php:1563
#, php-format
msgid "Access to this page is not allowed for current role: %s."
msgstr "Access to this page is not allowed for current role: %s."
-#: classes/GemsEscort.php:1568
-#: classes/GemsEscort.php:1580
+#: classes/GemsEscort.php:1573
+#: classes/GemsEscort.php:1585
msgid "You are no longer logged in."
msgstr "You are no longer logged in."
-#: classes/GemsEscort.php:1569
+#: classes/GemsEscort.php:1574
msgid "You must login to access this page."
msgstr "You must login to access this page."
-#: classes/GemsEscort.php:1709
-#: classes/GemsEscort.php:1711
+#: classes/GemsEscort.php:1714
+#: classes/GemsEscort.php:1716
#, php-format
msgid "%d survey"
msgid_plural "%d surveys"
@@ -99,10 +99,6 @@
msgid "Database needs to be updated!"
msgstr "Database needs to be updated!"
-#: classes/Gems/Auth.php:235
-msgid "Combination of organization, username and password not found."
-msgstr "Combination of organization, username and password not found."
-
#: classes/Gems/Html.php:154
msgid "<< First"
msgstr "<< First"
@@ -450,13 +446,11 @@
msgstr "Trying upgrade for %s to level %s: %s"
#: classes/Gems/Controller/BrowseEditAction.php:354
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:226
#, php-format
msgid "New %s..."
msgstr "New %s..."
#: classes/Gems/Controller/BrowseEditAction.php:387
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:246
#, php-format
msgid "Delete %s"
msgstr "Delete %s"
@@ -485,7 +479,6 @@
msgstr "No %s found"
#: classes/Gems/Controller/BrowseEditAction.php:673
-#: classes/Gems/Default/ExportAction.php:234
#, php-format
msgid "No %s found."
msgstr "No %s found."
@@ -495,14 +488,10 @@
msgstr "Are you sure?"
#: classes/Gems/Controller/BrowseEditAction.php:807
-#: classes/Gems/Default/DatabaseAction.php:187
-#: classes/Gems/Default/DatabaseAction.php:499
msgid "Yes"
msgstr "Yes"
#: classes/Gems/Controller/BrowseEditAction.php:808
-#: classes/Gems/Default/DatabaseAction.php:188
-#: classes/Gems/Default/DatabaseAction.php:500
msgid "No"
msgstr "No"
@@ -548,31 +537,31 @@
msgid "Cancel"
msgstr "Cancel"
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:236
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:238
#, php-format
msgid "Do you want to delete this %s?"
msgstr "Do you want to delete this %s?"
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:256
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:258
#, php-format
msgid "Edit %s..."
msgstr "Edit %s..."
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:269
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:271
msgid "No data found."
msgstr "No data found."
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:331
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:333
#, php-format
msgid "No %s found..."
msgstr "No %s found..."
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:341
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:343
#, php-format
msgid "Showing %s"
msgstr "Showing %s"
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:377
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:379
msgid "item"
msgid_plural "items"
msgstr[0] "item"
@@ -616,22 +605,22 @@
msgid "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
msgstr "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
-#: classes/Gems/Default/AskAction.php:131
+#: classes/Gems/Default/AskAction.php:132
#, php-format
msgid "Thank you for answering. At the moment we have no further surveys for you to take."
msgstr "Thank you for answering. At the moment we have no further surveys for you to take."
-#: classes/Gems/Default/AskAction.php:133
+#: classes/Gems/Default/AskAction.php:134
#, php-format
msgid "The survey for token %s has been answered and no further surveys are open."
msgstr "The survey for token %s has been answered and no further surveys are open."
-#: classes/Gems/Default/AskAction.php:140
+#: classes/Gems/Default/AskAction.php:141
#, php-format
msgid "The token %s does not exist (any more)."
msgstr "The token %s does not exist (any more)."
-#: classes/Gems/Default/AskAction.php:241
+#: classes/Gems/Default/AskAction.php:270
#, php-format
msgid "The survey for token %s is no longer active."
msgstr "The survey for token %s is no longer active."
@@ -1196,6 +1185,7 @@
msgstr "Date"
#: classes/Gems/Default/LogAction.php:191
+#: classes/Gems/Default/LogMaintenanceAction.php:52
msgid "Action"
msgstr "Action"
@@ -1212,6 +1202,7 @@
msgstr "IP address"
#: classes/Gems/Default/LogAction.php:209
+#: classes/Gems/Default/LogMaintenanceAction.php:53
msgid "Log"
msgstr "Log"
@@ -1421,6 +1412,8 @@
msgstr "Email servers"
#: classes/Gems/Default/MailTemplateAction.php:76
+#: classes/Gems/Default/StaffAction.php:278
+#: classes/Gems/Default/StaffAction.php:311
msgid "(all organizations)"
msgstr "(all organizations)"
@@ -1445,6 +1438,7 @@
#: classes/Gems/Default/OptionAction.php:136
#: classes/Gems/Default/OrganizationAction.php:132
#: classes/Gems/Default/RespondentAction.php:175
+#: classes/Gems/Default/StaffAction.php:294
msgid "Language"
msgstr "Language"
@@ -1564,6 +1558,7 @@
msgstr "This can not be changed yet"
#: classes/Gems/Default/OrganizationAction.php:169
+#: classes/Gems/Default/StaffAction.php:119
msgid "User Definition"
msgstr "User Definition"
@@ -2095,6 +2090,10 @@
msgid "User with id %s already exists but is deleted, do you want to reactivate the account?"
msgstr "User with id %s already exists but is deleted, do you want to reactivate the account?"
+#: classes/Gems/Default/StaffAction.php:270
+msgid "Username"
+msgstr "Username"
+
#: classes/Gems/Default/StaffAction.php:285
msgid "Primary function"
msgstr "Primary function"
@@ -3610,37 +3609,32 @@
msgid "Shared secret"
msgstr "Shared secret"
-#: classes/Gems/User/User.php:408
+#: classes/Gems/User/User.php:392
#, 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:443
+#: classes/Gems/User/User.php:427
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:1094
+#: classes/Gems/User/User.php:1078
msgid "Your birthday"
msgstr "Your birthday"
-#: classes/Gems/User/User.php:1110
+#: classes/Gems/User/User.php:1094
#: classes/Gems/User/Form/ChangePasswordForm.php:163
#, php-format
msgid "%s is not correct."
msgstr "%s is not correct."
-#: classes/Gems/User/User.php:1115
-#: classes/Gems/User/Form/OrganizationFormAbstract.php:230
-msgid "Username"
-msgstr "Username"
-
-#: classes/Gems/User/User.php:1192
+#: classes/Gems/User/User.php:1176
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:1220
+#: classes/Gems/User/User.php:1204
msgid "Unable to send e-mail."
msgstr "Unable to send e-mail."
@@ -3998,24 +3992,19 @@
msgstr "Edit track"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:172
-#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:143
-#: snippets/DeleteTrackTokenSnippet.php:193
msgid "Edit token"
msgstr "Edit token"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:225
-#: snippets/DeleteTrackTokenSnippet.php:245
#, php-format
msgid "Redo of token %s."
msgstr "Redo of token %s."
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:228
-#: snippets/DeleteTrackTokenSnippet.php:248
msgid "Old comment:"
msgstr "Old comment:"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:249
-#: snippets/DeleteTrackTokenSnippet.php:269
#, php-format
msgid "Created replacement token %2$s for token %1$s."
msgstr "Created replacement token %2$s for token %1$s."
@@ -4042,6 +4031,7 @@
msgstr "Lists choices changed."
#: snippets/EditSingleSurveyTokenSnippet.php:132
+#: snippets/ShowSingleSurveyTokenSnippet.php:150
msgid "Show survey"
msgstr "Show survey"
@@ -4092,7 +4082,6 @@
msgstr "Selected surveys"
#: snippets/ShowSingleSurveyTokenSnippet.php:76
-#: snippets/ShowTrackTokenSnippet.php:77
msgid "Actions"
msgstr "Actions"
@@ -4179,39 +4168,42 @@
msgid "Can access"
msgstr "Can access"
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:110
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:111
#, php-format
msgid "Welcome %s,"
msgstr "Welcome %s,"
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:113
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:114
#, php-format
msgid "Thank you for answering the \"%s\" survey."
msgstr "Thank you for answering the \"%s\" survey."
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:114
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:115
msgid "Please click the button below to answer the next survey."
msgstr "Please click the button below to answer the next survey."
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:119
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:120
#, php-format
msgid "Please click the button below to answer the survey for token %s."
msgstr "Please click the button below to answer the survey for token %s."
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:123
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:124
#, php-format
msgid "Wait one second to open the survey automatically or click on Cancel to stop."
msgid_plural "Wait %d seconds to open the survey automatically or click on Cancel to stop."
msgstr[0] "Wait one second to open the survey automatically or click on Cancel to stop."
msgstr[1] "Wait %d seconds to open the survey automatically or click on Cancel to stop."
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:138
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:139
#, php-format
msgid "After this survey there is one other survey we would like you to answer."
msgid_plural "After this survey there are another %d surveys we would like you to answer."
msgstr[0] "After this survey there is one other survey we would like you to answer."
msgstr[1] "After this survey there are another %d surveys we would like you to answer."
+#~ msgid "Combination of organization, username and password not found."
+#~ msgstr "Combination of organization, username and password not found."
+
#~ msgid "Dear {greeting},"
#~ msgstr "Dear {greeting},"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-04-24 14:01:21 UTC (rev 634)
+++ trunk/library/languages/default-nl.po 2012-04-25 14:43:30 UTC (rev 635)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-12 15:06+0100\n"
+"POT-Creation-Date: 2012-04-25 16:16+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -18,77 +18,77 @@
"X-Poedit-KeywordsList: plural:1,2\n"
"X-Poedit-SearchPath-0: .\n"
-#: classes/GemsEscort.php:211
+#: classes/GemsEscort.php:212
#, php-format
msgid "Path %s not writable"
msgstr "Path %s niet schrijfbaar"
-#: classes/GemsEscort.php:745
+#: classes/GemsEscort.php:750
#, php-format
msgid "You are logged in as %s"
msgstr "Ingelogd als %s"
-#: classes/GemsEscort.php:747
+#: classes/GemsEscort.php:752
#: classes/Gems/Menu.php:249
msgid "Logoff"
msgstr "Uitloggen"
-#: classes/GemsEscort.php:750
+#: classes/GemsEscort.php:755
msgid "You are not logged in"
msgstr "U bent niet ingelogd"
-#: classes/GemsEscort.php:934
+#: classes/GemsEscort.php:939
#, php-format
msgid "User: %s"
msgstr "Login: %s"
-#: classes/GemsEscort.php:959
+#: classes/GemsEscort.php:964
msgid "version"
msgstr "versie"
-#: classes/GemsEscort.php:1390
+#: classes/GemsEscort.php:1395
msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer uw gegevens en probeer a.u.b. opnieuw."
-#: classes/GemsEscort.php:1521
+#: classes/GemsEscort.php:1526
msgid "Please check back later."
msgstr "Probeer het later opnieuw."
-#: classes/GemsEscort.php:1523
-#: classes/GemsEscort.php:1527
#: classes/GemsEscort.php:1528
+#: classes/GemsEscort.php:1532
+#: classes/GemsEscort.php:1533
msgid "System is in maintenance mode"
msgstr "Systeem is in onderhoudsmodus"
-#: classes/GemsEscort.php:1538
+#: classes/GemsEscort.php:1543
msgid "No access to site."
msgstr "Geen toegang tot website."
-#: classes/GemsEscort.php:1540
-#: classes/GemsEscort.php:1582
+#: classes/GemsEscort.php:1545
+#: classes/GemsEscort.php:1587
msgid "You have no access to this site."
msgstr "U heeft geen toegang tot deze website."
-#: classes/GemsEscort.php:1556
+#: classes/GemsEscort.php:1561
msgid "No access to page"
msgstr "Geen toegang tot pagina"
-#: classes/GemsEscort.php:1558
+#: classes/GemsEscort.php:1563
#, php-format
msgid "Access to this page is not allowed for current role: %s."
msgstr "U heeft geen toegang tot deze pagina. Uw huidige rol is: %s."
-#: classes/GemsEscort.php:1568
-#: classes/GemsEscort.php:1580
+#: classes/GemsEscort.php:1573
+#: classes/GemsEscort.php:1585
msgid "You are no longer logged in."
msgstr "U bent niet meer ingelogd."
-#: classes/GemsEscort.php:1569
+#: classes/GemsEscort.php:1574
msgid "You must login to access this page."
msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
-#: classes/GemsEscort.php:1709
-#: classes/GemsEscort.php:1711
+#: classes/GemsEscort.php:1714
+#: classes/GemsEscort.php:1716
#, php-format
msgid "%d survey"
msgid_plural "%d surveys"
@@ -99,10 +99,6 @@
msgid "Database needs to be updated!"
msgstr "Database dient ververst te worden!"
-#: classes/Gems/Auth.php:235
-msgid "Combination of organization, username and password not found."
-msgstr "Combinatie van organisatie, gebruikersnaam en wachtwoord niet gevonden."
-
#: classes/Gems/Html.php:154
msgid "<< First"
msgstr "<< Eerste"
@@ -450,13 +446,11 @@
msgstr "Probeert upgrade voor %s naar niveau %s: %s"
#: classes/Gems/Controller/BrowseEditAction.php:354
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:226
#, php-format
msgid "New %s..."
msgstr "Nieuwe %s..."
#: classes/Gems/Controller/BrowseEditAction.php:387
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:246
#, php-format
msgid "Delete %s"
msgstr "Verwijder %s"
@@ -485,7 +479,6 @@
msgstr "Geen %s gevonden"
#: classes/Gems/Controller/BrowseEditAction.php:673
-#: classes/Gems/Default/ExportAction.php:234
#, php-format
msgid "No %s found."
msgstr "Geen %s gevonden."
@@ -495,14 +488,10 @@
msgstr "Weet u het zeker?"
#: classes/Gems/Controller/BrowseEditAction.php:807
-#: classes/Gems/Default/DatabaseAction.php:187
-#: classes/Gems/Default/DatabaseAction.php:499
msgid "Yes"
msgstr "Ja"
#: classes/Gems/Controller/BrowseEditAction.php:808
-#: classes/Gems/Default/DatabaseAction.php:188
-#: classes/Gems/Default/DatabaseAction.php:500
msgid "No"
msgstr "Nee"
@@ -548,31 +537,31 @@
msgid "Cancel"
msgstr "Annuleren"
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:236
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:238
#, php-format
msgid "Do you want to delete this %s?"
msgstr "Weet u zeker dat deze %s verwijderd moet worden?"
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:256
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:258
#, php-format
msgid "Edit %s..."
msgstr "Bewerk %s..."
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:269
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:271
msgid "No data found."
msgstr "Geen gegevens gevonden."
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:331
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:333
#, php-format
msgid "No %s found..."
msgstr "Geen %s gevonden..."
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:341
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:343
#, php-format
msgid "Showing %s"
msgstr "Toon %s"
-#: classes/Gems/Controller/ModelSnippetActionAbstract.php:377
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:379
msgid "item"
msgid_plural "items"
msgstr[0] "item"
@@ -616,22 +605,22 @@
msgid "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
msgstr "Er wordt geen verschil gemaakt tussen het getal nul en de letter O en ook niet tussen het getal één en de letter L."
-#: classes/Gems/Default/AskAction.php:131
+#: classes/Gems/Default/AskAction.php:132
#, php-format
msgid "Thank you for answering. At the moment we have no further surveys for you to take."
msgstr "Dank u voor uw antwoorden. Op dit moment hebben we geen vragenlijsten meer voor u."
-#: classes/Gems/Default/AskAction.php:133
+#: classes/Gems/Default/AskAction.php:134
#, php-format
msgid "The survey for token %s has been answered and no further surveys are open."
msgstr "De vragenlijst met het kenmerk %s is beantwoord en er staan verder geen vragenlijsten open."
-#: classes/Gems/Default/AskAction.php:140
+#: classes/Gems/Default/AskAction.php:141
#, php-format
msgid "The token %s does not exist (any more)."
msgstr "Het kenmerk %s bestaat niet (meer)."
-#: classes/Gems/Default/AskAction.php:241
+#: classes/Gems/Default/AskAction.php:270
#, php-format
msgid "The survey for token %s is no longer active."
msgstr "De vragenlijst voor kenmerk %s is niet meer in gebruik."
@@ -1196,6 +1185,7 @@
msgstr "Datum"
#: classes/Gems/Default/LogAction.php:191
+#: classes/Gems/Default/LogMaintenanceAction.php:52
msgid "Action"
msgstr "Actie"
@@ -1212,6 +1202,7 @@
msgstr "IP adres"
#: classes/Gems/Default/LogAction.php:209
+#: classes/Gems/Default/LogMaintenanceAction.php:53
msgid "Log"
msgstr "Logboek"
@@ -1421,6 +1412,8 @@
msgstr "Email servers"
#: classes/Gems/Default/MailTemplateAction.php:76
+#: classes/Gems/Default/StaffAction.php:278
+#: classes/Gems/Default/StaffAction.php:311
msgid "(all organizations)"
msgstr "(alle organisaties)"
@@ -1445,6 +1438,7 @@
#: classes/Gems/Default/OptionAction.php:136
#: classes/Gems/Default/OrganizationAction.php:132
#: classes/Gems/Default/RespondentAction.php:175
+#: classes/Gems/Default/StaffAction.php:294
msgid "Language"
msgstr "Taal"
@@ -1564,6 +1558,7 @@
msgstr "Dit kan nog niet gewijzigd worden"
#: classes/Gems/Default/OrganizationAction.php:169
+#: classes/Gems/Default/StaffAction.php:119
msgid "User Definition"
msgstr "User Definition"
@@ -2095,6 +2090,10 @@
msgid "User with id %s already exists but is deleted, do you want to reactivate the account?"
msgstr "Gebruiker met inlognaam %s bestaat al maar is verwijderd, wilt u het account opnieuw activeren?"
+#: classes/Gems/Default/StaffAction.php:270
+msgid "Username"
+msgstr "Gebruikersnaam"
+
#: classes/Gems/Default/StaffAction.php:285
msgid "Primary function"
msgstr "Primaire functie"
@@ -3610,37 +3609,32 @@
msgid "Shared secret"
msgstr "Shared secret"
-#: classes/Gems/User/User.php:408
+#: classes/Gems/User/User.php:392
#, 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] "Uw account is tijdelijk geblokkeerd. U kunt over een minuut opnieuw inloggen."
msgstr[1] "Uw account is tijdelijk geblokkeerd. U kunt over %d minuten opnieuw inloggen."
-#: classes/Gems/User/User.php:443
+#: classes/Gems/User/User.php:427
msgid "You are not allowed to login from this location."
msgstr "U kunt vanaf deze locatie niet inloggen."
-#: classes/Gems/User/User.php:1094
+#: classes/Gems/User/User.php:1078
msgid "Your birthday"
msgstr "Uw geboortedatum"
-#: classes/Gems/User/User.php:1110
+#: classes/Gems/User/User.php:1094
#: classes/Gems/User/Form/ChangePasswordForm.php:163
#, php-format
msgid "%s is not correct."
msgstr "%s is onjuist."
-#: classes/Gems/User/User.php:1115
-#: classes/Gems/User/Form/OrganizationFormAbstract.php:230
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-#: classes/Gems/User/User.php:1192
+#: classes/Gems/User/User.php:1176
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:1220
+#: classes/Gems/User/User.php:1204
msgid "Unable to send e-mail."
msgstr "Verzenden email mislukt."
@@ -3998,24 +3992,19 @@
msgstr "Bewerk traject"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:172
-#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:143
-#: snippets/DeleteTrackTokenSnippet.php:193
msgid "Edit token"
msgstr "Kenmerk bewerken"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:225
-#: snippets/DeleteTrackTokenSnippet.php:245
#, php-format
msgid "Redo of token %s."
msgstr "Herkansing voor kenmerk %s."
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:228
-#: snippets/DeleteTrackTokenSnippet.php:248
msgid "Old comment:"
msgstr "Oude opmerkingen"
#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:249
-#: snippets/DeleteTrackTokenSnippet.php:269
#, php-format
msgid "Created replacement token %2$s for token %1$s."
msgstr "Kenmerk %s is vervangen door het nieuwe kenmerk %s."
@@ -4042,6 +4031,7 @@
msgstr "Keuzelijst is veranderd."
#: snippets/EditSingleSurveyTokenSnippet.php:132
+#: snippets/ShowSingleSurveyTokenSnippet.php:150
msgid "Show survey"
msgstr "Toon vragenlijst"
@@ -4092,7 +4082,6 @@
msgstr "Geselecteerde vragenlijsten"
#: snippets/ShowSingleSurveyTokenSnippet.php:76
-#: snippets/ShowTrackTokenSnippet.php:77
msgid "Actions"
msgstr "Acties"
@@ -4179,39 +4168,43 @@
msgid "Can access"
msgstr "Toegang tot"
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:110
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:111
#, php-format
msgid "Welcome %s,"
msgstr "Welkom %s,"
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:113
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:114
#, php-format
msgid "Thank you for answering the \"%s\" survey."
msgstr "Dank u voor het invullen van de \"%s\" vragenlijst."
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:114
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:115
msgid "Please click the button below to answer the next survey."
msgstr "Klik op de onderstaande knop om de volgende vragenlijst in te vullen."
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:119
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:120
#, php-format
msgid "Please click the button below to answer the survey for token %s."
msgstr "Klik op de onderstaande knop om de vragenlijst behorende bij kenmerk %s in te vullen."
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:123
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:124
#, php-format
msgid "Wait one second to open the survey automatically or click on Cancel to stop."
msgid_plural "Wait %d seconds to open the survey automatically or click on Cancel to stop."
msgstr[0] "Over één seconde start de vragenlijst automatisch. Klik op annuleren om dit te onderbreken."
msgstr[1] "Over %d seconden start de vragenlijst automatisch. Klik op annuleren om dit te onderbreken."
-#: snippets/Track/Token/ShowFirstOpenSnippet.php:138
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:139
#, php-format
msgid "After this survey there is one other survey we would like you to answer."
msgid_plural "After this survey there are another %d surveys we would like you to answer."
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 "Combination of organization, username and password not found."
+#~ msgstr ""
+#~ "Combinatie van organisatie, gebruikersnaam en wachtwoord niet gevonden."
+
#~ msgid "Dear {greeting},"
#~ msgstr "Geachte {greeting},"
Modified: trunk/library/snippets/Track/Token/ShowFirstOpenSnippet.php
===================================================================
--- trunk/library/snippets/Track/Token/ShowFirstOpenSnippet.php 2012-04-24 14:01:21 UTC (rev 634)
+++ trunk/library/snippets/Track/Token/ShowFirstOpenSnippet.php 2012-04-25 14:43:30 UTC (rev 635)
@@ -76,6 +76,7 @@
return false;
}
}
+
/**
* Create the snippets content
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-24 14:01:31
|
Revision: 634
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=634&view=rev
Author: mennodekker
Date: 2012-04-24 14:01:21 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Fixed wording so 'username' in login screen is the same as 'username' in the staff screen
Modified Paths:
--------------
trunk/library/classes/Gems/Default/StaffAction.php
Modified: trunk/library/classes/Gems/Default/StaffAction.php
===================================================================
--- trunk/library/classes/Gems/Default/StaffAction.php 2012-04-24 13:39:19 UTC (rev 633)
+++ trunk/library/classes/Gems/Default/StaffAction.php 2012-04-24 14:01:21 UTC (rev 634)
@@ -267,7 +267,7 @@
$model = $this->loader->getModels()->getStaffModel();
- $model->set('gsf_login', 'label', $this->_('Login'));
+ $model->set('gsf_login', 'label', $this->_('Username'));
$model->set('name', 'label', $this->_('Name'),
'column_expression', "CONCAT(COALESCE(CONCAT(gsf_last_name, ', '), '-, '), COALESCE(CONCAT(gsf_first_name, ' '), ''), COALESCE(gsf_surname_prefix, ''))");
$model->set('gsf_email', 'label', $this->_('E-Mail'), 'itemDisplay', 'MUtil_Html_AElement::ifmail');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-24 13:39:29
|
Revision: 633
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=633&view=rev
Author: mennodekker
Date: 2012-04-24 13:39:19 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Cleanup unused validator
Modified Paths:
--------------
trunk/library/classes/Gems/Util.php
Modified: trunk/library/classes/Gems/Util.php
===================================================================
--- trunk/library/classes/Gems/Util.php 2012-04-23 14:13:47 UTC (rev 632)
+++ trunk/library/classes/Gems/Util.php 2012-04-24 13:39:19 UTC (rev 633)
@@ -318,13 +318,6 @@
$min = ip2long(substr($range, 0, $sep));
$max = ip2long(substr($range, $sep + 1));
- $validate = new Zend_Validate_Between(
- array(
- 'min' => $min,
- 'max' => $max
- )
- );
-
if ($min <= $ipLong && $ipLong <= $max) {
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-23 14:13:54
|
Revision: 632
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=632&view=rev
Author: matijsdejong
Date: 2012-04-23 14:13:47 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
After survey completion the user always returns to his/her own site, regardless of later url changes.
Fixed UserLoader issue when the database does not exist
Added documentation and utility functions to Html and Html_Attributes
Modified Paths:
--------------
trunk/library/classes/Gems/Default/AskAction.php
trunk/library/classes/Gems/Tracker/Token.php
trunk/library/classes/Gems/User/UserLoader.php
trunk/library/classes/MUtil/Html/ArrayAttribute.php
trunk/library/classes/MUtil/Html/AttributeAbstract.php
trunk/library/classes/MUtil/Html/AttributeInterface.php
trunk/library/classes/MUtil/Html/UrlArrayAttribute.php
trunk/library/classes/MUtil/Html.php
trunk/library/configs/db/patches.sql
trunk/library/configs/db/tables/gems__tokens.200.sql
Modified: trunk/library/classes/Gems/Default/AskAction.php
===================================================================
--- trunk/library/classes/Gems/Default/AskAction.php 2012-04-23 12:08:39 UTC (rev 631)
+++ trunk/library/classes/Gems/Default/AskAction.php 2012-04-23 14:13:47 UTC (rev 632)
@@ -112,14 +112,15 @@
if ($tokenId = $this->_getParam(MUtil_Model::REQUEST_ID)) {
$tracker = $this->loader->getTracker();
$tokenId = $tracker->filterToken($tokenId);
+ $token = $tracker->getToken($tokenId);
- if ($token = $tracker->getToken($tokenId)) {
+ if ($token->exists) {
/****************************
* Update open tokens first *
****************************/
$respId = $token->getRespondentId();
- $tracker->processCompletedTokens($respId, $respId);
+ $tracker->processCompletedTokens($respId, $token->getChangedBy());
// Display token when possible
if ($this->html->snippet($this->forwardSnippets, 'token', $token)) {
@@ -141,7 +142,7 @@
}
}
- $this->_forward('token');
+ $this->_forward('index');
}
/**
@@ -168,31 +169,58 @@
}
/**
+ * Common handler utility to initialize tokens from parameters
+ */
+ protected function initToken()
+ {
+ $this->tracker = $this->loader->getTracker();
+ $this->tokenId = $this->tracker->filterToken($this->_getParam(MUtil_Model::REQUEST_ID));
+ $this->token = $this->tracker->getToken($this->tokenId);
+ }
+
+ /**
* The action where survey sources should return to after survey completion
*/
public function returnAction()
{
- $user = $this->loader->getCurrentUser();
+ $tracker = $this->loader->getTracker();
- if ($user->isActive() && ($parameters = $user->getSurveyReturn())) {
- $tracker = $this->loader->getTracker();
- $token = $tracker->getToken($tracker->filterToken($this->_getParam(MUtil_Model::REQUEST_ID)));
+ if ($tokenId = $this->_getParam(MUtil_Model::REQUEST_ID)) {
+ $tokenId = $tracker->filterToken($tokenId);
+ $token = $tracker->getToken($tokenId);
- // Check for completed tokens
- $this->loader->getTracker()->processCompletedTokens($token->getRespondentId(), $user->getUserId());
+ if ($url = $token->getReturnUrl()) {
+ // Check for completed tokens
+ $this->loader->getTracker()->processCompletedTokens($token->getRespondentId(), $token->getChangedBy());
- if (! $parameters) {
- // Default
- $request = $this->getRequest();
- $parameters[$request->getControllerKey()] = 'respondent';
- $parameters[$request->getActionKey()] = 'show';
- $parameters[MUtil_Model::REQUEST_ID] = $token->getPatientNumber();
+ // Redirect at once, might be another site url
+ header('Location: ' . $url);
+ exit();
}
- $this->_reroute($parameters, true);
- } else {
- $this->_forward('forward');
+ // Nor return? Check for old style user based return
+ $user = $this->loader->getCurrentUser();
+
+ if ($user->isActive() && ($parameters = $user->getSurveyReturn())) {
+
+ // Check for completed tokens
+ $this->loader->getTracker()->processCompletedTokens($token->getRespondentId(), $user->getUserId());
+
+ if (! $parameters) {
+ // Default
+ $request = $this->getRequest();
+ $parameters[$request->getControllerKey()] = 'respondent';
+ $parameters[$request->getActionKey()] = 'show';
+ $parameters[MUtil_Model::REQUEST_ID] = $token->getPatientNumber();
+ }
+
+ $this->_reroute($parameters, true);
+ return;
+ }
}
+
+ // In all other cases: the action that generates meaningfull warnings as is reachable for everyone
+ $this->_forward('forward');
}
/**
Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php 2012-04-23 12:08:39 UTC (rev 631)
+++ trunk/library/classes/Gems/Tracker/Token.php 2012-04-23 14:13:47 UTC (rev 632)
@@ -272,7 +272,104 @@
return $this;
}
+
/**
+ * Retrieve a certain $key from the local cache
+ *
+ * For speeding up things the token can hold a local cache, living as long as the
+ * token object exists in memory. Sources can use this to store reusable information.
+ *
+ * To reset the cache on an update, the source can use the cacheReset method or the
+ * setCache method to update the changed value.
+ *
+ * @param string $key The key used in the cache
+ * @param mixed $defaultValue The optional default value to use when it is not present
+ * @return mixed
+ */
+ public function cacheGet($key, $defaultValue = null) {
+ if ($this->cacheHas($key)) {
+ return $this->_cache[$key];
+ } else {
+ return $defaultValue;
+ }
+ }
+
+ /**
+ * find out if a certain key is present in the cache
+ *
+ * @param string $key
+ * @return boolean
+ */
+ public function cacheHas($key) {
+ return isset($this->_cache[$key]);
+
+ }
+
+ /**
+ * Reset the local cache for this token
+ *
+ * You can pass in an optional $key parameter to reset just that key, otherwise all
+ * the cache will be reset
+ *
+ * @param string|null $key The key to reset
+ */
+ public function cacheReset($key = null) {
+ if (is_null($key)) {
+ $this->_cache = array();
+ } else {
+ unset($this->_cache[$key]);
+ }
+ }
+
+ /**
+ * Set a $key in the local cache
+ *
+ * @param string $key
+ * @param mixed $value
+ */
+ public function cacheSet($key, $value) {
+ $this->_cache[$key] = $value;
+ }
+
+ /**
+ * Returns the full url Gems should forward to after survey completion.
+ *
+ * This fix allows multiple sites with multiple url's to share a single
+ * installation.
+ *
+ * @return string
+ */
+ protected function calculateReturnUrl()
+ {
+ $currentUri = $this->util->getCurrentURI();
+
+ /*
+ // Referrer would be powerful when someone is usng multiple windows, but
+ // the loop does not always provide a correct referrer.
+ $referrer = $_SERVER["HTTP_REFERER"];
+
+ // If a referrer was specified and that referral is from the current site, then use it
+ // as it is more dependable when the user has multiple windows open on the application.
+ if ($referrer && (0 == strncasecmp($referrer, $currentUri, strlen($currentUri)))) {
+ return $referrer;
+ // MUtil_Echo::track($referrer);
+ } // */
+
+ // Use the survey return if available.
+ $surveyReturn = $this->loader->getCurrentUser()->getSurveyReturn();
+ if ($surveyReturn) {
+ // Do not show the base url as it is in $currentUri
+ $surveyReturn['NoBase'] = true;
+
+ return $currentUri . MUtil_Html::urlString($surveyReturn);
+ // MUtil_Echo::track($currentUri . MUtil_Html::urlString($surveyReturn));
+ }
+
+ // Ultimate backup solution for reutrn
+ return $currentUri . '/ask/forward/' . MUtil_Model::REQUEST_ID . '/' . urlencode($this->getTokenId());
+ }
+
+ /**
* Should be called after answering the request to allow the Target
* to check if all required registry values have been set correctly.
*
@@ -455,7 +552,18 @@
}
/**
+ * Returns the staff or respondent id of the person
+ * who last changed this token.
*
+ * @return int
+ */
+ public function getChangedBy()
+ {
+ return $this->_gemsData['gto_changed_by'];
+ }
+
+ /**
+ *
* @return MUtil_Date Completion time as a date or null
*/
public function getCompletionTime()
@@ -734,6 +842,15 @@
return $this->_gemsData['gto_id_respondent_track'];
}
+ /**
+ * The full return url for a redirect
+ *
+ * @return string
+ */
+ public function getReturnUrl()
+ {
+ return $this->_gemsData['gto_return_url'];
+ }
/**
*
@@ -889,7 +1006,7 @@
$values['gto_in_source'] = 1;
}
$values['gto_by'] = $userId;
- // 1.5.4 $values['gto_return_url'] = $_SERVER["HTTP_REFERER"];
+ $values['gto_return_url'] = $this->calculateReturnUrl();
$this->_updateToken($values, $userId);
@@ -1189,62 +1306,4 @@
return $this->_updateToken($values, $userId);
}
-
- /**
- * Retrieve a certain $key from the local cache
- *
- * For speeding up things the token can hold a local cache, living as long as the
- * token object exists in memory. Sources can use this to store reusable information.
- *
- * To reset the cache on an update, the source can use the cacheReset method or the
- * setCache method to update the changed value.
- *
- * @param string $key The key used in the cache
- * @param mixed $defaultValue The optional default value to use when it is not present
- * @return mixed
- */
- public function cacheGet($key, $defaultValue = null) {
- if ($this->cacheHas($key)) {
- return $this->_cache[$key];
- } else {
- return $defaultValue;
- }
- }
-
- /**
- * find out if a certain key is present in the cache
- *
- * @param string $key
- * @return boolean
- */
- public function cacheHas($key) {
- return isset($this->_cache[$key]);
-
- }
-
- /**
- * Reset the local cache for this token
- *
- * You can pass in an optional $key parameter to reset just that key, otherwise all
- * the cache will be reset
- *
- * @param string|null $key The key to reset
- */
- public function cacheReset($key = null) {
- if (is_null($key)) {
- $this->_cache = array();
- } else {
- unset($this->_cache[$key]);
- }
- }
-
- /**
- * Set a $key in the local cache
- *
- * @param string $key
- * @param mixed $value
- */
- public function cacheSet($key, $value) {
- $this->_cache[$key] = $value;
- }
-}
\ No newline at end of file
+}
Modified: trunk/library/classes/Gems/User/UserLoader.php
===================================================================
--- trunk/library/classes/Gems/User/UserLoader.php 2012-04-23 12:08:39 UTC (rev 631)
+++ trunk/library/classes/Gems/User/UserLoader.php 2012-04-23 14:13:47 UTC (rev 632)
@@ -357,7 +357,12 @@
}
if (! $urls) {
- $data = $this->db->fetchPairs("SELECT gor_id_organization, gor_url_base FROM gems__organizations WHERE gor_active=1 AND gor_url_base IS NOT NULL");
+ try {
+ $data = $this->db->fetchPairs("SELECT gor_id_organization, gor_url_base FROM gems__organizations WHERE gor_active=1 AND gor_url_base IS NOT NULL");
+ } catch (Zend_Db_Exception $zde) {
+ // Table might not be filled
+ $data = array();
+ }
$urls = array();
foreach ($data as $orgId => $urlsBase) {
foreach (explode(' ', $urlsBase) as $url) {
Modified: trunk/library/classes/MUtil/Html/ArrayAttribute.php
===================================================================
--- trunk/library/classes/MUtil/Html/ArrayAttribute.php 2012-04-23 12:08:39 UTC (rev 631)
+++ trunk/library/classes/MUtil/Html/ArrayAttribute.php 2012-04-23 14:13:47 UTC (rev 632)
@@ -1,41 +1,55 @@
<?php
-
-/**
- * Copyright (c) 2011, Erasmus MC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Erasmus MC nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
/**
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package MUtil
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package MUtil
* @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
+/**
+ * Parent class for all array based attribute classes.
+ *
+ * Useable as is, using spaces as value separators by default.
+ *
+ * Parameter setting checks for the addition of special types,
+ * just as MUtil_Html_HtmlElement.
+ *
+ * @package MUtil
+ * @subpackage Html
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
+ */
+
class MUtil_Html_ArrayAttribute extends MUtil_Html_AttributeAbstract
implements ArrayAccess, Countable, IteratorAggregate
{
@@ -44,7 +58,8 @@
protected $_specialTypes;
private $_specialTypesDefault = array(
- 'setView' => 'Zend_View',
+ 'setRequest' => 'Zend_Controller_Request_Abstract',
+ 'setView' => 'Zend_View',
);
protected $_values;
Modified: trunk/library/classes/MUtil/Html/AttributeAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Html/AttributeAbstract.php 2012-04-23 12:08:39 UTC (rev 631)
+++ trunk/library/classes/MUtil/Html/AttributeAbstract.php 2012-04-23 14:13:47 UTC (rev 632)
@@ -1,6 +1,5 @@
<?php
-
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
@@ -48,35 +47,84 @@
*/
abstract class MUtil_Html_AttributeAbstract implements MUtil_Html_AttributeInterface
{
+ /**
+ *
+ * @var type
+ */
+ public $name;
+
+ /**
+ *
+ * @var Zend_Controller_Request_Abstract
+ */
+ public $request;
+
+ /**
+ *
+ * @var Zend_View_Abstract
+ */
public $view;
- protected $_name;
-
+ /**
+ *
+ * @param string $name The name of the attribute
+ * @param mixed $value
+ */
public function __construct($name, $value = null)
{
- $this->_name = $name;
+ $this->name = $name;
if ($value) {
$this->set($value);
}
}
+ /**
+ * Returns an unescape string version of the attribute
+ *
+ * Output escaping is done elsewhere, e.g. in Zend_View_Helper_HtmlElement->_htmlAttribs()
+ *
+ * If a subclass needs the view for the right output and the view might not be set
+ * it must overrule __toString().
+ *
+ * @return string
+ */
public function __toString()
{
- // Output escaping is done in Zend_View_Helper_HtmlElement->_htmlAttribs()
- //
- // If the attribute needs the view to get the right data it must overrule __toString().
return $this->get();
}
// public function add($value);
// public function get();
+ /**
+ * Returns the attribute name
+ *
+ * @return string
+ */
public function getAttributeName()
{
- return $this->_name;
+ return $this->name;
}
+ /**
+ *
+ * @return Zend_Controller_Request_Abstract
+ */
+ public function getRequest()
+ {
+ if (! $this->request) {
+ $front = Zend_Controller_Front::getInstance();
+ $this->request = $front->getRequest();
+ }
+
+ return $this->request;
+ }
+
+ /**
+ *
+ * @return Zend_View_Abstract
+ */
public function getView()
{
if (! $this->view) {
@@ -88,6 +136,14 @@
return $this->view;
}
+ /**
+ * Renders the element into a html string
+ *
+ * The $view is used to correctly encode and escape the output
+ *
+ * @param Zend_View_Abstract $view
+ * @return string Correctly encoded and escaped html output
+ */
public function render(Zend_View_Abstract $view)
{
$this->setView($view);
@@ -101,6 +157,21 @@
// public function set($value);
+ /**
+ *
+ * @param Zend_Controller_Request_Abstract $request
+ * @return MUtil_Html_AttributeAbstract (continuation pattern)
+ */
+ public function setRequest(Zend_Controller_Request_Abstract $request)
+ {
+ $this->request = $request;
+ return $this;
+ }
+
+ /**
+ *
+ * @param Zend_View_Abstract $view
+ */
public function setView(Zend_View_Abstract $view)
{
$this->view = $view;
Modified: trunk/library/classes/MUtil/Html/AttributeInterface.php
===================================================================
--- trunk/library/classes/MUtil/Html/AttributeInterface.php 2012-04-23 12:08:39 UTC (rev 631)
+++ trunk/library/classes/MUtil/Html/AttributeInterface.php 2012-04-23 14:13:47 UTC (rev 632)
@@ -1,62 +1,78 @@
<?php
-
-/**
- * Copyright (c) 2011, Erasmus MC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Erasmus MC nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
/**
- *
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package MUtil
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package MUtil
* @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
* Standard interface for attributes in this package.
- *
+ *
* The interface ensure the ability to not only get and set the
* value, but also the attribute name and the ability to add to
* the content in a manner as defined by the attribute itself.
- *
+ *
* E.g. adding to a class attribute usually involves seperating
* the new addition with a space.
- *
- * @author Matijs de Jong
- * @package MUtil
+ *
+ * @package MUtil
* @subpackage Html
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
interface MUtil_Html_AttributeInterface extends MUtil_Html_HtmlInterface
{
+ /**
+ * Returns an unescape string version of the attribute
+ *
+ * Output escaping is done elsewhere, e.g. in Zend_View_Helper_HtmlElement->_htmlAttribs()
+ *
+ * @return string
+ */
public function __toString();
+
public function add($value);
public function get();
+
+ /**
+ * Returns the attribute name
+ *
+ * @return string
+ */
public function getAttributeName();
+
// inherited: public function render(Zend_View_Abstract $view);
+
public function set($value);
}
\ No newline at end of file
Modified: trunk/library/classes/MUtil/Html/UrlArrayAttribute.php
===================================================================
--- trunk/library/classes/MUtil/Html/UrlArrayAttribute.php 2012-04-23 12:08:39 UTC (rev 631)
+++ trunk/library/classes/MUtil/Html/UrlArrayAttribute.php 2012-04-23 14:13:47 UTC (rev 632)
@@ -1,6 +1,5 @@
<?php
-
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
@@ -26,23 +25,59 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package MUtil
+ * @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package MUtil
+ * An array attribute that forms url's using Zend framework routing
+ *
+ * @package MUtil
* @subpackage Html
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
-
class MUtil_Html_UrlArrayAttribute extends MUtil_Html_ArrayAttribute
{
- protected $_request;
- protected $_routeReset;
+ /**
+ *
+ * @var boolean
+ */
+ protected $_routeReset = false;
+ /**
+ * Seperator used to separate multiple items
+ *
+ * @var string
+ */
protected $_separator = '&';
+ protected $_specialTypes = array('setRouter' => 'Zend_Controller_Router_Route');
+
+ /**
+ *
+ * @var Zend_Controller_Router_Route
+ */
+ public $router;
+
+ /**
+ * Helper function thats fills a parameter from the request if it was not
+ * already in the options array.
+ *
+ * This function ensures that e.g. the current controller is used instead
+ * of the default 'index' controller.
+ *
+ * @param Zend_Controller_Request_Abstract $request
+ * @param string $name
+ * @param array $options
+ */
private static function _rerouteUrlOption(Zend_Controller_Request_Abstract $request, $name, &$options)
{
if (! array_key_exists($name, $options)) {
@@ -85,7 +120,8 @@
// Make sure controllor, action, module are specified
$url_parameters = self::rerouteUrl($this->getRequest(), $url_parameters);
- return $this->getView()->url($url_parameters, null, $this->getRouteReset(), false);
+ $router = $this->getRouter();
+ return $router->assemble($url_parameters, null, $this->getRouteReset(), false);
}
return null;
@@ -96,25 +132,40 @@
return $key . '=' . $value;
}
- public function getRequest()
+ /**
+ *
+ * @return Zend_Controller_Router_Route
+ */
+ public function getRouter()
{
- if (! $this->_request) {
+ if (! $this->router) {
$front = Zend_Controller_Front::getInstance();
- $this->_request = $front->getRequest();
+ $this->router = $front->getRouter();
}
- return $this->_request;
+ return $this->router;
}
+ /**
+ * Whether or not to set route defaults with the paramter values
+ *
+ * @return type
+ */
public function getRouteReset()
{
return $this->_routeReset;
}
+ /**
+ * Is this Url an Zend Framework Mvc url or a string with parameters.
+ *
+ * @return boolean
+ */
public function isMvcUrl()
{
foreach ($this->getArray() as $key => $value) {
if (is_numeric($key)) {
+ // Contains standalone string => not Zend
return false;
}
}
@@ -122,31 +173,58 @@
return true;
}
+ /**
+ * Set the module, controller and action of an url parameter array to the current
+ * module, controller and action, except when one of these items has already been
+ * specified in the array.
+ *
+ * @param Zend_Controller_Request_Abstract $request
+ * @param array $options An array of parameters (optionally including e.g. controller name) for the new url
+ * @param boolean $addRouteReset Deprecated: add the 'RouteReset' parameter that is used by objects of this type to set RouteReset
+ * @return array Url array with adapted utl's
+ */
public static function rerouteUrl(Zend_Controller_Request_Abstract $request, $options, $addRouteReset = false)
{
- self::_rerouteUrlOption($request, 'module', $options);
- self::_rerouteUrlOption($request, 'controller', $options);
- self::_rerouteUrlOption($request, 'action', $options);
+ self::_rerouteUrlOption($request, $request->getModuleKey(), $options);
+ self::_rerouteUrlOption($request, $request->getControllerKey(), $options);
+ self::_rerouteUrlOption($request, $request->getActionKey(), $options);
if ($addRouteReset) {
+ // Use of this paramter is deprecated
$options['RouteReset'] = true;
}
return $options;
}
- public function setRequest(Zend_Controller_Request_Abstract $request)
+ /**
+ *
+ * @param Zend_Controller_Router_Route $router
+ * @return MUtil_Html_UrlArrayAttribute (continuation pattern)
+ */
+ public function setRouter(Zend_Controller_Router_Route $router)
{
- $this->_request = $request;
+ $this->router = $router;
return $this;
}
+ /**
+ * Whether or not to set route defaults with the paramter values
+ *
+ * @param boolean $routeReset
+ * @return MUtil_Html_UrlArrayAttribute (continuation pattern)
+ */
public function setRouteReset($routeReset = true)
{
$this->_routeReset = $routeReset;
return $this;
}
+ /**
+ * @deprecated
+ * @param string $label
+ * @return Zend_Navigation_Page_Mvc
+ */
public function toPage($label)
{
if ($this->isMvcUrl()) {
@@ -165,4 +243,62 @@
return new Zend_Navigation_Page_Uri($options);
}
}
+
+ /**
+ * Returns relative url string using the current module, controller and action when
+ * none where specified.
+ *
+ * This is url is encoded for url usage, but not for use as attribute values,
+ * i.e. this helper function is used for generating url's for internal use.
+ *
+ * @param array $options Array of parameter values
+ * @param Zend_Controller_Request_Abstract $request
+ * @param Zend_Controller_Router_Route $router
+ * @return string
+ */
+ public static function toUrlString(array $options, Zend_Controller_Request_Abstract $request = null, Zend_Controller_Router_Route $router = null)
+ {
+ $base = '';
+ $encode = true;
+ $nobase = false;
+ $reset = false;
+
+ if (array_key_exists('Encode', $options)) {
+ $encode = $options['Encode'];
+ unset($options['Encode']);
+ }
+ if (array_key_exists('NoBase', $options)) {
+ $nobase = $options['NoBase'];
+ unset($options['NoBase']);
+ }
+ if (array_key_exists('RouteReset', $options)) {
+ $reset = $options['RouteReset'];
+ unset($options['RouteReset']);
+ }
+
+ if ($nobase || (null === $request) || (null === $router)) {
+ $front = Zend_Controller_Front::getInstance();
+
+ if ($nobase) {
+ $base = rtrim($front->getBaseUrl(), '/');
+ }
+
+ if (null === $request) {
+ $request = $front->getRequest();
+ }
+ if (null === $router) {
+ $router = $front->getRouter();
+ }
+ }
+
+ $options = self::rerouteUrl($request, $options);
+ $url = $router->assemble($options, null, $reset, $encode);
+
+ // Remove the base url that was specified
+ if ($nobase && (0 === strncmp($url, $base . '/', strlen($base) + 1))) {
+ return substr($url, strlen($base));
+ }
+
+ return $url;
+ }
}
\ No newline at end of file
Modified: trunk/library/classes/MUtil/Html.php
===================================================================
--- trunk/library/classes/MUtil/Html.php 2012-04-23 12:08:39 UTC (rev 631)
+++ trunk/library/classes/MUtil/Html.php 2012-04-23 14:13:47 UTC (rev 632)
@@ -79,6 +79,12 @@
*/
public static $verbose = false;
+ /**
+ * @deprecated
+ * @param Zend_Navigation_Container $menu
+ * @param string $label
+ * @param array $arg_array
+ */
public static function addUrl2Page(Zend_Navigation_Container $menu, $label, $arg_array = null)
{
$args = array_slice(func_get_args(), 2);
@@ -311,6 +317,7 @@
/**
* Returns a href attribute
*
+ * @deprecated
* @param mixed $arg_array MUtil_Args::ra arguements
* @return MUtil_Html_HrefArrayAttribute
*/
@@ -319,4 +326,21 @@
$args = func_get_args();
return new MUtil_Html_HrefArrayAttribute($args);
}
+
+ /**
+ * Returns relative url string using the current module, controller and action when
+ * none where specified.
+ *
+ * This is url is encoded for url usage, but not for use as attribute values,
+ * i.e. this helper function is used for generating url's for internal use.
+ *
+ * @param array $options Array of parameter values
+ * @param Zend_Controller_Request_Abstract $request
+ * @param Zend_Controller_Router_Route $router
+ * @return string
+ */
+ public static function urlString(array $options, Zend_Controller_Request_Abstract $request = null, Zend_Controller_Router_Route $router = null)
+ {
+ return MUtil_Html_UrlArrayAttribute::toUrlString($options, $request, $router);
+ }
}
Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql 2012-04-23 12:08:39 UTC (rev 631)
+++ trunk/library/configs/db/patches.sql 2012-04-23 14:13:47 UTC (rev 632)
@@ -396,4 +396,4 @@
-- GEMS VERSION: 47
-- PATCH: Add return url to tokens
--- ALTER TABLE gems__tokens ADD gto_return_url varchar(250) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null default null AFTER gto_reception_code;
+ALTER TABLE gems__tokens ADD gto_return_url varchar(250) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null default null AFTER gto_reception_code;
Modified: trunk/library/configs/db/tables/gems__tokens.200.sql
===================================================================
--- trunk/library/configs/db/tables/gems__tokens.200.sql 2012-04-23 12:08:39 UTC (rev 631)
+++ trunk/library/configs/db/tables/gems__tokens.200.sql 2012-04-23 14:13:47 UTC (rev 632)
@@ -41,7 +41,7 @@
gto_reception_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' default 'OK' not null
references gems__reception_codes (grc_id_reception_code),
- -- gto_return_url varchar(250) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null default null,
+ gto_return_url varchar(250) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null default null,
gto_changed timestamp not null default current_timestamp on update current_timestamp,
gto_changed_by bigint unsigned not null,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-23 12:25:14
|
Revision: 630
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=630&view=rev
Author: mennodekker
Date: 2012-04-23 10:58:42 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
get the real project object :)
Modified Paths:
--------------
trunk/library/classes/GemsEscort.php
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2012-04-23 10:41:59 UTC (rev 629)
+++ trunk/library/classes/GemsEscort.php 2012-04-23 10:58:42 UTC (rev 630)
@@ -212,7 +212,7 @@
die(sprintf($this->translate->_('Path %s not writable'), $log_path));
}
- $filter = new Zend_Log_Filter_Priority($project->getLogLevel());
+ $filter = new Zend_Log_Filter_Priority($this->project->getLogLevel());
$writer->addFilter($filter);
$logger->addWriter($writer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
