Skip to content

Commit d74f2a7

Browse files
adauradaur
committed
Begin Twig
1 parent d2bfb3f commit d74f2a7

Some content is hidden

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

54 files changed

+3488
-3238
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"gettext/gettext": "^4.2",
3232
"s9e/text-formatter": "^0.9",
3333
"featherbb/php-utf-8": "dev-master",
34-
"twig/twig": "1.31"
34+
"twig/twig": "2.*"
3535
},
3636
"support": {
3737
"email": "[email protected]",

‎featherbb/Core/RunBBTwig.php‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,17 @@ public function getFunctions()
5858
}, ['is_safe' => ['html']]),
5959

6060
/**
61-
* Return the translation of a string in a specific domain
62-
* where first argument in array must be domain name
61+
* Return the status of a user
6362
*/
64-
new \Twig_SimpleFunction('transd', function ($str) {
65-
if (is_array($str)) {
66-
return call_user_func_array('d__', $str);
67-
} else {
68-
return $str;
69-
}
63+
new \Twig_SimpleFunction('isAdminMod', function () {
64+
return User::isAdminMod();
65+
}, ['is_safe' => ['html']]),
66+
67+
/**
68+
* Check permissions
69+
*/
70+
new \Twig_SimpleFunction('can', function ($str) {
71+
return User::can($str);
7072
}, ['is_safe' => ['html']]),
7173

7274
/**

‎featherbb/Core/View.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ protected function getDefaultPageInfo()
343343
];
344344

345345
if (User::get() !== null) {
346-
if (User::get()->is_admmod) {
346+
if (User::isAdminMod()) {
347347
$data['has_reports'] = \FeatherBB\Model\Admin\Reports::hasReports();
348348
}
349349
// check db configured

‎featherbb/View/admin/bans/add_ban.html.twig‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
{% extends '@forum/adminLayout.html.twig' %}
1+
{% extends '@forum/layout.html.twig' %}
22

33
{% block content %}
4+
5+
{% include '@forum/admin/menu.html.twig' %}
6+
47
{{ fireHook('view.admin.bans.add.start') }}
58

69
<div class="blockform">
@@ -85,6 +88,8 @@
8588
</form>
8689
</div>
8790
</div>
91+
<div class="clearer"></div>
92+
</div>
8893

8994
{{ fireHook('view.admin.bans.add.end') }}
9095
{% endblock content %}

‎featherbb/View/admin/bans/admin_bans.html.twig‎

Lines changed: 96 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,102 @@
1-
{% extends '@forum/adminLayout.html.twig' %}
1+
{% extends '@forum/layout.html.twig' %}
22

33
{% block content %}
4-
{{ fireHook('view.admin.bans.admin_bans.start') }}
5-
<div class="blockform">
6-
<h2><span>{{ trans('New ban head') }}</span></h2>
7-
<div class="box">
8-
<form id="bans" method="post" action="{{ pathFor('addBan') }}">
9-
<input type="hidden" name="csrf_name" value="{{ csrf_name }}">
10-
<input type="hidden" name="csrf_value" value="{{ csrf_value }}">
11-
<div class="inform">
12-
<fieldset>
13-
<legend>{{ trans('Add ban subhead') }}</legend>
14-
<div class="infldset">
15-
<table class="aligntop">
16-
<tr>
17-
<th scope="row">{{ trans('Username label') }}
18-
<div><input type="submit" name="add_ban" value="{{ trans('Add') }}" tabindex="2" /></div></th>
19-
<td>
20-
<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
21-
<span>{{ trans('Username advanced help') }}</span>
22-
</td>
23-
</tr>
24-
</table>
25-
</div>
26-
</fieldset>
27-
</div>
28-
</form>
29-
</div>
304

31-
<h2 class="block2"><span>{{ trans('Ban search head') }}</span></h2>
32-
<div class="box">
33-
<form id="find_bans" method="get" action="{{ pathFor('adminBans') }}">
34-
<p class="submittop"><input type="submit" name="find_ban" value="{{ trans('Submit search') }}" tabindex="3" /></p>
35-
<div class="inform">
36-
<fieldset>
37-
<legend>{{ trans('Ban search subhead') }}</legend>
38-
<div class="infldset">
39-
<p>{{ trans('Ban search info') }}</p>
40-
<table class="aligntop">
41-
<tr>
42-
<th scope="row">{{ trans('Username label') }}</th>
43-
<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
44-
</tr>
45-
<tr>
46-
<th scope="row">{{ trans('IP label') }}</th>
47-
<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
48-
</tr>
49-
<tr>
50-
<th scope="row">{{ trans('E-mail label') }}</th>
51-
<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
52-
</tr>
53-
<tr>
54-
<th scope="row">{{ trans('Message label') }}</th>
55-
<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
56-
</tr>
57-
<tr>
58-
<th scope="row">{{ trans('Expire after label') }}</th>
59-
<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
60-
<span>{{ trans('Date help') }}</span></td>
61-
</tr>
62-
<tr>
63-
<th scope="row">{{ trans('Expire before label') }}</th>
64-
<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
65-
<span>{{ trans('Date help') }}</span></td>
66-
</tr>
67-
<tr>
68-
<th scope="row">{{ trans('Order by label') }}</th>
69-
<td>
70-
<select name="order_by" tabindex="10">
71-
<option value="username" selected="selected">{{ trans('Order by username') }}</option>
72-
<option value="ip">{{ trans('Order by ip') }}</option>
73-
<option value="email">{{ trans('Order by e-mail') }}</option>
74-
<option value="expire">{{ trans('Order by expire') }}</option>
75-
</select>
76-
&#160;&#160;&#160;
77-
<select name="direction" tabindex="11">
78-
<option value="ASC" selected="selected">{{ trans('Ascending') }}</option>
79-
<option value="DESC">{{ trans('Descending') }}</option>
80-
</select>
81-
</td>
82-
</tr>
83-
{{ fireHook('view.admin.bans.admin_bans.form') }}
84-
</table>
85-
</div>
86-
</fieldset>
87-
</div>
88-
<p class="submitend">
89-
<input type="submit" name="find_ban" value="{{ trans('Submit search') }}" tabindex="12" />
90-
</p>
91-
</form>
92-
</div>
5+
{% include '@forum/admin/menu.html.twig' %}
6+
7+
{{ fireHook('view.admin.bans.admin_bans.start') }}
8+
9+
<div class="blockform">
10+
<h2><span>{{ trans('New ban head') }}</span></h2>
11+
<div class="box">
12+
<form id="bans" method="post" action="{{ pathFor('addBan') }}">
13+
<input type="hidden" name="csrf_name" value="{{ csrf_name }}">
14+
<input type="hidden" name="csrf_value" value="{{ csrf_value }}">
15+
<div class="inform">
16+
<fieldset>
17+
<legend>{{ trans('Add ban subhead') }}</legend>
18+
<div class="infldset">
19+
<table class="aligntop">
20+
<tr>
21+
<th scope="row">{{ trans('Username label') }}
22+
<div><input type="submit" name="add_ban" value="{{ trans('Add') }}" tabindex="2" /></div></th>
23+
<td>
24+
<input type="text" name="new_ban_user" size="25" maxlength="25" tabindex="1" />
25+
<span>{{ trans('Username advanced help') }}</span>
26+
</td>
27+
</tr>
28+
</table>
29+
</div>
30+
</fieldset>
9331
</div>
32+
</form>
33+
</div>
34+
35+
<h2 class="block2"><span>{{ trans('Ban search head') }}</span></h2>
36+
<div class="box">
37+
<form id="find_bans" method="get" action="{{ pathFor('adminBans') }}">
38+
<p class="submittop"><input type="submit" name="find_ban" value="{{ trans('Submit search') }}" tabindex="3" /></p>
39+
<div class="inform">
40+
<fieldset>
41+
<legend>{{ trans('Ban search subhead') }}</legend>
42+
<div class="infldset">
43+
<p>{{ trans('Ban search info') }}</p>
44+
<table class="aligntop">
45+
<tr>
46+
<th scope="row">{{ trans('Username label') }}</th>
47+
<td><input type="text" name="username" size="30" maxlength="25" tabindex="4" /></td>
48+
</tr>
49+
<tr>
50+
<th scope="row">{{ trans('IP label') }}</th>
51+
<td><input type="text" name="ip" size="30" maxlength="255" tabindex="5" /></td>
52+
</tr>
53+
<tr>
54+
<th scope="row">{{ trans('E-mail label') }}</th>
55+
<td><input type="text" name="email" size="30" maxlength="80" tabindex="6" /></td>
56+
</tr>
57+
<tr>
58+
<th scope="row">{{ trans('Message label') }}</th>
59+
<td><input type="text" name="message" size="30" maxlength="255" tabindex="7" /></td>
60+
</tr>
61+
<tr>
62+
<th scope="row">{{ trans('Expire after label') }}</th>
63+
<td><input type="text" name="expire_after" size="10" maxlength="10" tabindex="8" />
64+
<span>{{ trans('Date help') }}</span></td>
65+
</tr>
66+
<tr>
67+
<th scope="row">{{ trans('Expire before label') }}</th>
68+
<td><input type="text" name="expire_before" size="10" maxlength="10" tabindex="9" />
69+
<span>{{ trans('Date help') }}</span></td>
70+
</tr>
71+
<tr>
72+
<th scope="row">{{ trans('Order by label') }}</th>
73+
<td>
74+
<select name="order_by" tabindex="10">
75+
<option value="username" selected="selected">{{ trans('Order by username') }}</option>
76+
<option value="ip">{{ trans('Order by ip') }}</option>
77+
<option value="email">{{ trans('Order by e-mail') }}</option>
78+
<option value="expire">{{ trans('Order by expire') }}</option>
79+
</select>
80+
&#160;&#160;&#160;
81+
<select name="direction" tabindex="11">
82+
<option value="ASC" selected="selected">{{ trans('Ascending') }}</option>
83+
<option value="DESC">{{ trans('Descending') }}</option>
84+
</select>
85+
</td>
86+
</tr>
87+
{{ fireHook('view.admin.bans.admin_bans.form') }}
88+
</table>
89+
</div>
90+
</fieldset>
91+
</div>
92+
<p class="submitend">
93+
<input type="submit" name="find_ban" value="{{ trans('Submit search') }}" tabindex="12" />
94+
</p>
95+
</form>
96+
</div>
97+
</div>
98+
<div class="clearer"></div>
99+
</div>
100+
94101
{{ fireHook('view.admin.bans.admin_bans.end') }}
95102
{% endblock content %}

0 commit comments

Comments
 (0)