Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/416] Allow multiple inclusions of main menu

Browse Source 
B3P-416
This commit is contained in:
Marc Alexander
2014-12-01 21:03:34 +01:00
parent d3bc75ccdf
commit 15fbf01a29
4 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/leaders.php
View File

@@ -47,10 +47,10 @@ class leaders extends module_base
/** @var \phpbb\config\config */
protected $config;
/** @var \phpbb\db\driver */
/** @var \phpbb\db\driver\driver_interface */
protected $db;
/** @var \phpbb\template */
/** @var \phpbb\template\template */
protected $template;
/** @var string PHP file extension */
@@ -67,8 +67,8 @@ class leaders extends module_base
*
* @param \phpbb\auth\auth $auth phpBB auth service
* @param \phpbb\config\config $config phpBB config
* @param \phpbb\db\driver $db phpBB db driver
* @param \phpbb\template $template phpBB template
* @param \phpbb\db\driver\driver_interface $db phpBB db driver
* @param \phpbb\template\template $template phpBB template
* @param string $phpEx php file extension
* @param string $phpbb_root_path phpBB root path
* @param \phpbb\user $user phpBB user object

15
modules/main_menu.php
View File

@@ -57,13 +57,13 @@ class main_menu extends module_base
/** @var \phpbb\config\config */
protected $config;
/** @var \phpbb\db\driver */
/** @var \phpbb\db\driver\driver_interface */
protected $db;
/** @var \phpbb\request\request */
protected $request;
/** @var \phpbb\template */
/** @var \phpbb\template\template */
protected $template;
/** @var string PHP file extension */
@@ -82,9 +82,9 @@ class main_menu extends module_base
* Construct a main menu object
*
* @param \phpbb\config\config $config phpBB config
* @param \phpbb\db\driver $db phpBB db driver
* @param \phpbb\db\driver\driver_interface $db phpBB db driver
* @param \phpbb\request\request $request phpBB request
* @param \phpbb\template $template phpBB template
* @param \phpbb\template\template $template phpBB template
* @param string $phpbb_root_path phpBB root path
* @param string $phpEx php file extension
* @param \phpbb\user $user phpBB user object
@@ -111,6 +111,8 @@ class main_menu extends module_base
$links = $this->utf_unserialize($portal_config['board3_menu_array_' . $module_id]);
$this->template->assign_block_vars('portal_menu', array('MODULE_ID' => $module_id));
// get user's groups
$groups_ary = get_user_groups();
@@ -118,9 +120,8 @@ class main_menu extends module_base
{
if ($links[$i]['type'] == self::LINK_CAT)
{
$this->template->assign_block_vars('portalmenu', array(
$this->template->assign_block_vars('portal_menu.category', array(
'CAT_TITLE' => (isset($this->user->lang[$links[$i]['title']])) ? $this->user->lang[$links[$i]['title']] : $links[$i]['title'],
'MODULE_ID' => $module_id,
));
}
else
@@ -140,7 +141,7 @@ class main_menu extends module_base
if (!empty($permission_check) || $links[$i]['permission'] == '')
{
$this->template->assign_block_vars('portalmenu.links', array(
$this->template->assign_block_vars('portal_menu.category.links', array(
'LINK_TITLE' => (isset($this->user->lang[$links[$i]['title']])) ? $this->user->lang[$links[$i]['title']] : $links[$i]['title'],
'LINK_URL' => $cur_url,
'NEW_WINDOW' => ($links[$i]['type'] != self::LINK_INT && $this->config['board3_menu_url_new_window_' . $module_id]) ? true : false,