From ff3f78708384b49761824dfcc55a845b2cd4081f Mon Sep 17 00:00:00 2001
From: following <following>
Date: Fri, 12 Apr 2013 15:05:08 +0200
Subject: [PATCH] added 'contact reporter' in cache-report admin interface

---
 htdocs/adminreports.php                    | 5 +++++
 htdocs/doc/sql/static-data/data.sql        | 2 ++
 htdocs/templates2/ocstyle/adminreports.tpl | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/adminreports.php b/htdocs/adminreports.php
index a10d12ae..92907bbd 100644
--- a/htdocs/adminreports.php
+++ b/htdocs/adminreports.php
@@ -25,6 +25,7 @@
 	$rid = isset($_REQUEST['rid']) ? $_REQUEST['rid']+0 : 0;
 	$cacheid = isset($_REQUEST['cacheid']) ? $_REQUEST['cacheid']+0 : 0;
 	$ownerid = isset($_REQUEST['ownerid']) ? $_REQUEST['ownerid']+0 : 0;
+	$reporterid =sql_value("SELECT `userid` FROM `cache_reports` WHERE `id`=&1", 0, $rid); 
 	$adminid = sql_value("SELECT `adminid` FROM `cache_reports` WHERE `id`=&1", 0, $rid);
 	$age = sql_value("SELECT DATEDIFF(NOW(),`lastmodified`) FROM `cache_reports` WHERE `id`=&1", 0, $rid);
 
@@ -38,6 +39,10 @@
 	{
 		$tpl->redirect('mailto.php?userid=' . urlencode($ownerid));
 	}
+	elseif (isset($_REQUEST['contact_reporter']) && $reporterid > 0)
+	{
+		$tpl->redirect('mailto.php?userid=' . urlencode($reporterid));
+	}
 	elseif ((isset($_REQUEST['statusActive']) || 
 	         isset($_REQUEST['statusTNA']) || 
 	         isset($_REQUEST['statusArchived']) || 
diff --git a/htdocs/doc/sql/static-data/data.sql b/htdocs/doc/sql/static-data/data.sql
index 0afcaabe..6ee3f1b8 100644
--- a/htdocs/doc/sql/static-data/data.sql
+++ b/htdocs/doc/sql/static-data/data.sql
@@ -2434,6 +2434,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1973', 'General
 INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1974', 'If you do not see any E-Mail, please check the spam folder of your mailbox.', '2013-02-23 19:00:04');
 INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1975', 'Do not use easy-to-guess number and letter sequences like \'123456\' or \'qwerty\'', '2013-02-23 19:00:04');
 INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1976', 'currently not available', '2013-02-23 19:00:04');
+INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1977', 'Contact reporter', '2013-02-23 19:00:04');
 
 -- Table sys_trans_ref
 SET NAMES 'utf8';
@@ -6145,6 +6146,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1974', 'DE', 'Falls du keine E-Mail sehen solltest, prüfe bitte ob sie im Spam-Ordner deines Postfachs einsortiert wurde.', '2013-02-19 05:48:07');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1975', 'DE', 'Verwende keine einfach erratbaren Ziffern- oder Buchstabenkombinationen wie &bdquo;123456&ldquo; oder &bdquo;qwertz&ldquo;.', '2013-02-19 05:48:07');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1976', 'DE', 'zurzeit nicht verfügbar', '2013-02-19 05:48:07');
+INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1977', 'DE', 'Email an Melder', '2013-02-19 05:48:07');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs \r', '2010-09-02 00:15:30');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'EN', 'The database could not be reconnected.', '2010-08-28 11:48:07');
 INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing – please do not login', '2010-08-28 11:48:07');
diff --git a/htdocs/templates2/ocstyle/adminreports.tpl b/htdocs/templates2/ocstyle/adminreports.tpl
index b823b655..1b9c4f49 100644
--- a/htdocs/templates2/ocstyle/adminreports.tpl
+++ b/htdocs/templates2/ocstyle/adminreports.tpl
@@ -68,7 +68,7 @@
 
 		<p style="line-height: 1.6em;"><input type="submit" name="assign" value="{t}Assign to me{/t}" class="formbutton" onclick="submitbutton('assign')" />
 		{if $ownreport}
-		&nbsp;<input type="submit" name="contact" value="{t}Contact owner{/t}" class="formbutton" onclick="submitbutton('contact')" />&nbsp;&nbsp;<input type="submit" name="done" value="{t}Mark as finished{/t}" class="formbutton" onclick="submitbutton('done')" /></p>
+		&nbsp;<input type="submit" name="contact" value="{t}Contact owner{/t}" class="formbutton" onclick="submitbutton('contact')" />&nbsp;<input type="submit" name="contact_reporter" value="{t}Contact reporter{/t}" class="formbutton" onclick="submitbutton('contact_reporter')" />&nbsp;&nbsp;<input type="submit" name="done" value="{t}Mark as finished{/t}" class="formbutton" onclick="submitbutton('done')" /></p>
 
 		<div class="content2-container bg-blue02">
 	  	<p class="content-title-noshade-size2">