Skip to content

Commit 076940a

Browse files
authored
Merge pull request #296 from phpbb/remove/jabber
Remove jabber and add web push documentation
2 parents a838ead + 11b9501 commit 076940a

16 files changed

+74
-65
lines changed

development/development/upgrade/400.rst

+12
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ The ban system has been greatly refactored for phpBB 4.0. As part of this, the f
4040
- Added support for IPv6 banning
4141
- Removed "exclude" functionality which resulted in ambiguous settings
4242

43+
Removal of Jabber/XMPP
44+
----------------------
45+
The Jabber/XMPP functionality has been removed from phpBB 4.0. This includes the Jabber/XMPP settings in the ACP and the Jabber/XMPP notification system.
46+
Users with Jabber/XMPP accounts will no longer receive notifications via Jabber/XMPP and have instead been migrated to email notifications.
47+
The Jabber/XMPP functionality was removed due to the lack of support for the XMPP protocol in modern browsers and the fact that it was not widely used by phpBB users.
48+
4349
Class and function changes
4450
==========================
4551
The following table lists class and function changes that might affect custom PHP or Extension code.
@@ -391,6 +397,12 @@ Also have a look at the `phpBB API documentation <https://area51.phpbb.com/docs/
391397
- ``4.0.0-a1``
392398
- Use phpbb_build_radio() instead.
393399

400+
* - ``messenger``
401+
- ``includes/functions_messenger.php``
402+
- Refactored to new messenger system, removed jabber support
403+
- ``4.0.0-a1``
404+
- Added new refactored messenger system. See the API docs for `\\phpbb\\messenger <https://area51.phpbb.com/docs/code/master/phpbb/messenger.html>`_ namespace.
405+
394406
**Explanation of columns:**
395407

396408
* **Class or function:** The name of the class or function that was added, changed, deprecated, or removed in this version.

development/extensions/tutorial_notifications.rst

+3-7
Original file line numberDiff line numberDiff line change
@@ -651,14 +651,10 @@ you will have to indicate that in the path, e.g.: ``@vendor_extension/subdirecto
651651
return '@vendor_extension/sample';
652652
}
653653
654-
There is also a third notification method, Jabber, which uses the :class:`email/short` directory for its template files.
655-
This notification method is closely tied to the email method, so it is important to also supply that template file,
656-
even though the content might be identical to the email template.
657-
658-
.. warning::
654+
.. note::
659655

660-
Make sure to have both :class:`language/en/email/sample.txt` and :class:`language/en/email/short/sample.txt`
661-
in your extension's language directory to prevent errors.
656+
The previously existing Jabber notification method has been removed in phpBB 4.0. A separate :class:`email/short` directory
657+
for this notification method is no longer used and therefore you no longer need to create a separate template file for it.
662658

663659
get_email_template_variables
664660
----------------------------

documentation/content/en/chapters/admin_guide.xml

+27-21
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</chapterinfo>
1111
<title>Administration Guide</title>
1212
<abstract>
13-
<para>This chapter describes the phpBB 3.3 admin controls.</para>
13+
<para>This chapter describes the phpBB admin controls.</para>
1414
</abstract>
1515
<section id="admin_control_panel">
1616
<sectioninfo>
@@ -21,7 +21,7 @@
2121
</authorgroup>
2222
</sectioninfo>
2323
<title>The Administration Control Panel</title>
24-
<para>Even more so than its predecessor, phpBB 3.3 &quot;Proteus&quot; is highly configurable. You can tune, adjust, or turn off almost all features. To make this load of settings as accessible as possible, we redesigned the Administration Control Panel (ACP) completely. </para>
24+
<para>Even more so than its predecessor, phpBB is highly configurable. You can tune, adjust, or turn off almost all features. To make this load of settings as accessible as possible, we redesigned the Administration Control Panel (ACP) completely. </para>
2525
<para>Click on the <guilabel>Administration Control Panel</guilabel> link on the bottom of the default forum style to visit the <acronym>ACP</acronym>.</para>
2626
<para>The <acronym>ACP</acronym> has seven different sections by default with each containing a number of subsections. We will discuss each section in this Admin Guide. </para>
2727

@@ -146,7 +146,7 @@
146146
<title>Private Messaging</title>
147147
<para><glossterm>Private Messages</glossterm> are a way for registered members to communicate privately through your board without the need to fall back to e-mail or instant messaging. </para>
148148
<para>You can disable this feature with the <guilabel>Private Messaging</guilabel> setting. This will keep the feature turned off for the whole board. You can disable private messages for selected users or groups with <link linkend="acp_permissions">Permissions</link>. Please see the <link linkend="acp_permissions">Permissions section</link> for more information. </para>
149-
<para>Proteus allows users to create own personal folders to organise Private Messages. The <guilabel>Maximum private message folders</guilabel> setting defines the number of message folders they can create. The default value is 4. You can disable the feature with setting value to 0. </para>
149+
<para>phpBB allows users to create own personal folders to organise Private Messages. The <guilabel>Maximum private message folders</guilabel> setting defines the number of message folders they can create. The default value is 4. You can disable the feature with setting value to 0. </para>
150150
<para><guilabel>Max Private Messages Per Box</guilabel> sets the number of Private Messages each folder can contain. The default value is <guilabel>50</guilabel>, Set it to 0 to allow unlimited messages per folder. </para>
151151
<para>If you limit the number of messages users can store in their folders, you need to define a default action that is taken once a folder is full. This can be changed in the &quot;Full Folder Default Action&quot; list. The oldest message gets deleted or the new message will be held back until the folder has place for it. Note that users will be able to choose this for themselves in their PM options and this setting only changes the default value they face. This will not override the action a user chosen. </para>
152152
<para>When sending a private message, it is still possible to edit the message until the recipient reads it. After a sent private message has been read, editing the message is no longer possible. To limit the time a message can be edited before the recipient reads it, you can set the <guilabel>Limit Editing Time</guilabel>. The default value is 0, which allows editing until the message is read. Note that you can disallow users or groups to edit Private Messages after sending through <link linkend="acp_permissions">Permissions</link>. If the permission to edit messages is denied, it will override this setting. </para>
@@ -330,30 +330,37 @@
330330
</itemizedlist>
331331
</section>
332332

333-
<section id="acp_client_jabber">
333+
<section id="acp_client_webpush">
334334
<sectioninfo>
335335
<authorgroup>
336336
<author>
337-
<othername>MennoniteHobbit</othername>
337+
<othername>Marc</othername>
338338
</author>
339339
</authorgroup>
340340
</sectioninfo>
341-
<title>Jabber settings</title>
342-
343-
<para>phpBB3 also has the ability to communicate messages to users via <glossterm>Jabber</glossterm>, your board can be configured to board notifications via Jabber. Here, you can enable and control exactly how your board will use Jabber for communication.</para>
341+
<title>Web Push settings</title>
344342

345-
<note>
346-
<para>Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Note that it may take several seconds to update Jabber account details, so do not stop the script until it has finished!</para>
347-
</note>
343+
<para>phpBB also has the ability to send notifications to users via <glossterm>Web Push</glossterm>. Your board can be configured to board notifications via Web Push.</para>
348344

349345
<itemizedlist>
350-
<title>Jabber settings</title>
351-
<listitem><para><guilabel>Enable Jabber</guilabel>: Set this to <guilabel>Enabled</guilabel> if you want to enable the use of Jabber for messaging and notifications.</para></listitem>
352-
<listitem><para><guilabel>Jabber server</guilabel>: The Jabber server that your board will use. For a list of public servers, see <ulink url="http://www.jabber.org">jabber.org</ulink>'s <ulink url="http://www.jabber.org/user/publicservers.shtml">list of open, public servers</ulink>.</para></listitem>
353-
<listitem><para><guilabel>Jabber port</guilabel>: The port that the Jabber server specified above is located on. Port 5222 is the most common port; if you are unsure about this, leave this value alone.</para></listitem>
354-
<listitem><para><guilabel>Jabber username or JID</guilabel>: The Jabber username or a complete Jabber ID (looks like an e-mail address) that your board will use when connecting to the specified Jabber server. You must specify an already registered account.</para></listitem>
355-
<listitem><para><guilabel>Jabber password</guilabel>: The password for the Jabber username specified above. If the Jabber username is unregistered, phpBB3 will attempt to register the above Jabber username, with this specified value as the password.</para><important><para>This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</para></important></listitem>
356-
<listitem><para><guilabel>Jabber package size</guilabel>: This is the number of messages that can be sent in one package. If this is set to &quot;0&quot;, messages will be sent immediately and is will not be queued for later sending.</para></listitem>
346+
<title>Web Push settings</title>
347+
<listitem>
348+
<para><guilabel>Enable Web Push</guilabel>: Set this to <guilabel>Yes</guilabel> if you want to enable the use of Web Push for notifications.</para>
349+
</listitem>
350+
<listitem>
351+
<para><guilabel>Server identification public key</guilabel>: The Voluntary Application Server Identification (VAPID) public key is shared to authenticate push messages from your site. You can set this manually or generate the key by clicking on the <guilabel>Generate Identification keys</guilabel> button.</para>
352+
<important><para><emphasis>Caution:</emphasis> Modifying the VAPID public key will automatically render all Web Push subscriptions invalid.</para></important>
353+
</listitem>
354+
<listitem>
355+
<para><guilabel>Server identification private key</guilabel>: The Voluntary Application Server Identification (VAPID) private key is used to generate authenticated push messages dispatched from your site. The VAPID private key must form a valid public-private key pair alongside the VAPID public key. You can set this manually or generate the key by clicking on the <guilabel>Generate Identification keys</guilabel> button.</para>
356+
<important><para><emphasis>Caution:</emphasis> Modifying the VAPID private key will automatically render all Web Push subscriptions invalid.</para></important>
357+
</listitem>
358+
<listitem>
359+
<para><guilabel>Enable all user-based web push notification options by default</guilabel>: When this setting is enabled, users who subscribe and allow browser notifications will start receiving them automatically. Users only need to visit the UCP Notification settings to disable any unwanted notifications. If this setting is disabled, users will not receive any notifications, even if they have subscribed, until they visit the UCP Notification settings to enable the specific notification options they wish to receive.</para>
360+
</listitem>
361+
<listitem>
362+
<para><guilabel>Show “Subscribe” button in notification dropdown</guilabel>: Display a “Subscribe” button in the Notification dropdown, allowing users to easily subscribe to push notifications from anywhere in the forum.</para>
363+
</listitem>
357364
</itemizedlist>
358365
</section>
359366
</section>
@@ -739,8 +746,7 @@
739746
</authorgroup>
740747
</sectioninfo>
741748
<title>Subforums</title>
742-
<para>One of the features in phpBB 3.3 is <glossterm>subforums</glossterm>. Especially bulletin boards with a high number of forums will benefit from this. In the simple flat category and forum approach in phpBB 2.0, all forums and categories were listed on the forum index. In Proteus you can now put as many forums, links, or categories as you like inside other forums.</para>
743-
<!-- (TODO: Diagram of a 2.0 / 3.0 comparison) -->
749+
<para>One of the features in phpBB is <glossterm>subforums</glossterm>. Especially bulletin boards with a high number of forums will benefit from this. In the simple flat category and forum approach in phpBB 2.0, all forums and categories were listed on the forum index. In phpBB you can now put as many forums, links, or categories as you like inside other forums.</para>
744750
<para>If you have a forum about pets for instance, you are able to put subforums for cats, dogs, or guinea pigs inside it without making the parent "Pets" forum a category. In this example, only the "Pets" forum will be listed on the index like a normal forum. Its subforums will appear as simple links below the forum description (unless you disabled this).</para>
745751

746752
<figure id="img_acp_subforums_list">
@@ -1899,7 +1905,7 @@
18991905
</authorgroup>
19001906
</sectioninfo>
19011907
<title>Permissions</title>
1902-
<para>On your board, you will need to control what users can and cannot do, and what they can and cannot see. With the flexible and detailed system that Proteus provides, you have an extensive ability to manage permissions. There are five types of permissions in phpBB3:</para>
1908+
<para>On your board, you will need to control what users can and cannot do, and what they can and cannot see. With the flexible and detailed system that phpBB provides, you have an extensive ability to manage permissions. There are five types of permissions in phpBB:</para>
19031909
<itemizedlist>
19041910
<listitem><para>Global User permissions</para></listitem>
19051911
<listitem><para>Global Moderator permissions</para></listitem>

documentation/content/en/chapters/glossary.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,6 @@
180180
</listitem>
181181
</varlistentry>
182182

183-
<varlistentry>
184-
<term>Jabber</term>
185-
<listitem>
186-
<para>Jabber is the former name of Extensible Messaging and Presence Protocol (XMPP) an open-source protocol that can be used for instant messenging. For more information on XMPP's role in phpBB, see <xref linkend="acp_client_jabber" />.</para>
187-
</listitem>
188-
</varlistentry>
189-
190183
<varlistentry>
191184
<term>Listener</term>
192185
<listitem>
@@ -330,6 +323,13 @@
330323
<para>Usergroups are a way of grouping users. This makes it easier to set permissions to many people at the same time (e.g. create a moderator group and give it moderating permissions to a certain forum instead of giving lots of individual people moderating permissions separately). A usergroup has a usergroup moderator (a leader, essentially), who has the ability to add or delete users from the group. Usergroups can be set to hidden, closed or open. If a usergroup is open, users can try requesting membership via the proper page within the <link linkend="user_control_panel">group control panel</link>. phpBB 3.3 has six pre-defined usergroups.</para>
331324
</listitem>
332325
</varlistentry>
326+
327+
<varlistentry>
328+
<term>Web Push</term>
329+
<listitem>
330+
<para>Web Push notifications are messages sent by a website to a user's browser, even when the user is not actively browsing the site. They deliver notifications to all subscribed devices in real-time. For more information on Web Push notifications in phpBB, see <xref linkend="acp_client_webpush" />.</para>
331+
</listitem>
332+
</varlistentry>
333333
</variablelist>
334334
</section>
335335
</chapter>

0 commit comments

Comments
 (0)