Skip to content

Commit 792770e

Browse files
slawkensslawkens
committed
* fixed some typos
* changes account.management to use buttons defined in template
1 parent dece42c commit 792770e

File tree

8 files changed

+32
-27
lines changed

8 files changed

+32
-27
lines changed

‎TODO

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* remove tibiacom template, and include it as a plugin
2828

2929
2.0
30+
* remove gesior backward support
3031
* remove compat functions
3132
* remove $template['link_*']
3233
* folder restructure:

‎index.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -423,18 +423,18 @@ function error_handler($errno, $errstr) {
423423
die('ERROR: Cannot load template.');
424424
}
425425

426-
$super = superAdmin();
427426
echo '<!-- MyAAC ' . MYAAC_VERSION . ' :: http://www.my-aac.org/ -->' . "\n";
428-
if($super) {
427+
if(superAdmin()) {
429428
echo '<!-- Generated in: ' . round(microtime(true) - START_TIME, 4) . 'ms -->';
430429
echo PHP_EOL . '<!-- Queries done: ' . $db->queries() . ' -->';
431430
if(function_exists('memory_get_peak_usage')) {
432431
echo PHP_EOL . '<!-- Peak memory usage: ' . convert_bytes(memory_get_peak_usage(true)) . ' -->';
433432
}
433+
434+
if($config['database_log']) {
435+
echo PHP_EOL . '<!-- Database Queries Done by MyAAC:' . PHP_EOL . $db->getLog() . '-->';
436+
}
434437
}
435438

436-
if($config['database_log'] && $super) {
437-
echo PHP_EOL . '<!-- Database Queries Done by MyAAC:' . PHP_EOL . $db->getLog() . '-->';
438-
}
439439
$hooks->trigger(HOOK_FINISH);
440440
?>

‎system/libs/pot/OTS_Group.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,8 @@ public function getPlayersList()
490490
// creates filter
491491
$filter = new OTS_SQLFilter();
492492
$filter->compareField('group_id', (int) $this->data['id']);
493-
if($this->db->hasColumn('players', 'deletion'))
493+
global $db;
494+
if($db->hasColumn('players', 'deletion'))
494495
$filter->compareField('deletion', 0);
495496
else
496497
$filter->compareField('deleted', 0);

‎system/pages/admin/players.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ function verify_number($number, $name, $max_length) {
399399
Head:<input type="text" name="look_head" size="2" maxlength="11" value="<?php echo $player->getLookHead(); ?>" />
400400
Legs:<input type="text" name="look_legs" size="2" maxlength="11" value="<?php echo $player->getLookLegs(); ?>" />
401401
Type:<input type="text" name="look_type" size="2" maxlength="11" value="<?php echo $player->getLookType(); ?>" />
402-
<?php if($db->hasColumn('lookaddons', 'players')): ?>
402+
<?php if($db->hasColumn('players', 'lookaddons')): ?>
403403
Addons:<input type="text" name="look_addons" size="2" maxlength="11" value="<?php echo $player->getLookAddons(); ?>" />
404404
<?php endif; ?>
405405
</td>
@@ -520,7 +520,7 @@ function verify_number($number, $name, $max_length) {
520520
<table>
521521
<tr style="background-color: transparent;">
522522
<td><label for="deleted">Deleted:</label></td>
523-
<td><input type="checkbox" name="deleted" id="deleted" value="true" <?php echo ($player->getCustomField($db->hasColumn('deletion', 'players') ? 'deletion' : 'deleted') == '1' ? ' checked' : ''); ?>/></td>
523+
<td><input type="checkbox" name="deleted" id="deleted" value="true" <?php echo ($player->getCustomField($db->hasColumn('players', 'deletion') ? 'deletion' : 'deleted') == '1' ? ' checked' : ''); ?>/></td>
524524

525525
<td><label for="hidden">Hidden:</label></td>
526526
<td><input type="checkbox" name="hidden" id="hidden" value="true" <?php echo ($player->isHidden() ? ' checked' : ''); ?>/></td>

‎system/pages/forum/show_thread.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
$db->query("UPDATE `" . TABLE_PREFIX . "forum` SET `views`=`views`+1 WHERE `id` = ".(int) $thread_id);
3939
}
4040

41-
$lookaddons = $db-hasColumn('players', 'lookaddons');
41+
$lookaddons = $db->hasColumn('players', 'lookaddons');
4242
$groups = new OTS_Groups_List();
4343
foreach($posts as &$post)
4444
{

‎system/templates/account.management.html.twig

+16-8
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
<div align="center">
5959
You can register your account for increased protection. Click on "Register Account" and get your free recovery key today!<br/>
6060
<form action="{{ getLink('account/register') }}" method="post">
61-
<input type="submit" value="Register Account" />
61+
{% set button_name = 'Register Account' %}
62+
{% include('buttons.base.html.twig') %}
6263
</form>
6364
</div>
6465
<br/>
@@ -69,7 +70,8 @@
6970
A request has been submitted to change the email address of this account to <b>{{ email_new }}</b>. After <b>{{ email_new_time|date("j F Y, G:i:s") }}</b> you can accept the new email address and finish the process. Please cancel the request if you do not want your email address to be changed! Also cancel the request if you have no access to the new email address!
7071

7172
<form action="{{ getLink('account/email') }}" method="post">
72-
<input type="submit" value="Edit" />
73+
{% set button_name = 'Edit' %}
74+
{% include('buttons.base.html.twig') %}
7375
</form>
7476
</div>
7577
<br/><br/>
@@ -84,7 +86,8 @@
8486
<td style="width: 90px;">Email Address:</td>
8587
<td>{{ account_email ~ email_change }}
8688
<form action="{{ getLink('account/email') }}" method="post">
87-
<input type="submit" value="Change Email" />
89+
{% set button_name = 'Change Email' %}
90+
{% include('buttons.base.html.twig') %}
8891
</form>
8992
</td>
9093
</tr>
@@ -120,7 +123,8 @@
120123
</tr>
121124
</table>
122125
<form action="{{ getLink('account/info') }}" method="post">
123-
<input type="submit" value="Change Info" />
126+
{% set button_name = 'Change Info' %}
127+
{% include('buttons.base.html.twig') %}
124128
</form>
125129
<br/>
126130
<h2>Action Log</h2>
@@ -159,26 +163,30 @@
159163
<tr>
160164
<td>
161165
<form action="{{ getLink('account/character/create') }}" method="post" >
162-
<input type="Submit" name="Create Character" value="Create Character" />
166+
{% set button_name = 'Create Character' %}
167+
{% include('buttons.base.html.twig') %}
163168
</form>
164169
</td>
165170
{% if config.account_change_character_name %}
166171
<td>
167172
<form action="{{ getLink('account/character/name') }}" method="post" >
168-
<input type="Submit" name="Change Name" value="Change Name" />
173+
{% set button_name = 'Change Name' %}
174+
{% include('buttons.base.html.twig') %}
169175
</form>
170176
</td>
171177
{% endif %}
172178
{% if config.account_change_character_sex %}
173179
<td>
174180
<form action="{{ getLink('account/character/sex') }}" method="post" >
175-
<input type="Submit" name="Change Sex" value="Change Sex" />
181+
{% set button_name = 'Change Sex' %}
182+
{% include('buttons.base.html.twig') %}
176183
</form>
177184
</td>
178185
{% endif %}
179186
<td>
180187
<form action="{{ getLink('account/character/delete') }}" method="post">
181-
<input type="Submit" name="Delete Character" value="Delete Character" />
188+
{% set button_name = 'Delete Character' %}
189+
{% include('buttons.base.html.twig') %}
182190
</form>
183191
</td>
184192
</tr>

‎system/templates/forum.show_thread.html.twig

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Page: {{ links_to_pages|raw }}<br/>
2828
<br />
2929
{% endif %}
3030
<font size="1">
31-
{% if post.group is defined and post.group|lower != 'player' %}
31+
{% if post.group is defined %}
3232
Position: {{ post.group }}<br />
3333
{% endif %}
3434

@@ -55,7 +55,7 @@ Page: {{ links_to_pages|raw }}<br/>
5555
{% if post.first_post != post.id %}
5656
<a href="?subtopic=forum&action=remove_post&id={{ post.id }}" title="Remove Post" onclick="return confirm('Are you sure you want remove post of {{ post.player.getName() }}?')"><img src="images/del.png"/></a>
5757
{% else %}
58-
<a href="?subtopic=forum&action=move_thread&id={{ post.id }}"><img src="images/icons/arrow_right.gif"/></a>
58+
<a href="?subtopic=forum&action=move_thread&id={{ post.id }}" title="Move Thread"><img src="images/icons/arrow_right.gif"/></a>
5959
<a href="?subtopic=forum&action=remove_post&id={{ post.id }}" title="Remove Thread" target="_blank" onclick="return confirm('Are you sure you want remove thread > {{ post.post_topic}} <?')"><img src="images/del.png"/></a>
6060
{% endif %}
6161
{% if logged and (post.player.getAccount().getId() == account_logged.getId() or is_moderator) %}

‎tools/news_preview.php

+3-8
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,7 @@
2727
'icon_id' => $cat['icon_id']
2828
);
2929
}
30-
/*
31-
$template_path = $_GET['template_path'];
32-
$twig->addGlobal('template_path', $template_path);
33-
if($twig_loader && file_exists(BASE . $template_path))
34-
$twig_loader->prependPath(BASE . $template_path);
35-
*/
30+
3631
$twig->addGlobal('config', $config);
3732

3833
$player = new OTS_Player();
@@ -45,7 +40,7 @@
4540

4641
if($_GET['type'] == 3) { // ARTICLE
4742
if(!isset($_GET['article_text'], $_GET['article_image'])) {
48-
error_('Error: please fill all inputs 2.');
43+
error_('Error: please fill all inputs.');
4944
}
5045

5146
$featured_article = '';
@@ -57,7 +52,7 @@
5752
'text' => $_GET['article_text'],
5853
'image' => $_GET['article_image'],
5954
'hidden' => 0,
60-
'read_more'=> getLink('news/archive/') . '0'
55+
'read_more'=> '#'
6156
),
6257
'canEdit' => false
6358
));

0 commit comments

Comments
 (0)