Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2026-01-09 08:11:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
slawkens
2026-01-03 20:40:56 +01:00
parent ca2e3bb576 c65d4e4b62
commit 2f0b67f840
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/src/Settings.php
View File

@@ -184,11 +184,11 @@ class Settings implements \ArrayAccess
} }
?> ?>
<h3 id="row_<?= $key ?>" style="text-align: center"><strong><?= $setting['title']; ?></strong></h3> <h3 id="row_<?= $key ?>" style="text-align: center"><strong><?= $setting['title']; ?></strong></h3>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped table-responsive d-md-table">
<thead> <thead>
<tr> <tr>
<th style="width: 13%">Name</th> <th style="width: 13%">Name</th>
<th style="width: 30%">Value</th> <th style="width: 30%; min-width: 200px">Value</th>
<th>Description</th> <th>Description</th>
</tr> </tr>
</thead> </thead>

2
system/templates/admin.changelog.html.twig
View File

@@ -1,6 +1,6 @@
<div class="card card-info card-outline"> <div class="card card-info card-outline">
<div class="card-header"> <div class="card-header">
<h5 class="m-0">News: <h5 class="m-0">Changelogs:
<form method="post" class="float-right"> <form method="post" class="float-right">
{{ csrf() }} {{ csrf() }}
<input type="hidden" name="action" value="new" /> <input type="hidden" name="action" value="new" />

20
system/templates/online.html.twig
View File

@@ -138,22 +138,22 @@
{% set content %} {% set content %}
<table width="100%" class="myaac-table"> <table width="100%" class="myaac-table">
<tr class="LabelH" style="position: relative; z-index: 20;"> <tr class="LabelH" style="z-index: 20;">
{% if setting('core.account_country') %} {% if setting('core.account_country') %}
<td width="11px"><a href="{{ getLink('online')}}?order=country_{{ order == 'country_asc' ? 'desc' : 'asc' }}">#&#160;&#160;</a> <td style="width: 6px;"><a href="{{ getLink('online')}}?order=country_{{ order == 'country_asc' ? 'desc' : 'asc' }}">#&#160;&#160;</a>
</td> </td>
{% endif %} {% endif %}
{% if setting('core.online_outfit') %} {% if setting('core.online_outfit') %}
<td><b>Outfit</b></td> <td style="width: 32px;"><b>Outfit</b></td>
{% endif %} {% endif %}
<td style="text-align:left; width:50%">Name&#160;&#160; <td style="text-align:left;">Name&#160;&#160;
<small style="font-weight:normal">[<a href="{{ getLink('online')}}?order=name_{{ order == 'name_asc' ? 'desc' : 'asc' }}">sort</a>]</small> <small style="font-weight:normal">[<a href="{{ getLink('online')}}?order=name_{{ order == 'name_asc' ? 'desc' : 'asc' }}">sort</a>]</small>
<img class="sortarrow" src="images/{{ order == 'name_asc' ? 'order_desc' : (order == 'name_desc' ? 'order_asc' : 'news/blank') }}.gif"/></td> <img class="sortarrow" src="images/{{ order == 'name_asc' ? 'order_desc' : (order == 'name_desc' ? 'order_asc' : 'news/blank') }}.gif"/></td>
<td style="text-align:left;width:30%">Level&#160;&#160; <td style="text-align:left;width:10%">Level&#160;&#160;
<small style="font-weight:normal">[<a href="{{ getLink('online')}}?order=level_{{ order == 'level_asc' ? 'desc' : 'asc' }}">sort</a>]</small> <small style="font-weight:normal">[<a href="{{ getLink('online')}}?order=level_{{ order == 'level_asc' ? 'desc' : 'asc' }}">sort</a>]</small>
<img class="sortarrow" src="images/{{ order == 'level_asc' ? 'order_desc' : (order == 'level_desc' ? 'order_asc' : 'news/blank') }}.gif"/> <img class="sortarrow" src="images/{{ order == 'level_asc' ? 'order_desc' : (order == 'level_desc' ? 'order_asc' : 'news/blank') }}.gif"/>
</td> </td>
<td style="text-align:left;width:50%">Vocation&#160;&#160; <td style="text-align:left;width:20%">Vocation&#160;&#160;
<small style="font-weight:normal">[<a href="{{ getLink('online')}}?order=vocation_{{ order == 'vocation_asc' ? 'desc' : 'asc' }}">sort</a>]</small> <small style="font-weight:normal">[<a href="{{ getLink('online')}}?order=vocation_{{ order == 'vocation_asc' ? 'desc' : 'asc' }}">sort</a>]</small>
<img class="sortarrow" src="images/{{ order == 'vocation_asc' ? 'order_desc' : (order == 'vocation_desc' ? 'order_asc' : 'news/blank') }}.gif"/> <img class="sortarrow" src="images/{{ order == 'vocation_asc' ? 'order_desc' : (order == 'vocation_desc' ? 'order_asc' : 'news/blank') }}.gif"/>
</td> </td>
@@ -169,14 +169,14 @@
{% endif %} {% endif %}
{% if setting('core.online_outfit') %} {% if setting('core.online_outfit') %}
<td width="5%"><img style="position:absolute;margin-top:-48px;margin-left:-70px;" src="{{ player.outfit }}" alt="player outfit"/></td> <td><img style="position:absolute;margin-top:-48px;margin-left:-70px;" src="{{ player.outfit }}" alt="player outfit"/></td>
{% endif %} {% endif %}
<td style="width:70%; text-align:left"> <td style="text-align:left">
{{ player.name|raw }}{{ player.skull|raw }} {{ player.name|raw }}{{ player.skull|raw }}
</td> </td>
<td style="width:10%">{{ player.level }}</td> <td>{{ player.level }}</td>
<td style="width:20%">{{ player.vocation }}</td> <td>{{ player.vocation }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>

8
tools/signature/index.php
View File

@@ -35,14 +35,14 @@
if(!isset($_REQUEST['name'])) if(!isset($_REQUEST['name']))
die('Please enter name as get or post parameter.'); die('Please enter name as get or post parameter.');
$name = stripslashes(ucwords(strtolower(trim($_REQUEST['name']))));
$player = new OTS_Player(); $player = new OTS_Player();
$player->find($name); $player->find($_REQUEST['name']);
if(!$player->isLoaded()) if(!$player->isLoaded())
{ {
header('Content-type: image/png'); //header('Content-type: image/png');
readfile(SIGNATURES_IMAGES.'nocharacter.png'); //readfile(SIGNATURES_IMAGES.'nocharacter.png');
http_response_code(404);
exit; exit;
} }