xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-18 09:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix reports

Browse Source
This commit is contained in:
unknown
2012-05-05 02:32:09 +03:00
parent 5adbc57bc9
commit 6b3e6b9968
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Database/db_MYSQL.php
+6
View File
@@ -1507,6 +1507,12 @@
$result = mysql_query($q, $this->connection); $result = mysql_query($q, $this->connection);
return $this->mysql_fetch_all($result); return $this->mysql_fetch_all($result);
} }
function getDelNotice($uid) {
$q = "SELECT * FROM " . TB_PREFIX . "ndata where uid = $uid and del = 1 ORDER BY time DESC";
$result = mysql_query($q, $this->connection);
return $this->mysql_fetch_all($result);
}
function getNotice2($id, $field) { function getNotice2($id, $field) {
$q = "SELECT ".$field." FROM " . TB_PREFIX . "ndata where `id` = '$id'"; $q = "SELECT ".$field." FROM " . TB_PREFIX . "ndata where `id` = '$id'";
GameEngine/Message.php
+3 -1
View File
@@ -13,7 +13,7 @@
public $unread, $nunread = false; public $unread, $nunread = false;
public $note; public $note;
public $inbox, $sent, $reading, $reply, $archived, $noticearray, $readingNotice = array(); public $inbox, $sent, $reading, $reply, $archived, $noticearray, $delnoticearray, $readingNotice = array();
private $totalMessage, $totalNotice; private $totalMessage, $totalNotice;
private $allNotice = array(); private $allNotice = array();
@@ -112,6 +112,7 @@
} }
if (!is_array($type)) { $type = array($type); } if (!is_array($type)) { $type = array($type); }
$this->noticearray = $this->filter_by_value($database->getNotice($session->uid), "ntype", $type); $this->noticearray = $this->filter_by_value($database->getNotice($session->uid), "ntype", $type);
$this->delnoticearray = $this->filter_by_value($database->getDelNotice($session->uid), "ntype", $type);
} }
if(isset($get['id'])) { if(isset($get['id'])) {
$this->readingNotice = $this->getReadNotice($get['id']); $this->readingNotice = $this->getReadNotice($get['id']);
@@ -214,6 +215,7 @@
global $database, $session; global $database, $session;
$this->allNotice = $database->getNotice($session->uid); $this->allNotice = $database->getNotice($session->uid);
$this->noticearray = $this->filter_by_value_except($this->allNotice, "ntype", 9); $this->noticearray = $this->filter_by_value_except($this->allNotice, "ntype", 9);
$this->delnoticearray = $this->filter_by_value_except($database->getDelNotice($session->uid), "ntype", 9);
$this->totalNotice = count($this->allNotice); $this->totalNotice = count($this->allNotice);
} }
Templates/Notice/all.tpl
+2 -4
View File
@@ -84,12 +84,10 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
} }
$date = $generator->procMtime($message->noticearray[$i-1]['time']); $date = $generator->procMtime($message->noticearray[$i-1]['time']);
echo "</div></td><td class=\"dat\">".$date[0]." ".$date[1]."</td></tr>"; echo "</div></td><td class=\"dat\">".$date[0]." ".$date[1]."</td></tr>";
}else{ }}
$count =+ 1;
}}
$name++; $name++;
} }
if(count($message->noticearray) == $count) { if(count($message->noticearray)-count($message->delnoticearray) == 0) {
echo "<td colspan=\"3\" class=\"none\">There are no reports available.</td></tr>"; echo "<td colspan=\"3\" class=\"none\">There are no reports available.</td></tr>";
} }
?> ?>