Skip to content

Commit 3449d97

Browse files
author
Dark❶
authored
Member Avatar & Status [MAS] v3.1.0 (#7)
Fix #6 Signed-off-by: Dark❶ <dark-1@users.noreply.github.com>
1 parent bc9f80d commit 3449d97

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+995
-468
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Checklist:
2-
- [ ] Correct branch: `master` for new features & bug fixes or `lang-pack` for Language Packs
2+
- [ ] Correct branch: `master` for new features & bug fixes **or** `lang-pack` for Language Packs
33
- [ ] Tests pass {Ignore this for `lang-pack`}
44
- [ ] Code follows coding guidelines: [phpBB coding guidelines](https://area51.phpbb.com/docs/dev/master/development/coding_guidelines.html)
55

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This Extension Lets Admin to display User's Avatar & it's Online Status on *Inde
66
#### Status Badge for Member Avatar & Status [MAS] on phpBB v3.2.x :
77
![Travis-CI](https://img.shields.io/badge/Travis-CI-8000FF.svg) : [![Build Status](https://travis-ci.com/dark-1/memberavatarstatus.svg?branch=master)](https://travis-ci.com/dark-1/memberavatarstatus)
88
![Scrutinizer-CI](https://img.shields.io/badge/Scrutinizer-CI-8000FF.svg) : [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/dark-1/memberavatarstatus/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/dark-1/memberavatarstatus/?branch=master) [![Build Status](https://scrutinizer-ci.com/g/dark-1/memberavatarstatus/badges/build.png?b=master)](https://scrutinizer-ci.com/g/dark-1/memberavatarstatus/build-status/master)
9-
![Actions-CI](https://img.shields.io/badge/Actions-CI-8000FF.svg) : ![Actions Status](https://github.com/dark-1/memberavatarstatus/workflows/Actions%20CI/badge.svg)
10-
![Shields.IO](https://img.shields.io/badge/Shields-IO-8000FF.svg?style=flat-square) : ![GitHub release](https://img.shields.io/github/release/dark-1/memberavatarstatus.svg?style=flat-square) ![license](https://img.shields.io/github/license/dark-1/memberavatarstatus.svg?style=flat-square) ![Github All Releases](https://img.shields.io/github/downloads/dark-1/memberavatarstatus/total.svg?style=flat-square) [![HitCount](http://hits.dwyl.io/dark-1/memberavatarstatus.svg)](https://github.com/dark-1/memberavatarstatus)
9+
![Actions-CI](https://img.shields.io/badge/Actions-CI-8000FF.svg) : [![Actions Status](https://github.com/dark-1/memberavatarstatus/workflows/Actions%20CI/badge.svg)](https://github.com/dark-1/memberavatarstatus/actions?workflow=Actions%20CI)
10+
![Shields.IO](https://img.shields.io/badge/Shields-IO-8000FF.svg?style=flat-square) : [![GitHub release](https://img.shields.io/github/release/dark-1/memberavatarstatus.svg?style=flat-square) ![license](https://img.shields.io/github/license/dark-1/memberavatarstatus.svg?style=flat-square) ![Github All Releases](https://img.shields.io/github/downloads/dark-1/memberavatarstatus/total.svg?style=flat-square) ![HitCount](http://hits.dwyl.io/dark-1/memberavatarstatus.svg)](https://github.com/dark-1/memberavatarstatus)
1111

1212

1313
## **Features:**
@@ -75,8 +75,8 @@ Detailed phpBB standard Uninstallation of Extensions here : [phpBB Extensions Re
7575

7676

7777
GitHub Repository: [memberavatarstatus](https://github.com/dark-1/memberavatarstatus)
78-
phpBB Customisation Database Extension: [Member Avatar & Status](https://www.phpbb.com/customise/db/extension/member_avatar_status/)
79-
For more Details Go Here : [[3.2][RC] Member Avatar & Status [MAS]](https://www.phpbb.com/community/viewtopic.php?t=2474156)
78+
phpBB Customisation Database Extension: [Member Avatar & Status](https://www.phpbb.com/customise/db/extension/member_avatar_status)
79+
For more Details Go Here : [Member Avatar & Status [MAS]](https://dark-1.github.io/memberavatarstatus)
8080

8181
## License [GPLv2](license.txt)
8282

‎acp/general_info.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
/**
3+
*
4+
* Member Avatar & Status [MAS]. An extension for the phpBB Forum Software package.
5+
*
6+
* @copyright (c) 2018-2019, Dark❶ [dark1]
7+
* @license GNU General Public License, version 2 (GPL-2.0-only)
8+
*
9+
*/
10+
11+
namespace dark1\memberavatarstatus\acp;
12+
13+
/**
14+
* Member Avatar & Status ACP module info.
15+
*/
16+
class general_info
17+
{
18+
public function module()
19+
{
20+
return array(
21+
'filename' => '\dark1\memberavatarstatus\acp\general_module',
22+
'title' => 'ACP_MAS_TITLE',
23+
'modes' => array(
24+
'general' => array(
25+
'title' => 'ACP_MAS_MODE_GENERAL',
26+
'auth' => 'ext_dark1/memberavatarstatus && acl_a_board',
27+
'cat' => array('ACP_MAS_TITLE')
28+
),
29+
),
30+
);
31+
}
32+
}

‎acp/general_module.php‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?php
2+
/**
3+
*
4+
* Member Avatar & Status [MAS]. An extension for the phpBB Forum Software package.
5+
*
6+
* @copyright (c) 2018-2019, Dark❶ [dark1]
7+
* @license GNU General Public License, version 2 (GPL-2.0-only)
8+
*
9+
*/
10+
11+
namespace dark1\memberavatarstatus\acp;
12+
13+
use dark1\memberavatarstatus\core\memberavatarstatus;
14+
15+
/**
16+
* Member Avatar & Status ACP module.
17+
*/
18+
class general_module
19+
{
20+
public $page_title;
21+
public $tpl_name;
22+
public $u_action;
23+
24+
public function main()
25+
{
26+
global $phpbb_container, $config, $request, $template, $user, $language, $phpbb_log;
27+
$mas = $phpbb_container->get('dark1.memberavatarstatus');
28+
$ext_name_mas = 'Member Avatar & Status [MAS]';
29+
$ext_by_dark1 = 'Dark❶ [dark1]';
30+
31+
$user->add_lang_ext('dark1/memberavatarstatus', 'lang_acp_mas');
32+
$this->tpl_name = 'acp_mas_general';
33+
$this->page_title = $language->lang('ACP_MAS_TITLE') . ' - ' . $language->lang('ACP_MAS_MODE_GENERAL');
34+
add_form_key('acp_mas_general');
35+
36+
if ($request->is_set_post('submit'))
37+
{
38+
if (!check_form_key('acp_mas_general'))
39+
{
40+
trigger_error('FORM_INVALID', E_USER_WARNING);
41+
}
42+
43+
// Get Setting from ACP
44+
$config->set('dark1_mas_avatar', $request->variable('dark1_mas_avatar', 0));
45+
$config->set('dark1_mas_online', $request->variable('dark1_mas_online', 0));
46+
$config->set('dark1_mas_col_off', $mas->mas_config_color('off', $request->variable('dark1_mas_col_off', memberavatarstatus::COL_DEF_OFF)));
47+
$config->set('dark1_mas_col_on', $mas->mas_config_color('on', $request->variable('dark1_mas_col_on', memberavatarstatus::COL_DEF_ON)));
48+
49+
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'ACP_MAS_LOG_SET_SAV', time(), array($language->lang('ACP_MAS_MODE_GENERAL')));
50+
trigger_error($language->lang('ACP_MAS_LOG_SET_SAV', $language->lang('ACP_MAS_MODE_GENERAL')) . adm_back_link($this->u_action), E_USER_NOTICE);
51+
}
52+
53+
$template->assign_vars(array(
54+
'U_ACTION' => $this->u_action,
55+
'MAS_EXT_NAME' => $ext_name_mas,
56+
'MAS_EXT_DEV' => $ext_by_dark1,
57+
'MAS_AVATAR' => $config['dark1_mas_avatar'],
58+
'MAS_ONLINE' => $config['dark1_mas_online'],
59+
'MAS_COLOR_OFFLINE' => $config['dark1_mas_col_off'],
60+
'MAS_COLOR_ONLINE' => $config['dark1_mas_col_on'],
61+
));
62+
}
63+
64+
}

‎acp/main_module.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ class main_module
2121

2222
public function main()
2323
{
24-
global $config, $template, $user, $phpbb_admin_path, $phpEx;
24+
global $config, $template, $user, $language, $phpbb_admin_path, $phpEx;
2525
$ext_name_mas = 'Member Avatar & Status [MAS]';
2626
$ext_by_dark1 = 'Dark❶ [dark1]';
2727

2828
$user->add_lang_ext('dark1/memberavatarstatus', 'lang_acp_mas');
2929
$this->tpl_name = 'acp_mas_main';
30-
$this->page_title = $user->lang('ACP_MAS_TITLE') . ' - ' . $user->lang('ACP_MAS_MODE_MAIN');
30+
$this->page_title = $language->lang('ACP_MAS_TITLE') . ' - ' . $language->lang('ACP_MAS_MODE_MAIN');
3131
$main_adm_path = $phpbb_admin_path . 'index.' . $phpEx;
3232

3333
$template->assign_vars(array(
@@ -37,6 +37,11 @@ public function main()
3737
'MAS_PHPBB_LK_OL' => append_sid($main_adm_path, 'i=acp_board&amp;mode=load#load_onlinetrack'),
3838
'MAS_PHPBB_AVATAR' => $config['allow_avatar'],
3939
'MAS_PHPBB_ONLINE' => $config['load_onlinetrack'],
40+
// General
41+
'MAS_AVATAR' => $config['dark1_mas_avatar'],
42+
'MAS_ONLINE' => $config['dark1_mas_online'],
43+
'MAS_COLOR_OFFLINE' => $config['dark1_mas_col_off'],
44+
'MAS_COLOR_ONLINE' => $config['dark1_mas_col_on'],
4045
// MemberList
4146
'MAS_ML_AVATAR' => $config['dark1_mas_ml_av'],
4247
'MAS_ML_AV_SIZE' => $config['dark1_mas_ml_av_sz'],

‎acp/memberlist_module.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ class memberlist_module
2323

2424
public function main()
2525
{
26-
global $phpbb_container, $config, $request, $template, $user, $phpbb_log;
27-
$mas_func = $phpbb_container->get('dark1.memberavatarstatus');
26+
global $phpbb_container, $config, $request, $template, $user, $language, $phpbb_log;
27+
$mas = $phpbb_container->get('dark1.memberavatarstatus');
2828
$ext_name_mas = 'Member Avatar & Status [MAS]';
2929
$ext_by_dark1 = 'Dark❶ [dark1]';
3030

3131
$user->add_lang_ext('dark1/memberavatarstatus', 'lang_acp_mas');
3232
$this->tpl_name = 'acp_mas_memberlist';
33-
$this->page_title = $user->lang('ACP_MAS_TITLE') . ' - ' . $user->lang('ACP_MAS_MODE_MEMBERLIST');
33+
$this->page_title = $language->lang('ACP_MAS_TITLE') . ' - ' . $language->lang('ACP_MAS_MODE_MEMBERLIST');
3434
add_form_key('acp_mas_memberlist');
3535

3636
if ($request->is_set_post('submit'))
@@ -43,20 +43,22 @@ public function main()
4343
// Get Setting from ACP
4444
$config->set('dark1_mas_ml_av', $request->variable('dark1_mas_ml_av', 0));
4545
$config->set('dark1_mas_ml_ol', $request->variable('dark1_mas_ml_ol', 0));
46-
$config->set('dark1_mas_ml_av_sz', $mas_func->mas_get_avatar_size($request->variable('dark1_mas_ml_av_sz', memberavatarstatus::AV_DEF_SZ_BIG), memberavatarstatus::AV_DEF_SZ_BIG, memberavatarstatus::AV_MAX_SZ_BIG));
46+
$config->set('dark1_mas_ml_av_sz', $mas->mas_get_avatar_size($request->variable('dark1_mas_ml_av_sz', memberavatarstatus::AV_DEF_SZ_BIG), memberavatarstatus::AV_DEF_SZ_BIG, memberavatarstatus::AV_MAX_SZ_BIG));
4747

48-
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'ACP_MAS_LOG_SET_SAV', time(), array($user->lang('ACP_MAS_MODE_MEMBERLIST')));
49-
trigger_error(sprintf($user->lang('ACP_MAS_LOG_SET_SAV'), $user->lang('ACP_MAS_MODE_MEMBERLIST')) . adm_back_link($this->u_action), E_USER_NOTICE);
48+
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'ACP_MAS_LOG_SET_SAV', time(), array($language->lang('ACP_MAS_MODE_MEMBERLIST')));
49+
trigger_error($language->lang('ACP_MAS_LOG_SET_SAV', $language->lang('ACP_MAS_MODE_MEMBERLIST')) . adm_back_link($this->u_action), E_USER_NOTICE);
5050
}
5151

5252
$template->assign_vars(array(
5353
'U_ACTION' => $this->u_action,
5454
'MAS_EXT_NAME' => $ext_name_mas,
5555
'MAS_EXT_DEV' => $ext_by_dark1,
56+
'MAS_COLOR_OFFLINE' => $config['dark1_mas_col_off'],
57+
'MAS_COLOR_ONLINE' => $config['dark1_mas_col_on'],
5658
'MAS_ML_AVATAR' => $config['dark1_mas_ml_av'],
5759
'MAS_ML_AV_SIZE' => $config['dark1_mas_ml_av_sz'],
5860
'MAS_ML_ONLINE' => $config['dark1_mas_ml_ol'],
59-
'MAS_NO_AVATAR_IMG' => $mas_func->mas_get_no_avatar_img(),
61+
'MAS_NO_AVATAR_IMG' => $mas->mas_get_no_avatar_img(),
6062
));
6163
}
6264

‎acp/review_module.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ class review_module
2323

2424
public function main()
2525
{
26-
global $phpbb_container, $config, $request, $template, $user, $phpbb_log;
27-
$mas_func = $phpbb_container->get('dark1.memberavatarstatus');
26+
global $phpbb_container, $config, $request, $template, $user, $language, $phpbb_log;
27+
$mas = $phpbb_container->get('dark1.memberavatarstatus');
2828
$ext_name_mas = 'Member Avatar & Status [MAS]';
2929
$ext_by_dark1 = 'Dark❶ [dark1]';
3030

3131
$user->add_lang_ext('dark1/memberavatarstatus', 'lang_acp_mas');
3232
$this->tpl_name = 'acp_mas_review';
33-
$this->page_title = $user->lang('ACP_MAS_TITLE') . ' - ' . $user->lang('ACP_MAS_MODE_REVIEW');
33+
$this->page_title = $language->lang('ACP_MAS_TITLE') . ' - ' . $language->lang('ACP_MAS_MODE_REVIEW');
3434
add_form_key('acp_mas_review');
3535

3636
if ($request->is_set_post('submit'))
@@ -43,20 +43,22 @@ public function main()
4343
// Get Setting from ACP
4444
$config->set('dark1_mas_rv_av', $request->variable('dark1_mas_rv_av', 0));
4545
$config->set('dark1_mas_rv_ol', $request->variable('dark1_mas_rv_ol', 0));
46-
$config->set('dark1_mas_rv_av_sz', $mas_func->mas_get_avatar_size($request->variable('dark1_mas_rv_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
46+
$config->set('dark1_mas_rv_av_sz', $mas->mas_get_avatar_size($request->variable('dark1_mas_rv_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
4747

48-
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'ACP_MAS_LOG_SET_SAV', time(), array($user->lang('ACP_MAS_MODE_REVIEW')));
49-
trigger_error(sprintf($user->lang('ACP_MAS_LOG_SET_SAV'), $user->lang('ACP_MAS_MODE_REVIEW')) . adm_back_link($this->u_action), E_USER_NOTICE);
48+
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'ACP_MAS_LOG_SET_SAV', time(), array($language->lang('ACP_MAS_MODE_REVIEW')));
49+
trigger_error($language->lang('ACP_MAS_LOG_SET_SAV', $language->lang('ACP_MAS_MODE_REVIEW')) . adm_back_link($this->u_action), E_USER_NOTICE);
5050
}
5151

5252
$template->assign_vars(array(
5353
'U_ACTION' => $this->u_action,
5454
'MAS_EXT_NAME' => $ext_name_mas,
5555
'MAS_EXT_DEV' => $ext_by_dark1,
56+
'MAS_COLOR_OFFLINE' => $config['dark1_mas_col_off'],
57+
'MAS_COLOR_ONLINE' => $config['dark1_mas_col_on'],
5658
'MAS_RV_AVATAR' => $config['dark1_mas_rv_av'],
5759
'MAS_RV_AV_SIZE' => $config['dark1_mas_rv_av_sz'],
5860
'MAS_RV_ONLINE' => $config['dark1_mas_rv_ol'],
59-
'MAS_NO_AVATAR_IMG' => $mas_func->mas_get_no_avatar_img(),
61+
'MAS_NO_AVATAR_IMG' => $mas->mas_get_no_avatar_img(),
6062
));
6163
}
6264

‎acp/search_module.php‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ class search_module
2323

2424
public function main()
2525
{
26-
global $phpbb_container, $config, $request, $template, $user, $phpbb_log;
27-
$mas_func = $phpbb_container->get('dark1.memberavatarstatus');
26+
global $phpbb_container, $config, $request, $template, $user, $language, $phpbb_log;
27+
$mas = $phpbb_container->get('dark1.memberavatarstatus');
2828
$ext_name_mas = 'Member Avatar & Status [MAS]';
2929
$ext_by_dark1 = 'Dark❶ [dark1]';
3030

3131
$user->add_lang_ext('dark1/memberavatarstatus', 'lang_acp_mas');
3232
$this->tpl_name = 'acp_mas_search';
33-
$this->page_title = $user->lang('ACP_MAS_TITLE') . ' - ' . $user->lang('ACP_MAS_MODE_SEARCH');
33+
$this->page_title = $language->lang('ACP_MAS_TITLE') . ' - ' . $language->lang('ACP_MAS_MODE_SEARCH');
3434
add_form_key('acp_mas_search');
3535

3636
if ($request->is_set_post('submit'))
@@ -49,18 +49,20 @@ public function main()
4949
$config->set('dark1_mas_sh_up_ol', $request->variable('dark1_mas_sh_up_ol', 0));
5050

5151
// Check Avatar Size Before Assigning
52-
$config->set('dark1_mas_sh_fp_av_sz', $mas_func->mas_get_avatar_size($request->variable('dark1_mas_sh_fp_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
53-
$config->set('dark1_mas_sh_lp_av_sz', $mas_func->mas_get_avatar_size($request->variable('dark1_mas_sh_lp_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
54-
$config->set('dark1_mas_sh_up_av_sz', $mas_func->mas_get_avatar_size($request->variable('dark1_mas_sh_up_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
52+
$config->set('dark1_mas_sh_fp_av_sz', $mas->mas_get_avatar_size($request->variable('dark1_mas_sh_fp_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
53+
$config->set('dark1_mas_sh_lp_av_sz', $mas->mas_get_avatar_size($request->variable('dark1_mas_sh_lp_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
54+
$config->set('dark1_mas_sh_up_av_sz', $mas->mas_get_avatar_size($request->variable('dark1_mas_sh_up_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
5555

56-
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'ACP_MAS_LOG_SET_SAV', time(), array($user->lang('ACP_MAS_MODE_SEARCH')));
57-
trigger_error(sprintf($user->lang('ACP_MAS_LOG_SET_SAV'), $user->lang('ACP_MAS_MODE_SEARCH')) . adm_back_link($this->u_action), E_USER_NOTICE);
56+
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'ACP_MAS_LOG_SET_SAV', time(), array($language->lang('ACP_MAS_MODE_SEARCH')));
57+
trigger_error($language->lang('ACP_MAS_LOG_SET_SAV', $language->lang('ACP_MAS_MODE_SEARCH')) . adm_back_link($this->u_action), E_USER_NOTICE);
5858
}
5959

6060
$template->assign_vars(array(
6161
'U_ACTION' => $this->u_action,
6262
'MAS_EXT_NAME' => $ext_name_mas,
6363
'MAS_EXT_DEV' => $ext_by_dark1,
64+
'MAS_COLOR_OFFLINE' => $config['dark1_mas_col_off'],
65+
'MAS_COLOR_ONLINE' => $config['dark1_mas_col_on'],
6466
'MAS_SH_FP_AVATAR' => $config['dark1_mas_sh_fp_av'],
6567
'MAS_SH_FP_AV_SIZE' => $config['dark1_mas_sh_fp_av_sz'],
6668
'MAS_SH_FP_ONLINE' => $config['dark1_mas_sh_fp_ol'],
@@ -70,7 +72,7 @@ public function main()
7072
'MAS_SH_UP_AVATAR' => $config['dark1_mas_sh_up_av'],
7173
'MAS_SH_UP_AV_SIZE' => $config['dark1_mas_sh_up_av_sz'],
7274
'MAS_SH_UP_ONLINE' => $config['dark1_mas_sh_up_ol'],
73-
'MAS_NO_AVATAR_IMG' => $mas_func->mas_get_no_avatar_img(),
75+
'MAS_NO_AVATAR_IMG' => $mas->mas_get_no_avatar_img(),
7476
));
7577
}
7678

‎acp/viewforum_module.php‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ class viewforum_module
2323

2424
public function main()
2525
{
26-
global $phpbb_container, $config, $request, $template, $user, $phpbb_log;
27-
$mas_func = $phpbb_container->get('dark1.memberavatarstatus');
26+
global $phpbb_container, $config, $request, $template, $user, $language, $phpbb_log;
27+
$mas = $phpbb_container->get('dark1.memberavatarstatus');
2828
$ext_name_mas = 'Member Avatar & Status [MAS]';
2929
$ext_by_dark1 = 'Dark❶ [dark1]';
3030

3131
$user->add_lang_ext('dark1/memberavatarstatus', 'lang_acp_mas');
3232
$this->tpl_name = 'acp_mas_viewforum';
33-
$this->page_title = $user->lang('ACP_MAS_TITLE') . ' - ' . $user->lang('ACP_MAS_MODE_VIEWFORUM');
33+
$this->page_title = $language->lang('ACP_MAS_TITLE') . ' - ' . $language->lang('ACP_MAS_MODE_VIEWFORUM');
3434
add_form_key('acp_mas_viewforum');
3535

3636
if ($request->is_set_post('submit'))
@@ -47,24 +47,26 @@ public function main()
4747
$config->set('dark1_mas_vf_lp_ol', $request->variable('dark1_mas_vf_lp_ol', 0));
4848

4949
// Check Avatar Size Before Assigning
50-
$config->set('dark1_mas_vf_fp_av_sz', $mas_func->mas_get_avatar_size($request->variable('dark1_mas_vf_fp_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
51-
$config->set('dark1_mas_vf_lp_av_sz', $mas_func->mas_get_avatar_size($request->variable('dark1_mas_vf_lp_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
50+
$config->set('dark1_mas_vf_fp_av_sz', $mas->mas_get_avatar_size($request->variable('dark1_mas_vf_fp_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
51+
$config->set('dark1_mas_vf_lp_av_sz', $mas->mas_get_avatar_size($request->variable('dark1_mas_vf_lp_av_sz', memberavatarstatus::AV_DEF_SZ_SML), memberavatarstatus::AV_DEF_SZ_SML, memberavatarstatus::AV_MAX_SZ_SML));
5252

53-
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'ACP_MAS_LOG_SET_SAV', time(), array($user->lang('ACP_MAS_MODE_VIEWFORUM')));
54-
trigger_error(sprintf($user->lang('ACP_MAS_LOG_SET_SAV'), $user->lang('ACP_MAS_MODE_VIEWFORUM')) . adm_back_link($this->u_action), E_USER_NOTICE);
53+
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'ACP_MAS_LOG_SET_SAV', time(), array($language->lang('ACP_MAS_MODE_VIEWFORUM')));
54+
trigger_error($language->lang('ACP_MAS_LOG_SET_SAV', $language->lang('ACP_MAS_MODE_VIEWFORUM')) . adm_back_link($this->u_action), E_USER_NOTICE);
5555
}
5656

5757
$template->assign_vars(array(
5858
'U_ACTION' => $this->u_action,
5959
'MAS_EXT_NAME' => $ext_name_mas,
6060
'MAS_EXT_DEV' => $ext_by_dark1,
61+
'MAS_COLOR_OFFLINE' => $config['dark1_mas_col_off'],
62+
'MAS_COLOR_ONLINE' => $config['dark1_mas_col_on'],
6163
'MAS_VF_FP_AVATAR' => $config['dark1_mas_vf_fp_av'],
6264
'MAS_VF_FP_AV_SIZE' => $config['dark1_mas_vf_fp_av_sz'],
6365
'MAS_VF_FP_ONLINE' => $config['dark1_mas_vf_fp_ol'],
6466
'MAS_VF_LP_AVATAR' => $config['dark1_mas_vf_lp_av'],
6567
'MAS_VF_LP_AV_SIZE' => $config['dark1_mas_vf_lp_av_sz'],
6668
'MAS_VF_LP_ONLINE' => $config['dark1_mas_vf_lp_ol'],
67-
'MAS_NO_AVATAR_IMG' => $mas_func->mas_get_no_avatar_img(),
69+
'MAS_NO_AVATAR_IMG' => $mas->mas_get_no_avatar_img(),
6870
));
6971
}
7072

0 commit comments

Comments
 (0)