diff --git a/Admin/Templates/artifact.tpl b/Admin/Templates/artifact.tpl
index 6973638d..f4c1aa44 100644
--- a/Admin/Templates/artifact.tpl
+++ b/Admin/Templates/artifact.tpl
@@ -48,6 +48,6 @@ $artifactInfo = Artifacts::getArtifactInfo($artifact);
Return to Natars';
+ if($village['owner'] != 3) echo 'Return to Natars';
?>
\ No newline at end of file
diff --git a/Admin/admin.php b/Admin/admin.php
index f4523819..0c5fc58f 100644
--- a/Admin/admin.php
+++ b/Admin/admin.php
@@ -413,11 +413,12 @@ if (!empty($_GET['p'])) {
function inaktiv() {event.srcElement.className='fl2'; }
function del(e,id){
- if(e == 'did'){ var conf = confirm('Dou you really want delete village id '+id+'?'); }
- if(e == 'unban'){ var conf = confirm('Dou you really want unban player '+id+'?'); }
- if(e == 'stopDel'){ var conf = confirm('Dou you really want stop deleting user '+id+'?'); }
- if(e == 'oas'){ var conf = confirm('Dou you really want to delete oasis id '+id+'?'); }
- if(conf){return true;}else{return false;}
+ if(e == 'arti'){ var conf = confirm('Dou you really want delete artifact id '+id+'?'); }
+ if(e == 'did'){ var conf = confirm('Dou you really want delete village id '+id+'?'); }
+ if(e == 'unban'){ var conf = confirm('Dou you really want unban player '+id+'?'); }
+ if(e == 'stopDel'){ var conf = confirm('Dou you really want stop deleting user '+id+'?'); }
+ if(e == 'oas'){ var conf = confirm('Dou you really want to delete oasis id '+id+'?'); }
+ return conf;
}
diff --git a/GameEngine/Database.php b/GameEngine/Database.php
index 6eb70b00..0f6c365d 100755
--- a/GameEngine/Database.php
+++ b/GameEngine/Database.php
@@ -7299,7 +7299,7 @@ References: User ID/Message ID, Mode
return (isset($cachedValue[$type]) ? $cachedValue[$type] : []);
}
- $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE vref = $vref ORDER BY size";
+ $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE vref = $vref AND del = 0 ORDER BY size";
$result = $this->mysqli_fetch_all(mysqli_query($this->dblink,$q));
// cache all types and return the requested one
@@ -7394,8 +7394,8 @@ References: User ID/Message ID, Mode
function deleteArtifact($id){
list($id) = $this->escape_input((int) $id);
-
- $q = "UPDATE " . TB_PREFIX . "artefacts WHERE id = $id SET del = 1";
+
+ $q = "UPDATE " . TB_PREFIX . "artefacts SET del = 1 WHERE id = $id";
return mysqli_query($this->dblink, $q);
}