From 6715774b360ae6a768ebcce407eeb4418339eab1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Fri, 22 Mar 2019 15:42:53 +0100
Subject: [PATCH] Remove Google+ profile field

see #2808
---
 com.woltlab.wcf/userOption.xml                | 11 --------
 .../user/GooglePlusUserOptionOutput.class.php | 27 -------------------
 wcfsetup/install/lang/de.xml                  |  2 --
 wcfsetup/install/lang/en.xml                  |  2 --
 4 files changed, 42 deletions(-)
 delete mode 100644 wcfsetup/install/files/lib/system/option/user/GooglePlusUserOptionOutput.class.php

diff --git a/com.woltlab.wcf/userOption.xml b/com.woltlab.wcf/userOption.xml
index 228ec01e64..bcf8bf6710 100644
--- a/com.woltlab.wcf/userOption.xml
+++ b/com.woltlab.wcf/userOption.xml
@@ -158,17 +158,6 @@
 				<editable>3</editable>
 				<contentpattern>^https?://twitter.com/([A-Za-z0-9_]+)$</contentpattern>
 			</option>
-			<option name="googlePlus">
-				<categoryname>profile.contact</categoryname>
-				<optiontype>text</optiontype>
-				<validationpattern>^$|^\d{21}$|^\+\S[^/]+$</validationpattern>
-				<outputclass>wcf\system\option\user\GooglePlusUserOptionOutput</outputclass>
-				<searchable>1</searchable>
-				<visible>15</visible>
-				<editable>3</editable>
-				<isdisabled>1</isdisabled>
-				<contentpattern>^https?://(?:plus|www).google(?:apis)?.com(?:/\w+/\w+(?:/\w)?)?/(\d{21}|\+\S[^/]+)$</contentpattern>
-			</option>
 			<!-- /profile -->
 			<!-- settings -->
 			<option name="recentActivitiesFilterByFollowing">
diff --git a/wcfsetup/install/files/lib/system/option/user/GooglePlusUserOptionOutput.class.php b/wcfsetup/install/files/lib/system/option/user/GooglePlusUserOptionOutput.class.php
deleted file mode 100644
index 77e684f53b..0000000000
--- a/wcfsetup/install/files/lib/system/option/user/GooglePlusUserOptionOutput.class.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace wcf\system\option\user;
-use wcf\data\user\option\UserOption;
-use wcf\data\user\User;
-use wcf\util\StringUtil;
-
-/**
- * User option output implementation for the output of a google+ user profile.
- * 
- * @author	Jeffrey Reichardt
- * @copyright	2001-2019 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	WoltLabSuite\Core\System\Option\User
- */
-class GooglePlusUserOptionOutput implements IUserOptionOutput {
-	/**
-	 * @inheritDoc
-	 */
-	public function getOutput(User $user, UserOption $option, $value) {
-		if (empty($value)) return '';
-		
-		$url = StringUtil::encodeHTML('https://plus.google.com/'.$value.'/posts');
-		$value = StringUtil::encodeHTML($value);
-		
-		return '<a href="'.$url.'" class="externalURL"'.((EXTERNAL_LINK_REL_NOFOLLOW || EXTERNAL_LINK_TARGET_BLANK) ? (' rel="'.(EXTERNAL_LINK_REL_NOFOLLOW ? 'nofollow' : '').((EXTERNAL_LINK_REL_NOFOLLOW && EXTERNAL_LINK_TARGET_BLANK) ? ' ' : '').(EXTERNAL_LINK_TARGET_BLANK ? 'noopener noreferrer' : '').' me"') : ' rel="me"').(EXTERNAL_LINK_TARGET_BLANK ? ' target="_blank"' : '').'>'.$value.'</a>';
-	}
-}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 6010d0b80f..1e25da72f4 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -5100,8 +5100,6 @@ Benachrichtigungen auf <a href="{link isEmail=true}{/link}">{PAGE_TITLE|language
 		<item name="wcf.user.option.skype"><![CDATA[Skype]]></item>
 		<item name="wcf.user.option.facebook"><![CDATA[Facebook]]></item>
 		<item name="wcf.user.option.twitter"><![CDATA[Twitter]]></item>
-		<item name="wcf.user.option.googlePlus"><![CDATA[Google+]]></item>
-		<item name="wcf.user.option.googlePlus.description"><![CDATA[21-stellige Google-Plus-ID, Google-Plus Benutzername (+Benutzername) oder URL zum Google-Plus-Profil]]></item>
 		<item name="wcf.user.option.canWriteProfileComments"><![CDATA[Kann Pinnwand-Kommentare schreiben]]></item>
 		<item name="wcf.user.option.editorPastePreserveFormatting"><![CDATA[Text-Formatierung beim Einfügen in den Editor übernehmen]]></item>
 		<item name="wcf.user.option.editorPastePreserveFormatting.description"><![CDATA[Die Deaktivierung dieser Option erzwingt das Einfügen aus der Zwischenablage in reiner Textform, Formatierungen werden dabei entfernt.]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 1cdfa162fd..dce74ba33a 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -5099,8 +5099,6 @@ your notifications on <a href="{link isEmail=true}{/link}">{PAGE_TITLE|language}
 		<item name="wcf.user.option.skype"><![CDATA[Skype]]></item>
 		<item name="wcf.user.option.facebook"><![CDATA[Facebook]]></item>
 		<item name="wcf.user.option.twitter"><![CDATA[Twitter]]></item>
-		<item name="wcf.user.option.googlePlus"><![CDATA[Google+]]></item>
-		<item name="wcf.user.option.googlePlus.description"><![CDATA[Enter the 21 digit Google Plus user ID, Google Plus username (+Username), or the URL of your Google Plus profile.]]></item>
 		<item name="wcf.user.option.canWriteProfileComments"><![CDATA[Can Write Comments on My Wall]]></item>
 		<item name="wcf.user.option.editorPastePreserveFormatting"><![CDATA[Preserve text formatting when pasting into the editor]]></item>
 		<item name="wcf.user.option.editorPastePreserveFormatting.description"><![CDATA[Disabling this option will force any content to be pasted from clipboard as plain text, stripping all formatting.]]></item>
-- 
2.20.1