From 51f1d183ebc6fe8dfcca39fdde3a0f58d5d9d8d7 Mon Sep 17 00:00:00 2001
From: Martin Ambrus <martin@martinambrus.com>
Date: Wed, 8 Nov 2017 08:54:12 +0100
Subject: [PATCH] fix: quest 6 does not send a message with original quests set

Closes #315
---
 Templates/Ajax/quest_core.tpl   | 7 +++++++
 Templates/Ajax/quest_core25.tpl | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/Templates/Ajax/quest_core.tpl b/Templates/Ajax/quest_core.tpl
index 3ac270b0..8276bfaf 100644
--- a/Templates/Ajax/quest_core.tpl
+++ b/Templates/Ajax/quest_core.tpl
@@ -112,6 +112,7 @@ if (isset($qact)){
 			$Subject="Message From The Taskmaster";
 			$Subject=Q6_SUBJECT;
 			$Message=Q6_MESSAGE;
+			$database->sendMessage($session->userinfo['id'],4,$Subject,$Message,0,0,0,0,0);
 			$RB=true;
 			//Give Reward
 			$database->modifyResource($session->villages[0],50,60,30,30,1);	
@@ -486,6 +487,9 @@ $temp['uid']=$session->userinfo['id'];
 $ranking->procRankReq($temp);
 $displayarray = $database->getUserArray($temp['uid'],1);
 $rRes=$ranking->searchRank($displayarray['username'],"username");
+if (!isset($rSubmited)) {
+	$rSubmited = null;
+}
 if ($rRes!=$rSubmited && $rRes !== 'Multihunter'){?>
 {"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/><?php echo Q4; ?><\/h1><br \/><i>&rdquo;<?php echo Q4_DESC; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q4_ORDER; ?><\/div><br \/><input id=\"qst_val\" class=\"text\" type=\"text\" name=\"qstin\" \/> <input onclick=\"qst_next('','rank',document.getElementById('qst_val').value)\" type=\"button\" value=\"<?php echo Q4_BUTN; ?>\"\/><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"rank\"><\/div>\n\t\t","number":-4,"reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
 <?php $_SESSION['qstnew']='0'; }else{ $_SESSION['qstnew']='1'; ?>
@@ -507,6 +511,9 @@ if ($ironL<1 || $clayL<1){?>
 <?php } elseif($_SESSION['qst']== 6){ 
 
 //Check message is viewed or no
+if (!isset($RB)) {
+	$RB = null;
+}
 if ($message->unread || $RB==true){?>
 {"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q6; ?><\/h1><br \/><i>&rdquo;<?php echo Q6_DESC; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q6_ORDER; ?><\/div><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"msg\"><\/div>\n\t\t","number":"-6","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"i2","altstep":99}
 <?php $_SESSION['qstnew']='0'; }else{ $_SESSION['qstnew']='1'; ?>
diff --git a/Templates/Ajax/quest_core25.tpl b/Templates/Ajax/quest_core25.tpl
index 4e78a792..8c98ebe4 100644
--- a/Templates/Ajax/quest_core25.tpl
+++ b/Templates/Ajax/quest_core25.tpl
@@ -468,6 +468,9 @@ $temp['uid']=$session->userinfo['id'];
 $ranking->procRankReq($temp);
 $displayarray = $database->getUserArray($temp['uid'],1);
 $rRes=$ranking->searchRank($displayarray['username'],"username");
+if (!isset($rSubmited)) {
+	$rSubmited = null;
+}
 if ($rRes!=$rSubmited && $rRes !== 'Multihunter'){?>
 {"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/><?php echo Q4; ?><\/h1><br \/><i>&rdquo;<?php echo Q4_DESC; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q4_ORDER; ?><\/div><br \/><input id=\"qst_val\" class=\"text\" type=\"text\" name=\"qstin\" \/> <input onclick=\"qst_next('','rank',document.getElementById('qst_val').value)\" type=\"button\" value=\"<?php echo Q_BUTN; ?>\"\/><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"rank\"><\/div>\n\t\t","number":-4,"reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
 <?php $_SESSION['qstnew']='0'; }else{ $_SESSION['qstnew']='1'; ?>
@@ -489,6 +492,9 @@ if ($ironL<1 || $clayL<1){?>
 <?php } elseif($_SESSION['qst']== 6){ 
 
 //Check message is viewed or no
+if (!isset($RB)) {
+	$RB = null;
+}
 if ($message->unread || $RB==true){?>
 {"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> <?php echo Q6; ?><\/h1><br \/><i>&rdquo;<?php echo Q6_DESC; ?>&rdquo;<\/i><br \/><br \/><div class=\"rew\"><p class=\"ta_aw\"><?php echo Q6_ORDER; ?><\/div><br \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"msg\"><\/div>\n\t\t","number":"-6","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"i2","altstep":99}
 <?php $_SESSION['qstnew']='0'; }else{ $_SESSION['qstnew']='1'; ?>