diff --git a/system/pages/guilds/list.php b/system/pages/guilds/list.php index 6296db72..2b65e15d 100644 --- a/system/pages/guilds/list.php +++ b/system/pages/guilds/list.php @@ -19,23 +19,23 @@ $guilds_list->orderBy("name"); $guilds = array(); if(count($guilds_list) > 0) { - foreach ($guilds_list as $guild) { - $guild_logo = $guild->getCustomField('logo_name'); - if (empty($guild_logo) || !file_exists(GUILD_IMAGES_DIR . $guild_logo)) - $guild_logo = "default.gif"; + foreach ($guilds_list as $guild) { + $guild_logo = $guild->getCustomField('logo_name'); + if (empty($guild_logo) || !file_exists(GUILD_IMAGES_DIR . $guild_logo)) + $guild_logo = "default.gif"; - $description = $guild->getCustomField('description'); - $description_with_lines = str_replace(array("\r\n", "\n", "\r"), '
', $description, $count); - if ($count < $config['guild_description_lines_limit']) - $description = wordwrap(nl2br($description), 60, "
", true); + $description = $guild->getCustomField('description'); + $description_with_lines = str_replace(array("\r\n", "\n", "\r"), '
', $description, $count); + if ($count < $config['guild_description_lines_limit']) + $description = wordwrap(nl2br($description), 60, "
", true); - $guildName = $guild->getName(); - $guilds[] = array('name' => $guildName, 'logo' => $guild_logo, 'link' => getGuildLink($guildName, false), 'description' => $description); - } + $guildName = $guild->getName(); + $guilds[] = array('name' => $guildName, 'logo' => $guild_logo, 'link' => getGuildLink($guildName, false), 'description' => $description); + } }; $twig->display('guilds.list.html.twig', array( - 'guilds' => $guilds, - 'logged' => isset($logged) ? $logged : false, - 'isAdmin' => admin(), + 'guilds' => $guilds, + 'logged' => isset($logged) ? $logged : false, + 'isAdmin' => admin(), )); diff --git a/system/pages/guilds/show.php b/system/pages/guilds/show.php index dc10480c..f4b4f15c 100644 --- a/system/pages/guilds/show.php +++ b/system/pages/guilds/show.php @@ -49,78 +49,78 @@ $players_from_account_in_guild = array(); $players_from_account_ids = array(); if($logged) { - $account_players = $account_logged->getPlayers(); - foreach($account_players as $player) - { - $players_from_account_ids[] = $player->getId(); - $player_rank = $player->getRank(); - if($player_rank->isLoaded()) - { - foreach($rank_list as $rank_in_guild) - { - if($guild_owner->isLoaded() && $rank_in_guild->isLoaded() && $player_rank->isLoaded() && - $rank_in_guild->getId() == $player_rank->getId()) - { - $players_from_account_in_guild[] = $player->getName(); - if($guild_owner->getId() == $player->getId()) - { - $guild_vice = true; - $guild_leader = true; - } - else if($player_rank->getLevel() > 1) - { - $guild_vice = true; - $level_in_guild = $player_rank->getLevel(); - } - } - } - } - } + $account_players = $account_logged->getPlayers(); + foreach($account_players as $player) + { + $players_from_account_ids[] = $player->getId(); + $player_rank = $player->getRank(); + if($player_rank->isLoaded()) + { + foreach($rank_list as $rank_in_guild) + { + if($guild_owner->isLoaded() && $rank_in_guild->isLoaded() && $player_rank->isLoaded() && + $rank_in_guild->getId() == $player_rank->getId()) + { + $players_from_account_in_guild[] = $player->getName(); + if($guild_owner->getId() == $player->getId()) + { + $guild_vice = true; + $guild_leader = true; + } + else if($player_rank->getLevel() > 1) + { + $guild_vice = true; + $level_in_guild = $player_rank->getLevel(); + } + } + } + } + } } //show guild page $guild_logo = $guild->getCustomField('logo_name'); if(empty($guild_logo) || !file_exists(GUILD_IMAGES_DIR . $guild_logo)) - $guild_logo = "default.gif"; + $guild_logo = "default.gif"; $description = $guild->getCustomField('description'); $description_with_lines = str_replace(array("\r\n", "\n", "\r"), '
', $description, $count); if($count < $config['guild_description_lines_limit']) - $description = wordwrap(nl2br($description), 60, "
", true); + $description = wordwrap(nl2br($description), 60, "
", true); //$description = $description_with_lines; $guild_owner = $guild->getOwner(); if($guild_owner->isLoaded()) - $guild_owner_name = $guild_owner->getName(); + $guild_owner_name = $guild_owner->getName(); $guild_members = array(); foreach($rank_list as $rank) { - if($db->hasTable(GUILD_MEMBERS_TABLE)) - $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;'); + if($db->hasTable(GUILD_MEMBERS_TABLE)) + $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) - { - $members = array(); - foreach($players_with_rank as $result) - { - $player = new OTS_Player(); - $player->load($result['id']); - if(!$player->isLoaded()) - continue; + $players_with_rank_number = $players_with_rank->rowCount(); + if($players_with_rank_number > 0) + { + $members = array(); + foreach($players_with_rank as $result) + { + $player = new OTS_Player(); + $player->load($result['id']); + if(!$player->isLoaded()) + continue; - $members[] = $player; - } + $members[] = $player; + } - $guild_members[] = array( - 'rank_name' => $rank->getName(), - 'rank_level' => $rank->getLevel(), - 'members' => $members - ); - } + $guild_members[] = array( + 'rank_name' => $rank->getName(), + 'rank_level' => $rank->getLevel(), + 'members' => $members + ); + } } include(SYSTEM . 'libs/pot/InvitesDriver.php'); @@ -129,37 +129,37 @@ $invited_list = $guild->listInvites(); $show_accept_invite = 0; if($logged && count($invited_list) > 0) { - foreach($invited_list as $invited_player) - { - if(count($account_players) > 0) - { - foreach($account_players as $player_from_acc) - { - if($player_from_acc->isLoaded() && $invited_player->isLoaded() && $player_from_acc->getName() == $invited_player->getName()) - $show_accept_invite++; - } - } - } + foreach($invited_list as $invited_player) + { + if(count($account_players) > 0) + { + foreach($account_players as $player_from_acc) + { + if($player_from_acc->isLoaded() && $invited_player->isLoaded() && $player_from_acc->getName() == $invited_player->getName()) + $show_accept_invite++; + } + } + } } $useGuildNick = false; if($db->hasColumn('players', 'guildnick')) - $useGuildNick = true; + $useGuildNick = true; $twig->display('guilds.view.html.twig', array( - 'logo' => $guild_logo, - 'guild_name' => $guild_name, - 'description' => $description, - 'guild_owner' => $guild_owner->isLoaded() ? $guild_owner : null, - 'guild_creation_date' => $guild->getCreationData(), - 'guild_members' => $guild_members, - 'players_from_account_ids' => $players_from_account_ids, - 'players_from_account_in_guild' => $players_from_account_in_guild, - 'level_in_guild' => $level_in_guild, - 'isLeader' => $guild_leader, - 'isVice' => $guild_vice, - 'logged' => $logged, - 'invited_list' => $invited_list, - 'show_accept_invite' => $show_accept_invite, - 'useGuildNick' => $useGuildNick + 'logo' => $guild_logo, + 'guild_name' => $guild_name, + 'description' => $description, + 'guild_owner' => $guild_owner->isLoaded() ? $guild_owner : null, + 'guild_creation_date' => $guild->getCreationData(), + 'guild_members' => $guild_members, + 'players_from_account_ids' => $players_from_account_ids, + 'players_from_account_in_guild' => $players_from_account_in_guild, + 'level_in_guild' => $level_in_guild, + 'isLeader' => $guild_leader, + 'isVice' => $guild_vice, + 'logged' => $logged, + 'invited_list' => $invited_list, + 'show_accept_invite' => $show_accept_invite, + 'useGuildNick' => $useGuildNick )); diff --git a/system/templates/guilds.list.html.twig b/system/templates/guilds.list.html.twig index f1c03404..da5016b0 100644 --- a/system/templates/guilds.list.html.twig +++ b/system/templates/guilds.list.html.twig @@ -1,162 +1,162 @@
-
-
- - - - -
Active Guilds on {{ config.lua.serverName }}
- - - - -
-
+
+
+ + + + +
Active Guilds on {{ config.lua.serverName }}
+ + + + +
+
- - - - + + +
-
- - - - + {% endif %} + + {% endif %} + +
-
-
-
-
-
- - - {% if guilds|length > 0 %} - - - - - +
LogoDescription 
+ + + - - -
+
+ + + + - - -
+
+
+
+
+
+ + + {% if guilds|length > 0 %} + + + + + - {% set i = 0 %} - {% for guild in guilds %} - {% set i = i + 1 %} - - + {% set i = 0 %} + {% for guild in guilds %} + {% set i = i + 1 %} + + - + {% if guild.description is not empty %} +
+ {{ guild.description }} + {% endif %} + - - - {% endfor %} - {% else %} - - + + + {% endfor %} + {% else %} + + - {% if logged %} - - {% endif %} - - {% endif %} - -
LogoDescription 
- -
+ + - - {{ guild.name }}{% if isAdmin %} - Delete this guild (for ADMIN only!){% endif %} - + + + {{ guild.name }}{% if isAdmin %} - Delete this guild (for ADMIN only!){% endif %} + - {% if guild.description is not empty %} -
- {{ guild.description }} - {% endif %} - 		- - - - - - -
-
- {{ include('buttons.view.html.twig') }} -
-
-
- Create Guild -
- Actually there is no guild on server.{% if logged %} Create first! Press button "Create Guild"{% endif %} - 		+ + + + + + +
+
+ {{ include('buttons.view.html.twig') }} +
+
+
+ Create Guild +
+ Actually there is no guild on server.{% if logged %} Create first! Press button "Create Guild"{% endif %} + 		- - - - {% set button_name = 'Found Guild' %} - {% set button_image = '_sbutton_foundguild' %} - {% include('buttons.base.html.twig') %} - - -
-
-
-
-
-
-
-
-
-
-
-
-
+ {% if logged %} +
+ + + + {% set button_name = 'Found Guild' %} + {% set button_image = '_sbutton_foundguild' %} + {% include('buttons.base.html.twig') %} + + +
+
+
+ +
+
+
+
+
+
+
+
+ + + +
- - - + + + - + {% if logged %} +
+ If you have any problem with guilds try: +
+ Cleanup players - can't join guild/be invited? Can't create guild? Try cleanup players. +
+ Cleanup guilds - made guild, you are a leader, but you are not on players list? Cleanup guilds! + {% endif %} + - - - + + +
- -
+ + - - - {% if logged %} - No guild found that suits your needs? - - {% set button_name = 'Found Guild' %} - {% set button_image = '_sbutton_foundguild' %} - {% include('buttons.base.html.twig') %} - - {% else %} - Before you can create a guild you must login. -
- - {% include('buttons.login.html.twig') %} - - {% endif %} - -
+ 		+ + + {% if logged %} + No guild found that suits your needs? + + {% set button_name = 'Found Guild' %} + {% set button_image = '_sbutton_foundguild' %} + {% include('buttons.base.html.twig') %} + + {% else %} + Before you can create a guild you must login. +
+ + {% include('buttons.login.html.twig') %} + + {% endif %} + +
- {% if logged %} -
- If you have any problem with guilds try: -
- Cleanup players - can't join guild/be invited? Can't create guild? Try cleanup players. -
- Cleanup guilds - made guild, you are a leader, but you are not on players list? Cleanup guilds! - {% endif %} - 		- -
+ +
diff --git a/system/templates/guilds.view.html.twig b/system/templates/guilds.view.html.twig index 52d5e8b5..36efbc3d 100644 --- a/system/templates/guilds.view.html.twig +++ b/system/templates/guilds.view.html.twig @@ -1,347 +1,347 @@
-
-
- - - - +
+
+
- -
+ + + - + - - - -
+ +

{{ guild_name }}

{{ guild_name }}

 - -
-
+ + + + + + +
- - - - + + +
-
-
-
-
- - - - -
Guild Information
- - - - -
-
-
+ + + + + + +
+
+
+
+
+ + + + +
Guild Information
+ + + + +
+
+
- - - - + + +
-
- - - - - - -
-
- {% if descriptions is not empty %} - {{ description }} -
-
- {% endif %} + + + + - - -
+
+ + + + - - -
+
+ {% if descriptions is not empty %} + {{ description }} +
+
+ {% endif %} - {% if guild_owner is not empty %} - {% set guildOwnerName = guild_owner.getName() %} + {% if guild_owner is not empty %} + {% set guildOwnerName = guild_owner.getName() %} - {{ guildOwnerName }} is guild leader of {{ guild_name }}. -
- {% endif %} + {{ guildOwnerName }} is guild leader of {{ guild_name }}. +
+ {% endif %} - The guild was founded on {{ config.lua.serverName }} on {{ guild_creation_date|date("j F Y") }}. - {% if isLeader %} - - Manage Guild - - {% endif %} -
-
-
-
-
-
+ The guild was founded on {{ config.lua.serverName }} on {{ guild_creation_date|date("j F Y") }}. + {% if isLeader %} + + Manage Guild + + {% endif %} +
+
+
+
+
+
-
-
-
-
-
- - - - -
Guild Members
- - - - -
-
-
+
+
+
+
+
+ + + + +
Guild Members
+ + + + +
+
+
- - - - + + +
-
- - - - + + + {% endfor %} + +
-
-
- - - - - - - - - +
RankName{% if useGuildNick %} and Title{% endif %}VocationLevelStatus
+ + + - - -
+
+ + + + - - -
+
+
+ + + + + + + + + - {% set showedRank, i = false, 0 %} - {% for rank in guild_members if rank.members|length > 0 %} - {% set rankStyle, i = getStyle(i), i + 1 %} + {% set showedRank, i = false, 0 %} + {% for rank in guild_members if rank.members|length > 0 %} + {% set rankStyle, i = getStyle(i), i + 1 %} - {% for player in rank.members %} - - + {% for player in rank.members %} + + - + {% if level_in_guild > rank.rank_level or isLeader %} + {% if guildOwnerName != playerName %} + + {KICK} + + {% endif %} + {% endif %} + {% else %} + {% if showGuildNick %} ({{ guildNickRaw }}){% endif %} + {% endif %} + + - - - - - {% endfor %} + + + + + {% endfor %} - {% set showedRank = false %} - {% else %} - - - - {% endfor %} - -
RankName{% if useGuildNick %} and Title{% endif %}VocationLevelStatus
- {% if not showedRank %}{{ rank.rank_name }}{% endif %} - {% set showedRank = true %} -
+ {% if not showedRank %}{{ rank.rank_name }}{% endif %} + {% set showedRank = true %} + - {% set playerName = player.getName() %} -
- {{ getPlayerLink(playerName, true)|raw }} +
+ {% set playerName = player.getName() %} + + {{ getPlayerLink(playerName, true)|raw }} - {% set showGuildNick = false %} - {% if player.getGuildNick() is not empty %} - {% set showGuildNick = true %} - {% set guildNickRaw = player.getGuildNick()|raw %} - {% endif %} + {% set showGuildNick = false %} + {% if player.getGuildNick() is not empty %} + {% set showGuildNick = true %} + {% set guildNickRaw = player.getGuildNick()|raw %} + {% endif %} - {% if logged %} - {% if player.getId() in players_from_account_ids %} - () - {% else %} - {% if showGuildNick %} ({{ guildNickRaw }}){% endif %} - {% endif %} + {% if logged %} + {% if player.getId() in players_from_account_ids %} + () + {% else %} + {% if showGuildNick %} ({{ guildNickRaw }}){% endif %} + {% endif %} - {% if level_in_guild > rank.rank_level or isLeader %} - {% if guildOwnerName != playerName %} - - {KICK} - - {% endif %} - {% endif %} - {% else %} - {% if showGuildNick %} ({{ guildNickRaw }}){% endif %} - {% endif %} - - {{ player.getVocationName() }}{{ player.getLevel() }} - Online{% else %} red;">Offline{% endif %} -
{{ player.getVocationName() }}{{ player.getLevel() }} + Online{% else %} red;">Offline{% endif %} +
No guild members found.
-
-
-
-
-
-
-
+ {% set showedRank = false %} + {% else %} +
No guild members found.
+
+ +
+
+ + + + +
+
-
-
-
- - - - -
Invited Characters
- - - - -
-
+
+
+
+ + + + +
Invited Characters
+ + + + +
+
- - - - + + +
-
- - - - + + {% endif %} + {% else %} + + + + {% endfor %} + +
-
- - - - - +
Name
+ + + - - -
+
+ + + + - - -
+
+ + + + + - {% set i = 0 %} - {% for invited_player in invited_list if invited_list|length > 0 %} - {% if invited_player.isLoaded() %} - - {% set i = i + 1 %} + {% set i = 0 %} + {% for invited_player in invited_list if invited_list|length > 0 %} + {% if invited_player.isLoaded() %} + + {% set i = i + 1 %} - - - {% endif %} - {% else %} - - - - {% endfor %} - -
Name
- {{ getPlayerLink(invited_player.getName(), true)|raw }} + + {{ getPlayerLink(invited_player.getName(), true)|raw }} - {% if isVice %} - - {% endif %} -
- No invited characters found. -
-
-
-
-
-
-
+ {% if isVice %} + + {% endif %} +
+ No invited characters found. +
+
+
+
+ + + + +
+
-
- - - - + + +
-
- - - - + + + +
-
- - - - {% if not logged %} - - - - {% else %} - {% if show_accept_invite > 0 %} - - - - {% endif %} +
+
- {{ include('buttons.login.html.twig') }} -
- -
+ + + - - -
+
+ + + + - - -
+
+ + + + {% if not logged %} + + + + {% else %} + {% if show_accept_invite > 0 %} + + + + {% endif %} - {% if isVice %} - - - + {% if isVice %} + + + - - - - {% endif %} + + + + {% endif %} - {% if players_from_account_in_guild|length > 0 %} - - - - {% endif %} - {% endif %} + {% if players_from_account_in_guild|length > 0 %} + + + + {% endif %} + {% endif %} - - - - - -
+ {{ include('buttons.login.html.twig') }} +
+ +
- {% set button_name = 'Invite Character' %} - {% set button_image = '_sbutton_invitecharacter' %} - {% include('buttons.base.html.twig') %} -
+ {% set button_name = 'Invite Character' %} + {% set button_image = '_sbutton_invitecharacter' %} + {% include('buttons.base.html.twig') %} +
- {% set button_name = 'Edit Ranks' %} - {% set button_image = '_sbutton_editranks' %} - {% include('buttons.base.html.twig') %} -
+ {% set button_name = 'Edit Ranks' %} + {% set button_image = '_sbutton_editranks' %} + {% include('buttons.base.html.twig') %} +
- {% set button_name = 'Leave Guild' %} - {% set button_image = '_sbutton_leaveguild' %} - {% include('buttons.base.html.twig') %} -
+ {% set button_name = 'Leave Guild' %} + {% set button_image = '_sbutton_leaveguild' %} + {% include('buttons.base.html.twig') %} +
- {{ include('buttons.back.html.twig') }} -
-
-
-
-
-
- - +
+
+ {{ include('buttons.back.html.twig') }} +
+
+
+
+ + + + +
+
+