Digitalstack/ZnoteAAC
2
0
Fork 0
mirror of https://github.com/Znote/ZnoteAAC.git synced 2025-05-17 03:19:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better guild validations, Fix #457

Browse Source
This commit is contained in:
Znote 2021-07-22 17:30:49 +02:00
parent 1701d48629
commit ddd54a932e
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/function/users.php
View File

@ -457,7 +457,7 @@ function get_guild_rank_data($gid) {
// Creates a guild, where cid is the owner of the guild, and name is the name of guild. // Creates a guild, where cid is the owner of the guild, and name is the name of guild.
function create_guild($cid, $name) { function create_guild($cid, $name) {
$cid = (int)$cid; $cid = (int)$cid;
$name = sanitize($name); $name = trim(preg_replace('/\s\s+/', ' ', str_replace("\n", " ", sanitize($name))));
$time = time(); $time = time();
// Create the guild // Create the guild

48
guilds.php
View File

@ -351,13 +351,25 @@ if (user_logged_in() === true) {
// Uninvite and joinguild is also used for visitors who reject their invitation. // Uninvite and joinguild is also used for visitors who reject their invitation.
if (!empty($_POST['uninvite'])) { if (!empty($_POST['uninvite'])) {
// // Is this action being triggered by a vice leader+, or the invited player?
guild_remove_invitation($_POST['uninvite'], $gid); $u_player = (int)$_POST['uninvite'];
header('Location: guilds.php?name='. $_GET['name']); $u_player = user_character_name($u_player);
exit(); $u_player = (int)user_character_account_id($u_player);
if (in_array($highest_access, array(2,3)) || $u_player === $session_user_id) {
guild_remove_invitation($_POST['uninvite'], $gid);
header('Location: guilds.php?name='. $_GET['name']);
exit();
}
} }
if (!empty($_POST['joinguild'])) { if (!empty($_POST['joinguild'])) {
$joining_player_id = (int)$_POST['joinguild']; $joining_player_id = (int)$_POST['joinguild'];
$join_account = (int)user_character_account_id(user_character_name($joining_player_id));
if ($join_account !== $session_user_id) {
echo '<font color="red" size="4">Join guild request sent from wrong account.</font>';
include 'layout/overall/footer.php';
exit();
}
// Join a guild // Join a guild
if ($inv_data !== false) foreach ($inv_data as $inv) { if ($inv_data !== false) foreach ($inv_data as $inv) {
if ((int)$inv['player_id'] == $joining_player_id) { if ((int)$inv['player_id'] == $joining_player_id) {
@ -383,6 +395,14 @@ if (user_logged_in() === true) {
if (!empty($_POST['leave_guild'])) { if (!empty($_POST['leave_guild'])) {
$name = sanitize($_POST['leave_guild']); $name = sanitize($_POST['leave_guild']);
$cidd = user_character_id($name); $cidd = user_character_id($name);
$leave_account = (int)user_character_account_id($name);
if ($leave_account !== $session_user_id) {
echo '<font color="red" size="4">Leave guild request sent from wrong account.</font>';
include 'layout/overall/footer.php';
exit();
}
// If character is offline // If character is offline
if ($config['ServerEngine'] !== 'TFS_10') $chardata = user_character_data($cidd, 'online'); if ($config['ServerEngine'] !== 'TFS_10') $chardata = user_character_data($cidd, 'online');
else $chardata['online'] = (user_is_online_10($cidd)) ? 1 : 0; else $chardata['online'] = (user_is_online_10($cidd)) ? 1 : 0;
@ -482,9 +502,8 @@ if ($highest_access >= 2) {
} }
if (!empty($_POST['disband'])) { if (!empty($_POST['disband'])) {
// // $gidd = (int)$_POST['disband'];
$gidd = (int)$_POST['disband']; $members = get_guild_players($gid);
$members = get_guild_players($gidd);
$online = false; $online = false;
// First figure out if anyone are online. // First figure out if anyone are online.
@ -534,8 +553,8 @@ if ($highest_access >= 2) {
} }
if (!empty($_POST['change_ranks'])) { if (!empty($_POST['change_ranks'])) {
$c_gid = (int)$_POST['change_ranks']; //$c_gid = (int)$_POST['change_ranks'];
$c_ranks = get_guild_rank_data($c_gid); $c_ranks = get_guild_rank_data($gid);
$rank_data = array(); $rank_data = array();
$rank_ids = array(); $rank_ids = array();
@ -560,10 +579,13 @@ if ($highest_access >= 2) {
$name = sanitize($_POST['remove_member']); $name = sanitize($_POST['remove_member']);
$cid = user_character_id($name); $cid = user_character_id($name);
if ($config['ServerEngine'] !== 'TFS_10') guild_remove_member($cid); $p_guild = get_player_guild_data($cid);
else guild_remove_member_10($cid); if ($p_guild['guild_id'] == $gid) {
header('Location: guilds.php?name='. $_GET['name']); if ($config['ServerEngine'] !== 'TFS_10') guild_remove_member($cid);
exit(); else guild_remove_member_10($cid);
header('Location: guilds.php?name='. $_GET['name']);
exit();
}
} }
if (!empty($_POST['forumGuildId'])) { if (!empty($_POST['forumGuildId'])) {