xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-28 00:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix alliance Assign to position and Changepos

Browse Source 
Code and Fix alliance Assign to position and Changepos
This commit is contained in:
Catalin Novgorodschi
2026-04-22 12:24:26 +03:00
parent befaa62d10
commit c3049f7f1a
4 changed files with 111 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Alliance.php
+55 -25
View File
@@ -178,6 +178,10 @@ class Alliance {
exit;
}
/*****************************************
Function to process of sending Forms
*****************************************/
public function procAlliForm($post) {
if(isset($post['ft'])) {
switch($post['ft']) {
@@ -185,9 +189,7 @@ class Alliance {
$this->createAlliance($post);
break;
}
}
}
if(isset($post['dipl']) && isset($post['a_name'])) $this->changediplomacy($post);
if(isset($post['s'])) {
@@ -424,30 +426,58 @@ class Alliance {
/*****************************************
Function to change the user permissions
*****************************************/
private function changeUserPermissions($post)
{
private function changeUserPermissions($post){
global $database, $session, $form;
if($this->userPermArray['opt1'] == 0) $form->addError("perm", NO_PERMISSION);
elseif($database->getUserField($post['a_user'], "alliance", 0) != $session->alliance) $form->addError("perm", USER_NOT_IN_YOUR_ALLY);
elseif($post['a_user'] == $session->uid) $form->addError("perm", CANT_EDIT_YOUR_PERMISSIONS);
elseif($database->isAllianceOwner($_POST['a_user'])) $form->addError("perm", CANT_EDIT_LEADER_PERMISSIONS);
else
{
$database->updateAlliPermissions($post['a_user'], $session->alliance, $post['a_titel'], $post['e1'], $post['e2'], $post['e3'], $post['e4'], $post['e5'], $post['e6'], $post['e7']);
// log the notice
$database->insertAlliNotice($session->alliance, '<a href="spieler.php?uid='.$session->uid.'">'.addslashes($session->username).'</a> has changed permissions of <a href="spieler.php?uid='.$post['a_user'].'">'.addslashes($database->getUserField($post['a_user'], "username", 0)).'</a>.');
$form->addError("perm", ALLY_PERMISSIONS_UPDATED);
}
if($form->returnErrors() > 0)
{
$_SESSION['errorarray'] = $form->getErrors();
$_SESSION['valuearray'] = $post;
header("Location: allianz.php?s=5");
exit;
}
if($this->userPermArray['opt1'] == 0) {
$form->addError("perm", NO_PERMISSION);
}
elseif($database->getUserField($post['a_user'], "alliance", 0) != $session->alliance) {
$form->addError("perm", USER_NOT_IN_YOUR_ALLY);
}
elseif($post['a_user'] == $session->uid) {
$form->addError("perm", CANT_EDIT_YOUR_PERMISSIONS);
}
elseif($database->isAllianceOwner($post['a_user'])) {
$form->addError("perm", CANT_EDIT_LEADER_PERMISSIONS);
}
else
{
// normalize checkbox values (CRITICAL FIX)
$opt1 = isset($post['e1']) ? 1 : 0;
$opt2 = isset($post['e2']) ? 1 : 0;
$opt3 = isset($post['e3']) ? 1 : 0;
$opt4 = isset($post['e4']) ? 1 : 0;
$opt5 = isset($post['e5']) ? 1 : 0;
$opt6 = isset($post['e6']) ? 1 : 0;
$opt7 = isset($post['e7']) ? 1 : 0;
$rank = isset($post['a_titel']) ? $post['a_titel'] : '';
$ok = $database->updateAlliPermissions(
(int)$post['a_user'],
(int)$session->alliance,
$rank,
$opt1,$opt2,$opt3,$opt4,$opt5,$opt6,$opt7
);
if(!$ok) {
$form->addError("perm", "DB UPDATE FAILED");
} else {
$database->insertAlliNotice(
$session->alliance,
'<a href="spieler.php?uid='.$session->uid.'">'.
addslashes($session->username).
'</a> has changed permissions of '.
addslashes($database->getUserField($post['a_user'], "username", 0)).'.'
);
$_SESSION['success'] = ALLY_PERMISSIONS_UPDATED;
}
}
if($form->returnErrors() > 0)
{
$_SESSION['errorarray'] = $form->getErrors();
$_SESSION['valuearray'] = $post;
header("Location: allianz.php?s=5");
exit;
}
}
/*****************************************
Function to kick a user from alliance
*****************************************/
GameEngine/Database.php
+11 -8
View File
@@ -3309,10 +3309,10 @@ public function getBestOasisCropBonus($x, $y) {
Function to update alliance permissions
References:
*****************************************/
function updateAlliPermissions($uid, $aid, $rank, $opt1, $opt2, $opt3, $opt4, $opt5, $opt6, $opt7) {
list($uid, $aid, $rank, $opt1, $opt2, $opt3, $opt4, $opt5, $opt6, $opt7) = $this->escape_input((int) $uid, (int) $aid, $rank, $opt1, $opt2, $opt3, $opt4, $opt5, $opt6, $opt7);
// update cache
function updateAlliPermissions($uid, $aid, $rank, $opt1, $opt2, $opt3, $opt4, $opt5, $opt6, $opt7){
list($uid, $aid, $rank, $opt1, $opt2, $opt3, $opt4, $opt5, $opt6, $opt7) = $this->escape_input((int)$uid, (int)$aid, $rank, $opt1, $opt2, $opt3, $opt4, $opt5, $opt6, $opt7);
// update cache
if (isset(self::$alliancePermissionsCache[$uid.$aid])) {
self::$alliancePermissionsCache[ $uid . $aid ]['rank'] = $rank;
self::$alliancePermissionsCache[ $uid . $aid ]['opt1'] = $opt1;
@@ -3324,11 +3324,14 @@ public function getBestOasisCropBonus($x, $y) {
self::$alliancePermissionsCache[ $uid . $aid ]['opt7'] = $opt7;
self::$alliancePermissionsCache[ $uid . $aid ]['opt8'] = $opt8;
}
$q = "UPDATE " . TB_PREFIX . "ali_permission SET rank = '$rank', opt1 = '$opt1', opt2 = '$opt2', opt3 = '$opt3', opt4 = '$opt4', opt5 = '$opt5', opt6 = '$opt6', opt7 = '$opt7' where uid = $uid && alliance =$aid";
return mysqli_query($this->dblink,$q);
$q = "UPDATE " . TB_PREFIX . "ali_permission SET `rank` = '$rank',opt1 = '$opt1', opt2 = '$opt2', opt3 = '$opt3', opt4 = '$opt4', opt5 = '$opt5', opt6 = '$opt6', opt7 = '$opt7' WHERE uid = $uid AND alliance = $aid LIMIT 1";
$result = mysqli_query($this->dblink, $q);
if(!$result) {
die("SQL ERROR: " . mysqli_error($this->dblink) . "<br><br>" . $q);
}
return true;
}
/*****************************************
Function to read alliance permissions
References: ID, notice, description