Skip to content

Commit

Permalink
Merge pull request #69 from whiteblXK/master
Browse files Browse the repository at this point in the history 
Move team page to twig template
  • Loading branch information
@slawkens
slawkens committed Mar 12, 2019
2 parents b0603c6 + 3fc8d01 commit 3b96b21
Show file tree
Hide file tree
Showing 2 changed files with 178 additions and 84 deletions.
106 changes: 22 additions & 84 deletions system/pages/team.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,7 @@
return;
}

$newStyle = ($config['team_style'] == 2);
if(!$newStyle)
{
echo '<div style="text-align:center"><h2>Support in game</h2></div>
<table border="0" cellspacing="1" cellpadding="4" width="100%">' . getGroupHeader();
}

$group_tmp = array();
$i = 0;
$groupMember = array();
$groupList = $groups->getGroups();
foreach($groupList as $id => $group)
{
Expand All @@ -40,87 +32,33 @@
if(!count($group_members))
continue;

$members_count = 0;
$groupNames = array();
$members = array();
foreach($group_members as $member)
{
if(!admin() && $member->isHidden())
continue;

$members_count++;
$flag = '';
if($config['account_country'])
$flag = getFlagImage($member->getAccount()->getCountry());

$tmp = '<tr bgcolor="' . getStyle($i++) . '">';
if(!$newStyle)
$tmp .= '<td>' . ucfirst($group->getName()) . '</td>';

$tmp .= '<td>' . $flag . ' ' . getPlayerLink($member->getName()) . '</td>';
if($config['team_display_status'])
$tmp .= '<td>' . ($member->isOnline() > 0 ? '<span style="color: green"><b>Online</b></span>' : '<span style="color: red"><b>Offline</b></span>') . '</td>';

if($config['multiworld'] || $config['team_display_world'])
$tmp .= '<td><span class="white"><b>' . getWorldName($member->getWorldId()) . '</b></span></td>';

$lastLogin = '';
if($config['team_display_lastlogin'])
{
$lastLogin = 'Never.';
if($member->getLastLogin() > 0)
$lastLogin = date("j F Y, g:i a", $member->getLastLogin());
}

$tmp .= '<td>' . $lastLogin . '</td></tr>';
if($newStyle)
{
if(isset($groupNames[$group->getName()]))
$groupNames[$group->getName()] .= $tmp;
else
$groupNames[$group->getName()] = $tmp;
}
else
echo $tmp;
$lastLogin = 'Never.';
if($member->getLastLogin() > 0)
$lastLogin = date("j F Y, g:i a", $member->getLastLogin());

$members[] = array(
'group_name' => $group->getName(),
'status' => $member->isOnline(),
'link' => getPlayerLink($member->getName()),
'flag_image' => getFlagImage($member->getAccount()->getCountry()),
'world_name' => getWorldName($member->getWorldId()),

This comment has been minimized.

Sign in to view

Copy link
@Leesneaks

Leesneaks Mar 14, 2019

Collaborator

'world_name' => ($config['multiworld'] || $config['team_display_world'] ? getWorldName($member->getWorldId()) : ""),
'last_login' => $lastLogin
);
}

if($newStyle && $members_count > 0)
{
$group_tmp[$id] = '<div style="text-align:center"><h2>' . ucfirst($group->getName()) . 's</h2></div>
<table border="0" cellspacing="1" cellpadding="4" width="100%">' . getGroupHeader(false) . $groupNames[$group->getName()] . '</table>';
}
$groupMember[] = array(
'group_name' => $group->getName(),
'members' => $members
);
}

if($newStyle)
{
for($i = $id; $i >= 0; $i--)
{
if(isset($group_tmp[$i]))
echo $group_tmp[$i];
}
}
else
echo '</table>';

function getGroupHeader($groupField = true)
{
global $config;

$ret = '<tr bgcolor="' . $config['vdarkborder'] . '">';
if($groupField)
$ret .= '<td width="20%"><span class="white"><b>Group</b></span></td>';

$ret .= '<td width="40%"><span class="white"><b>Name</b></span></td>';

if($config['team_display_status'])
$ret .= '<td width="20%"><span class="white"><b>Status</b></span></td>';

if($config['multiworld'] || $config['team_display_world'])
$ret .= '<td><span class="white"><b>World</b></span></td>';

if($config['team_display_lastlogin'])
$ret .= '<td width="20%"><span class="white"><b>Last login</b></span></td>';

$ret .= '</tr>';
return $ret;
}
?>
$twig->display('team.html.twig', array(
'groupmember' => $groupMember
));
?>
156 changes: 156 additions & 0 deletions system/templates/team.html.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
<div class="TableContainer">
<table class="Table1" cellpadding="0" cellspacing="0">
<div class="CaptionContainer">
<div class="CaptionInnerContainer">
<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
<div class="Text" >Support in game</div>
<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
</div>
</div>

<tr>
<td>
<div class="InnerTableContainer">
<table cellspacing="1" cellpadding="4" border="0" width="100%">
{% if config.team_style == 1 %}
<tr>
<td width="10%">
<span><b>Group</b></span>
</td>

<td width="40%">
<span><b>Name</b></span>
</td>

{% if config.team_display_status %}
<td width="10%">
<span><b>Status</b></span>
</td>
{% endif %}

{% if (config.multiworld or config.team_display_world) %}
<td width="20%">
<span><b>World</b></span>
</td>
{% endif %}

{% if config.team_display_lastlogin %}
<td width="20%">
<span><b>Last login</b></span>
</td>
{% endif %}
</tr>

{% for group in groupmember|reverse %}
{% for member in group.members|reverse %}
<tr>
<td>{{ group.group_name }}</td>

<td>
{% if config.account_country %}
{{ member.flag_image|raw }}
{% endif %}
{{ member.link|raw }}
</td>

{% if config.team_display_status %}
<td>
{% if member.status %}
<span style="color: green"><b>Online</b></span>
{% else %}
<span style="color: red"><b>Offline</b></span>
{% endif %}
</td>
{% endif %}

{% if (config.multiworld or config.team_display_world) %}
<td>
<span><b>{{ member.world_name }}</b></span>
</td>
{% endif %}

{% if config.team_display_lastlogin %}
<td>
{{ member.last_login }}
</td>
{% endif %}
</tr>
{% endfor %}
{% endfor %}

{% elseif config.team_style == 2 %}
{% for group in groupmember|reverse %}

This comment has been minimized.

Sign in to view

Copy link
@Leesneaks

Leesneaks Mar 14, 2019

Collaborator

{% if group.members|length > 0 %}
<div style="text-align:center"><h2>{{ group.group_name }}</h2></div>

<table cellspacing="1" cellpadding="4" border="0" width="100%">
<tr>
<td width="40%">
<span><b>Name</b></span>
</td>

{% if config.team_display_status %}
<td width="20%">
<span><b>Status</b></span>
</td>
{% endif %}

{% if (config.multiworld or config.team_display_world) %}
<td width="20%">
<span><b>World</b></span>
</td>
{% endif %}

{% if config.team_display_lastlogin %}
<td width="20%">
<span><b>Last login</b></span>
</td>
{% endif %}
</tr>

{% for member in group.members %}
<tr>
<td>
{% if config.account_country %}
{{ member.flag_image|raw }}
{% endif %}
{{ member.link|raw }}
</td>

{% if config.team_display_status %}
<td>
{% if member.status %}
<span style="color: green"><b>Online</b></span>
{% else %}
<span style="color: red"><b>Offline</b></span>
{% endif %}
</td>
{% endif %}

{% if (config.multiworld or config.team_display_world) %}
<td>
<span><b>{{ member.world_name }}</b></span>
</td>
{% endif %}

{% if config.team_display_lastlogin %}
<td>
{{ member.last_login }}
</td>
{% endif %}
</tr>
{% endfor %}
</table>

This comment has been minimized.

Sign in to view

Copy link
@Leesneaks

Leesneaks Mar 14, 2019

Collaborator

{% endif %}
{% endfor %}
{% endif %}
</table>
</div>
</td>
</tr>
</table>
</div>

2 comments on commit 3b96b21

@Leesneaks
Copy link
Collaborator

@Leesneaks Leesneaks commented on 3b96b21 Mar 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fatal error: Uncaught E_OTS_NotLoaded in system/libs/pot/OTS_Player.php:2316 Stack trace: #0 system/pages/team.php(62): OTS_Player->getWorldId() #1 public_html/index.php(392): require('...') #2 {main} thrown in system/libs/pot/OTS_Player.php on line 2316

the checks to see if multiworld etc have been removed from the php.

@Leesneaks
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this also breaks the tibiacom layout because there is an error with the table and div closes.

Please sign in to comment.