Skip to content

Commit e792cc1

Browse files
marc1706marc1706
committed
Merge remote-tracking branch 'upstream/master'
2 parents 860b8c6 + b227262 commit e792cc1

51 files changed

Lines changed: 548 additions & 136 deletions

Some content is hidden

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

‎.devcontainer/resources/phpbb-config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ installer:
3030
server:
3131
cookie_secure: false
3232
server_protocol: http://
33-
force_server_vars: false
33+
force_server_vars: true
3434
server_name: localhost
3535
server_port: 80
3636
script_path: /

‎.devcontainer/resources/setup.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ sudo ln -s /workspaces/phpbb/phpBB /var/www/html
3434
echo "[Codespaces] Copy phpBB configuration"
3535
cp /workspaces/phpbb/.devcontainer/resources/phpbb-config.yml /workspaces/phpbb/phpBB/install/install-config.yml
3636

37+
# Force the server URL to reflect the Codespace
38+
# https://docs.github.com/en/codespaces/developing-in-a-codespace/default-environment-variables-for-your-codespace
39+
if [ "$CODESPACES" = true ] ; then
40+
echo "[Codespaces] Set the phpBB server name using default environment variables"
41+
codespaces_url="${CODESPACE_NAME}-80.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
42+
sed -i "s/localhost/$codespaces_url/g" /workspaces/phpbb/phpBB/install/install-config.yml
43+
fi
44+
3745
# Install phpBB
3846
echo "[Codespaces] Run phpBB CLI installation"
3947
cd /workspaces/phpbb/phpBB && composer install --no-interaction

‎build/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
44
<!-- a few settings for the build -->
55
<property name="newversion" value="4.0.0-a1-dev" />
6-
<property name="prevversion" value="3.3.12-RC1" />
6+
<property name="prevversion" value="3.3.12" />
77
<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10, 3.3.11" />
88
<!-- no configuration should be needed beyond this point -->
99

‎phpBB/adm/style/acp_groups.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ <h1>{L_ADD_USERS}</h1>
225225

226226
<fieldset>
227227
<legend>{L_ADD_USERS}</legend>
228+
{% EVENT acp_groups_add_user_options_before %}
228229
<dl>
229230
<dt><label for="leader">{L_USER_GROUP_LEADER}{L_COLON}</label></dt>
230231
<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
@@ -235,11 +236,13 @@ <h1>{L_ADD_USERS}</h1>
235236
<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
236237
<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
237238
</dl>
239+
{% EVENT acp_groups_add_user_usernames_before %}
238240
<dl>
239241
<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
240242
<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
241243
<dd><!-- EVENT acp_groups_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_groups_find_username_append --></dd>
242244
</dl>
245+
{% EVENT acp_groups_add_user_options_after %}
243246

244247
<p class="quick">
245248
<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />

‎phpBB/adm/style/acp_main.html‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,31 @@ <h1>{L_WELCOME_PHPBB}</h1>
1414

1515
<p>{L_ADMIN_INTRO}</p>
1616

17-
<!-- IF S_UPDATE_INCOMPLETE -->
17+
{% if S_UPDATE_INCOMPLETE %}
1818
<div class="errorbox">
19-
<p>{L_UPDATE_INCOMPLETE} <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
19+
<p>{{ lang('UPDATE_INCOMPLETE') }} <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
2020
</div>
21-
<!-- ELSEIF S_VERSIONCHECK_FAIL -->
21+
{% elseif S_VERSIONCHECK_FAIL %}
2222
<div class="errorbox notice">
23-
<p>{L_VERSIONCHECK_FAIL}</p>
24-
<p>{VERSIONCHECK_FAIL_REASON}</p>
25-
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
23+
<p>{{ lang('VERSIONCHECK_FAIL') }}</p>
24+
<p>{{ VERSIONCHECK_FAIL_REASON }}</p>
25+
<p><a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a> &middot; <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
2626
</div>
27-
<!-- ELSEIF not S_VERSION_UP_TO_DATE -->
27+
{% elseif not S_VERSION_UP_TO_DATE %}
2828
<div class="errorbox">
29-
<p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
30-
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
29+
<p>{{ lang('VERSION_NOT_UP_TO_DATE_TITLE') }}</p>
30+
<p><a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a> &middot; <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
3131
</div>
32-
<!-- ENDIF -->
33-
<!-- IF S_VERSION_UPGRADEABLE -->
32+
{% elseif S_VERSION_UP_TO_DATE && S_VERSIONCHECK_FORCE %}
33+
<div class="successbox">
34+
<p>{{ lang('VERSION_UP_TO_DATE_ACP') }}</p>
35+
</div>
36+
{% endif %}
37+
{% if S_VERSION_UPGRADEABLE %}
3438
<div class="errorbox notice">
35-
<p>{UPGRADE_INSTRUCTIONS}</p>
39+
<p>{{ UPGRADE_INSTRUCTIONS }}</p>
3640
</div>
37-
<!-- ENDIF -->
41+
{% endif %}
3842
{% if S_CAPTCHA_UNSAFE %}
3943
<div class="errorbox">
4044
<p>{{ lang('CAPTCHA_UNSAFE_WARNING') }}</p>

‎phpBB/docs/CHANGELOG.html‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ <h1>Changelog</h1>
5050
<ol>
5151
<li><a href="#changelog">Changelog</a>
5252
<ul>
53+
<li><a href="#v3312rc1">Changes since 3.3.12-RC1</a></li>
5354
<li><a href="#v3311">Changes since 3.3.11</a></li>
5455
<li><a href="#v3310">Changes since 3.3.10</a></li>
5556
<li><a href="#v3310rc1">Changes since 3.3.10-RC1</a></li>
@@ -168,6 +169,21 @@ <h1>Changelog</h1>
168169
<div class="inner">
169170

170171
<div class="content">
172+
<a name="v3312rc1"></a><h3>Changes since 3.3.12-RC1</h3>
173+
<h4>Bug</h4>
174+
<ul>
175+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17312">PHPBB3-17312</a>] - User last visit gets updated too often</li>
176+
</ul>
177+
<h4>Improvement</h4>
178+
<ul>
179+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17324">PHPBB3-17324</a>] - Add template event to notification_dropdown.html</li>
180+
</ul>
181+
<h4>Hardening</h4>
182+
<ul>
183+
<li>[<a href="https://tracker.phpbb.com/browse/SECURITY-276">SECURITY-276</a>] - Prevent resending activation email too often</li>
184+
<li>[<a href="https://tracker.phpbb.com/browse/SECURITY-278">SECURITY-278</a>] - Always release cron lock, even invalid task is passed</li>
185+
</ul>
186+
171187
<a name="v3311"></a><h3>Changes since 3.3.11</h3>
172188
<h4>Bug</h4>
173189
<ul>

‎phpBB/docs/events.md‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,24 @@ acp_group_types_prepend
184184
* Since: 3.2.9-RC1
185185
* Purpose: Add additional group type options to group settings (prepend the list)
186186

187+
acp_groups_add_user_options_after
188+
===
189+
* Location: adm/style/acp_groups.html
190+
* Since: 3.3.13-RC1
191+
* Purpose: Add content after options for adding user to group in the ACP
192+
193+
acp_groups_add_user_options_before
194+
===
195+
* Location: adm/style/acp_groups.html
196+
* Since: 3.3.13-RC1
197+
* Purpose: Add content before options for adding user to group in the ACP
198+
199+
acp_groups_add_user_usernames_before
200+
===
201+
* Location: adm/style/acp_groups.html
202+
* Since: 3.3.13-RC1
203+
* Purpose: Add content before usernames option for adding user to group in the ACP
204+
187205
acp_groups_find_username_append
188206
===
189207
* Location: adm/style/acp_groups.html
@@ -1597,6 +1615,20 @@ navbar_header_username_prepend
15971615
* Since: 3.1.0-RC1
15981616
* Purpose: Add text and HTMl before the username shown in the navbar.
15991617

1618+
notification_dropdown_footer_after
1619+
===
1620+
* Locations:
1621+
+ styles/prosilver/template/notification_dropdown.html
1622+
* Since: 3.3.12
1623+
* Purpose: Add content after notifications list footer.
1624+
1625+
notification_dropdown_footer_before
1626+
===
1627+
* Locations:
1628+
+ styles/prosilver/template/notification_dropdown.html
1629+
* Since: 3.3.12
1630+
* Purpose: Add content before notifications list footer.
1631+
16001632
overall_footer_after
16011633
===
16021634
* Locations:
@@ -2521,6 +2553,20 @@ ucp_friend_list_before
25212553
* Since: 3.1.0-a4
25222554
* Purpose: Add optional elements before list of friends in UCP
25232555

2556+
ucp_group_settings_after
2557+
===
2558+
* Locations:
2559+
+ styles/prosilver/template/ucp_groups_manage.html
2560+
* Since: 3.3.13-RC1
2561+
* Purpose: Add content after options for managing a group in the UCP
2562+
2563+
ucp_group_settings_before
2564+
===
2565+
* Locations:
2566+
+ styles/prosilver/template/ucp_groups_manage.html
2567+
* Since: 3.3.13-RC1
2568+
* Purpose: Add content before options for managing a group in the UCP
2569+
25242570
ucp_header_content_before
25252571
===
25262572
* Locations:

‎phpBB/includes/acp/acp_inactive.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,11 @@ function main($id, $mode)
238238

239239
$messenger->save_queue();
240240

241-
// Add the remind state to the database
241+
// Add the remind state to the database and increase activation expiration by one day
242242
$sql = 'UPDATE ' . USERS_TABLE . '
243243
SET user_reminded = user_reminded + 1,
244-
user_reminded_time = ' . time() . '
244+
user_reminded_time = ' . time() . ',
245+
user_actkey_expiration = ' . (int) $user::get_token_expiration() . '
245246
WHERE ' . $db->sql_in_set('user_id', $user_ids);
246247
$db->sql_query($sql);
247248

‎phpBB/includes/acp/acp_main.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ function main($id, $mode)
445445
$template->assign_vars(array(
446446
'S_VERSION_UP_TO_DATE' => empty($updates_available),
447447
'S_VERSION_UPGRADEABLE' => !empty($upgrades_available),
448+
'S_VERSIONCHECK_FORCE' => (bool) $recheck,
448449
'UPGRADE_INSTRUCTIONS' => !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false,
449450
));
450451
}

‎phpBB/includes/acp/acp_search.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ protected function get_post_index_progress(int $post_counter): array
516516
$this->db->sql_freeresult($result);
517517

518518
$total_count = $done_count + $remain_count;
519-
$percent = ($done_count / $total_count) * 100;
519+
$percent = $total_count > 0 ? ($done_count / $total_count) * 100 : 100;
520520

521521
return [
522522
'VALUE' => $done_count,

0 commit comments

Comments
 (0)