Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-14 01:34:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

* replace "$twig->render()" with "$this->display"

Browse Source
This commit is contained in:
slawkens
2018-05-29 21:29:08 +02:00
parent 68d74a490b
commit c654ea329c
69 changed files with 413 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
system/pages/guilds/accept_invite.php
View File

@@ -33,7 +33,7 @@ if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
if(!Validator::characterName($name)) {
$errors[] = 'Invalid name format.';
}
if(empty($errors)) {
$player = new OTS_Player();
$player->find($name);
@@ -63,7 +63,7 @@ if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
}
}
}
if(!$is_invited) {
$errors[] = 'Character '.$player->getName.' isn\'t invited to guild <b>'.$guild->getName().'</b>.';
}
@@ -77,7 +77,7 @@ else
include(SYSTEM . 'libs/pot/InvitesDriver.php');
new InvitesDriver($guild);
$invited_list = $guild->listInvites();
if(count($invited_list) > 0) {
foreach($invited_list as $invited) {
foreach($account_players as $player_from_acc) {
@@ -96,16 +96,16 @@ else
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array(
'action' => getLink('guilds') . '/' . $guild_name
));
}
else {
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
$guild->acceptInvite($player);
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Accept invitation',
'description' => 'Player with name <b>'.$player->getName().'</b> has been added to guild <b>'.$guild->getName() . '</b>.',
'custom_buttons' => $twig->render('guilds.back_button.html.twig', array(
@@ -116,8 +116,8 @@ else {
else
{
sort($list_of_invited_players);
echo $twig->render('guilds.accept_invite.html.twig', array(
$twig->display('guilds.accept_invite.html.twig', array(
'guild_name' => $guild_name,
'invited_players' => $list_of_invited_players
));

12
system/pages/guilds/add_rank.php
View File

@@ -55,9 +55,9 @@ if(empty($errors)) {
}
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array(
'new_line' => true,
'action' => '?subtopic=guilds&guild='.$guild_name.'&action=show'
));
@@ -66,9 +66,9 @@ if(empty($errors)) {
else
{
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array(
'new_line' => true
));
}

14
system/pages/guilds/change_description.php
View File

@@ -37,7 +37,7 @@ if(empty($errors)) {
$level_in_guild = 3;
}
}
$saved = false;
if($guild_leader) {
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
@@ -45,12 +45,12 @@ if(empty($errors)) {
$guild->setCustomField('description', $description);
$saved = true;
}
if($saved) {
success('Changes has been saved');
}
echo $twig->render('guilds.change_description.html.twig', array(
$twig->display('guilds.change_description.html.twig', array(
'guild' => $guild,
'rows' => bcsub($config['guild_description_lines_limit'],1)
));
@@ -64,9 +64,9 @@ if(empty($errors)) {
}
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array(
'new_line' => true,
'action' => '?subtopic=guilds'
));

32
system/pages/guilds/change_logo.php
View File

@@ -18,7 +18,7 @@ if(!Validator::guildName($guild_name)) {
if(empty($errors)) {
$guild = new OTS_Guild();
$guild->find($guild_name);
if(!$guild->isLoaded()) {
$errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
}
@@ -29,7 +29,7 @@ if(empty($errors)) {
$guild_leader_char = $guild->getOwner();
$guild_leader = false;
$account_players = $account_logged->getPlayers();
foreach($account_players as $player) {
if($guild_leader_char->getId() == $player->getId()) {
$guild_vice = true;
@@ -37,7 +37,7 @@ if(empty($errors)) {
$level_in_guild = 3;
}
}
if($guild_leader)
{
$max_image_size_b = $config['guild_image_size_kb'] * 1024;
@@ -53,7 +53,7 @@ if(empty($errors)) {
if($file['size'] > $max_image_size_b) {
$upload_errors[] = 'Uploaded image is too big. Size: <b>'.$file['size'].' bytes</b>, Max. size: <b>'.$max_image_size_b.' bytes</b>.';
}
$type = strtolower($file['type']);
if(!in_array($type, $allowed_ext)) {
$upload_errors[] = 'Your file type isn\' allowed. Allowed: <b>gif, jpg, bmp, png</b>. Your file type: <b>'.$type.'</b> If it\'s valid image contact with admin.';
@@ -62,14 +62,14 @@ if(empty($errors)) {
else {
$upload_errors[] = 'You didn\'t send file or file is too big. Limit: <b>'.$config['guild_image_size_kb'].' KB</b>.';
}
if(empty($upload_errors)) {
$extension = $ext_name[$type];
if(!move_uploaded_file($file['tmp_name'], $save_path.'.'.$extension)) {
$upload_errors[] = "Sorry! Can't save your image.";
}
}
if(empty($upload_errors))
{
$guild_logo = $guild->getCustomField('logo_name');
@@ -77,33 +77,33 @@ if(empty($errors)) {
if(empty($guild_logo) || !file_exists('images/guilds/' . $guild_logo)) {
$guild_logo = "default.gif";
}
if($guild_logo != "default.gif" && $guild_logo != $save_file_name.'.'.$extension) {
unlink('images/guilds/' . $guild_logo);
}
}
//show errors or save file
if(!empty($upload_errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $upload_errors));
$twig->display('error_box.html.twig', array('errors' => $upload_errors));
}
else {
success('Logo has been changed.');
$guild->setCustomField('logo_name', $save_file_name.'.'.$extension);
}
}
$guild_logo = $guild->getCustomField('logo_name');
if(empty($guild_logo) || !file_exists('images/guilds/' . $guild_logo)) {
$guild_logo = "default.gif";
}
echo $twig->render('guilds.change_logo.html.twig', array(
$twig->display('guilds.change_logo.html.twig', array(
'guild_logo' => $guild_logo,
'guild' => $guild,
'max_image_size_b' => $max_image_size_b
));
}
else {
$errors[] = 'You are not a leader of guild!';
@@ -115,9 +115,9 @@ if(empty($errors)) {
}
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array(
'new_line' => true,
'action' => '?subtopic=guilds'
));

14
system/pages/guilds/change_motd.php
View File

@@ -40,7 +40,7 @@ if(empty($errors)) {
$level_in_guild = 3;
}
}
$saved = false;
if($guild_leader) {
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
@@ -48,12 +48,12 @@ if(empty($errors)) {
$guild->setCustomField('motd', $motd);
$saved = true;
}
if($saved) {
success('Changes has been saved');
}
echo $twig->render('guilds.change_motd.html.twig', array(
$twig->display('guilds.change_motd.html.twig', array(
'guild' => $guild
));
}
@@ -66,9 +66,9 @@ if(empty($errors)) {
}
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array(
'new_line' => true,
'action' => '?subtopic=guilds'
));

4
system/pages/guilds/change_nick.php
View File

@@ -12,7 +12,7 @@ defined('MYAAC') or die('Direct access not allowed!');
if(!$logged) {
echo 'You are not logged.';
echo $twig->render('guilds.back_button.html.twig');
$twig->display('guilds.back_button.html.twig');
return;
}
@@ -62,5 +62,5 @@ if(strlen($new_nick) <= 40)
else
echo 'Too long guild nick. Max. 40 chars, your length: '.strlen($new_nick);
echo $twig->render('guilds.back_button.html.twig');
$twig->display('guilds.back_button.html.twig');
?>

32
system/pages/guilds/change_rank.php
View File

@@ -29,9 +29,9 @@ if(empty($errors))
if(!empty($errors))
{
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig');
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig');
return;
}
@@ -74,23 +74,23 @@ if($guild_vice)
$ranks[$rid]['0'] = $rank->getId();
$ranks[$rid]['1'] = $rank->getName();
$rid++;
if($db->hasColumn('players', 'rank_id'))
$players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank->getId() . ' AND `deleted` = 0;');
else
$players_with_rank = $db->query('SELECT `players`.`id` as `id`, `' . GUILD_MEMBERS_TABLE . '`.`rank_id` as `rank_id` FROM `players`, `' . GUILD_MEMBERS_TABLE . '` WHERE `' . GUILD_MEMBERS_TABLE . '`.`rank_id` = ' . $rank->getId() . ' AND `players`.`id` = `' . GUILD_MEMBERS_TABLE . '`.`player_id` ORDER BY `name`;');
$players_with_rank_number = $players_with_rank->rowCount();
if(count($players_with_rank) > 0)
{
foreach($players_with_rank as $result)
{
$player = new OTS_Player();
$player->load($result['id']);
if(!$player->isLoaded())
continue;
if($guild->getOwner()->getId() != $player->getId() || $guild_leader)
{
$players_with_lower_rank[$sid][0] = $player->getName();
@@ -141,16 +141,16 @@ if($guild_vice)
if(!$player_has_lower_rank)
$change_errors[] = 'This player has higher rank in guild than you. You can\'t change his/her rank.';
}
if(empty($change_errors))
{
$player_to_change->setRank($rank);
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Rank Changed',
'description' => 'Rank of player <b>'.$player_to_change->getName().'</b> has been changed to <b>'.$rank->getName().'</b>.',
'custom_buttons' => ''
));
unset($players_with_lower_rank);
unset($ranks);
$rid = 0;
@@ -162,12 +162,12 @@ if($guild_vice)
$ranks[$rid]['0'] = $rank->getId();
$ranks[$rid]['1'] = $rank->getName();
$rid++;
if($db->hasColumn('players', 'rank_id'))
$players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank->getId() . ' AND `deleted` = 0;');
else
$players_with_rank = $db->query('SELECT `players`.`id` as `id`, `' . GUILD_MEMBERS_TABLE . '`.`rank_id` as `rank_id` FROM `players`, `' . GUILD_MEMBERS_TABLE . '` WHERE `' . GUILD_MEMBERS_TABLE . '`.`rank_id` = ' . $rank->getId() . ' AND `players`.`id` = `' . GUILD_MEMBERS_TABLE . '`.`player_id` ORDER BY `name`;');
$players_with_rank_number = $players_with_rank->rowCount();
if(count($players_with_rank) > 0)
{
@@ -177,7 +177,7 @@ if($guild_vice)
$player->load($result['id']);
if(!$player->isLoaded())
continue;
if($guild->getOwner()->getId() != $player->getId() || $guild_leader)
{
$players_with_lower_rank[$sid][0] = $player->getName();
@@ -191,10 +191,10 @@ if($guild_vice)
}
else
{
echo $twig->render('error_box.html.twig', array('errors' => $change_errors));
$twig->display('error_box.html.twig', array('errors' => $change_errors));
}
}
echo $twig->render('guilds.change_rank.html.twig', array(
$twig->display('guilds.change_rank.html.twig', array(
'players' => $players_with_lower_rank,
'guild_name' => $guild->getName(),
'ranks' => $ranks
@@ -202,7 +202,7 @@ if($guild_vice)
}
else {
echo 'Error. You are not a leader or vice leader in guild ' . $guild->getName();
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('guilds.back_button.html.twig', array(
'new_line' => true,
'action' => getLink('guilds') . '/' . $guild->getName()
));

4
system/pages/guilds/cleanup_guilds.php
View File

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
if(!$logged)
{
echo "You are not logged in.";
echo $twig->render('guilds.back_button.html.twig');
$twig->display('guilds.back_button.html.twig');
return;
}
@@ -63,5 +63,5 @@ if(count($guilds_list) > 0)
else
echo "0 guilds found.";
echo $twig->render('guilds.back_button.html.twig');
$twig->display('guilds.back_button.html.twig');
?>

8
system/pages/guilds/cleanup_players.php
View File

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
if(!$logged)
{
echo "You are not logged in.";
echo $twig->render('guilds.back_button.html.twig');
$twig->display('guilds.back_button.html.twig');
return;
}
@@ -50,7 +50,7 @@ if(count($players_list) > 0)
$player->setGuildNick('');
$changed_ranks_of[] = $player->getName();
}
}
}
echo "<b>Deleted ranks (this ranks guilds doesn't exist [bug fix]):</b>";
@@ -64,6 +64,6 @@ if(count($players_list) > 0)
}
else
echo "0 players found.";
echo $twig->render('guilds.back_button.html.twig');
$twig->display('guilds.back_button.html.twig');
?>

20
system/pages/guilds/create.php
View File

@@ -47,12 +47,12 @@ if($todo == 'save')
$guild_errors[] = Validator::getLastError();
$guild_name = '';
}
if(!Validator::characterName($name)) {
$guild_errors[] = 'Invalid character name format.';
$name = '';
}
if(empty($guild_errors)) {
$player = new OTS_Player();
$player->find($name);
@@ -60,8 +60,8 @@ if($todo == 'save')
$guild_errors[] = 'Character <b>'.$name.'</b> doesn\'t exist.';
}
}
if(empty($guild_errors))
{
$guild = new OTS_Guild();
@@ -70,7 +70,7 @@ if($todo == 'save')
$guild_errors[] = 'Guild <b>'.$guild_name.'</b> already exist. Select other name.';
}
}
if(empty($guild_errors))
{
$bad_char = true;
@@ -83,7 +83,7 @@ if($todo == 'save')
$guild_errors[] = 'Character <b>'.$name.'</b> isn\'t on your account or is already in guild.';
}
}
if(empty($guild_errors)) {
if($player->getLevel() < $config['guild_need_level']) {
$guild_errors[] = 'Character <b>'.$name.'</b> has too low level. To create guild you need character with level <b>'.$config['guild_need_level'].'</b>.';
@@ -95,7 +95,7 @@ if($todo == 'save')
}
if(!empty($guild_errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $guild_errors));
$twig->display('error_box.html.twig', array('errors' => $guild_errors));
unset($todo);
}
@@ -115,18 +115,18 @@ if(isset($todo) && $todo == 'save')
$player->setRank($rank);
}
}
echo $twig->render('guilds.create.success.html.twig', array(
$twig->display('guilds.create.success.html.twig', array(
'guild_name' => $guild_name,
'leader_name' => $player->getName()
));
/*$db->query('INSERT INTO `guild_ranks` (`id`, `guild_id`, `name`, `level`) VALUES (null, '.$new_guild->getId().', "the Leader", 3)');
$db->query('INSERT INTO `guild_ranks` (`id`, `guild_id`, `name`, `level`) VALUES (null, '.$new_guild->getId().', "a Vice-Leader", 2)');
$db->query('INSERT INTO `guild_ranks` (`id`, `guild_id`, `name`, `level`) VALUES (null, '.$new_guild->getId().', "a Member", 1)');*/
}
else {
sort($array_of_player_nig);
echo $twig->render('guilds.create.html.twig', array(
$twig->display('guilds.create.html.twig', array(
'players' => $array_of_player_nig
));
}

12
system/pages/guilds/delete_by_admin.php
View File

@@ -31,16 +31,16 @@ if(empty($errors)) {
delete_guild($guild->getId());
$saved = true;
}
if($saved) {
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Guild Deleted',
'description' => 'Guild with name <b>' . $guild_name . '</b> has been deleted.',
'custom_buttons' => $twig->render('guilds.back_button.html.twig')
));
}
else {
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Delete Guild',
'description' => 'Are you sure you want delete guild <b>' . $guild_name . '</b>?<br/>
<form action="?subtopic=guilds&guild=' . $guild->getName() . '&action=delete_by_admin" METHOD="post"><input type="hidden" name="todo" value="save"><input type="submit" value="Yes, delete"></form>',
@@ -57,9 +57,9 @@ if(empty($errors)) {
}
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array(
'new_line' => true,
'action' => '?subtopic=guilds'
));

18
system/pages/guilds/delete_guild.php
View File

@@ -30,7 +30,7 @@ if(empty($errors)) {
$rank_list->orderBy('level', POT::ORDER_DESC);
$guild_leader = false;
$account_players = $account_logged->getPlayers();
foreach($account_players as $player) {
if($guild->getOwner()->getId() == $player->getId()) {
$guild_vice = true;
@@ -38,24 +38,24 @@ if(empty($errors)) {
$level_in_guild = 3;
}
}
if($guild_leader) {
$saved = false;
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
delete_guild($guild->getId());
$saved = true;
}
if($saved) {
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Guild Deleted',
'description' => 'Guild with name <b>'.$guild_name.'</b> has been deleted.',
'custom_buttons' => $twig->render('guilds.back_button.html.twig')
));
}
else {
echo $twig->render('guilds.delete_guild.html.twig', array(
$twig->display('guilds.delete_guild.html.twig', array(
'guild' => $guild
));
}
@@ -70,9 +70,9 @@ if(empty($errors)) {
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array(
'new_line' => true
));
}

12
system/pages/guilds/delete_invite.php
View File

@@ -61,7 +61,7 @@ if(empty($errors))
}
}
}
if(!$guild_vice)
$errors[] = 'You are not a leader or vice leader of guild <b>' . $guild_name . '</b>.';
}
@@ -92,23 +92,23 @@ if(empty($errors))
}
if(!empty($errors))
{
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array('action' => '?subtopic=guilds&action=show&guild=' . $guild_name));
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array('action' => '?subtopic=guilds&action=show&guild=' . $guild_name));
}
else
{
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save')
{
$guild->deleteInvite($player);
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Deleted player invitation',
'description' => 'Player with name <b>' . $player->getName() . '</b> has been deleted from invites list.',
'custom_buttons' => $twig->render('guilds.back_button.html.twig', array('action' => '?subtopic=guilds&action=show&guild=' . $guild_name))
));
}
else {
echo $twig->render('guilds.delete_invite.html.twig', array(
$twig->display('guilds.delete_invite.html.twig', array(
'player_name' => $player->getName(),
'guild_name' => $guild->getName()
));

18
system/pages/guilds/delete_rank.php
View File

@@ -59,7 +59,7 @@ if(empty($guild_errors)) {
$players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank->getId() . ' AND `deleted` = 0;');
else
$players_with_rank = $db->query('SELECT `players`.`id` as `id`, `' . GUILD_MEMBERS_TABLE . '`.`rank_id` as `rank_id` FROM `players`, `' . GUILD_MEMBERS_TABLE . '` WHERE `' . GUILD_MEMBERS_TABLE . '`.`rank_id` = ' . $rank->getId() . ' AND `players`.`id` = `' . GUILD_MEMBERS_TABLE . '`.`player_id` ORDER BY `name`;');
$players_with_rank_number = $players_with_rank->rowCount();
if($players_with_rank_number > 0) {
foreach($rank_list as $checkrank) {
@@ -69,7 +69,7 @@ if(empty($guild_errors)) {
}
}
}
if(empty($new_rank)) {
$new_rank = new OTS_GuildRank();
$new_rank->setGuild($guild);
@@ -87,16 +87,16 @@ if(empty($guild_errors)) {
}
}
if($saved) {
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Rank Deleted',
'description' => 'Rank <b>'.$rank->getName().'</b> has been deleted. Players with this rank has now other rank.',
'custom_buttons' => ''
));
} else {
echo $twig->render('error_box.html.twig', array('errors' => $guild_errors2));
$twig->display('error_box.html.twig', array('errors' => $guild_errors2));
}
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('guilds.back_button.html.twig', array(
'new_line' => true,
'action' => '?subtopic=guilds&guild='.$guild->getName().'&action=manager'
));
@@ -112,9 +112,9 @@ if(empty($guild_errors)) {
}
}
if(!empty($guild_errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $guild_errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $guild_errors));
$twig->display('guilds.back_button.html.twig', array(
'new_line' => true,
'action' => '?subtopic=guilds'
));

14
system/pages/guilds/invite.php
View File

@@ -45,7 +45,7 @@ if(empty($errors)) {
$guild_vice = true;
$level_in_guild = $player_rank->getLevel();
}
if($guild->getOwner()->getId() == $player->getId()) {
$guild_vice = true;
$guild_leader = true;
@@ -64,7 +64,7 @@ if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
if(!Validator::characterName($name)) {
$errors[] = 'Invalid name format.';
}
if(empty($errors)) {
$player = new OTS_Player();
$player->find($name);
@@ -95,23 +95,23 @@ if(empty($errors)) {
$show = true;
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
$twig->display('error_box.html.twig', array('errors' => $errors));
}
else {
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
$guild->invite($player);
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Invite player',
'description' => 'Player with name <b>' . $player->getName() . '</b> has been invited to your guild.',
'custom_buttons' => ''
));
$show = false;
}
}
if($show) {
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Invite player',
'description' => $twig->render('guilds.invite.html.twig', array(
'guild_name' => $guild->getName()
@@ -120,6 +120,6 @@ if($show) {
));
}
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('guilds.back_button.html.twig', array(
'action' => getLink('guilds') . '/' . $guild_name
));

10
system/pages/guilds/kick_player.php
View File

@@ -93,8 +93,8 @@ if(empty($errors)) {
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array(
'action' => getLink('guilds') . '/' . $guild_name
));
}
@@ -102,8 +102,8 @@ else
{
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
$player->setRank();
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Kick player',
'description' => 'Player with name <b>'.$player->getName().'</b> has been kicked from your guild.',
'custom_buttons' => $twig->render('guilds.back_button.html.twig', array(
@@ -112,7 +112,7 @@ else
));
}
else {
echo $twig->render('guilds.kick_player.html.twig', array(
$twig->display('guilds.kick_player.html.twig', array(
'player_name' => $player->getName(),
'guild_name' => $guild->getName()
));

16
system/pages/guilds/leave_guild.php
View File

@@ -36,7 +36,7 @@ if(empty($errors)) {
if(!Validator::characterName($name)) {
$errors[] = 'Invalid name format.';
}
if(empty($errors)) {
$player = new OTS_Player();
$player->find($name);
@@ -49,7 +49,7 @@ if(empty($errors)) {
}
}
}
if(empty($errors)) {
$player_loaded_rank = $player->getRank();
if($player_loaded_rank->isLoaded()) {
@@ -61,7 +61,7 @@ if(empty($errors)) {
$errors[] = "Character <b>" . $name . "</b> isn't in any guild.";
}
}
if(empty($errors)) {
if($guild_owner_name == $player->getName()) {
$errors[] = "You can't leave guild. You are an owner of guild.";
@@ -85,8 +85,8 @@ if(empty($errors)) {
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig', array(
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig', array(
'action' => getLink('guilds') . '/' . $guild_name
));
}
@@ -94,7 +94,7 @@ else
{
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
$player->setRank();
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Leave guild',
'description' => 'Player with name <b>'.$player->getName().'</b> leaved guild <b>'.$guild->getName().'</b>.',
'custom_buttons' => $twig->render('guilds.back_button.html.twig', array(
@@ -105,8 +105,8 @@ else
else
{
sort($array_of_player_ig);
echo $twig->render('guilds.leave_guild.html.twig', array(
$twig->display('guilds.leave_guild.html.twig', array(
'players' => $array_of_player_ig,
'guild_name' => $guild_name
));

4
system/pages/guilds/manager.php
View File

@@ -38,7 +38,7 @@ if(empty($errors)) {
}
}
if($guild_leader) {
echo $twig->render('guilds.manager.html.twig', array(
$twig->display('guilds.manager.html.twig', array(
'guild' => $guild,
'rank_list' => $rank_list
));
@@ -54,7 +54,7 @@ if(empty($errors)) {
}
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
$twig->display('error_box.html.twig', array('errors' => $errors));
}
?>

22
system/pages/guilds/pass_leadership.php
View File

@@ -28,14 +28,14 @@ if(empty($guild_errors)) {
if(!Validator::characterName($pass_to)) {
$guild_errors2[] = 'Invalid player name format.';
}
if(empty($guild_errors2)) {
$to_player = new OTS_Player();
$to_player->find($pass_to);
if(!$to_player->isLoaded()) {
$guild_errors2[] = 'Player with name <b>'.$pass_to.'</b> doesn\'t exist.';
}
if(empty($guild_errors2)) {
$to_player_rank = $to_player->getRank();
if($to_player_rank->isLoaded()) {
@@ -63,7 +63,7 @@ if(empty($guild_errors) && empty($guild_errors2)) {
$level_in_guild = 3;
}
}
$saved = false;
if($guild_leader) {
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
@@ -71,25 +71,25 @@ if(empty($guild_errors) && empty($guild_errors2)) {
if($query) {
$guild_leader_char->setRankId($query['id'], $guild->getId());
}
$query = $db->query('SELECT `id` FROM `guild_ranks` WHERE `guild_id` = ' . $guild->getId() . ' ORDER BY `level` DESC LIMIT 1')->fetch();
if($query) {
$to_player->setRankId($query['id'], $guild->getId());
}
$guild->setOwner($to_player);
$guild->save();
$saved = true;
}
if($saved) {
echo $twig->render('success.html.twig', array(
$twig->display('success.html.twig', array(
'title' => 'Leadership passed',
'description' => '<b>'.$to_player->getName().'</b> is now a Leader of <b>'.$guild_name.'</b>.',
'custom_buttons' => '<center><form action="' . getLink('guilds') . '/' . $guild->getName().'" METHOD=post>' . $twig->render('buttons.back.html.twig') . '</form></center>'
));
}
else {
echo $twig->render('guilds.pass_leadership.html.twig', array(
$twig->display('guilds.pass_leadership.html.twig', array(
'guild' => $guild
));
}
@@ -103,16 +103,16 @@ if(empty($guild_errors) && empty($guild_errors2)) {
}
}
if(empty($guild_errors) && !empty($guild_errors2)) {
echo $twig->render('error_box.html.twig', array('errors' => $guild_errors2));
$twig->display('error_box.html.twig', array('errors' => $guild_errors2));
echo '<br/><center><form action="?subtopic=guilds&guild='.$guild->getName().'&action=pass_leadership" method="post">' . $twig->render('buttons.back.html.twig') . '</form></center>';
}
if(!empty($guild_errors)) {
if(!empty($guild_errors2)) {
$guild_errors = array_merge($guild_errors, $guild_errors2);
}
echo $twig->render('error_box.html.twig', array('errors' => $guild_errors));
$twig->display('error_box.html.twig', array('errors' => $guild_errors));
echo '<br/><center><form action="?subtopic=guilds" method="post">' . $twig->render('buttons.back.html.twig') . '</form></center>';
}

10
system/pages/guilds/save_ranks.php
View File

@@ -30,7 +30,7 @@ if(empty($errors)) {
$rank_list->orderBy('level', POT::ORDER_DESC);
$guild_leader = false;
$account_players = $account_logged->getPlayers();
foreach($account_players as $player) {
if($guild_leader_char->getId() == $player->getId()) {
$guild_vice = true;
@@ -38,7 +38,7 @@ if(empty($errors)) {
$level_in_guild = 3;
}
}
if($guild_leader) {
foreach($rank_list as $rank) {
$rank_id = $rank->getId();
@@ -56,12 +56,12 @@ if(empty($errors)) {
else {
$errors[] = 'Invalid rank level. Contact with admin. Rank ID <b>'.$rank_id.'</b>.';
}
$rank->save();
}
//show errors or redirect
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
$twig->display('error_box.html.twig', array('errors' => $errors));
}
else
{
@@ -79,7 +79,7 @@ if(empty($errors)) {
}
}
if(!empty($errors)) {
echo $twig->render('error_box.html.twig', array('errors' => $errors));
$twig->display('error_box.html.twig', array('errors' => $errors));
}
?>

20
system/pages/guilds/show.php
View File

@@ -25,9 +25,9 @@ if(empty($errors))
if(!empty($errors))
{
echo $twig->render('error_box.html.twig', array('errors' => $errors));
echo $twig->render('guilds.back_button.html.twig');
$twig->display('error_box.html.twig', array('errors' => $errors));
$twig->display('guilds.back_button.html.twig');
}
else
{
@@ -102,13 +102,13 @@ else
<TD WIDTH=30%><B>Rank</B></TD>
<TD WIDTH=30%><B>Name, title, level & status</B></TD>
</TR>';
//Slaw stats values
//$s_total_members = 0;
//$s_members_online = 0;
//$s_total_level = 0;
//End Slaw stats values
$showed_players = 1;
foreach($rank_list as $rank)
{
@@ -116,7 +116,7 @@ else
$players_with_rank = $db->query('SELECT `players`.`id` as `id`, `' . GUILD_MEMBERS_TABLE . '`.`rank_id` as `rank_id` FROM `players`, `' . GUILD_MEMBERS_TABLE . '` WHERE `' . GUILD_MEMBERS_TABLE . '`.`rank_id` = ' . $rank->getId() . ' AND `players`.`id` = `' . GUILD_MEMBERS_TABLE . '`.`player_id` ORDER BY `name`;');
else if($db->hasColumn('players', 'rank_id'))
$players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank->getId() . ' AND `deleted` = 0;');
$players_with_rank_number = $players_with_rank->rowCount();
if($players_with_rank_number > 0)
{
@@ -133,7 +133,7 @@ else
$player->load($result['id']);
if(!$player->isLoaded())
continue;
//$s_total_members++;
//$s_total_level += $player->getLevel();
echo '<TR><TD>' . getPlayerLink($player->getName()) . '<FORM ACTION="?subtopic=guilds&action=change_nick&name='.$player->getName().'" METHOD=post>';
@@ -151,11 +151,11 @@ else
else
if(!empty($guild_nick))
echo ' ('.htmlentities($player->getGuildNick()).')';
if($level_in_guild > $rank->getLevel() || $guild_leader)
if($guild_leader_char->getName() != $player->getName())
echo '&nbsp;<font size=1>{<a href="?subtopic=guilds&action=kick_player&guild='.urlencode($guild->getName()).'&name='.urlencode($player->getName()).'">KICK</a>}</font>';
echo '</FORM></TD><TD align="right" width="10%">'.$player->getLevel().'</TD><TD align="right" width="20%"><font color="'.($player->isOnline() ? 'green"><b>Online' : 'red"><b>Offline').'</b></font></TD></TR>';
}
echo '</TABLE></TD></TR>';
@@ -207,7 +207,7 @@ else
echo '</TABLE>';
*/
//End statistics
//Lets update some stuff in database
//$db->query('UPDATE `guilds` SET `total_members` = '.$s_total_members.', `members_online` = '.$s_members_online.', `total_level` = '.$s_total_level.', `average_level` = '.ceil($s_total_level/$s_total_members).' WHERE `id` = '.$guild->getId());
include(SYSTEM . 'libs/pot/InvitesDriver.php');