From f7f80a424f15ce0ffb257c4fccf22217012acb41 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Mon, 9 Jun 2014 22:55:13 +0200
Subject: [PATCH 1/9] [ticket/12680] Adds alternative text to contact icon in
 viewtopic.php

PHPBB3-12680
---
 phpBB/styles/prosilver/template/viewtopic_body.html | 2 +-
 phpBB/styles/prosilver/theme/buttons.css            | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index fb0b9733e7..b4eb521c47 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -164,7 +164,7 @@
 									<div>
 								<!-- ENDIF -->
 									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 550, 320); return false;"<!-- ENDIF -->>
-										<span class="contact-icon {postrow.contact.ID}-icon"></span>
+										<span class="contact-icon {postrow.contact.ID}-icon"><span>{postrow.contact.NAME}</span></span>
 									</a>
 								<!-- IF REMAINDER eq 3 or postrow.contact.S_LAST_ROW -->
 									</div>
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 19cb547bd4..c35ff7922c 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -133,6 +133,14 @@ ul.linklist.bulletin li.small-icon:before {
 	clear: left;
 }
 
+.contact-icons span.contact-icon  span{
+	display: block;
+	height: 0;
+	overflow: hidden;
+	position: absolute;
+	width: 1px;
+}
+
 /* Profile icons */
 .pm-icon		{ background-position: 0 0; }
 .email-icon		{ background-position: -21px 0; }

From 2d90c754fe63c59db8b3d394441f5980a165cfd6 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Mon, 9 Jun 2014 23:25:34 +0200
Subject: [PATCH 2/9] [ticket/12680] Adds second alternativ text and font-size:
 0 to remove text

PHPBB3-12680
---
 phpBB/styles/prosilver/template/viewtopic_body.html | 4 ++--
 phpBB/styles/prosilver/theme/buttons.css            | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index b4eb521c47..b31927ebe0 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -153,7 +153,7 @@
 			<dd class="profile-contact">
 				<strong>{L_CONTACT}{L_COLON}</strong>
 				<div class="dropdown-container dropdown-left">
-					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a>
+					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{L_CONTACT}{L_COLON} {postrow.POST_AUTHOR}">{L_CONTACT}{L_COLON} {postrow.POST_AUTHOR}</span></a>
 					<div class="dropdown hidden">
 						<div class="pointer"><div class="pointer-inner"></div></div>
 						<div class="dropdown-contents contact-icons">
@@ -164,7 +164,7 @@
 									<div>
 								<!-- ENDIF -->
 									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 550, 320); return false;"<!-- ENDIF -->>
-										<span class="contact-icon {postrow.contact.ID}-icon"><span>{postrow.contact.NAME}</span></span>
+										<span class="contact-icon {postrow.contact.ID}-icon">{postrow.contact.NAME}</span>
 									</a>
 								<!-- IF REMAINDER eq 3 or postrow.contact.S_LAST_ROW -->
 									</div>
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index c35ff7922c..0cf1fb6bf1 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -105,6 +105,7 @@ ul.linklist.bulletin li.small-icon:before {
 .contact-icons.dropdown-contents {
 	min-width: 0;
 	padding: 0;
+	font-size: 0;
 }
 
 .contact-icon {
@@ -133,14 +134,6 @@ ul.linklist.bulletin li.small-icon:before {
 	clear: left;
 }
 
-.contact-icons span.contact-icon  span{
-	display: block;
-	height: 0;
-	overflow: hidden;
-	position: absolute;
-	width: 1px;
-}
-
 /* Profile icons */
 .pm-icon		{ background-position: 0 0; }
 .email-icon		{ background-position: -21px 0; }

From 02c53595b5cb3a19154e88f51e46663ced0f6cc7 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Tue, 10 Jun 2014 19:22:59 +0200
Subject: [PATCH 3/9] [ticket/12680] Adds alternativ text with new variable to
 contact:

PHPBB3-12680
---
 phpBB/styles/prosilver/template/viewtopic_body.html | 2 +-
 phpBB/viewtopic.php                                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index b31927ebe0..82d0a05885 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -153,7 +153,7 @@
 			<dd class="profile-contact">
 				<strong>{L_CONTACT}{L_COLON}</strong>
 				<div class="dropdown-container dropdown-left">
-					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{L_CONTACT}{L_COLON} {postrow.POST_AUTHOR}">{L_CONTACT}{L_COLON} {postrow.POST_AUTHOR}</span></a>
+					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{postrow.CONTACT_USER}">{postrow.CONTACT_USER}</span></a>
 					<div class="dropdown hidden">
 						<div class="pointer"><div class="pointer-inner"></div></div>
 						<div class="dropdown-contents contact-icons">
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 789d53c676..0845ed0039 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1061,6 +1061,7 @@ while ($row = $db->sql_fetchrow($result))
 		'post_time'			=> $row['post_time'],
 		'user_id'			=> $row['user_id'],
 		'username'			=> $row['username'],
+		'contact_user' 		=> $user->lang('CONTACT_USER', $row['username']),
 		'user_colour'		=> $row['user_colour'],
 		'topic_id'			=> $row['topic_id'],
 		'forum_id'			=> $row['forum_id'],
@@ -1698,6 +1699,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'POSTER_AVATAR'		=> $user_cache[$poster_id]['avatar'],
 		'POSTER_WARNINGS'	=> $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '',
 		'POSTER_AGE'		=> $user_cache[$poster_id]['age'],
+		'CONTACT_USER'	=> $user->lang($row['contact_user']),
 
 		'POST_DATE'			=> $user->format_date($row['post_time'], false, ($view == 'print') ? true : false),
 		'POST_SUBJECT'		=> $row['post_subject'],

From af60861cfd13d1226776ecf85a163a4061a731b5 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Tue, 10 Jun 2014 19:34:32 +0200
Subject: [PATCH 4/9] [ticket/12680] Removes unnessesary $user->lang from
 CONTACT_USER

PHPBB3-12680
---
 phpBB/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 0845ed0039..be35b7baa0 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1699,7 +1699,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'POSTER_AVATAR'		=> $user_cache[$poster_id]['avatar'],
 		'POSTER_WARNINGS'	=> $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '',
 		'POSTER_AGE'		=> $user_cache[$poster_id]['age'],
-		'CONTACT_USER'	=> $user->lang($row['contact_user']),
+		'CONTACT_USER'		=> $row['contact_user'],
 
 		'POST_DATE'			=> $user->format_date($row['post_time'], false, ($view == 'print') ? true : false),
 		'POST_SUBJECT'		=> $row['post_subject'],

From 8a5cb4a026e9e3f9f687cb192c2f10806a3f14f1 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sat, 14 Jun 2014 15:57:20 +0200
Subject: [PATCH 5/9] [ticket/12680] Little changes, but some issues are still
 there

PHPBB3-12680
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php               | 1 +
 phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 4 ++--
 phpBB/viewtopic.php                                     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index fc568abc68..11a0f59874 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -204,6 +204,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'AUTHOR_AVATAR'		=> (isset($user_info['avatar'])) ? $user_info['avatar'] : '',
 		'AUTHOR_JOINED'		=> $user->format_date($user_info['user_regdate']),
 		'AUTHOR_POSTS'		=> (int) $user_info['user_posts'],
+		'CONTACT_USER'		=> $user->lang('CONTACT_USER' . get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username'])), //$row['contact_user'],
 
 		'ONLINE_IMG'		=> (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('icon_user_online', $user->lang['ONLINE']) : $user->img('icon_user_offline', $user->lang['OFFLINE'])),
 		'S_ONLINE'			=> (!$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false),
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 84ab6ecb44..9f33bc04f7 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -38,7 +38,7 @@
 			<dd class="profile-contact">
 				<strong>{L_CONTACT}{L_COLON}</strong>
 				<div class="dropdown-container dropdown-left">
-					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a>
+					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{CONTACT_USER}">{CONTACT_USER}</span></a>
 					<div class="dropdown hidden">
 						<div class="pointer"><div class="pointer-inner"></div></div>
 						<div class="dropdown-contents contact-icons">
@@ -49,7 +49,7 @@
 									<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, 550, 320); return false;"<!-- ENDIF -->>
-										<span class="contact-icon {contact.ID}-icon"></span>
+										<span class="contact-icon {contact.ID}-icon">{contact.NAME}</span>
 									</a>
 								<!-- IF REMAINDER eq 3 or contact.S_LAST_ROW -->
 									</div>
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index be35b7baa0..10be5a09cb 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1061,7 +1061,6 @@ while ($row = $db->sql_fetchrow($result))
 		'post_time'			=> $row['post_time'],
 		'user_id'			=> $row['user_id'],
 		'username'			=> $row['username'],
-		'contact_user' 		=> $user->lang('CONTACT_USER', $row['username']),
 		'user_colour'		=> $row['user_colour'],
 		'topic_id'			=> $row['topic_id'],
 		'forum_id'			=> $row['forum_id'],
@@ -1198,6 +1197,7 @@ while ($row = $db->sql_fetchrow($result))
 
 				'username'			=> $row['username'],
 				'user_colour'		=> $row['user_colour'],
+				'contact_user' 		=> $user->lang('CONTACT_USER', $row['username']),
 
 				'online'		=> false,
 				'jabber'		=> ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
@@ -1699,7 +1699,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'POSTER_AVATAR'		=> $user_cache[$poster_id]['avatar'],
 		'POSTER_WARNINGS'	=> $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '',
 		'POSTER_AGE'		=> $user_cache[$poster_id]['age'],
-		'CONTACT_USER'		=> $row['contact_user'],
+		'CONTACT_USER'		=> $user_cache_data['contact_user'],
 
 		'POST_DATE'			=> $user->format_date($row['post_time'], false, ($view == 'print') ? true : false),
 		'POST_SUBJECT'		=> $row['post_subject'],

From 05ae46acdc90c35bd8b038b6848066d80e403feb Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sun, 15 Jun 2014 16:13:29 +0200
Subject: [PATCH 6/9] [ticket/12680] Still some problems with displaying the
 nickname in ucp

PHPBB3-12680
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 +-
 phpBB/viewtopic.php                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 11a0f59874..4f3de83c68 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -204,7 +204,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'AUTHOR_AVATAR'		=> (isset($user_info['avatar'])) ? $user_info['avatar'] : '',
 		'AUTHOR_JOINED'		=> $user->format_date($user_info['user_regdate']),
 		'AUTHOR_POSTS'		=> (int) $user_info['user_posts'],
-		'CONTACT_USER'		=> $user->lang('CONTACT_USER' . get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username'])), //$row['contact_user'],
+		'CONTACT_USER'		=> $user->lang('CONTACT_USER', $user_info['username']),
 
 		'ONLINE_IMG'		=> (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('icon_user_online', $user->lang['ONLINE']) : $user->img('icon_user_offline', $user->lang['OFFLINE'])),
 		'S_ONLINE'			=> (!$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false),
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 10be5a09cb..daa3b2476a 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1699,7 +1699,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'POSTER_AVATAR'		=> $user_cache[$poster_id]['avatar'],
 		'POSTER_WARNINGS'	=> $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '',
 		'POSTER_AGE'		=> $user_cache[$poster_id]['age'],
-		'CONTACT_USER'		=> $user_cache_data['contact_user'],
+		'CONTACT_USER'		=> $user_cache[$poster_id]['contact_user'],
 
 		'POST_DATE'			=> $user->format_date($row['post_time'], false, ($view == 'print') ? true : false),
 		'POST_SUBJECT'		=> $row['post_subject'],

From 453f2904c23ddcfe98a8db1dbdbe5c09f74c0717 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Mon, 23 Jun 2014 19:38:44 +0200
Subject: [PATCH 7/9] [ticket/12680] Solves last bugs. viewprofile: contact -->
 contact nickname

PHPBB3-12680
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 +-
 phpBB/language/en/memberlist.php          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 4f3de83c68..f42200d249 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -204,7 +204,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'AUTHOR_AVATAR'		=> (isset($user_info['avatar'])) ? $user_info['avatar'] : '',
 		'AUTHOR_JOINED'		=> $user->format_date($user_info['user_regdate']),
 		'AUTHOR_POSTS'		=> (int) $user_info['user_posts'],
-		'CONTACT_USER'		=> $user->lang('CONTACT_USER', $user_info['username']),
+		'CONTACT_USER'		=> $user->lang('CONTACT_USER', get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username'])),
 
 		'ONLINE_IMG'		=> (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('icon_user_online', $user->lang['ONLINE']) : $user->img('icon_user_offline', $user->lang['OFFLINE'])),
 		'S_ONLINE'			=> (!$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false),
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index d900ababd1..7e897e83af 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -49,7 +49,6 @@ $lang = array_merge($lang, array(
 	'BEFORE'				=> 'Before',
 
 	'CC_EMAIL'				=> 'Send a copy of this email to yourself.',
-	'CONTACT_USER'			=> 'Contact',
 	'CONTACT_ADMIN'			=> 'Contact a Board Administrator',
 
 	'DEST_LANG'				=> 'Language',

From 8984dc610348d7567e5b297c9923286d0c72ae5b Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Mon, 23 Jun 2014 20:12:12 +0200
Subject: [PATCH 8/9] [ticket/12680] Brings back get_username_string()

PHPBB3-12680
---
 phpBB/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index daa3b2476a..34d571531d 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1197,7 +1197,7 @@ while ($row = $db->sql_fetchrow($result))
 
 				'username'			=> $row['username'],
 				'user_colour'		=> $row['user_colour'],
-				'contact_user' 		=> $user->lang('CONTACT_USER', $row['username']),
+				'contact_user' 		=> $user->lang('CONTACT_USER', get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['username'])),
 
 				'online'		=> false,
 				'jabber'		=> ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',

From aff67b99b5f1fcb2df20e0adc47e13aa0f4f695e Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Mon, 23 Jun 2014 20:49:25 +0200
Subject: [PATCH 9/9] [ticket/12680] Adds variable for guest user

PHPBB3-12680
---
 phpBB/viewtopic.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 34d571531d..7c86f89522 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1140,6 +1140,7 @@ while ($row = $db->sql_fetchrow($result))
 
 				'username'			=> $row['username'],
 				'user_colour'		=> $row['user_colour'],
+				'contact_user'		=> '',
 
 				'warnings'			=> 0,
 				'allow_pm'			=> 0,