From b3bad1b25d373261ce696cf0fba165473ec8a3c7 Mon Sep 17 00:00:00 2001
From: following <following>
Date: Sun, 26 Aug 2012 10:50:07 +0200
Subject: [PATCH] 4619: hide log button for locked caches instead of showing
 empty page when pressed (owner exempted)

---
 htdocs/templates2/ocstyle/articles/DE/changelog.tpl | 1 +
 htdocs/templates2/ocstyle/articles/EN/changelog.tpl | 3 ++-
 htdocs/templates2/ocstyle/viewcache.tpl             | 2 ++
 htdocs/viewcache.php                                | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/templates2/ocstyle/articles/DE/changelog.tpl b/htdocs/templates2/ocstyle/articles/DE/changelog.tpl
index 499014fb..9309872a 100644
--- a/htdocs/templates2/ocstyle/articles/DE/changelog.tpl
+++ b/htdocs/templates2/ocstyle/articles/DE/changelog.tpl
@@ -33,6 +33,7 @@
 		 <li class="changelogitem">inaktive Caches auch auf der <a href="./newcachesrest.php">Alle-außer-Deutschland-Seite</a> ausgeblendet</li>
 		 <li class="changelogitem">einheitliche Schreibweise für Attributnamen</li>
 		 <li class="changelogitem">Cachelisting: &bdquo;Decrypt&ldquo; &rarr; &bdquo;Entschlüsseln&ldquo;</li>
+	   <li class="changelogitem">bei gesperrten Caches den Logbutton ausgeblendet, statt auf eine leere Seite zu verlinken</li>
    </ul>
 	 <p>Korrigiert (Bugfixes):</p>
 	 <ul class="changelog">
diff --git a/htdocs/templates2/ocstyle/articles/EN/changelog.tpl b/htdocs/templates2/ocstyle/articles/EN/changelog.tpl
index 495cacbf..5a63d767 100644
--- a/htdocs/templates2/ocstyle/articles/EN/changelog.tpl
+++ b/htdocs/templates2/ocstyle/articles/EN/changelog.tpl
@@ -31,7 +31,8 @@
 	   <li class="changelogitem">better display of cache reports for the support team</li>
 	   <li class="changelogitem">removed 65565-cache-listings-limit (OCFFFF, including archived caches)</li>
 	   <li class="changelogitem">Completed Spanish and Italian translations</li>
-	   <li class="changelogitem">hidden inaktive new Caches on <a href="./newcachesrest.php">All-but-Germany</a> page</li>
+	   <li class="changelogitem">hidden inaktive new caches on <a href="./newcachesrest.php">All-but-Germany</a> page</li>
+	   <li class="changelogitem">hidden log button for locked caches, instead of linking it to an emty page</li>
    </ul>
 	 <p>Fixed:</p>
 	 <ul class="changelog">
diff --git a/htdocs/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl
index f245c0a7..d58336fe 100644
--- a/htdocs/templates2/ocstyle/viewcache.tpl
+++ b/htdocs/templates2/ocstyle/viewcache.tpl
@@ -80,7 +80,9 @@
 			<ul id="cachemenu">
 				<li class="title" >Cache Menu</li>
 				{if $login.userid!=0}
+					{if $cache.log_allowed}
 					<li class="group"><a style="background-image: url(resource2/{$opt.template.style}/images/viewcache/new-entry-18.png);background-repeat:no-repeat;" href="log.php?cacheid={$cache.cacheid|urlencode}">{t}Log this cache{/t}</a></li>
+					{/if}
 				
 					{if $watched==1}
 						<li class="group"><a style="background-image: url(resource2/{$opt.template.style}/images/viewcache/watch-18.png);background-repeat:no-repeat;" href="mywatches.php?action=remove&amp;cacheid={$cache.cacheid|urlencode}&amp;target=viewcache.php%3Fcacheid%3D{$cache.cacheid|urlencode}">{t}Don't watch{/t}</a></li>
diff --git a/htdocs/viewcache.php b/htdocs/viewcache.php
index 6168f548..aa2358bc 100644
--- a/htdocs/viewcache.php
+++ b/htdocs/viewcache.php
@@ -107,6 +107,7 @@ function getChildWaypoints($cacheid)
 				`cache_desc`.`desc` AS `desc`,
 				`cache_desc`.`hint` AS `hint`,
 				`cache_desc`.`desc_html` AS `deschtml`,
+				`cache_status`.`allow_user_log`=1 OR `caches`.`user_id`='&4' AS `log_allowed`,
 				IFNULL(`stat_caches`.`found`, 0) AS `found`,
 				IFNULL(`stat_caches`.`notfound`, 0) AS `notfound`,
 				IFNULL(`stat_caches`.`note`, 0) AS `note`,
@@ -125,6 +126,7 @@ function getChildWaypoints($cacheid)
 		     FROM `caches`
 		    INNER JOIN `user` ON `caches`.`user_id`=`user`.`user_id`
 		    INNER JOIN `cache_desc` ON `caches`.`cache_id`=`cache_desc`.`cache_id` AND `cache_desc`.`language`=PREFERED_LANG(`caches`.`desc_languages`, '&3')
+		    INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id`
 		     LEFT JOIN `countries` ON `caches`.`country`=`countries`.`short`
 		     LEFT JOIN `sys_trans` AS `tCountry` ON `countries`.`trans_id`=`tCountry`.`id` AND `countries`.`name`=`tCountry`.`text`
 		     LEFT JOIN `sys_trans_text` AS `ttCountry` ON `tCountry`.`id`=`ttCountry`.`trans_id` AND `ttCountry`.`lang`='&2'