From 3a4ac22d8c7ec2a602c6e57e52ae04d481fd42c6 Mon Sep 17 00:00:00 2001 From: dmzx Date: Wed, 24 Jun 2015 13:40:50 +0200 Subject: [PATCH] Update version 0.1.1 --- acp/acp_mchat_info.php | 2 +- composer.json | 2 +- controller/admin_controller.php | 36 ++++++++++++++++----------------- controller/mchat.php | 2 +- core/functions_mchat.php | 4 ++-- core/render_helper.php | 8 ++++---- event/listener.php | 2 -- ext.php | 18 ----------------- language/de/common.php | 5 ++--- language/de/info_acp_mchat.php | 9 +++------ language/en/common.php | 5 ++--- language/en/info_acp_mchat.php | 35 +++++++++++++++----------------- language/es/common.php | 5 ++--- language/es/info_acp_mchat.php | 9 +++------ language/et/common.php | 9 +++++---- language/et/info_acp_mchat.php | 13 ++++++------ language/fr/common.php | 5 ++--- language/fr/info_acp_mchat.php | 7 ++----- language/it/common.php | 5 ++--- language/it/info_acp_mchat.php | 7 ++----- language/nl/common.php | 5 ++--- language/nl/info_acp_mchat.php | 7 ++----- language/pl/common.php | 5 ++--- language/pl/info_acp_mchat.php | 7 ++----- language/pt/common.php | 8 ++++---- language/pt/info_acp_mchat.php | 7 ++----- migrations/mchat_module.php | 1 - migrations/mchat_module1.php | 4 +--- migrations/mchat_schema.php | 8 ++++---- migrations/mchat_schema_2.php | 2 +- migrations/mchat_schema_3.php | 2 ++ migrations/mchat_schema_4.php | 17 ++++++++++++++++ migrations/mchat_schema_5.php | 3 ++- migrations/mchat_schema_6.php | 1 + ucp/ucp_mchat_info.php | 2 +- ucp/ucp_mchat_module.php | 6 +----- 36 files changed, 119 insertions(+), 154 deletions(-) delete mode 100644 ext.php diff --git a/acp/acp_mchat_info.php b/acp/acp_mchat_info.php index c50fff2..f3e5cd1 100644 --- a/acp/acp_mchat_info.php +++ b/acp/acp_mchat_info.php @@ -25,4 +25,4 @@ class acp_mchat_info ), ); } -} +} \ No newline at end of file diff --git a/composer.json b/composer.json index 75d7ebd..439e94e 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.0", + "version": "0.1.1", "time": "2015-03-10", "keywords": ["phpbb", "extension", "mchat"], "license": "GPL-2.0", diff --git a/controller/admin_controller.php b/controller/admin_controller.php index f0c9147..40a245f 100644 --- a/controller/admin_controller.php +++ b/controller/admin_controller.php @@ -260,24 +260,24 @@ class admin_controller protected function set_options() { - //update setting in config table for mod enabled or not - $this->config->set('mchat_enable', $this->request->variable('mchat_enable', 0)); - // update setting in config table for allowing on index or not - $this->config->set('mchat_on_index', $this->request->variable('mchat_on_index', 0)); - // update setting in config table to enable posts to display or not - $this->config->set('mchat_new_posts', $this->request->variable('mchat_new_posts', 0)); - // update setting in config table to allow topic to display or not - $this->config->set('mchat_new_posts_topic', $this->request->variable('mchat_new_posts_topic', 0)); - // update setting in config table to allow replies to display or not - $this->config->set('mchat_new_posts_reply', $this->request->variable('mchat_new_posts_reply', 0)); - // update setting in config table to allow edit posts to display or not - $this->config->set('mchat_new_posts_edit', $this->request->variable('mchat_new_posts_edit', 0)); - // update setting in config table to allow quoted posts to display or not - $this->config->set('mchat_new_posts_quote', $this->request->variable('mchat_new_posts_quote', 0)); - // update setting in config table for stats on index - $this->config->set('mchat_stats_index', $this->request->variable('mchat_stats_index', 0)); - // update setting in config table for message on top - $this->config->set('mchat_message_top', $this->request->variable('mchat_message_top', 0)); + //update setting in config table for mod enabled or not + $this->config->set('mchat_enable', $this->request->variable('mchat_enable', 0)); + // update setting in config table for allowing on index or not + $this->config->set('mchat_on_index', $this->request->variable('mchat_on_index', 0)); + // update setting in config table to enable posts to display or not + $this->config->set('mchat_new_posts', $this->request->variable('mchat_new_posts', 0)); + // update setting in config table to allow topic to display or not + $this->config->set('mchat_new_posts_topic', $this->request->variable('mchat_new_posts_topic', 0)); + // update setting in config table to allow replies to display or not + $this->config->set('mchat_new_posts_reply', $this->request->variable('mchat_new_posts_reply', 0)); + // update setting in config table to allow edit posts to display or not + $this->config->set('mchat_new_posts_edit', $this->request->variable('mchat_new_posts_edit', 0)); + // update setting in config table to allow quoted posts to display or not + $this->config->set('mchat_new_posts_quote', $this->request->variable('mchat_new_posts_quote', 0)); + // update setting in config table for stats on index + $this->config->set('mchat_stats_index', $this->request->variable('mchat_stats_index', 0)); + // update setting in config table for message on top + $this->config->set('mchat_message_top', $this->request->variable('mchat_message_top', 0)); } /** diff --git a/controller/mchat.php b/controller/mchat.php index 8a22c95..b3b5aaa 100644 --- a/controller/mchat.php +++ b/controller/mchat.php @@ -59,4 +59,4 @@ class mchat return $this->helper->render($ret['filename'], $ret['lang_title']); } -} +} \ No newline at end of file diff --git a/core/functions_mchat.php b/core/functions_mchat.php index 82fdddb..ee15399 100644 --- a/core/functions_mchat.php +++ b/core/functions_mchat.php @@ -70,7 +70,7 @@ class functions_mchat */ function mchat_cache() { - // Grab the config entries in teh ACP...and cache em :P + // Grab the config entries in the ACP...and cache em :P if (($config_mchat = $this->cache->get('_mchat_config')) === false) { $sql = 'SELECT * FROM ' . $this->mchat_config_table; @@ -95,7 +95,7 @@ class functions_mchat { $sql = 'UPDATE ' . $this->mchat_table . ' SET user_id = ' . ANONYMOUS . ' - WHERE user_id = ' . (int) $user_id; + WHERE user_id = ' . (int) $user_id; $this->db->sql_query($sql); return; diff --git a/core/render_helper.php b/core/render_helper.php index 4e01eab..16bb230 100644 --- a/core/render_helper.php +++ b/core/render_helper.php @@ -39,7 +39,9 @@ class render_helper protected $request; protected $phpbb_root_path; + protected $phpEx; + protected $table_prefix; /** * The database tables @@ -94,7 +96,6 @@ class render_helper $include_on_index = ($only_for_index === true); // Add lang file - //$this->user->add_lang(array('mods/mchat_lang', 'viewtopic', 'posting')); $this->user->add_lang('posting'); //chat enabled @@ -826,9 +827,8 @@ class render_helper $sql = 'DELETE FROM ' . $this->mchat_table . ' WHERE message_id = ' . (int) $message_id; $this->db->sql_query($sql); + //adds a log - // $message_author = get_username_string('no_profile', $row['user_id'], $row['username'], $row['user_colour'], $this->user->lang['GUEST']); - // add_log('admin', 'LOG_DELETED_MCHAT', $message_author); $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DELETED_MCHAT', false, array($row['username'])); // insert user into the mChat sessions table $this->functions_mchat->mchat_sessions($mchat_session_time, true); @@ -1121,4 +1121,4 @@ class render_helper 'lang_title' => $this->user->lang['MCHAT_TITLE'], ); } -} +} \ No newline at end of file diff --git a/event/listener.php b/event/listener.php index 0ce8ca6..e7a7410 100644 --- a/event/listener.php +++ b/event/listener.php @@ -60,7 +60,6 @@ class listener implements EventSubscriberInterface $this->phpEx = $phpEx; $this->table_prefix = $table_prefix; $this->mchat_table = $mchat_table; - } static public function getSubscribedEvents() @@ -178,5 +177,4 @@ class listener implements EventSubscriberInterface } } - } \ No newline at end of file diff --git a/ext.php b/ext.php deleted file mode 100644 index de93c60..0000000 --- a/ext.php +++ /dev/null @@ -1,18 +0,0 @@ - 'Erstelle eine neue Antwort', 'MCHAT_NEW_QUOTE' => 'Antworte mit einem Zitat', 'MCHAT_NEW_EDIT' => 'Bearbeite', + // UCP 'UCP_PROFILE_MCHAT' => 'mChat Einstellung', 'DISPLAY_MCHAT' => 'mChat auf der Indexseite anzeigen', @@ -119,6 +117,7 @@ $lang = array_merge($lang, array( 'TEXT_AREA' => 'Textbereich', 'UCP_CAT_MCHAT' => 'mChat', 'UCP_MCHAT_CONFIG' => 'mChat', + //Preferences 'LOG_MCHAT_TABLE_PRUNED' => 'mChat Tabelle löschen', 'ACP_USER_MCHAT' => 'mChat Einstellung', diff --git a/language/de/info_acp_mchat.php b/language/de/info_acp_mchat.php index e37ae55..2d108de 100644 --- a/language/de/info_acp_mchat.php +++ b/language/de/info_acp_mchat.php @@ -124,9 +124,6 @@ $lang = array_merge($lang, array( 'MCHAT_PAUSE_ON_INPUT_EXPLAIN' => 'Falls JA eingestellt ist, ist das automatische Aktualisieren während der Eingabe einer Nachricht deaktiviert.', // error reporting - 'MCHAT_NEEDS_UPDATING' => 'Der mChat Mod benötigt eine Aktualisierung. Bitte informiere einen Administrator das eine Aktualisierung nötig ist.', - 'MCHAT_WRONG_VERSION' => 'Die falsche Version des Mods ist installiert. Bitte starte den %sinstaller%s für die neue Version des Mods.', - 'WARNING' => 'Warnung', 'TOO_LONG_DATE' => 'Das angegebene Datumsformat ist zu lang.', 'TOO_SHORT_DATE' => 'Das angegebene Datumsformat ist zu kurz.', 'TOO_SMALL_REFRESH' => 'Das Aktualisierungsintervall ist zu kurz.', @@ -152,7 +149,7 @@ $lang = array_merge($lang, array( 'TOO_SMALL_TIMEOUT' => 'Der Wert für die Zeitüberschreitung eines Benutzers ist zu klein.', 'TOO_LARGE_TIMEOUT' => 'Der Wert für die Zeitüberschreitung eines Benutzers ist zu groß.', - // User perms + // User perms 'ACL_U_MCHAT_USE' => 'Kann mChat benutzen', 'ACL_U_MCHAT_VIEW' => 'Kann mChat sehen', 'ACL_U_MCHAT_EDIT' => 'Kann mChat bearbeiten', @@ -168,6 +165,6 @@ $lang = array_merge($lang, array( 'ACL_U_MCHAT_URLS' => 'Kann Url im mChat posten', // Admin perms - 'ACL_A_MCHAT' => array('lang' => 'Kann mChat Einstellung managen', 'cat' => 'Berechtigung'), // Using a phpBB category here + 'ACL_A_MCHAT' => 'Kann mChat Einstellung managen', -)); +)); \ No newline at end of file diff --git a/language/en/common.php b/language/en/common.php index eedd7ca..e8874e0 100644 --- a/language/en/common.php +++ b/language/en/common.php @@ -32,9 +32,6 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -// Adding new category -$lang['permission_cat']['mchat'] = 'mChat'; - // Adding the permissions $lang = array_merge($lang, array( @@ -106,6 +103,7 @@ $lang = array_merge($lang, array( 'MCHAT_NEW_REPLY' => 'Made A New Reply', 'MCHAT_NEW_QUOTE' => 'Replied with a Quote', 'MCHAT_NEW_EDIT' => 'Made A Edit', + // UCP 'UCP_PROFILE_MCHAT' => 'mChat Preferences', 'DISPLAY_MCHAT' => 'Display mChat on Index', @@ -119,6 +117,7 @@ $lang = array_merge($lang, array( 'TEXT_AREA' => 'Text area', 'UCP_CAT_MCHAT' => 'mChat', 'UCP_MCHAT_CONFIG' => 'mChat', + //Preferences 'LOG_MCHAT_TABLE_PRUNED' => 'mChat Table was pruned', 'ACP_USER_MCHAT' => 'mChat Settings', diff --git a/language/en/info_acp_mchat.php b/language/en/info_acp_mchat.php index 672ecbf..1fbeb92 100644 --- a/language/en/info_acp_mchat.php +++ b/language/en/info_acp_mchat.php @@ -124,9 +124,6 @@ $lang = array_merge($lang, array( 'MCHAT_PAUSE_ON_INPUT_EXPLAIN' => 'If set Yes, then the chat will not autoupdate upon a user entering a message in the input area', // error reporting - 'MCHAT_NEEDS_UPDATING' => 'The mChat extension needs updating. Please have a forum founder visit this section to run the installer.', - 'MCHAT_WRONG_VERSION' => 'The wrong version of the extension is installed. Please run the %sinstaller%s for the new version of the modification.', - 'WARNING' => 'Warning', 'TOO_LONG_DATE' => 'The date format you entered is too long.', 'TOO_SHORT_DATE' => 'The date format you entered is too short.', 'TOO_SMALL_REFRESH' => 'The refresh value is too small.', @@ -152,22 +149,22 @@ $lang = array_merge($lang, array( 'TOO_SMALL_TIMEOUT' => 'The user timeout value is too small.', 'TOO_LARGE_TIMEOUT' => 'The user timeout value is too large.', - // User perms - 'ACL_U_MCHAT_USE' => 'Can use mChat mchat', - 'ACL_U_MCHAT_VIEW' => 'Can view mChat mchat', - 'ACL_U_MCHAT_EDIT' => 'Can edit mChat messages mchat', - 'ACL_U_MCHAT_DELETE' => 'Can delete mChat messages mchat', - 'ACL_U_MCHAT_IP' => 'Can use view mChat IP addresses mchat', - 'ACL_U_MCHAT_PM' => 'Can use private message in mchat', - 'ACL_U_MCHAT_LIKE' => 'Can use like message in mchat', - 'ACL_U_MCHAT_QUOTE' => 'Can use quote message in mchat', - 'ACL_U_MCHAT_FLOOD_IGNORE' => 'Can ignore mChat flood mchat', - 'ACL_U_MCHAT_ARCHIVE' => 'Can view the Archive mchat', - 'ACL_U_MCHAT_BBCODE' => 'Can use bbcode in mChat mchat', - 'ACL_U_MCHAT_SMILIES' => 'Can use smilies in mChat mchat', - 'ACL_U_MCHAT_URLS' => 'Can post urls in mChat mchat', + // User perms + 'ACL_U_MCHAT_USE' => 'Can use mChat', + 'ACL_U_MCHAT_VIEW' => 'Can view mChat', + 'ACL_U_MCHAT_EDIT' => 'Can edit mChat messages', + 'ACL_U_MCHAT_DELETE' => 'Can delete mChat messages', + 'ACL_U_MCHAT_IP' => 'Can use view mChat IP addresses', + 'ACL_U_MCHAT_PM' => 'Can use private message in mChat', + 'ACL_U_MCHAT_LIKE' => 'Can use like message in mChat', + 'ACL_U_MCHAT_QUOTE' => 'Can use quote message in mChat', + 'ACL_U_MCHAT_FLOOD_IGNORE' => 'Can ignore mChat flood mChat', + 'ACL_U_MCHAT_ARCHIVE' => 'Can view the Archive mChat', + 'ACL_U_MCHAT_BBCODE' => 'Can use bbcode in mChat', + 'ACL_U_MCHAT_SMILIES' => 'Can use smilies in mChat', + 'ACL_U_MCHAT_URLS' => 'Can post urls in mChat', // Admin perms - 'ACL_A_MCHAT' => array('lang' => 'Can manage mChat settings', 'cat' => 'permissions'), // Using a phpBB category here + 'ACL_A_MCHAT' => 'Can manage mChat settings', -)); +)); \ No newline at end of file diff --git a/language/es/common.php b/language/es/common.php index ecdebf8..df861ac 100644 --- a/language/es/common.php +++ b/language/es/common.php @@ -32,9 +32,6 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -// Adding new category -$lang['permission_cat']['mchat'] = 'mChat'; - // Adding the permissions $lang = array_merge($lang, array( @@ -106,6 +103,7 @@ $lang = array_merge($lang, array( 'MCHAT_NEW_REPLY' => 'Nueva Respuesta', 'MCHAT_NEW_QUOTE' => 'Respondió Citando', 'MCHAT_NEW_EDIT' => 'Editado', + // UCP 'UCP_PROFILE_MCHAT' => 'Preferencias de mChat', 'DISPLAY_MCHAT' => 'Mostrar mChat en el índice', @@ -119,6 +117,7 @@ $lang = array_merge($lang, array( 'TEXT_AREA' => 'Área de texto', 'UCP_CAT_MCHAT' => 'mChat', 'UCP_MCHAT_CONFIG' => 'mChat', + //Preferences 'LOG_MCHAT_TABLE_PRUNED' => 'La tabla de mChat ha sido limpiada', 'ACP_USER_MCHAT' => 'Ajustes de mChat', diff --git a/language/es/info_acp_mchat.php b/language/es/info_acp_mchat.php index 13d9be3..91e6c4d 100644 --- a/language/es/info_acp_mchat.php +++ b/language/es/info_acp_mchat.php @@ -124,9 +124,6 @@ $lang = array_merge($lang, array( 'MCHAT_PAUSE_ON_INPUT_EXPLAIN' => 'Si pone Si, el chat no se actualizara automaticamente hasta que el usuario introduzca un mensaje', // error reporting - 'MCHAT_NEEDS_UPDATING' => 'El MOD de mChat necesita ser actualizado. Por favor, que uno de los fundadores del foro visite esta sección para ejecutar el instalador.', - 'MCHAT_WRONG_VERSION' => 'Hay una versión del MOD instalada incorrecta. Por favor, ejecute el %sinstalador%s para la nueva versión de la modificación.', - 'WARNING' => 'Advertencia', 'TOO_LONG_DATE' => 'El formato de fecha que ha entrado es demasiado largo.', 'TOO_SHORT_DATE' => 'El formato de fecha que ha introducido es demasiado corto.', 'TOO_SMALL_REFRESH' => 'El valor de refresco es demasiado corto.', @@ -152,7 +149,7 @@ $lang = array_merge($lang, array( 'TOO_SMALL_TIMEOUT' => 'El valor de tiempo de espera del usuario es demasiado corto.', 'TOO_LARGE_TIMEOUT' => 'El valor de tiempo de espera del usuario es demasiado largo.', - // User perms + // User perms 'ACL_U_MCHAT_USE' => 'Puede usar mChat', 'ACL_U_MCHAT_VIEW' => 'Puede ver mChat', 'ACL_U_MCHAT_EDIT' => 'Puede editar mensajes en mChat', @@ -168,6 +165,6 @@ $lang = array_merge($lang, array( 'ACL_U_MCHAT_URLS' => 'Puede poner URLs en mChat', // Admin perms - 'ACL_A_MCHAT' => array('lang' => 'Puede gestionar los ajustes de mChat', 'cat' => 'permissions'), // Using a phpBB category here + 'ACL_A_MCHAT' => 'Puede gestionar los ajustes de mChat', -)); +)); \ No newline at end of file diff --git a/language/et/common.php b/language/et/common.php index 75b7904..fb09b6f 100644 --- a/language/et/common.php +++ b/language/et/common.php @@ -28,8 +28,7 @@ if (empty($lang) || !is_array($lang)) // You do not need this where single placeholders are used, e.g. 'Message %d' is fine // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -// Adding new category -$lang['permission_cat']['mchat'] = 'mChat'; + // Adding the permissions $lang = array_merge($lang, array( 'MCHAT_TITLE' => 'Mini Jututuba', @@ -100,6 +99,7 @@ $lang = array_merge($lang, array( 'MCHAT_NEW_REPLY' => 'Tegi uue vastuse', 'MCHAT_NEW_QUOTE' => 'Vastas tsiteeringuga', 'MCHAT_NEW_EDIT' => 'Tegi muudatuse', + // UCP 'UCP_PROFILE_MCHAT' => 'mChat eelistused', 'DISPLAY_MCHAT' => 'Näita mChat esilehel', @@ -113,6 +113,7 @@ $lang = array_merge($lang, array( 'TEXT_AREA' => 'Teksti ala', 'UCP_CAT_MCHAT' => 'mChat', 'UCP_MCHAT_CONFIG' => 'mChat', + //Preferences 'LOG_MCHAT_TABLE_PRUNED' => 'mChat tabel on kärbitud', 'ACP_USER_MCHAT' => 'mChat seaded', @@ -123,7 +124,7 @@ $lang = array_merge($lang, array( 'MCHAT_NEW_CHAT' => 'Uus sõnum jututoas!', 'MCHAT_SEND_PM' => 'Saada privaatsõnum', 'MCHAT_PM' => '(PS)', + //Custom edits 'REPLY_WITH_LIKE' =>'Asjalik postitus', - )); - + )); \ No newline at end of file diff --git a/language/et/info_acp_mchat.php b/language/et/info_acp_mchat.php index c789f2a..1fdec94 100644 --- a/language/et/info_acp_mchat.php +++ b/language/et/info_acp_mchat.php @@ -117,10 +117,8 @@ $lang = array_merge($lang, array( 'MCHAT_MESSAGES' => 'Sõnumi seaded', 'MCHAT_PAUSE_ON_INPUT' => 'Sõnumi sisestamisel paus', 'MCHAT_PAUSE_ON_INPUT_EXPLAIN' => 'Valik jah määrab, kas jututoa sõnumeid värskendatakse ajal, mil kasutaja sisestab uut sõnumit tekstiväljal', + // error reporting => Vigade teavitus - 'MCHAT_NEEDS_UPDATING' => 'mChat laiendus vajab uuendamist. Palun võtta ühendust foorumi administraatoriga, et ta käivitaks uuenduse.', - 'MCHAT_WRONG_VERSION' => 'Vale versioon laiendusest on paigaldatud. Palun käivita %sinstaller%s, et paigaldada uus laienduse versioon.', - 'WARNING' => 'Hoiatus', 'TOO_LONG_DATE' => 'Kuupäeva formaat mille oled sisestanud on liiga pikk.', 'TOO_SHORT_DATE' => 'Kuupäeva formaat mille oled sisestanud on liiga lühike.', 'TOO_SMALL_REFRESH' => 'Värskendamise väärtus on liiga väike.', @@ -145,7 +143,8 @@ $lang = array_merge($lang, array( 'TOO_LONG_STATIC_MESSAGE' => 'Staatiline sõnum on liiga pikk.', 'TOO_SMALL_TIMEOUT' => 'Kasutaja sessiooni aeg on liiga väike.', 'TOO_LARGE_TIMEOUT' => 'Kasutaja sessiooni aeg on liiga suur.', - // User perms => Kasutaja õigused + + // User perms => Kasutaja õigused 'ACL_U_MCHAT_USE' => 'Saab kasutada mChat jututuba', 'ACL_U_MCHAT_VIEW' => 'Saab vaadata mChat jututuba', 'ACL_U_MCHAT_EDIT' => 'Saab muuta mChat jututoas sõnumeid', @@ -159,6 +158,8 @@ $lang = array_merge($lang, array( 'ACL_U_MCHAT_BBCODE' => 'Saab kasutada BBkoode mChat jututoas', 'ACL_U_MCHAT_SMILIES' => 'Saab kasutada emotikone mChat jututoas', 'ACL_U_MCHAT_URLS' => 'Saab postitada URL\'e mChat jututoas', + // Admin perms => Administraatori õigused - 'ACL_A_MCHAT' => array('lang' => 'Saab hallata mChat seadeid', 'cat' => 'permissions'), // Using a phpBB category here -)); + 'ACL_A_MCHAT' => 'Saab hallata mChat seadeid', + +)); \ No newline at end of file diff --git a/language/fr/common.php b/language/fr/common.php index 7ec9ee0..e592ac2 100644 --- a/language/fr/common.php +++ b/language/fr/common.php @@ -32,9 +32,6 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -// Adding new category -$lang['permission_cat']['mchat'] = 'mChat'; - // Adding the permissions $lang = array_merge($lang, array( @@ -106,6 +103,7 @@ $lang = array_merge($lang, array( 'MCHAT_NEW_REPLY' => 'Made A New Reply', 'MCHAT_NEW_QUOTE' => 'Replied with a Quote', 'MCHAT_NEW_EDIT' => 'Made A Edit', + // UCP 'UCP_PROFILE_MCHAT' => 'Préférences du mini-chat', 'DISPLAY_MCHAT' => 'Afficher le mini-chat sur l’index.', @@ -119,6 +117,7 @@ $lang = array_merge($lang, array( 'TEXT_AREA' => 'Zone de zaisie', 'UCP_CAT_MCHAT' => 'mChat', 'UCP_MCHAT_CONFIG' => 'mChat', + //Preferences 'LOG_MCHAT_TABLE_PRUNED' => 'La table du mini-chat a été délestée', 'ACP_USER_MCHAT' => 'Paramètres du mini-chat', diff --git a/language/fr/info_acp_mchat.php b/language/fr/info_acp_mchat.php index 5d95f76..a5dd7bf 100644 --- a/language/fr/info_acp_mchat.php +++ b/language/fr/info_acp_mchat.php @@ -124,9 +124,6 @@ $lang = array_merge($lang, array( 'MCHAT_PAUSE_ON_INPUT_EXPLAIN' => 'Si activée, le mini-chat ne sera pas mis à jour automatiquement lorsque l’utilisateur rédige un message dans la zone de saisie.', // error reporting - 'MCHAT_NEEDS_UPDATING' => 'Le MOD mChat a besoin d’être mis à jour. Le fondateur du forum doit visiter cette section pour commencer l’installation.', - 'MCHAT_WRONG_VERSION' => 'La mauvaise version du MOD est installée. Démarrez l’%sinstallation%s pour une nouvelle version du MOD.', - 'WARNING' => 'Attention', 'TOO_LONG_DATE' => 'Le format de la date saisi est trop long.', 'TOO_SHORT_DATE' => 'Le format de la date saisi est trop court.', 'TOO_SMALL_REFRESH' => 'La valeur de l’actualisation est trop petite.', @@ -168,6 +165,6 @@ $lang = array_merge($lang, array( 'ACL_U_MCHAT_URLS' => 'Peut poster des url’s sur mChat', // Admin perms - 'ACL_A_MCHAT' => array('lang' => 'Peut gérer les paramètres de mChat', 'cat' => 'permissions'), // Using a phpBB category here + 'ACL_A_MCHAT' => 'Peut gérer les paramètres de mChat', -)); +)); \ No newline at end of file diff --git a/language/it/common.php b/language/it/common.php index aecc982..e5b6fe8 100644 --- a/language/it/common.php +++ b/language/it/common.php @@ -32,9 +32,6 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -// Adding new category -$lang['permission_cat']['mchat'] = 'mChat'; - // Adding the permissions $lang = array_merge($lang, array( @@ -106,6 +103,7 @@ $lang = array_merge($lang, array( 'MCHAT_NEW_REPLY' => 'Nuova risposta', 'MCHAT_NEW_QUOTE' => 'Risposta con Quote', 'MCHAT_NEW_EDIT' => 'Ha modificato', + // UCP 'UCP_PROFILE_MCHAT' => 'mChat Preferenze', 'DISPLAY_MCHAT' => 'Visualizza mChat in Index', @@ -119,6 +117,7 @@ $lang = array_merge($lang, array( 'TEXT_AREA' => 'Testo area', 'UCP_CAT_MCHAT' => 'mChat', 'UCP_MCHAT_CONFIG' => 'mChat', + //Preferences 'LOG_MCHAT_TABLE_PRUNED' => 'mChat tabelle cancellate', 'ACP_USER_MCHAT' => 'mChat Opzioni', diff --git a/language/it/info_acp_mchat.php b/language/it/info_acp_mchat.php index b0c9a64..da3f837 100644 --- a/language/it/info_acp_mchat.php +++ b/language/it/info_acp_mchat.php @@ -124,9 +124,6 @@ $lang = array_merge($lang, array( 'MCHAT_PAUSE_ON_INPUT_EXPLAIN' => 'Se impostato Sì, allora la chat non verrà aggiornata automaticamente se un utente inserisce un messaggio in area di immissione', // error reporting - 'MCHAT_NEEDS_UPDATING' => 'Questa estensione mChat necessita di un aggiornamento. Si prega di visitare il fondatore per eseguire il programma di installazione.', - 'MCHAT_WRONG_VERSION' => 'È installata una versione errata di questa estensione. Eseguire il %sinstaller%s per la nuova versione.', - 'WARNING' => 'Attenzione', 'TOO_LONG_DATE' => 'Il formato della data immessa è troppo lunga.', 'TOO_SHORT_DATE' => 'Il formato della data immessa è troppo corta.', 'TOO_SMALL_REFRESH' => 'Il valore di aggiornamento è troppo piccolo.', @@ -165,6 +162,6 @@ $lang = array_merge($lang, array( 'ACL_U_MCHAT_URLS' => 'Puoi postare url in mChat', // Admin perms - 'ACL_A_MCHAT' => array('lang' => 'Puoi modificare impostazioni mChat', 'cat' => 'permessi'), // Using a phpBB category here + 'ACL_A_MCHAT' => 'Puoi modificare impostazioni mChat', -)); +)); \ No newline at end of file diff --git a/language/nl/common.php b/language/nl/common.php index 390e137..9b056d1 100644 --- a/language/nl/common.php +++ b/language/nl/common.php @@ -32,9 +32,6 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -// Adding new category -$lang['permission_cat']['mchat'] = 'mChat'; - // Adding the permissions $lang = array_merge($lang, array( @@ -106,6 +103,7 @@ $lang = array_merge($lang, array( 'MCHAT_NEW_REPLY' => 'Een nieuw antwoord gemaakt', 'MCHAT_NEW_QUOTE' => 'Beantwoord met een Citaat', 'MCHAT_NEW_EDIT' => 'Een bewerking gemaakt', + // UCP 'UCP_PROFILE_MCHAT' => 'mChat voorkeuren', 'DISPLAY_MCHAT' => 'Toon mChat op de index pagina', @@ -119,6 +117,7 @@ $lang = array_merge($lang, array( 'TEXT_AREA' => 'Tekst gebied', 'UCP_CAT_MCHAT' => 'mChat', 'UCP_MCHAT_CONFIG' => 'mChat', + //Preferences 'LOG_MCHAT_TABLE_PRUNED' => 'mChat tabel is ingekort', 'ACP_USER_MCHAT' => 'mChat Instellingen', diff --git a/language/nl/info_acp_mchat.php b/language/nl/info_acp_mchat.php index 2a74c33..72eaef3 100644 --- a/language/nl/info_acp_mchat.php +++ b/language/nl/info_acp_mchat.php @@ -124,9 +124,6 @@ $lang = array_merge($lang, array( 'MCHAT_PAUSE_ON_INPUT_EXPLAIN' => 'Stel je ja in, dan wordt mChat niet automatisch vernieuwd, todat een gebruiker een bericht plaatst in mChat', // error reporting - 'MCHAT_NEEDS_UPDATING' => 'De mChat extensie moet worden bijgewerkt. Neem contact op met de forum beheerder om de mChat bij te laten werken.', - 'MCHAT_WRONG_VERSION' => 'De verkeerde versie van de extensie is geïnstalleerd. Gebruik a.u.b. de %sinstaller%s van de nieuwe versie voor eventuele wijzigingen.', - 'WARNING' => 'Waarschuwing', 'TOO_LONG_DATE' => 'De datum weergave die je hebt ingegeven is te lang.', 'TOO_SHORT_DATE' => 'De datum weergave die je hebt ingegeven is te kort.', 'TOO_SMALL_REFRESH' => 'De waarde voor het vernieuwen van de pagina is te klein.', @@ -168,6 +165,6 @@ $lang = array_merge($lang, array( 'ACL_U_MCHAT_QUOTE' => 'Je kunt de citeer berichten knop gebruiken in mChat', // Admin perms - 'ACL_A_MCHAT' => array('lang' => 'Kan mChat instellingen beheren', 'cat' => 'permissions'), // Using a phpBB category here + 'ACL_A_MCHAT' => 'Kan mChat instellingen beheren', -)); +)); \ No newline at end of file diff --git a/language/pl/common.php b/language/pl/common.php index 088f080..c5504b6 100644 --- a/language/pl/common.php +++ b/language/pl/common.php @@ -32,9 +32,6 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -// Adding new category -$lang['permission_cat']['mchat'] = 'mChat'; - // Adding the permissions $lang = array_merge($lang, array( @@ -106,6 +103,7 @@ $lang = array_merge($lang, array( 'MCHAT_NEW_REPLY' => 'Made A New Reply', 'MCHAT_NEW_QUOTE' => 'Replied with a Quote', 'MCHAT_NEW_EDIT' => 'Made A Edit', + // UCP 'UCP_PROFILE_MCHAT' => 'mChat Preferences', 'DISPLAY_MCHAT' => 'Wyświetlaj mChat na stronie głównej', @@ -119,6 +117,7 @@ $lang = array_merge($lang, array( 'TEXT_AREA' => 'Okno', 'UCP_CAT_MCHAT' => 'mChat', 'UCP_MCHAT_CONFIG' => 'mChat', + //Preferences 'LOG_MCHAT_TABLE_PRUNED' => 'Tabela mChat została wyczyszczona', 'ACP_USER_MCHAT' => 'mChat Ustawienia', diff --git a/language/pl/info_acp_mchat.php b/language/pl/info_acp_mchat.php index 2178f35..e5d5079 100644 --- a/language/pl/info_acp_mchat.php +++ b/language/pl/info_acp_mchat.php @@ -124,9 +124,6 @@ $lang = array_merge($lang, array( 'MCHAT_PAUSE_ON_INPUT_EXPLAIN' => 'Zaznacz TAK aby nie auto-aktualizować mChatu gdy użytkownik pisze wiadomość', // error reporting - 'MCHAT_NEEDS_UPDATING' => 'Rozszerzenie mChat musi zostać zaktualizowane. Proszę skontaktuj się z administratorem.', - 'MCHAT_WRONG_VERSION' => 'Zainstalowano złą wersję rozszerzenia. Proszę uruchom %instalator%s aby zainstalować nową wersję rozszerzenia.', - 'WARNING' => 'Warning', 'TOO_LONG_DATE' => 'Format day który wpisałeś jest za długi.', 'TOO_SHORT_DATE' => 'Format day który wpisałeś jest za krótki.', 'TOO_SMALL_REFRESH' => 'Ustawiona wartość odświeżania jest za mała.', @@ -165,6 +162,6 @@ $lang = array_merge($lang, array( 'ACL_U_MCHAT_URLS' => 'Może wprowadzać adresy url mChat', // Admin perms - 'ACL_A_MCHAT' => array('lang' => 'Może zarządzać ustawieniami Mchat', 'cat' => 'permissions'), // Using a phpBB category here + 'ACL_A_MCHAT' => 'Może zarządzać ustawieniami Mchat', -)); +)); \ No newline at end of file diff --git a/language/pt/common.php b/language/pt/common.php index 1a23cc0..5a57f11 100644 --- a/language/pt/common.php +++ b/language/pt/common.php @@ -32,9 +32,6 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -// Adding new category -$lang['permission_cat']['mchat'] = 'mChat'; - // Adding the permissions $lang = array_merge($lang, array( @@ -106,6 +103,7 @@ $lang = array_merge($lang, array( 'MCHAT_NEW_REPLY' => 'Nova Resposta', 'MCHAT_NEW_QUOTE' => 'Resposta Citando', 'MCHAT_NEW_EDIT' => 'Editado', + // UCP 'UCP_PROFILE_MCHAT' => 'Preferencias do mChat', 'DISPLAY_MCHAT' => 'Mostrar mChat no índice', @@ -119,6 +117,7 @@ $lang = array_merge($lang, array( 'TEXT_AREA' => 'Área de texto', 'UCP_CAT_MCHAT' => 'mChat', 'UCP_MCHAT_CONFIG' => 'mChat', + //Preferences 'LOG_MCHAT_TABLE_PRUNED' => 'A tabela do mChat foi apagada', 'ACP_USER_MCHAT' => 'Ajustes do mChat', @@ -132,4 +131,5 @@ $lang = array_merge($lang, array( //Custom edits 'REPLY_WITH_LIKE' =>'Eu gosto desta mensagem', -)); + +)); \ No newline at end of file diff --git a/language/pt/info_acp_mchat.php b/language/pt/info_acp_mchat.php index 77f5b13..56e85ce 100644 --- a/language/pt/info_acp_mchat.php +++ b/language/pt/info_acp_mchat.php @@ -124,9 +124,6 @@ $lang = array_merge($lang, array( 'MCHAT_PAUSE_ON_INPUT_EXPLAIN' => 'Se colocar Sim, o Chat nao se actualizara automaticamente, mediante um utilizador introduza uma mensagem na área de entrada', // error reporting - 'MCHAT_NEEDS_UPDATING' => 'O MOD de mChat necesita de ser actualizado. Por favor, dê uma visita forum administrador desta seção para executar o instalador.', - 'MCHAT_WRONG_VERSION' => 'A versão do MOD instalado incorretamente. Por favor, execute o %sinstalador%s para a nova versão da modificação.', - 'WARNING' => 'Aviso', 'TOO_LONG_DATE' => 'O formato da data que você inseriu é muito longa.', 'TOO_SHORT_DATE' => 'O formato da data que você inseriu é muito curto.', 'TOO_SMALL_REFRESH' => 'O valor de atualização é muito pequeno.', @@ -168,6 +165,6 @@ $lang = array_merge($lang, array( 'ACL_U_MCHAT_URLS' => 'Pode colocár URLs no mChat', // Admin perms - 'ACL_A_MCHAT' => array('lang' => 'Pode gerir os ajustes do mChat', 'cat' => 'permissions'), // Using a phpBB category here + 'ACL_A_MCHAT' => 'Pode gerir os ajustes do mChat', -)); +)); \ No newline at end of file diff --git a/migrations/mchat_module.php b/migrations/mchat_module.php index cddc226..51ae9bc 100644 --- a/migrations/mchat_module.php +++ b/migrations/mchat_module.php @@ -25,5 +25,4 @@ class mchat_module extends \phpbb\db\migration\migration )), ); } - } \ No newline at end of file diff --git a/migrations/mchat_module1.php b/migrations/mchat_module1.php index 50c26a6..c54df35 100644 --- a/migrations/mchat_module1.php +++ b/migrations/mchat_module1.php @@ -24,6 +24,4 @@ class mchat_module1 extends \phpbb\db\migration\migration ))), ); } -} - - \ No newline at end of file +} \ No newline at end of file diff --git a/migrations/mchat_schema.php b/migrations/mchat_schema.php index 8d5537d..b370411 100644 --- a/migrations/mchat_schema.php +++ b/migrations/mchat_schema.php @@ -25,8 +25,9 @@ class mchat_schema extends \phpbb\db\migration\migration array('config.add', array('mchat_new_posts_quote', false)), array('config.add', array('mchat_message_top', true)), array('config.add', array('mchat_stats_index', false)), - array('config.add', array('mchat_version','0.1.0')), + array('config.add', array('mchat_version','0.1.1')), + // Add permissions array('permission.add', array('u_mchat_use')), array('permission.add', array('u_mchat_view')), array('permission.add', array('u_mchat_edit')), @@ -81,7 +82,7 @@ class mchat_schema extends \phpbb\db\migration\migration ); } - public function revert_schema() + public function revert_schema() { return array( 'drop_tables' => array( @@ -89,5 +90,4 @@ class mchat_schema extends \phpbb\db\migration\migration ), ); } - -} +} \ No newline at end of file diff --git a/migrations/mchat_schema_2.php b/migrations/mchat_schema_2.php index 1e0b478..b6740d0 100644 --- a/migrations/mchat_schema_2.php +++ b/migrations/mchat_schema_2.php @@ -40,6 +40,7 @@ class mchat_schema_2 extends \phpbb\db\migration\migration ), ); } + public function revert_schema() { return array( @@ -48,5 +49,4 @@ class mchat_schema_2 extends \phpbb\db\migration\migration ), ); } - } \ No newline at end of file diff --git a/migrations/mchat_schema_3.php b/migrations/mchat_schema_3.php index c1dd101..3bdc50c 100644 --- a/migrations/mchat_schema_3.php +++ b/migrations/mchat_schema_3.php @@ -18,12 +18,14 @@ class mchat_schema_3 extends \phpbb\db\migration\migration '\dmzx\mchat\migrations\mchat_schema_2', ); } + public function update_data() { return array( array('custom', array(array($this, 'insert_sample_data'))), ); } + public function insert_sample_data() { global $user; diff --git a/migrations/mchat_schema_4.php b/migrations/mchat_schema_4.php index 047047e..30a6271 100644 --- a/migrations/mchat_schema_4.php +++ b/migrations/mchat_schema_4.php @@ -18,6 +18,7 @@ class mchat_schema_4 extends \phpbb\db\migration\migration '\dmzx\mchat\migrations\mchat_schema_3', ); } + public function update_schema() { return array( @@ -33,4 +34,20 @@ class mchat_schema_4 extends \phpbb\db\migration\migration ), ); } + + public function revert_schema() + { + return array( + 'drop_columns' => array( + $this->table_prefix . 'users' => array( + 'user_mchat_index', + 'user_mchat_sound', + 'user_mchat_stats_index', + 'user_mchat_topics', + 'user_mchat_avatars', + 'user_mchat_input_area', + ), + ), + ); + } } \ No newline at end of file diff --git a/migrations/mchat_schema_5.php b/migrations/mchat_schema_5.php index d4816cb..b35be41 100644 --- a/migrations/mchat_schema_5.php +++ b/migrations/mchat_schema_5.php @@ -18,6 +18,7 @@ class mchat_schema_5 extends \phpbb\db\migration\migration '\dmzx\mchat\migrations\mchat_schema_4', ); } + public function update_schema() { return array( @@ -33,6 +34,7 @@ class mchat_schema_5 extends \phpbb\db\migration\migration ), ); } + public function revert_schema() { return array( @@ -41,5 +43,4 @@ class mchat_schema_5 extends \phpbb\db\migration\migration ), ); } - } \ No newline at end of file diff --git a/migrations/mchat_schema_6.php b/migrations/mchat_schema_6.php index e65a29e..232981d 100644 --- a/migrations/mchat_schema_6.php +++ b/migrations/mchat_schema_6.php @@ -18,6 +18,7 @@ class mchat_schema_6 extends \phpbb\db\migration\migration '\dmzx\mchat\migrations\mchat_schema_5', ); } + public function update_data() { return array( diff --git a/ucp/ucp_mchat_info.php b/ucp/ucp_mchat_info.php index b40d211..b390109 100644 --- a/ucp/ucp_mchat_info.php +++ b/ucp/ucp_mchat_info.php @@ -25,4 +25,4 @@ class ucp_mchat_info ), ); } -} +} \ No newline at end of file diff --git a/ucp/ucp_mchat_module.php b/ucp/ucp_mchat_module.php index de75f46..46eff7d 100644 --- a/ucp/ucp_mchat_module.php +++ b/ucp/ucp_mchat_module.php @@ -21,8 +21,6 @@ class ucp_mchat_module $this->functions_mchat = $phpbb_container->get('dmzx.mchat.functions_mchat'); - // $user->add_lang('mods/mchat_lang'); - $submit = (isset($_POST['submit'])) ? true : false; $error = $data = array(); @@ -107,6 +105,4 @@ class ucp_mchat_module $this->tpl_name = 'ucp_mchat'; $this->page_title = 'UCP_PROFILE_MCHAT'; } -// $this->page_title = 'UCP_PROFILE_MCHAT'; - -} +} \ No newline at end of file