Skip to content

Commit 05da942

Browse files
jayrmjayrm
committed
Update to phpBB 3.3.5
- update styles to 3.3.2 (the latest available)
1 parent bbbf5cf commit 05da942

File tree

3,205 files changed

+141235
-95336
lines changed

Some content is hidden

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

3,205 files changed

+141235
-95336
lines changed

‎.htaccess‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ RewriteRule ^(.*)$ app.php [QSA,L]
3636
#Options +FollowSymLinks
3737
</IfModule>
3838

39+
# Apache content negotation tries to interpret non-existent paths as files if
40+
# MultiViews is enabled. This will however cause issues with paths containg
41+
# dots, e.g. for the cron tasks
42+
<IfModule mod_negotiation.c>
43+
Options -MultiViews
44+
</IfModule>
45+
3946
# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
4047
# module mod_authz_host to a new module called mod_access_compat (which may be
4148
# disabled) and a new "Require" syntax has been introduced to mod_authz_host.

‎adm/images/phpbb_logo.svg‎

Lines changed: 6 additions & 0 deletions
Loading

‎adm/index.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
define('IN_ADMIN', true);
5050

5151
// Some oft used variables
52-
$safe_mode = (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false;
5352
$file_uploads = (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false;
5453
$module_id = $request->variable('i', '');
5554
$mode = $request->variable('mode', '');

‎adm/style/acp_avatar_options_upload.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dl>
22
<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
3-
<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
3+
<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept="{{ AVATAR_ALLOWED_EXTENSIONS }}" /></dd>
44
</dl>
55

66
<!-- IF S_UPLOAD_AVATAR_URL -->

‎adm/style/acp_bbcodes.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ <h1>{L_ACP_BBCODES}</h1>
3131
</fieldset>
3232

3333
<fieldset>
34-
<legend>{L_BBCODE_HELPLINE}</legend>
35-
<p>{L_BBCODE_HELPLINE_EXPLAIN}</p>
34+
<legend>{{ lang('BBCODE_HELPLINE') }}</legend>
35+
<p>{{ lang('BBCODE_HELPLINE_EXPLAIN') }}</p>
3636
<dl>
37-
<dt><label for="bbcode_helpline">{L_BBCODE_HELPLINE_TEXT}</label></dt>
38-
<dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd>
37+
<dt><label for="bbcode_helpline">{{ lang('BBCODE_HELPLINE_TEXT') }}</label></dt>
38+
<dd><textarea id="bbcode_helpline" name="bbcode_helpline" cols="60" rows="4">{{ BBCODE_HELPLINE }}</textarea></dd>
3939
</dl>
4040
</fieldset>
4141

‎adm/style/acp_contact.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h1>{L_ACP_CONTACT_SETTINGS}</h1>
4444
<!-- INCLUDE acp_posting_buttons.html -->
4545

4646
<dl class="responsive-columns">
47-
<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
47+
<dt style="width: 90px;" id="color_palette_placeholder" data-color-palette="v" data-height="12" data-width="15" data-bbcode="true">
4848
</dt>
4949

5050
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">

‎adm/style/acp_database.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ <h1>{L_ACP_BACKUP}</h1>
5858
<dl>
5959
<dt><label for="type">{L_BACKUP_TYPE}{L_COLON}</label></dt>
6060
<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
61-
<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
6261
<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
6362
</dl>
6463
<dl>

‎adm/style/acp_ext_delete_data.html‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
<!-- INCLUDE overall_header.html -->
1+
{% INCLUDE 'overall_header.html' %}
22

33
<a id="maincontent"></a>
44

5-
<h1>{L_EXTENSIONS_ADMIN}</h1>
5+
<h1>{{ lang('EXTENSIONS_ADMIN') }}</h1>
66

7-
<p>{L_EXTENSIONS_EXPLAIN}</p>
8-
<p>{L_EXTENSION_DELETE_DATA_EXPLAIN}</p>
7+
<p>{{ lang('EXTENSIONS_EXPLAIN') }}</p>
8+
<p>{{ lang('EXTENSION_DELETE_DATA_EXPLAIN') }}</p>
99

10-
<!-- IF MIGRATOR_ERROR -->
11-
<div class="errorbox">
12-
<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
13-
<p>{MIGRATOR_ERROR}</p>
14-
<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
15-
</div>
16-
<!-- ELSEIF PRE -->
17-
<div class="errorbox">
18-
<p>{L_CONFIRM_MESSAGE}</p>
19-
</div>
10+
{% if MIGRATOR_ERROR %}
11+
<div class="errorbox">
12+
<p><strong>{{ lang('MIGRATION_EXCEPTION_ERROR') }}</strong></p>
13+
<p>{{ MIGRATOR_ERROR }}</p>
14+
<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
15+
</div>
16+
{% elseif S_PRE_STEP %}
17+
<div class="errorbox">
18+
<p>{{ CONFIRM_MESSAGE }}</p>
19+
</div>
2020

21-
<form id="acp_extensions" method="post" action="{U_PURGE}">
22-
<fieldset class="submit-buttons">
23-
<legend>{L_EXTENSION_DELETE_DATA}</legend>
24-
<input class="button1" type="submit" name="delete_data" value="{L_EXTENSION_DELETE_DATA}" />
25-
<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
26-
</fieldset>
27-
</form>
28-
<!-- ELSEIF S_NEXT_STEP -->
21+
<form id="acp_extensions" method="post" action="{{ U_PURGE }}">
22+
<fieldset class="submit-buttons">
23+
<legend>{{ lang('EXTENSION_DELETE_DATA') }}</legend>
24+
<input class="button1" type="submit" name="delete_data" value="{{ lang('EXTENSION_DELETE_DATA') }}">
25+
<input class="button2" type="submit" name="cancel" value="{{ lang('CANCEL') }}">
26+
</fieldset>
27+
</form>
28+
{% elseif S_NEXT_STEP %}
2929
<div class="errorbox">
30-
<p>{L_EXTENSION_DELETE_DATA_IN_PROGRESS}</p>
30+
<p>{{ lang('EXTENSION_DELETE_DATA_IN_PROGRESS') }}</p>
3131
</div>
32-
<!-- ELSE -->
32+
{% else %}
3333
<div class="successbox">
34-
<p>{L_EXTENSION_DELETE_DATA_SUCCESS}</p>
35-
<br />
36-
<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
34+
<p>{{ lang('EXTENSION_DELETE_DATA_SUCCESS') }}</p>
35+
<br>
36+
<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
3737
</div>
38-
<!-- ENDIF -->
38+
{% endif %}
3939

40-
<!-- INCLUDE overall_footer.html -->
40+
{% INCLUDE 'overall_footer.html' %}

‎adm/style/acp_ext_disable.html‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
<!-- INCLUDE overall_header.html -->
1+
{% INCLUDE 'overall_header.html' %}
22

33
<a id="maincontent"></a>
44

5-
<h1>{L_EXTENSIONS_ADMIN}</h1>
5+
<h1>{{ lang('EXTENSIONS_ADMIN') }}</h1>
66

7-
<p>{L_EXTENSIONS_EXPLAIN}</p>
8-
<p>{L_EXTENSION_DISABLE_EXPLAIN}</p>
7+
<p>{{ lang('EXTENSIONS_EXPLAIN') }}</p>
8+
<p>{{ lang('EXTENSION_DISABLE_EXPLAIN') }}</p>
99

10-
<!-- IF PRE -->
11-
<fieldset>
12-
<h2>{L_CONFIRM}</h2>
13-
<p>{L_CONFIRM_MESSAGE}</p>
14-
</fieldset>
10+
{% if S_PRE_STEP %}
11+
<fieldset>
12+
<h2>{{ lang('CONFIRM') }}</h2>
13+
<p>{{ CONFIRM_MESSAGE }}</p>
14+
</fieldset>
1515

16-
<form id="acp_extensions" method="post" action="{U_DISABLE}">
17-
<fieldset class="submit-buttons">
18-
<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />
19-
<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
20-
</fieldset>
21-
</form>
22-
<!-- ELSEIF S_NEXT_STEP -->
16+
<form id="acp_extensions" method="post" action="{{ U_DISABLE }}">
17+
<fieldset class="submit-buttons">
18+
<input class="button1" type="submit" name="disable" value="{{ lang('EXTENSION_DISABLE') }}">
19+
<input class="button2" type="submit" name="cancel" value="{{ lang('CANCEL') }}">
20+
</fieldset>
21+
</form>
22+
{% elseif S_NEXT_STEP %}
2323
<div class="successbox notice">
24-
<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>
24+
<p>{{ lang('EXTENSION_DISABLE_IN_PROGRESS') }}</p>
2525
</div>
26-
<!-- ELSE -->
26+
{% else %}
2727
<div class="successbox">
28-
<p>{L_EXTENSION_DISABLE_SUCCESS}</p>
29-
<br />
30-
<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
28+
<p>{{ lang('EXTENSION_DISABLE_SUCCESS') }}</p>
29+
<br>
30+
<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
3131
</div>
32-
<!-- ENDIF -->
32+
{% endif %}
3333

34-
<!-- INCLUDE overall_footer.html -->
34+
{% INCLUDE 'overall_footer.html' %}

‎adm/style/acp_ext_enable.html‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
<!-- INCLUDE overall_header.html -->
1+
{% INCLUDE 'overall_header.html' %}
22

33
<a id="maincontent"></a>
44

5-
<h1>{L_EXTENSIONS_ADMIN}</h1>
5+
<h1>{{ lang('EXTENSIONS_ADMIN') }}</h1>
66

7-
<p>{L_EXTENSIONS_EXPLAIN}</p>
8-
<p>{L_EXTENSION_ENABLE_EXPLAIN}</p>
7+
<p>{{ lang('EXTENSIONS_EXPLAIN') }}</p>
8+
<p>{{ lang('EXTENSION_ENABLE_EXPLAIN') }}</p>
99

10-
<!-- IF MIGRATOR_ERROR -->
11-
<div class="errorbox">
12-
<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
13-
<p>{MIGRATOR_ERROR}</p>
14-
<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
15-
</div>
16-
<!-- ELSEIF PRE -->
17-
<fieldset>
18-
<h2>{L_CONFIRM}</h2>
19-
<p>{L_CONFIRM_MESSAGE}</p>
20-
</fieldset>
10+
{% if MIGRATOR_ERROR %}
11+
<div class="errorbox">
12+
<p><strong>{{ lang('MIGRATION_EXCEPTION_ERROR') }}</strong></p>
13+
<p>{{ MIGRATOR_ERROR }}</p>
14+
<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
15+
</div>
16+
{% elseif S_PRE_STEP %}
17+
<fieldset>
18+
<h2>{{ lang('CONFIRM') }}</h2>
19+
<p>{{ CONFIRM_MESSAGE }}</p>
20+
</fieldset>
2121

22-
<form id="acp_extensions" method="post" action="{U_ENABLE}">
23-
<fieldset class="submit-buttons">
24-
<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />
25-
<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
26-
</fieldset>
27-
</form>
28-
<!-- ELSEIF S_NEXT_STEP -->
22+
<form id="acp_extensions" method="post" action="{{ U_ENABLE }}">
23+
<fieldset class="submit-buttons">
24+
<input class="button1" type="submit" name="enable" value="{{ lang('EXTENSION_ENABLE') }}">
25+
<input class="button2" type="submit" name="cancel" value="{{ lang('CANCEL') }}">
26+
</fieldset>
27+
</form>
28+
{% elseif S_NEXT_STEP %}
2929
<div class="successbox notice">
30-
<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>
30+
<p>{{ lang('EXTENSION_ENABLE_IN_PROGRESS') }}</p>
3131
</div>
32-
<!-- ELSE -->
32+
{% else %}
3333
<div class="successbox">
34-
<p>{L_EXTENSION_ENABLE_SUCCESS}</p>
35-
<br />
36-
<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
34+
<p>{{ lang('EXTENSION_ENABLE_SUCCESS') }}</p>
35+
<br>
36+
<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
3737
</div>
38-
<!-- ENDIF -->
38+
{% endif %}
3939

40-
<!-- INCLUDE overall_footer.html -->
40+
{% INCLUDE 'overall_footer.html' %}

0 commit comments

Comments
 (0)