diff --git a/composer.json b/composer.json index 11c94fb..f30fa6c 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "phpbb-extension", "description": "mChat Extension for phpbb 3.1.x", "homepage": "http://www.dmzx-web.net", - "version": "0.1.3", + "version": "0.1.4", "time": "2015-03-10", "keywords": ["phpbb", "extension", "mchat"], "license": "GPL-2.0", diff --git a/config/services.yml b/config/services.yml index 556305d..c378a04 100644 --- a/config/services.yml +++ b/config/services.yml @@ -54,7 +54,6 @@ services: - @log - @dbal.conn - @cache - - @service_container - %core.table_prefix% - %dmzx.mchat.table.mchat% - %dmzx.mchat.table.mchat_config% diff --git a/core/functions_mchat.php b/core/functions_mchat.php index e622517..37575f6 100644 --- a/core/functions_mchat.php +++ b/core/functions_mchat.php @@ -27,9 +27,6 @@ class functions_mchat /** @var \phpbb\cache\service */ protected $cache; - /** @var \phpbb\event\dispatcher_interface */ - protected $dispatcher; - protected $table_prefix; /** @@ -53,14 +50,13 @@ class functions_mchat * @param \phpbb\cache\service $cache * @param $table_prefix */ - public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\auth\auth $auth, \phpbb\log\log_interface $log, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $dispatcher, $table_prefix, $mchat_table, $mchat_config_table, $mchat_sessions_table) + public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\auth\auth $auth, \phpbb\log\log_interface $log, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $table_prefix, $mchat_table, $mchat_config_table, $mchat_sessions_table) { $this->template = $template; $this->user = $user; $this->auth = $auth; $this->db = $db; $this->cache = $cache; - $this->dispatcher = $dispatcher; $this->phpbb_log = $log; $this->table_prefix = $table_prefix; $this->mchat_table = $mchat_table; @@ -386,16 +382,4 @@ class functions_mchat } $this->db->sql_freeresult($result); } - - function functions_mchat_aft() - { - /** - * Event functions_mchat_aft - * - * @event dmzx.mchat.core.functions_mchat_aft - * @since 0.1.2 - */ - $this->dispatcher->trigger_event('dmzx.mchat.core.functions_mchat_aft'); - } - } \ No newline at end of file diff --git a/core/render_helper.php b/core/render_helper.php index fd2cadd..444a38a 100644 --- a/core/render_helper.php +++ b/core/render_helper.php @@ -806,6 +806,14 @@ class render_helper // If read mode request set true $mchat_read_mode = true; + /** + * Event render_helper_edit + * + * @event dmzx.mchat.core.render_helper_edit + * @since 0.1.4 + */ + $this->dispatcher->trigger_event('dmzx.mchat.core.render_helper_edit'); + break; // Delete function... @@ -837,6 +845,14 @@ class render_helper throw new \phpbb\exception\http_exception(403, 'MCHAT_ERROR_FORBIDDEN'); } + /** + * Event render_helper_delete + * + * @event dmzx.mchat.core.render_helper_delete + * @since 0.1.4 + */ + $this->dispatcher->trigger_event('dmzx.mchat.core.render_helper_delete'); + // Run delete! $sql = 'DELETE FROM ' . $this->mchat_table . ' WHERE message_id = ' . (int) $message_id; diff --git a/migrations/mchat_schema.php b/migrations/mchat_schema.php index 8e664b8..c4abcbe 100644 --- a/migrations/mchat_schema.php +++ b/migrations/mchat_schema.php @@ -11,7 +11,7 @@ namespace dmzx\mchat\migrations; class mchat_schema extends \phpbb\db\migration\migration { - var $ext_version = '0.1.3'; + var $ext_version = '0.1.4'; public function update_data() {