diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index d8f59fb4..60420cf2 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -1485,7 +1485,7 @@
}
function removeNotice($id) {
- $q = "DELETE FROM " . TB_PREFIX . "ndata where id = $id";
+ $q = "UPDATE " . TB_PREFIX . "ndata set del = 1 where id = $id";
return mysql_query($q, $this->connection);
}
diff --git a/Templates/Build/17.tpl b/Templates/Build/17.tpl
index eadbcfde..18bae0f3 100644
--- a/Templates/Build/17.tpl
+++ b/Templates/Build/17.tpl
@@ -75,7 +75,7 @@ if(isset($_POST['ft'])=='check' && $allres!=0 && ($_POST['x']!="" && $_POST['y']
$getvilowner = $database->getVillageField($getwref, "owner");
}
?>
-
(|) |
+ (|) |
| Player: |
@@ -194,12 +194,10 @@ if(isset($_POST['ft'])=='check'){
if(!$checkexist){
$error = 'No Coordinates selected';
- }elseif($_POST['r1']==0){
+ }elseif($_POST['r1']==0 && $_POST['r2']==0 && $_POST['r3']==0 && $_POST['r4']==0){
$error = 'Resources not selected.';
}elseif(!$_POST['x'] && !$_POST['y'] && !$_POST['dname']){
- $error = 'Enter the coordinates.';
- }elseif($_POST['x']==0 && $_POST['y']==0 && !$_POST['dname']){
- $error = 'Enter the coordinates.';
+ $error = 'Enter coordinates or village name.';
}
echo $error;
}
diff --git a/Templates/Notice/all.tpl b/Templates/Notice/all.tpl
index 09db6472..7e450c95 100644
--- a/Templates/Notice/all.tpl
+++ b/Templates/Notice/all.tpl
@@ -63,8 +63,10 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
}
$name = 1;
+ $count = 0;
for($i=(1+$s);$i<=(10+$s);$i++) {
if(count($message->noticearray) >= $i) {
+ if($message->noticearray[$i-1]['del'] == 0){
echo "
| noticearray[$i-1]['id']."\" /> |
";
$type = (isset($_GET['t']) && $_GET['t'] == 5)? $message->noticearray[$i-1]['archive'] : $message->noticearray[$i-1]['ntype'];
@@ -82,10 +84,12 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
}
$date = $generator->procMtime($message->noticearray[$i-1]['time']);
echo " | ".$date[0]." ".$date[1]." |
";
- }
+ }else{
+ $count =+ 1;
+ }}
$name++;
}
- if(count($message->noticearray) == 0) {
+ if(count($message->noticearray) == $count) {
echo "There are no reports available. | ";
}
?>