[ticket/17493] Remove more jabber remainders

PHPBB-17493

phpBB/includes/functions_posting.php

@@ -2381,7 +2381,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data
 				VALUES (' . $user->data['user_id'] . ', ' . $data_ary['topic_id'] . ')';
 			$db->sql_query($sql);
 		}
-		else if (($config['email_enable'] || $config['jab_enable']) && $data_ary['notify_set'] && !$data_ary['notify'])
+		else if ($config['email_enable'] && $data_ary['notify_set'] && !$data_ary['notify'])
 		{
 			$sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . '
 				WHERE user_id = ' . $user->data['user_id'] . '

phpBB/includes/questionnaire/questionnaire.php

@@ -366,9 +366,6 @@ class phpbb_questionnaire_phpbb_data_provider
 			'img_max_width' => true,
 			'img_min_thumb_filesize' => true,
 			'ip_check' => true,
-			'jab_enable' => true,
-			'jab_package_size' => true,
-			'jab_use_ssl' => true,
 			'limit_load' => true,
 			'limit_search_load' => true,
 			'load_anon_lastread' => true,

phpBB/phpbb/messenger/queue.php

@@ -64,7 +64,7 @@ class queue
 	/**
 	 * Init a queue object
 	 *
-	 * @param string $object 	Queue object type: email/jabber/etc
+	 * @param string $object 	Queue object type: email/etc
 	 * @param int $package_size Size of the messenger package to send
 	 * @return void
 	 */
@@ -78,7 +78,7 @@ class queue
 	/**
 	 * Put message into the messenger file queue
 	 *
-	 * @param string $object 		Queue object type: email/jabber/etc
+	 * @param string $object 		Queue object type: email/etc
 	 * @param array $message_data	Message data to send
 	 * @return void
 	 */

phpBB/phpbb/notification/manager.php

@@ -708,7 +708,7 @@ class manager
 	*
 	* @param string $item_type Type identifier of the subscription
 	* @param int $item_id The id of the item
-	* @param string $method The method of the notification e.g. 'board', 'email', or 'jabber'
+	* @param string $method The method of the notification e.g. 'board', 'email'
 	*                       (if null a subscription will be added for all the defaults methods)
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
 	*/
@@ -765,7 +765,7 @@ class manager
 	*
 	* @param string $item_type Type identifier of the subscription
 	* @param int $item_id The id of the item
-	* @param string $method The method of the notification e.g. 'board', 'email', or 'jabber'
+	* @param string $method The method of the notification e.g. 'board', 'email'
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
 	*/
 	public function delete_subscription($item_type, $item_id = 0, $method = null, $user_id = false)

phpBB/phpbb/notification/method/messenger_base.php

@@ -18,7 +18,7 @@ use phpbb\di\service_collection;
 use phpbb\user_loader;
 
 /**
-* Abstract notification method handling email and jabber notifications
+* Abstract notification method handling messenger notifications
 * using the phpBB messenger.
 */
 abstract class messenger_base extends \phpbb\notification\method\base

phpBB/phpbb/notification/type/base.php

@@ -327,10 +327,7 @@ abstract class base implements \phpbb\notification\type\type_interface
 	*/
 
 	/**
-	* URL to unsubscribe to this notification (fall back)
+	* {@inheritDoc}
-	*
-	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
-	* @return false
 	*/
 	public function get_unsubscribe_url($method = false)
 	{

phpBB/phpbb/notification/type/type_interface.php

@@ -132,7 +132,7 @@ interface type_interface
 	/**
 	* URL to unsubscribe to this notification
 	*
-	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
+	* @param string|bool $method Method name to unsubscribe from (email|etc), False to unsubscribe from all notifications for this item
 	*/
 	public function get_unsubscribe_url($method);
 

phpBB/styles/prosilver/template/ucp_pm_viewmessage.html

@@ -70,7 +70,7 @@
 									<!-- IF REMAINDER eq 0 -->
 										<div>
 									<!-- ENDIF -->
-										<a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
+										<a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF -->>
 											{% if contact.ID == 'pm' %}
 												{{ Icon('font', 'message', '', true, 'far contact-icon') }}
 											{% elseif contact.ID == 'email' %}

phpBB/styles/prosilver/template/viewtopic_body.html

@@ -191,7 +191,7 @@
 								<!-- IF REMAINDER eq 0 -->
 									<div>
 								<!-- ENDIF -->
-									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
+									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF -->>
 										{% EVENT viewtopic_body_contact_icon_prepend %}
 										{% if postrow.contact.ID == 'pm' %}
 											{{ Icon('font', 'message', '', true, 'far contact-icon') }}