Skip to content
Permalink
Browse files

show publication state info for unpublished caches; updates #1063

  • Loading branch information...
following5 committed Aug 20, 2017
1 parent d8bf48c commit 49a9043cb6c9a4d62ef85578c33e3ab4f0f68a8b
@@ -193,8 +193,8 @@ function getWaypoints($cacheId)
$way_length = isset($_POST['way_length']) ? trim($_POST['way_length']) : $cache_record['way_length'];
if ($status_old == 5 && $status == 5) {
if (isset($_POST['publish'])) { // Ocprop
$publish = $_POST['publish'];
if (isset($_REQUEST['publish'])) { // Ocprop; see also res_state_warning.tpl
$publish = $_REQUEST['publish'];
if (!($publish == 'now' || $publish == 'later' || $publish == 'notnow')) {
// somebody messed up the POST-data, so we do not publish the cache,
// since he isn't published right now (status=5)
@@ -323,7 +323,7 @@ function toggleAttr(id)
</td>
</tr>
<tr><td class="spacer" colspan="2">&nbsp;</td></tr>
<tr>
<tr id="others">
<td class="header-small" colspan="2">
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size2">
@@ -10,6 +10,15 @@
<div class="isarchived">
<p><strong>{t 1=$cache.statusName|escape}Attention! This Geocache is &quot;<span class="errormsg">%1</span>&quot;!</strong> The geocache itself or parts of it are missing or there are other issues that make a successful search impossible. In the interest of the place it should not be necessarily to search!{/t}</p>
</div>
{elseif $cache.status==5}
<div class="isannotated">
{if $date_activate}
<p style="margin-bottom:0">{t 1=$date_activate|date_format:$opt.format.datelong 2=$date_activate|date_format:$opt.format.time}This geocache will be published on <b>%1</b> at <b>%2</b>.{/t}</p>
{else}
<p><strong>{t}This Geocache has not been published yet.{/t}</strong></p>
<p>{t 1="href='articles.php?page=cacheinfo' target='_blank'" 2=$cache.cacheid}Please verify that the geocache description is complete and all properties and attributes are set properly, according to the <a %1>instructions</a>. Then click <strong><a href="editcache.php?cacheid=%2&publish=now#others">here</a></strong> and "Save" to publish your geocache.{/t}
{/if}
</div>
{elseif $cache.listing_outdated>0}
<div class="isannotated">
<p><strong>{t}This geocache description may be outdated.{/t}</strong> {t 1=$smarty.server.PHP_SELF 2="?cacheid=" 3=$smarty.get.cacheid}See the <span style="white-space:nowrap"><img src="resource2/ocstyle/images/log/16x16-listing-outdated.png"> <a href="%1%2%3#logentries" class="systemlink">log entries</a></span> for more information.{/t}</p>
@@ -124,6 +124,7 @@ function getChildWaypoints($cacheid)
`caches`.`protect_old_coords` OR `user`.`is_active_flag`=0 AS `protect_old_coords`,
`caches`.`needs_maintenance`,
`caches`.`listing_outdated`,
`caches`.`date_activate`,
`cache_desc`.`language` AS `desclanguage`,
`cache_desc`.`short_desc` AS `shortdesc`,
`cache_desc`.`desc` AS `desc`,
@@ -488,6 +489,7 @@ function getChildWaypoints($cacheid)
$tpl->assign('listing_admin', $login->listingAdmin());
$tpl->assign('npahelplink', helppagelink('npa'));
$tpl->assign('desclang', $desclang);
$tpl->assign('date_activate', $rCache['date_activate']);
// display the page
$tpl->display();
@@ -1933,5 +1933,8 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2633', 'This Ca
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2634', 'More information', '2017-05-14 21:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2635', 'Close', '2017-05-14 21:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2636', 'This website uses cookies. If you stay on this site you accept the usage of cookies.', '2017-05-14 21:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2637', 'This Geocache has not been published yet.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2638', 'Please verify that the geocache description is complete and all properties and attributes are set properly, according to the <a %1>instructions</a>. Then click <strong><a href=\"editcache.php?cacheid=%2&publish=now#others\">here</a></strong> and \"Save\" to publish your geocache.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2639', 'This geocache will be published on <b>%1</b> at <b>%2</b>.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2640', 'Do you really want to delete the picture \\\'{title}\\\'?', '2017-08-22 18:45:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2641', 'There is already a report in progress for this cache, see below.', '2017-08-23 13:20:00');
@@ -1930,5 +1930,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2634', 'DE', 'Mehr Informationen', '2017-05-14 21:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2635', 'DE', 'Schließen', '2017-05-14 21:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2636', 'DE', 'Diese Webseite verwendet Cookies. Wenn Sie auf der Seite weitersurfen, stimmen Sie der Cookie-Nutzung zu.', '2017-05-14 21:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2637', 'DE', 'Dieser Cache ist noch nicht veröffentlicht.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2638', 'DE', 'Prüfe bitte, ob die Cachebeschreibung vollständig ist und alle Cacheigenschaften und -attribute gemäß <a %1>Anleitung</a> eingetragen sind. Dann klicke <strong><a href=\"editcache.php?cacheid=%2&publish=now#others\">hier</a></strong> auf &bdquo;Speichern&ldquo;, um deinen Cache zu veröffentlichen.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2639', 'DE', 'Dieser Cache wird am <b>%1</b> um <b>%2 Uhr</b> veröffentlicht.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2640', 'DE', 'Möchtest du das Bild &bdquo;{title}&ldquo; wirklich löschen?', '2017-08-22 18:45:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2641', 'DE', 'Für diesen Cache ist bereits eine Meldung in Arbeit, siehe unten.', '2017-08-23 13:20:00');

0 comments on commit 49a9043

Please sign in to comment.
You can’t perform that action at this time.