Skip to content

Commit 89b9fc9

Browse files
adauradaur
committed
Implement hooks and replace tabs with spaces
1 parent 0b4ea9c commit 89b9fc9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+4385
-4105
lines changed

‎featherbb/View/admin/bans/add_ban.php‎

Lines changed: 84 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -11,88 +11,93 @@
1111

1212
// Make sure no one attempts to run this script "directly"
1313
if (!isset($feather)) {
14-
exit;
14+
exit;
1515
}
16+
17+
$feather->hooks->fire('view.admin.bans.add.start');
1618
?>
1719

1820
<div class="blockform">
19-
<h2><span><?php _e('Ban advanced head') ?></span></h2>
20-
<div class="box">
21-
<form id="bans2" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F">
22-
<div class="inform">
23-
<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
24-
<input type="hidden" name="mode" value="<?= $ban['mode'] ?>" />
25-
<?php if ($ban['mode'] == 'edit'): ?> <input type="hidden" name="ban_id" value="<?= $ban['id'] ?>" />
26-
<?php endif; ?>
27-
<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?= $ban['user_id'] ?>" />
28-
<?php endif; ?><fieldset>
29-
<legend><?php _e('Ban advanced subhead') ?></legend>
30-
<div class="infldset">
31-
<table class="aligntop">
32-
<tr>
33-
<th scope="row"><?php _e('Username label') ?></th>
34-
<td>
35-
<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
36-
echo Utils::escape($ban['ban_user']);
37-
} ?>" tabindex="1" />
38-
<span><?php _e('Username help') ?></span>
39-
</td>
40-
</tr>
41-
<tr>
42-
<th scope="row"><?php _e('IP label') ?></th>
43-
<td>
44-
<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
45-
echo Utils::escape($ban['ip']);
46-
} ?>" tabindex="2" />
47-
<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
48-
printf(' '.__('IP help link'), '<a href="proxy.php?url=https%3A%2F%2Fgithub.com%2Fadmin_users.php%3Fip_stats%3D%3C%2Fspan%3E%27%3C%2Fspan%3E.%3Cspan+class%3D"pl-s1">$ban['user_id'].'">'.__('here').'</a>');
49-
} ?></span>
50-
</td>
51-
</tr>
52-
<tr>
53-
<th scope="row"><?php _e('E-mail label') ?></th>
54-
<td>
55-
<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
56-
echo Utils::escape($ban['email']);
57-
} ?>" tabindex="3" />
58-
<span><?php _e('E-mail help') ?></span>
59-
</td>
60-
</tr>
61-
</table>
62-
<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
63-
</div>
64-
</fieldset>
65-
</div>
66-
<div class="inform">
67-
<fieldset>
68-
<legend><?php _e('Message expiry subhead') ?></legend>
69-
<div class="infldset">
70-
<table class="aligntop">
71-
<tr>
72-
<th scope="row"><?php _e('Ban message label') ?></th>
73-
<td>
74-
<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
75-
echo Utils::escape($ban['message']);
76-
} ?>" tabindex="4" />
77-
<span><?php _e('Ban message help') ?></span>
78-
</td>
79-
</tr>
80-
<tr>
81-
<th scope="row"><?php _e('Expire date label') ?></th>
82-
<td>
83-
<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
84-
echo $ban['expire'];
85-
} ?>" tabindex="5" />
86-
<span><?php _e('Expire date help') ?></span>
87-
</td>
88-
</tr>
89-
</table>
90-
</div>
91-
</fieldset>
92-
</div>
93-
<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
94-
</form>
95-
</div>
21+
<h2><span><?php _e('Ban advanced head') ?></span></h2>
22+
<div class="box">
23+
<form id="bans2" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F">
24+
<div class="inform">
25+
<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
26+
<input type="hidden" name="mode" value="<?= $ban['mode'] ?>" />
27+
<?php if ($ban['mode'] == 'edit'): ?> <input type="hidden" name="ban_id" value="<?= $ban['id'] ?>" />
28+
<?php endif; ?>
29+
<?php if ($ban['mode'] == 'add' && isset($ban['user_id'])): ?><input type="hidden" name="ban_user_id" value="<?= $ban['user_id'] ?>" />
30+
<?php endif; ?><fieldset>
31+
<legend><?php _e('Ban advanced subhead') ?></legend>
32+
<div class="infldset">
33+
<table class="aligntop">
34+
<tr>
35+
<th scope="row"><?php _e('Username label') ?></th>
36+
<td>
37+
<input type="text" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban['ban_user'])) {
38+
echo Utils::escape($ban['ban_user']);
39+
} ?>" tabindex="1" />
40+
<span><?php _e('Username help') ?></span>
41+
</td>
42+
</tr>
43+
<tr>
44+
<th scope="row"><?php _e('IP label') ?></th>
45+
<td>
46+
<input type="text" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban['ip'])) {
47+
echo Utils::escape($ban['ip']);
48+
} ?>" tabindex="2" />
49+
<span><?php _e('IP help') ?><?php if ($ban['ban_user'] != '' && isset($ban['user_id'])) {
50+
printf(' '.__('IP help link'), '<a href="proxy.php?url=https%3A%2F%2Fgithub.com%2Fadmin_users.php%3Fip_stats%3D%3C%2Fspan%3E%27%3C%2Fspan%3E.%3Cspan+class%3D"pl-s1">$ban['user_id'].'">'.__('here').'</a>');
51+
} ?></span>
52+
</td>
53+
</tr>
54+
<tr>
55+
<th scope="row"><?php _e('E-mail label') ?></th>
56+
<td>
57+
<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban['email'])) {
58+
echo Utils::escape($ban['email']);
59+
} ?>" tabindex="3" />
60+
<span><?php _e('E-mail help') ?></span>
61+
</td>
62+
</tr>
63+
</table>
64+
<p class="topspace"><strong class="warntext"><?php _e('Ban IP range info') ?></strong></p>
65+
</div>
66+
</fieldset>
67+
</div>
68+
<div class="inform">
69+
<fieldset>
70+
<legend><?php _e('Message expiry subhead') ?></legend>
71+
<div class="infldset">
72+
<table class="aligntop">
73+
<tr>
74+
<th scope="row"><?php _e('Ban message label') ?></th>
75+
<td>
76+
<input type="text" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban['message'])) {
77+
echo Utils::escape($ban['message']);
78+
} ?>" tabindex="4" />
79+
<span><?php _e('Ban message help') ?></span>
80+
</td>
81+
</tr>
82+
<tr>
83+
<th scope="row"><?php _e('Expire date label') ?></th>
84+
<td>
85+
<input type="text" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban['expire'])) {
86+
echo $ban['expire'];
87+
} ?>" tabindex="5" />
88+
<span><?php _e('Expire date help') ?></span>
89+
</td>
90+
</tr>
91+
</table>
92+
</div>
93+
</fieldset>
94+
</div>
95+
<p class="submitend"><input type="submit" name="add_edit_ban" value="<?php _e('Save') ?>" tabindex="6" /></p>
96+
</form>
97+
</div>
9698
</div>
9799
<div class="clearer"></div>
98-
</div>
100+
</div>
101+
102+
<?php
103+
$feather->hooks->fire('view.admin.bans.add.end');

‎featherbb/View/admin/bans/admin_bans.php‎

Lines changed: 88 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -7,98 +7,101 @@
77
* License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
88
*/
99

10-
use FeatherBB\Core\Url;
11-
1210
// Make sure no one attempts to run this script "directly"
1311
if (!isset($feather)) {
1412
exit;
1513
}
14+
15+
$feather->hooks->fire('view.admin.bans.admin_bans.start');
1616
?>
1717

18-
<div class="blockform">
19-
<h2><span><?php _e('New ban head') ?></span></h2>
20-
<div class="box">
21-
<form id="bans" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?= $feather->urlFor('addBan') ?>">
22-
<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
23-
<div class="inform">
24-
<fieldset>
25-
<legend><?php _e('Add ban subhead') ?></legend>
26-
<div class="infldset">
27-
<table class="aligntop">
28-
<tr>
29-
<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
30-
<td>
31-
<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
32-
<span><?php _e('Username advanced help') ?></span>
33-
</td>
34-
</tr>
35-
</table>
36-
</div>
37-
</fieldset>
38-
</div>
39-
</form>
40-
</div>
18+
<div class="blockform">
19+
<h2><span><?php _e('New ban head') ?></span></h2>
20+
<div class="box">
21+
<form id="bans" method="post" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?= $feather->urlFor('addBan') ?>">
22+
<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
23+
<div class="inform">
24+
<fieldset>
25+
<legend><?php _e('Add ban subhead') ?></legend>
26+
<div class="infldset">
27+
<table class="aligntop">
28+
<tr>
29+
<th scope="row"><?php _e('Username label') ?><div><input type="submit" name="add_ban" value="<?php _e('Add') ?>" tabindex="2" /></div></th>
30+
<td>
31+
<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
32+
<span><?php _e('Username advanced help') ?></span>
33+
</td>
34+
</tr>
35+
</table>
36+
</div>
37+
</fieldset>
38+
</div>
39+
</form>
40+
</div>
4141

42-
<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
43-
<div class="box">
44-
<form id="find_bans" method="get" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?= $feather->urlFor('addBan') ?>">
45-
<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
46-
<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
47-
<div class="inform">
48-
<fieldset>
49-
<legend><?php _e('Ban search subhead') ?></legend>
50-
<div class="infldset">
51-
<p><?php _e('Ban search info') ?></p>
52-
<table class="aligntop">
53-
<tr>
54-
<th scope="row"><?php _e('Username label') ?></th>
55-
<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
56-
</tr>
57-
<tr>
58-
<th scope="row"><?php _e('IP label') ?></th>
59-
<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
60-
</tr>
61-
<tr>
62-
<th scope="row"><?php _e('E-mail label') ?></th>
63-
<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
64-
</tr>
65-
<tr>
66-
<th scope="row"><?php _e('Message label') ?></th>
67-
<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
68-
</tr>
69-
<tr>
70-
<th scope="row"><?php _e('Expire after label') ?></th>
71-
<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
72-
<span><?php _e('Date help') ?></span></td>
73-
</tr>
74-
<tr>
75-
<th scope="row"><?php _e('Expire before label') ?></th>
76-
<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
77-
<span><?php _e('Date help') ?></span></td>
78-
</tr>
79-
<tr>
80-
<th scope="row"><?php _e('Order by label') ?></th>
81-
<td>
82-
<select name="order_by" tabindex="10">
83-
<option value="username" selected="selected"><?php _e('Order by username') ?></option>
84-
<option value="ip"><?php _e('Order by ip') ?></option>
85-
<option value="email"><?php _e('Order by e-mail') ?></option>
86-
<option value="expire"><?php _e('Order by expire') ?></option>
87-
</select>
42+
<h2 class="block2"><span><?php _e('Ban search head') ?></span></h2>
43+
<div class="box">
44+
<form id="find_bans" method="get" action="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"pl-ent"><?= $feather->urlFor('addBan') ?>">
45+
<input type="hidden" name="<?= $csrf_key; ?>" value="<?= $csrf_token; ?>">
46+
<p class="submittop"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="3" /></p>
47+
<div class="inform">
48+
<fieldset>
49+
<legend><?php _e('Ban search subhead') ?></legend>
50+
<div class="infldset">
51+
<p><?php _e('Ban search info') ?></p>
52+
<table class="aligntop">
53+
<tr>
54+
<th scope="row"><?php _e('Username label') ?></th>
55+
<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
56+
</tr>
57+
<tr>
58+
<th scope="row"><?php _e('IP label') ?></th>
59+
<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
60+
</tr>
61+
<tr>
62+
<th scope="row"><?php _e('E-mail label') ?></th>
63+
<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
64+
</tr>
65+
<tr>
66+
<th scope="row"><?php _e('Message label') ?></th>
67+
<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
68+
</tr>
69+
<tr>
70+
<th scope="row"><?php _e('Expire after label') ?></th>
71+
<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
72+
<span><?php _e('Date help') ?></span></td>
73+
</tr>
74+
<tr>
75+
<th scope="row"><?php _e('Expire before label') ?></th>
76+
<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
77+
<span><?php _e('Date help') ?></span></td>
78+
</tr>
79+
<tr>
80+
<th scope="row"><?php _e('Order by label') ?></th>
81+
<td>
82+
<select name="order_by" tabindex="10">
83+
<option value="username" selected="selected"><?php _e('Order by username') ?></option>
84+
<option value="ip"><?php _e('Order by ip') ?></option>
85+
<option value="email"><?php _e('Order by e-mail') ?></option>
86+
<option value="expire"><?php _e('Order by expire') ?></option>
87+
</select>
8888
&#160;&#160;&#160;
8989
<select name="direction" tabindex="11">
90-
<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
91-
<option value="DESC"><?php _e('Descending') ?></option>
92-
</select>
93-
</td>
94-
</tr>
95-
</table>
96-
</div>
97-
</fieldset>
98-
</div>
99-
<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
100-
</form>
101-
</div>
102-
</div>
103-
<div class="clearer"></div>
90+
<option value="ASC" selected="selected"><?php _e('Ascending') ?></option>
91+
<option value="DESC"><?php _e('Descending') ?></option>
92+
</select>
93+
</td>
94+
</tr>
95+
</table>
96+
</div>
97+
</fieldset>
98+
</div>
99+
<p class="submitend"><input type="submit" name="find_ban" value="<?php _e('Submit search') ?>" tabindex="12" /></p>
100+
</form>
101+
</div>
102+
</div>
103+
<div class="clearer"></div>
104104
</div>
105+
106+
<?php
107+
$feather->hooks->fire('view.admin.bans.admin_bans.end');

0 commit comments

Comments
 (0)