diff --git a/README.md b/README.md index 4cb354d..79d6457 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# phpBB mChat Extension +# mChat Extension for phpBB 3.1 [](https://travis-ci.org/dmzx/mChat-Extension) @@ -9,12 +9,12 @@ 3. In the `ext` directory of your phpBB board, create a new directory named `dmzx` (if it does not already exist). 4. Copy the `mchat` folder to `/ext/dmzx/` (if done correctly, you'll have the main extension class at (your forum root)/ext/dmzx/mchat/composer.json). 5. Navigate in the ACP to `Customise -> Manage extensions`. -6. Look for `mChat Extension` under the Disabled Extensions list, and click its `Enable` link. +6. Look for `mChat Extension for phpBB 3.1` under the Disabled Extensions list, and click its `Enable` link. ## Uninstall 1. Navigate in the ACP to `Customise -> Extension Management -> Extensions`. -2. Look for `mChat Extension` under the Enabled Extensions list, and click its `Disable` link. +2. Look for `mChat Extension for phpBB 3.1` under the Enabled Extensions list, and click its `Disable` link. 3. To permanently uninstall, click `Delete Data` and then delete the `/ext/dmzx/mchat` folder. ## License diff --git a/acp/acp_mchat_info.php b/acp/acp_mchat_info.php index c50fff2..bffff83 100644 --- a/acp/acp_mchat_info.php +++ b/acp/acp_mchat_info.php @@ -1,11 +1,12 @@ 'ACP_CAT_MCHAT', 'modes' => array( 'configuration' => array( - 'title' => 'ACP_MCHAT_CONFIG', - 'auth' => 'ext_dmzx/mchat && acl_a_mchat', - 'cat' => array('ACP_CAT_MCHAT') + 'title' => 'ACP_MCHAT_CONFIG', + 'auth' => 'ext_dmzx/mchat && acl_a_mchat', + 'cat' => array('ACP_CAT_MCHAT'), ), ), ); diff --git a/acp/acp_mchat_module.php b/acp/acp_mchat_module.php index 4ca6bee..9a7b508 100644 --- a/acp/acp_mchat_module.php +++ b/acp/acp_mchat_module.php @@ -1,11 +1,12 @@ get('dmzx.mchat.admin.controller'); - - // Requests - $action = $request->variable('action', ''); - if ($request->is_set_post('add')) - { - $action = 'add'; - } + global $phpbb_container, $user; // Add the ACP lang file $user->add_lang_ext('dmzx/mchat', 'info_acp_mchat'); - // Load the display settings handle in the admin controller - $admin_controller->display_options(); - // Load a template from adm/style for our ACP page $this->tpl_name = 'acp_mchat'; // Set the page title for our ACP page $this->page_title = 'MCHAT_TITLE'; + // Get an instance of the admin controller + $admin_controller = $phpbb_container->get('dmzx.mchat.admin.controller'); + // Make the $u_action url available in the admin controller $admin_controller->set_page_url($this->u_action); + + // Load the display settings handle in the admin controller + $admin_controller->display_options(); } } diff --git a/adm/style/acp_mchat.html b/adm/style/acp_mchat.html index b19d7b1..5a5350b 100644 --- a/adm/style/acp_mchat.html +++ b/adm/style/acp_mchat.html @@ -1,239 +1,227 @@ - -
{MCHAT_ERROR}
-
+
-
+
{MCHAT_REFRESH_YES}
• {L_MCHAT_SESSION_ENDS} {MCHAT_USER_TIMEOUT_TIME} •
{L_MCHAT_COPYRIGHT}
diff --git a/styles/prosilver/template/mchat_messages.html b/styles/prosilver/template/mchat_messages.html
index ab510cb..b8dcf62 100644
--- a/styles/prosilver/template/mchat_messages.html
+++ b/styles/prosilver/template/mchat_messages.html
@@ -3,7 +3,7 @@
@@ -13,12 +13,12 @@