From 0845725ded2e2fe8e951a0b10d58dd8e83841906 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Sep 2015 18:18:48 +0200 Subject: [PATCH 1/6] [ticket/649] Use phpbb_get_user_rank() instead of deprecated function B3P-649 --- modules/random_member.php | 9 ++++----- modules/user_menu.php | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/modules/random_member.php b/modules/random_member.php index 9a34aba8..b3ce2f65 100644 --- a/modules/random_member.php +++ b/modules/random_member.php @@ -108,8 +108,7 @@ class random_member extends module_base $avatar_img = phpbb_get_avatar(\phpbb\avatar\manager::clean_row($row, 'user'), 'USER_AVATAR'); - $rank_title = $rank_img = $rank_img_src = ''; - get_user_rank($row['user_rank'], $row['user_posts'], $rank_title, $rank_img, $rank_img_src); + $rank_data = phpbb_get_user_rank($row, $row['user_posts']); $username = $row['username']; $user_id = (int) $row['user_id']; @@ -121,9 +120,9 @@ class random_member extends module_base 'USER_COLOR' => get_username_string('colour', $user_id, $username, $colour), 'U_VIEW_PROFILE' => get_username_string('profile', $user_id, $username, $colour), - 'RANK_TITLE' => $rank_title, - 'RANK_IMG' => $rank_img, - 'RANK_IMG_SRC' => $rank_img_src, + 'RANK_TITLE' => $rank_data['title'], + 'RANK_IMG' => $rank_data['img'], + 'RANK_IMG_SRC' => $rank_data['img_src'], 'USER_POSTS' => (int) $row['user_posts'], 'AVATAR_IMG' => $avatar_img, diff --git a/modules/user_menu.php b/modules/user_menu.php index fa64b579..9c51eec8 100644 --- a/modules/user_menu.php +++ b/modules/user_menu.php @@ -99,7 +99,7 @@ class user_menu extends module_base */ public function get_template_side($module_id) { - if (!function_exists('get_user_rank')) + if (!function_exists('phpbb_get_user_rank')) { include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); } @@ -147,8 +147,7 @@ class user_menu extends module_base $username = $this->user->data['username']; $colour = $this->user->data['user_colour']; $avatar_img = phpbb_get_avatar(\phpbb\avatar\manager::clean_row($this->user->data, 'user'), 'USER_AVATAR'); - $rank_title = $rank_img = $rank_img_src = ''; - \get_user_rank($this->user->data['user_rank'], $this->user->data['user_posts'], $rank_title, $rank_img, $rank_img_src); + $rank_data = phpbb_get_user_rank($this->user->data, $this->user->data['user_posts']); // Assign specific vars $this->template->assign_vars(array( @@ -157,9 +156,9 @@ class user_menu extends module_base 'L_UNREAD_POSTS'=> $this->user->lang['SEARCH_UNREAD'] . ' (' . $unread_posts_count . ')', 'B3P_AVATAR_IMG' => $avatar_img, - 'B3P_RANK_TITLE' => $rank_title, - 'B3P_RANK_IMG' => $rank_img, - 'RANK_IMG_SRC' => $rank_img_src, + 'B3P_RANK_TITLE' => $rank_data['title'], + 'B3P_RANK_IMG' => $rank_data['img'], + 'RANK_IMG_SRC' => $rank_data['img_src'], 'USERNAME_FULL' => get_username_string('full', $user_id, $username, $colour), 'U_VIEW_PROFILE' => get_username_string('profile', $user_id, $username, $colour), From 12781a6fc865c32ddacedf80bea40037bccf8ccf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Sep 2015 23:03:10 +0200 Subject: [PATCH 2/6] [ticket/649] Properly load language for permission settings in ACP B3P-649 --- event/listener.php | 14 +++++++++++ language/de/info_acp_portal.php | 4 --- language/de/permissions_portal.php | 39 ++++++++++++++++++++++++++++++ language/en/info_acp_portal.php | 4 --- language/en/permissions_portal.php | 39 ++++++++++++++++++++++++++++++ language/es/info_acp_portal.php | 4 --- language/es/permissions_portal.php | 39 ++++++++++++++++++++++++++++++ language/fr/info_acp_portal.php | 4 --- language/fr/permissions_portal.php | 39 ++++++++++++++++++++++++++++++ language/it/info_acp_portal.php | 4 --- language/it/permissions_portal.php | 39 ++++++++++++++++++++++++++++++ language/nl/info_acp_portal.php | 3 --- language/nl/permissions_portal.php | 39 ++++++++++++++++++++++++++++++ 13 files changed, 248 insertions(+), 23 deletions(-) create mode 100644 language/de/permissions_portal.php create mode 100644 language/en/permissions_portal.php create mode 100644 language/es/permissions_portal.php create mode 100644 language/fr/permissions_portal.php create mode 100644 language/it/permissions_portal.php create mode 100644 language/nl/permissions_portal.php diff --git a/event/listener.php b/event/listener.php index 0e757959..9dff8417 100644 --- a/event/listener.php +++ b/event/listener.php @@ -72,6 +72,7 @@ class listener implements EventSubscriberInterface 'core.user_setup' => 'load_portal_language', 'core.viewonline_overwrite_location' => 'viewonline_page', 'core.page_header' => 'add_portal_link', + 'core.permissions event' => 'load_permissions', ); } @@ -175,4 +176,17 @@ class listener implements EventSubscriberInterface { return $this->config['board_disable'] && !defined('SKIP_CHECK_DISABLED') && !$this->auth->acl_gets('a_', 'm_') && !$this->auth->acl_getf_global('m_'); } + + /** + * Load permissions into permissions array + * + * @param array $event Event data + */ + protected function load_permissions($event) + { + $permissions = $event['permissions']; + $permissions['a_manage_portal'] = array('lang' => 'ACL_A_MANAGE_PORTAL', 'cat' => 'misc'); + $permissions['u_view_portal'] = array('lang' => 'ACL_U_VIEW_PORTAL', 'cat' => 'misc'); + $event['permissions'] = $permissions; + } } diff --git a/language/de/info_acp_portal.php b/language/de/info_acp_portal.php index abc31f1e..1790fc83 100644 --- a/language/de/info_acp_portal.php +++ b/language/de/info_acp_portal.php @@ -47,8 +47,4 @@ $lang = array_merge($lang, array( 'LOG_PORTAL_EVENT_UPDATED' => 'Portal-Einstellungen geändert
» Termin geändert: %s ', 'LOG_PORTAL_EVENT_REMOVED' => 'Portal-Einstellungen geändert
» Termin gelöscht: %s ', 'LOG_PORTAL_CONFIG' => 'Portal-Einstellungen geändert
» %s', - - // Adding the permissions - 'ACL_A_MANAGE_PORTAL' => 'Kann Portal-Einstellungen ändern', - 'ACL_U_VIEW_PORTAL' => 'Kann das Portal sehen', )); diff --git a/language/de/permissions_portal.php b/language/de/permissions_portal.php new file mode 100644 index 00000000..59aeb3b4 --- /dev/null +++ b/language/de/permissions_portal.php @@ -0,0 +1,39 @@ + 'Kann Portal-Einstellungen ändern', + 'ACL_U_VIEW_PORTAL' => 'Kann das Portal sehen', +)); diff --git a/language/en/info_acp_portal.php b/language/en/info_acp_portal.php index 68680bbd..52b14f8a 100644 --- a/language/en/info_acp_portal.php +++ b/language/en/info_acp_portal.php @@ -46,8 +46,4 @@ $lang = array_merge($lang, array( 'LOG_PORTAL_EVENT_UPDATED' => 'Altered Portal settings
» Event updated: %s ', 'LOG_PORTAL_EVENT_REMOVED' => 'Altered Portal settings
» Event removed: %s ', 'LOG_PORTAL_CONFIG' => 'Altered Portal settings
» %s', - - // Adding the permissions - 'ACL_A_MANAGE_PORTAL' => 'Can alter Portal settings', - 'ACL_U_VIEW_PORTAL' => 'Can view the Portal', )); diff --git a/language/en/permissions_portal.php b/language/en/permissions_portal.php new file mode 100644 index 00000000..a324406b --- /dev/null +++ b/language/en/permissions_portal.php @@ -0,0 +1,39 @@ + 'Can alter Portal settings', + 'ACL_U_VIEW_PORTAL' => 'Can view the Portal', +)); diff --git a/language/es/info_acp_portal.php b/language/es/info_acp_portal.php index 8be4dae8..c50643a5 100644 --- a/language/es/info_acp_portal.php +++ b/language/es/info_acp_portal.php @@ -46,8 +46,4 @@ $lang = array_merge($lang, array( 'LOG_PORTAL_EVENT_UPDATED' => 'Ajustes del Portal alterados
» Evento actualizado: %s ', 'LOG_PORTAL_EVENT_REMOVED' => 'Ajustes del Portal alterados
» Evento eliminado: %s ', 'LOG_PORTAL_CONFIG' => 'Ajustes del Portal alterados
» %s', - - // Adding the permissions - 'ACL_A_MANAGE_PORTAL' => 'Puede alterar ajustes del Portal', - 'ACL_U_VIEW_PORTAL' => 'Puede ver el Portal', )); diff --git a/language/es/permissions_portal.php b/language/es/permissions_portal.php new file mode 100644 index 00000000..c2c3bc1b --- /dev/null +++ b/language/es/permissions_portal.php @@ -0,0 +1,39 @@ + 'Puede alterar ajustes del Portal', + 'ACL_U_VIEW_PORTAL' => 'Puede ver el Portal', +)); diff --git a/language/fr/info_acp_portal.php b/language/fr/info_acp_portal.php index 7f31835d..a9803623 100644 --- a/language/fr/info_acp_portal.php +++ b/language/fr/info_acp_portal.php @@ -47,8 +47,4 @@ $lang = array_merge($lang, array( 'LOG_PORTAL_EVENT_UPDATED' => 'Paramètres du portail modifiés
» Évènement mis à jour : %s ', 'LOG_PORTAL_EVENT_REMOVED' => 'Paramètres du portail modifiés
» Évènement retiré : %s ', 'LOG_PORTAL_CONFIG' => 'Paramètres du portail modifiés
» %s', - - // Adding the permissions - 'ACL_A_MANAGE_PORTAL' => 'Peut modifier les paramètres du portail', - 'ACL_U_VIEW_PORTAL' => 'Peut afficher le portail', )); diff --git a/language/fr/permissions_portal.php b/language/fr/permissions_portal.php new file mode 100644 index 00000000..bff5d758 --- /dev/null +++ b/language/fr/permissions_portal.php @@ -0,0 +1,39 @@ + 'Peut modifier les paramètres du portail', + 'ACL_U_VIEW_PORTAL' => 'Peut afficher le portail', +)); diff --git a/language/it/info_acp_portal.php b/language/it/info_acp_portal.php index 1f6b64e5..6b4aad66 100644 --- a/language/it/info_acp_portal.php +++ b/language/it/info_acp_portal.php @@ -46,8 +46,4 @@ $lang = array_merge($lang, array( 'LOG_PORTAL_EVENT_UPDATED' => 'Impostazioni portale modificate
» Evento aggiornato: %s ', 'LOG_PORTAL_EVENT_REMOVED' => 'Impostazioni portale modificate
» Evento rimosso: %s ', 'LOG_PORTAL_CONFIG' => 'Impostazioni portale modificate
» %s', - - // Adding the permissions - 'ACL_A_MANAGE_PORTAL' => 'Può modificare le impostazioni del portale', - 'ACL_U_VIEW_PORTAL' => 'Può visualizzare il portale', )); diff --git a/language/it/permissions_portal.php b/language/it/permissions_portal.php new file mode 100644 index 00000000..01015129 --- /dev/null +++ b/language/it/permissions_portal.php @@ -0,0 +1,39 @@ + 'Può modificare le impostazioni del portale', + 'ACL_U_VIEW_PORTAL' => 'Può visualizzare il portale', +)); diff --git a/language/nl/info_acp_portal.php b/language/nl/info_acp_portal.php index 7389dd28..c8bbb803 100644 --- a/language/nl/info_acp_portal.php +++ b/language/nl/info_acp_portal.php @@ -42,7 +42,4 @@ $lang = array_merge($lang, array( 'LOG_PORTAL_EVENT_UPDATED' => 'Portaalinstellingen veranderd
» Evenement gewijzigd: %s ', 'LOG_PORTAL_EVENT_REMOVED' => 'Portaalinstellingen veranderd
» Evenement verwijderd: %s ', 'LOG_PORTAL_CONFIG' => 'Portaalinstellingen veranderd
» %s', - // Adding the permissions - 'ACL_A_MANAGE_PORTAL' => 'Kan portaalinstellingen wijzigen', - 'ACL_U_VIEW_PORTAL' => 'Kan portaal bekijken', )); diff --git a/language/nl/permissions_portal.php b/language/nl/permissions_portal.php new file mode 100644 index 00000000..ca79d4dd --- /dev/null +++ b/language/nl/permissions_portal.php @@ -0,0 +1,39 @@ + 'Kan portaalinstellingen wijzigen', + 'ACL_U_VIEW_PORTAL' => 'Kan portaal bekijken', +)); From 94b93c34e69e018c49d44e742509016c869885fa Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Sep 2015 23:07:01 +0200 Subject: [PATCH 3/6] [ticket/649] Use correct event name and make method public B3P-649 --- event/listener.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/event/listener.php b/event/listener.php index 9dff8417..e816f36f 100644 --- a/event/listener.php +++ b/event/listener.php @@ -72,7 +72,7 @@ class listener implements EventSubscriberInterface 'core.user_setup' => 'load_portal_language', 'core.viewonline_overwrite_location' => 'viewonline_page', 'core.page_header' => 'add_portal_link', - 'core.permissions event' => 'load_permissions', + 'core.permissions' => 'load_permissions', ); } @@ -182,7 +182,7 @@ class listener implements EventSubscriberInterface * * @param array $event Event data */ - protected function load_permissions($event) + public function load_permissions($event) { $permissions = $event['permissions']; $permissions['a_manage_portal'] = array('lang' => 'ACL_A_MANAGE_PORTAL', 'cat' => 'misc'); From 8f99c070a883494260c59592fdcf4a1ddb17774a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Sep 2015 23:12:27 +0200 Subject: [PATCH 4/6] [ticket/649] Fix test for getSubscribedEvents() B3P-649 --- tests/unit/event/listener_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/event/listener_test.php b/tests/unit/event/listener_test.php index 46eee061..24a05e66 100644 --- a/tests/unit/event/listener_test.php +++ b/tests/unit/event/listener_test.php @@ -121,6 +121,7 @@ class listener_test extends \phpbb_template_template_test_case 'core.user_setup', 'core.viewonline_overwrite_location', 'core.page_header', + 'core.permissions', ), array_keys(\board3\portal\event\listener::getSubscribedEvents())); } From bf8d10d3fee35b87196017a6a7d7bcc5af7e03b0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Sep 2015 23:22:15 +0200 Subject: [PATCH 5/6] [ticket/649] Include correct language file for acp tests B3P-649 --- tests/functional/portal_acp_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/portal_acp_test.php b/tests/functional/portal_acp_test.php index e53adba9..2e3ee26d 100644 --- a/tests/functional/portal_acp_test.php +++ b/tests/functional/portal_acp_test.php @@ -90,7 +90,7 @@ class phpbb_functional_portal_acp_test extends \board3\portal\tests\testframewor public function test_portal_permissions() { - $this->add_lang_ext('board3/portal', 'info_acp_portal'); + $this->add_lang_ext('board3/portal', 'permissions_portal'); $crawler = self::request('GET', 'adm/index.php?i=acp_permissions&mode=setting_group_global&sid=' . $this->sid); $form = $crawler->selectButton('submit')->form(); $crawler = self::submit($form); From d7f6d265fa3d747fbbf588cb2027acdc83118c6c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 14 Sep 2015 12:57:23 +0200 Subject: [PATCH 6/6] [ticket/648] Add missing brackets to donations HTML files B3P-648 --- styles/prosilver/template/portal/modules/donation_center.html | 2 +- styles/prosilver/template/portal/modules/donation_side.html | 2 +- styles/subsilver2/template/portal/modules/donation_center.html | 2 +- styles/subsilver2/template/portal/modules/donation_side.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/styles/prosilver/template/portal/modules/donation_center.html b/styles/prosilver/template/portal/modules/donation_center.html index 239f904d..b852951b 100644 --- a/styles/prosilver/template/portal/modules/donation_center.html +++ b/styles/prosilver/template/portal/modules/donation_center.html @@ -21,7 +21,7 @@ diff --git a/styles/prosilver/template/portal/modules/donation_side.html b/styles/prosilver/template/portal/modules/donation_side.html index 4478276e..bf47baf0 100644 --- a/styles/prosilver/template/portal/modules/donation_side.html +++ b/styles/prosilver/template/portal/modules/donation_side.html @@ -15,7 +15,7 @@ diff --git a/styles/subsilver2/template/portal/modules/donation_center.html b/styles/subsilver2/template/portal/modules/donation_center.html index d0ed7e7e..e717c632 100644 --- a/styles/subsilver2/template/portal/modules/donation_center.html +++ b/styles/subsilver2/template/portal/modules/donation_center.html @@ -22,7 +22,7 @@ diff --git a/styles/subsilver2/template/portal/modules/donation_side.html b/styles/subsilver2/template/portal/modules/donation_side.html index 8bb5ed81..80399275 100644 --- a/styles/subsilver2/template/portal/modules/donation_side.html +++ b/styles/subsilver2/template/portal/modules/donation_side.html @@ -17,7 +17,7 @@