verify 'Attended' log date

following5 · following5 · commit e4fabb8e4995 · 2018-09-20T15:36:28.000+02:00
diff --git a/okapi/locale/de_DE/LC_MESSAGES/okapi_messages.mo b/okapi/locale/de_DE/LC_MESSAGES/okapi_messages.mo
diff --git a/okapi/locale/de_DE/LC_MESSAGES/okapi_messages.po b/okapi/locale/de_DE/LC_MESSAGES/okapi_messages.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OKAPI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 14:10+0200\n"
-"PO-Revision-Date: 2017-09-14 14:11+0200\n"
+"POT-Creation-Date: 2018-09-20 15:33+0200\n"
+"PO-Revision-Date: 2018-09-20 15:34+0200\n"
 "Last-Translator: following <following@online.de>\n"
 "Language-Team: following <following@online.de>\n"
 "Language: de\n"
@@ -28,83 +28,83 @@ msgstr "Das Passwort darf nicht länger als %d Zeichen sein."
 msgid "%s does not allow log passwords for traditional caches."
 msgstr "Tradis können bei %s keine Passwörter haben."
 
-#: services/caches/formatters/gpx/WebService.php:409
+#: services/caches/formatters/gpx/WebService.php:427
 msgid ""
 "<b>Geocache coordinates have been changed.</b> They have been replaced with "
 "your own custom coordinates which you have provided for this geocache."
 msgstr ""
 "<b>Die Koordinaten des Geocaches wurden geändert.</b> Sie wurden durch deine "
 "eigenen Koordinaten aus der persönlichen Notiz für diesen Cache ersetzt."
 
-#: services/caches/formatters/gpx/WebService.php:415
+#: services/caches/formatters/gpx/WebService.php:433
 msgid ""
 "<b>Geocache coordinates have been changed.</b> Currently they point to one "
 "of the alternate waypoints originally described as:"
 msgstr ""
 "<b>Die Koordinaten des Geocaches wurden geändert.</b> Sie zeigen zurzeit auf "
 "einen der zusätzlichen Wegpunkte mit der ursprünglichen Beschreibung:"
 
-#: services/caches/formatters/gpx/WebService.php:428
+#: services/caches/formatters/gpx/WebService.php:446
 msgid "Original geocache location"
 msgstr "Originalposition des Caches"
 
-#: services/caches/formatters/gpx/WebService.php:430
+#: services/caches/formatters/gpx/WebService.php:448
 #, php-format
 msgid "Original (owner-supplied) location of the %s geocache"
 msgstr "Originale, vom Besitzer angegebene Position des Geocaches %s"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:52
-#: services/caches/formatters/gpx/gpxfile.tpl.php:87
+#: services/caches/formatters/gpx/gpxfile.tpl.php:56
+#: services/caches/formatters/gpx/gpxfile.tpl.php:91
 msgid "hidden by"
 msgstr "versteckt von"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:89
+#: services/caches/formatters/gpx/gpxfile.tpl.php:93
 #, php-format
 msgid "%d recommendation"
 msgid_plural "%d recommendations"
 msgstr[0] "%d Empfehlung"
 msgstr[1] "%d Empfehlungen"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:90
+#: services/caches/formatters/gpx/gpxfile.tpl.php:94
 #, php-format
 msgid "found %d time"
 msgid_plural "found %d times"
 msgstr[0] "%d mal gefunden"
 msgstr[1] "%d mal gefunden"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:93
+#: services/caches/formatters/gpx/gpxfile.tpl.php:97
 #, php-format
 msgid "%d trackable"
 msgid_plural "%d trackables"
 msgstr[0] "%d Geokret"
 msgstr[1] "%d Geokrets"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:97
+#: services/caches/formatters/gpx/gpxfile.tpl.php:101
 msgid "Personal notes"
 msgstr "Persönliche Notizen"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:101
+#: services/caches/formatters/gpx/gpxfile.tpl.php:105
 msgid "Attributes"
 msgstr "Attribute"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:105
+#: services/caches/formatters/gpx/gpxfile.tpl.php:109
 msgid "Trackables"
 msgstr "Geokrets"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:115
-#: services/caches/formatters/gpx/gpxfile.tpl.php:131
+#: services/caches/formatters/gpx/gpxfile.tpl.php:119
+#: services/caches/formatters/gpx/gpxfile.tpl.php:135
 msgid "Images"
 msgstr "Bilder"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:138
+#: services/caches/formatters/gpx/gpxfile.tpl.php:142
 msgid "Spoilers"
 msgstr "Spoiler"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:147
+#: services/caches/formatters/gpx/gpxfile.tpl.php:151
 msgid "Image descriptions"
 msgstr "Bildbeschreibungen"
 
-#: services/caches/formatters/gpx/gpxfile.tpl.php:155
+#: services/caches/formatters/gpx/gpxfile.tpl.php:159
 msgid "The cache probably is located in the following protection areas:"
 msgstr ""
 "Der Geocache befindet sich wahrscheinlich in den folgenden Schutzgebieten:"
@@ -117,32 +117,32 @@ msgstr "Teile dieser Cachebeschreibung sind wahrscheinlich veraltet."
 msgid "See the log entries for more information."
 msgstr "Weitere Informationen dazu finden sich in den Logeinträgen."
 
-#: services/caches/geocaches/WebService.php:1049
+#: services/caches/geocaches/WebService.php:1063
 msgid "Stage"
 msgstr "Station"
 
-#: services/caches/geocaches/WebService.php:1093
+#: services/caches/geocaches/WebService.php:1107
 msgid "User location"
 msgstr "Benutzerkoordinaten"
 
-#: services/caches/geocaches/WebService.php:1096
+#: services/caches/geocaches/WebService.php:1110
 #, php-format
 msgid "Your own custom coordinates for the %s geocache"
 msgstr "Die Koordinaten für den Geocache %s aus deiner persönlichen Notiz"
 
-#: services/caches/geocaches/WebService.php:1260
+#: services/caches/geocaches/WebService.php:1274
 msgid "National Park / Landscape"
 msgstr "Nationalpark / Landschaft"
 
-#: services/caches/geocaches/WebService.php:1438
+#: services/caches/geocaches/WebService.php:1452
 #, php-format
 msgid ""
 "This <a href='%s'>geocache</a> description comes from the <a href='%s'>%s</"
 "a> site."
 msgstr ""
 "Diese <a href='%s'>Cache</a>-Beschreibung stammt von <a href='%s'>%s</a>."
 
-#: services/caches/geocaches/WebService.php:1450
+#: services/caches/geocaches/WebService.php:1464
 #, php-format
 msgid ""
 "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, <a href='https://"
@@ -153,7 +153,7 @@ msgstr ""
 "creativecommons.org/licenses/by-nc-nd/3.0/de/'>CC-BY-NC-ND</a>, Stand: %s; "
 "alle Logeinträge &copy; jeweiliger Autor"
 
-#: services/caches/geocaches/WebService.php:1461
+#: services/caches/geocaches/WebService.php:1475
 #, php-format
 msgid ""
 "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, <a href='https://"
@@ -204,7 +204,7 @@ msgstr ""
 "einem Bildbearbeitungsprogramm. (Du kannst auch die Entwickler von '%s' "
 "darum bitten, hochgeladene Bilder automatisch zu verkleinern.)"
 
-#: services/logs/images/add/WebService.php:407
+#: services/logs/images/add/WebService.php:415
 msgid "Image has been successfully saved."
 msgstr "Das Bild wurde erfolgreich gespeichert."
 
@@ -254,74 +254,82 @@ msgstr ""
 "Dies ist ein Event-Cache. Du kannst ihn nicht \"finden\" (aber du kannst am "
 "Event teilnehmen oder einen Hinweis loggen)."
 
-#: services/logs/submit/WebService.php:223
+#: services/logs/submit/WebService.php:220
+msgid ""
+"You cannot attend an event before it took place. Please check the log type "
+"and date."
+msgstr ""
+"Du kannst ein Event nicht besuchen, bevor es stattfindet. Bitte überprüfe "
+"den Logtyp und das Logdatum."
+
+#: services/logs/submit/WebService.php:229
 msgid ""
 "This cache is NOT an Event cache. You cannot \"Attend\" it (but you can find "
 "it, or comment on it)!"
 msgstr ""
 "Dies ist KEIN Event-Cache. Du kannst an ihm nicht \"teilnehmen\" (aber du "
 "kannst ihn finden oder kommentieren)."
 
-#: services/logs/submit/WebService.php:233
+#: services/logs/submit/WebService.php:239
 msgid "Your have to supply some text for your comment."
 msgstr "Du musst einen Text für dein Hinweislog eingeben!"
 
-#: services/logs/submit/WebService.php:249
+#: services/logs/submit/WebService.php:255
 msgid "This cache requires a password. You didn't provide one!"
 msgstr ""
 "Dieser Cache kann nur mit Kennwort geloggt werden, aber du hast keines "
 "angegeben."
 
-#: services/logs/submit/WebService.php:253
+#: services/logs/submit/WebService.php:259
 msgid "Invalid password!"
 msgstr "Ungültiges Kennwort!"
 
-#: services/logs/submit/WebService.php:400
+#: services/logs/submit/WebService.php:396
 msgid "You have already submitted a log entry with exactly the same contents."
 msgstr ""
 "Du hast bereits einen Logeintrag mit genau dem gleichen Inhalt gemacht."
 
-#: services/logs/submit/WebService.php:434
+#: services/logs/submit/WebService.php:430
 msgid ""
 "You have already submitted a \"Found it\" log entry once. Now you may submit "
 "\"Comments\" only!"
 msgstr ""
 "Du hast diesen Cache bereits als \"gefunden\" geloggt. Ein zweites Fundlog "
 "ist nicht möglich, aber du kannst stattdessen einen Hinweis loggen."
 
-#: services/logs/submit/WebService.php:436
+#: services/logs/submit/WebService.php:432
 msgid ""
 "You have already submitted an \"Attended\" log entry once. Now you may "
 "submit \"Comments\" only!"
 msgstr ""
 "Du hast dieses Event bereits als \"teilgenommen\" geloggt. Eine zweite "
 "Teilnahme ist nicht möglich, aber du kannst stattdessen einen Hinweis loggen."
 
-#: services/logs/submit/WebService.php:446
+#: services/logs/submit/WebService.php:442
 msgid "You are the owner of this cache. You may submit \"Comments\" only!"
 msgstr ""
 "Als Besitzer des Caches kannst du nur Hinweise loggen, keine Funde oder "
 "Nichtfunde."
 
-#: services/logs/submit/WebService.php:468
+#: services/logs/submit/WebService.php:464
 msgid "You have already rated this cache once. Your rating cannot be changed."
 msgstr ""
 "Du hast diesen Cache bereits bewertet. Deine Bewertung ist nicht änderbar."
 
-#: services/logs/submit/WebService.php:489
+#: services/logs/submit/WebService.php:485
 msgid "You have already recommended this cache once."
 msgstr "Du hast diesen Cache bereits empfohlen."
 
-#: services/logs/submit/WebService.php:505
+#: services/logs/submit/WebService.php:501
 msgid "You don't have any recommendations to give. Find more caches first!"
 msgstr ""
 "Du musst mehr Caches finden, um eine weitere Bewertung abgeben zu können."
 
-#: services/logs/submit/WebService.php:556
+#: services/logs/submit/WebService.php:552
 msgid "Event caches cannot \"need maintenance\"."
 msgstr "Event-Caches können keine \"Wartung benötigen\"."
 
-#: services/logs/submit/WebService.php:707
+#: services/logs/submit/WebService.php:710
 msgid "Your cache log entry was posted successfully."
 msgstr "Dein Log wurde veröffentlicht."
 
diff --git a/okapi/services/logs/submit/WebService.php b/okapi/services/logs/submit/WebService.php
@@ -194,7 +194,7 @@ private static function _call(OkapiRequest $request)
             'services/caches/geocache',
             new OkapiInternalRequest($request->consumer, null, array(
                 'cache_code' => $cache_code,
-                'fields' => 'internal_id|status|owner|type|req_passwd'
+                'fields' => 'internal_id|status|owner|type|date_hidden|req_passwd'
             ))
         );
         $user = OkapiServiceRunner::call(
@@ -215,6 +215,12 @@ private static function _call(OkapiRequest $request)
                     'you can attend it, or comment on it)!'
                 ));
             }
+            else if ($logtype == 'Attended' && $when < strtotime($cache['date_hidden'])) {
+                throw new CannotPublishException(_(
+                    'You cannot attend an event before it took place. '.
+                    'Please check the log type and date.'
+                ));
+            }
         }
         else  # type != event
         {
