Merge pull request #402 from danieltj27/3.3.x

Add link to user customisations page

Author: danieltj27

config/services.yml

@@ -226,6 +226,7 @@ services:
             - '@dbal.conn'
             - '@user'
             - '@template'
+            - '@language'
             - '@phpbb.titania.controller.helper'
             - '@phpbb.titania.access'
             - '@phpbb.titania.contribution.type.collection'

event/main_listener.php

@@ -17,6 +17,7 @@
 use phpbb\event\data;
 use phpbb\auth\auth;
 use phpbb\template\template;
+use phpbb\language\language;
 use phpbb\titania\controller\helper;
 use phpbb\titania\ext;
 use phpbb\user;
@@ -44,6 +45,9 @@ class main_listener implements EventSubscriberInterface
 	/** @var \phpbb\template\template */
 	protected $template;
 
+	/** @var \phpbb\language\language */
+	protected $language;
+
 	/** @var \phpbb\titania\controller\helper */
 	protected $controller_helper;
 
@@ -79,12 +83,13 @@ class main_listener implements EventSubscriberInterface
 	 * @param string $ext_root_path Titania root path
 	 * @param string $php_ext PHP file extension
 	 */
-	public function __construct(request $request, db_driver_interface $db, user $user, template $template, helper $controller_helper, access $access, type_collection $types, $phpbb_root_path, $ext_root_path, $php_ext)
+	public function __construct(request $request, db_driver_interface $db, user $user, template $template, language $language, helper $controller_helper, access $access, type_collection $types, $phpbb_root_path, $ext_root_path, $php_ext)
 	{
 		$this->request = $request;
 		$this->db = $db;
 		$this->user = $user;
 		$this->template = $template;
+		$this->language = $language;
 		$this->controller_helper = $controller_helper;
 		$this->access = $access;
 		$this->types = $types;
@@ -97,16 +102,18 @@ public function __construct(request $request, db_driver_interface $db, user $use
 	static public function getSubscribedEvents()
 	{
 		return array(
-			'core.permissions'							=> 'add_permissions',
-			'kernel.request'							=> array(array('startup', -1)),
-			'core.page_header_after'					=> 'overwrite_template_vars',
-            'core.text_formatter_s9e_configure_after'	=> 'inject_bbcode_code_lang',
+			'core.permissions'									=> 'add_permissions',
+			'kernel.request'									=> array(array('startup', -1)),
+			'core.page_header_after'							=> 'overwrite_template_vars',
+            'core.text_formatter_s9e_configure_after'			=> 'inject_bbcode_code_lang',
 
 			// Check whether a user is removed from a team
-			'core.group_delete_user_after'				=> 'remove_users_from_subscription',
+			'core.group_delete_user_after'						=> 'remove_users_from_subscription',
 
 			// Include quoted text when private messaging
-			'core.ucp_pm_compose_predefined_message'	=> 'quote_text_upon_pm',
+			'core.ucp_pm_compose_predefined_message'			=> 'quote_text_upon_pm',
+
+			'core.memberlist_view_profile'						=> 'add_memberlist_template_vars',
 		);
 	}
 
@@ -406,4 +413,40 @@ public function quote_text_upon_pm($event)
 			}
 		}
 	}
+
+	/**
+	 * Display contribution count and link to Titania profile in memberlist.php.
+	 * @param $event
+	 */
+	public function add_memberlist_template_vars($event)
+	{
+		if (!defined('TITANIA_CONTRIBS_TABLE'))
+		{
+			// Include Titania so we can access the constants
+			require($this->ext_root_path . 'common.' . $this->php_ext);
+		}
+
+		$this->language->add_lang(['memberlist'], 'phpbb/titania');
+
+		$sql = 'SELECT COUNT(contrib_id) as contribs
+		    FROM ' . TITANIA_CONTRIBS_TABLE . '
+		    WHERE contrib_user_id = ' . (int) $event['member']['user_id'] . '
+		      AND contrib_status = 2';
+
+		$result = $this->db->sql_query($sql);
+
+		$u_total_contribs = (int) $this->db->sql_fetchfield('contribs');
+
+		$this->db->sql_freeresult($result);
+
+		$u_user_contribs = $this->controller_helper->route('phpbb.titania.author', array(
+			'author'	=> urlencode($event['member']['username_clean']),
+			'page'		=> 'contributions',
+		));
+
+		$this->template->assign_vars(array(
+			'U_USER_CONTRIB_TOTAL'	=> $u_total_contribs,
+			'U_USER_CONTRIB_LINK'	=> $this->controller_helper->get_real_url($u_user_contribs),
+		));
+	}
 }

language/en/memberlist.php

@@ -0,0 +1,46 @@
+<?php
+/**
+*
+* This file is part of the phpBB Customisation Database package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+$lang = array_merge($lang, array(
+	'USER_TOTAL_CONTRIBUTIONS'			=> 'Total contributions',
+	'SEARCH_USER_CONTRIBUTIONS'			=> 'Search user’s contributions',
+));

styles/all/template/event/memberlist_view_user_statistics_after.html

@@ -0,0 +1,9 @@
+<dt>{{ lang('USER_TOTAL_CONTRIBUTIONS') ~ lang('COLON') }}</dt>
+<dd>
+	{{ U_USER_CONTRIB_TOTAL }} |
+	<strong>
+		<a href="{{ U_USER_CONTRIB_LINK }}">
+			{{ lang('SEARCH_USER_CONTRIBUTIONS') }}
+		</a>
+	</strong>
+</dd>