mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-07-24 05:26:19 +00:00
Fix Lang + Fix train troops in greatbarraks and great stable + fix ally message + refactor battle system
Fix Lang + Fix train troops in greatbarraks and great stable + fix ally message + refactor battle system #219
This commit is contained in:
+657
-400
File diff suppressed because it is too large
Load Diff
@@ -317,6 +317,27 @@ References: User ID/Message ID, Mode
|
||||
return $ids;
|
||||
}
|
||||
|
||||
/**
|
||||
* UM-W1: permisiunea de mesaj-catre-alianta (opt7) a unui membru. Muta
|
||||
* query-ul inline din Message::sendAMessage(). Returneaza direct valoarea
|
||||
* opt7 (0 sau 1), deci in Message.php comparatia devine "$permission == 1"
|
||||
* in loc de vechiul "$permission['opt7'] == 1" - aceeasi verificare.
|
||||
* Filtreaza pe uid SI alliance (+ LIMIT 1) ca sa nu ia un rand ramas dintr-o
|
||||
* alianta anterioara.
|
||||
*/
|
||||
function getAllyMessagePermission($uid, $alliance = 0) {
|
||||
list($uid, $alliance) = $this->escape_input((int) $uid, (int) $alliance);
|
||||
|
||||
$q = "SELECT opt7 FROM " . TB_PREFIX . "ali_permission WHERE uid = $uid";
|
||||
if ($alliance > 0) {
|
||||
$q .= " AND alliance = $alliance";
|
||||
}
|
||||
$q .= " LIMIT 1";
|
||||
|
||||
$row = mysqli_fetch_assoc(mysqli_query($this->dblink, $q));
|
||||
return (int) ($row['opt7'] ?? 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* UM-W1: target + owner ale unui mesaj (pentru a decide modul de stergere).
|
||||
* Muta SELECT-ul inline din Message::removeMessage().
|
||||
|
||||
+2498
-2481
File diff suppressed because it is too large
Load Diff
+1913
-1904
File diff suppressed because it is too large
Load Diff
+2518
-2315
File diff suppressed because it is too large
Load Diff
+2022
-2013
File diff suppressed because it is too large
Load Diff
@@ -596,7 +596,7 @@ class Message
|
||||
|
||||
$allmembers = $database->getAllianceMemberIds($session->alliance);
|
||||
$userally = $database->getUserField($session->uid, "alliance", 0);
|
||||
$permission = $database->getAllyMessagePermission($session->uid);
|
||||
$permission = $database->getAllyMessagePermission($session->uid, $session->alliance);
|
||||
|
||||
if (defined('WORD_CENSOR')) {
|
||||
$topic = $this->wordCensor($topic);
|
||||
|
||||
Reference in New Issue
Block a user