From 53b73481f5e07f570fe21e7f1671af2bfabddd3f Mon Sep 17 00:00:00 2001
From: following <following>
Date: Sun, 26 Aug 2012 18:19:58 +0200
Subject: [PATCH] log permission fixes

- fixed bug introduced with commit 016f3c7d
- fixed log edit links for locked caches when using viewlogs.php
    (added `status` to SELECT statement)
---
 htdocs/templates2/ocstyle/res_logentry_logitem.tpl |  2 +-
 htdocs/viewlogs.php                                | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/templates2/ocstyle/res_logentry_logitem.tpl b/htdocs/templates2/ocstyle/res_logentry_logitem.tpl
index ab401326..4f4f9722 100644
--- a/htdocs/templates2/ocstyle/res_logentry_logitem.tpl
+++ b/htdocs/templates2/ocstyle/res_logentry_logitem.tpl
@@ -38,7 +38,7 @@
 				[<a href="editlog.php?logid={$logItem.id|urlencode}">{t}Edit{/t}</a>]
 			{/if}
 
-			{if $logItem.userid==$login.userid}
+			{if $cache.userid==$login.userid || $logItem.userid==$login.userid}
 				<a href="removelog.php?logid={$logItem.id|urlencode}"><img src="resource2/{$opt.template.style}/images/log/16x16-trash.png" border="0" align="middle" border="0" width="16" height="16" alt="" /></a>
 				[<a href="removelog.php?logid={$logItem.id|urlencode}">{t}Delete{/t}</a>]
 			{/if}
diff --git a/htdocs/viewlogs.php b/htdocs/viewlogs.php
index 221b3ef9..56c66694 100644
--- a/htdocs/viewlogs.php
+++ b/htdocs/viewlogs.php
@@ -39,7 +39,17 @@
 	if ($cache_id != 0)
 	{ 
 		//get cache record
-		$rs = sql("SELECT `caches`.`cache_id`, `caches`.`wp_oc` AS `wpoc`, `caches`.`user_id` AS `userid`, `caches`.`name`, IFNULL(`stat_caches`.`found`, 0) AS `found`, IFNULL(`stat_caches`.`notfound`, 0) AS `notfound`, IFNULL(`stat_caches`.`note`, 0) AS `note`, `cache_status`.`allow_user_view` FROM `caches` INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` LEFT JOIN `stat_caches` ON `caches`.`cache_id`=`stat_caches`.`cache_id` WHERE `caches`.`cache_id`='&1'", $cache_id);
+		$rs = sql("SELECT `caches`.`cache_id`, `caches`.`wp_oc` AS `wpoc`, 
+											`caches`.`user_id` AS `userid`, `caches`.`name`, 
+											`caches`.`status` AS `status`,
+											IFNULL(`stat_caches`.`found`, 0) AS `found`, 
+											IFNULL(`stat_caches`.`notfound`, 0) AS `notfound`, 
+											IFNULL(`stat_caches`.`note`, 0) AS `note`, 
+											`cache_status`.`allow_user_view` 
+							 FROM `caches` 
+							 INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` 
+							 LEFT JOIN `stat_caches` ON `caches`.`cache_id`=`stat_caches`.`cache_id` 
+							 WHERE `caches`.`cache_id`='&1'", $cache_id);
 		$rCache = sql_fetch_array($rs);
 		sql_free_result($rs);