diff --git a/composer.json b/composer.json index 796d11b..496c0d7 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.9", + "version": "0.2.0", "time": "2015-03-10", "keywords": ["phpbb", "extension", "mchat"], "license": "GPL-2.0", diff --git a/event/listener.php b/event/listener.php index aaadd2f..f792900 100644 --- a/event/listener.php +++ b/event/listener.php @@ -90,6 +90,7 @@ class listener implements EventSubscriberInterface 'core.page_header' => 'add_page_header_link', 'core.index_modify_page_title' => 'display_mchat_on_index', 'core.posting_modify_submit_post_after' => 'posting_modify_submit_post_after', + 'core.permissions' => 'permissions', ); } @@ -180,11 +181,11 @@ class listener implements EventSubscriberInterface $uid = $bitfield = $options = ''; // will be modified by generate_text_for_storage generate_text_for_storage($message, $uid, $bitfield, $options, true, false, false); $sql_ary = array( - 'forum_id' => $event['forum_id'], - 'post_id' => $event['post_id'], - 'user_id' => $this->user->data['user_id'], - 'user_ip' => $this->user->data['session_ip'], - 'message' => $message, + 'forum_id' => $event['forum_id'], + 'post_id' => $event['post_id'], + 'user_id' => $this->user->data['user_id'], + 'user_ip' => $this->user->data['session_ip'], + 'message' => $message, 'bbcode_bitfield' => $bitfield, 'bbcode_uid' => $uid, 'bbcode_options' => $options, @@ -194,4 +195,70 @@ class listener implements EventSubscriberInterface $this->db->sql_query($sql); } } + + public function permissions($event) + { + $permissions = $event['permissions']; + $permissions += array( + 'u_mchat_use' => array( + 'lang' => 'ACL_U_MCHAT_USE', + 'cat' => 'mChat' + ), + 'u_mchat_view' => array( + 'lang' => 'ACL_U_MCHAT_VIEW', + 'cat' => 'mChat' + ), + 'u_mchat_edit' => array( + 'lang' => 'ACL_U_MCHAT_EDIT', + 'cat' => 'mChat' + ), + 'u_mchat_delete' => array( + 'lang' => 'ACL_U_MCHAT_DELETE', + 'cat' => 'mChat' + ), + 'u_mchat_ip' => array( + 'lang' => 'ACL_U_MCHAT_IP', + 'cat' => 'mChat' + ), + 'u_mchat_pm' => array( + 'lang' => 'ACL_U_MCHAT_PM', + 'cat' => 'mChat' + ), + 'u_mchat_like' => array( + 'lang' => 'ACL_U_MCHAT_LIKE', + 'cat' => 'mChat' + ), + 'u_mchat_quote' => array( + 'lang' => 'ACL_U_MCHAT_QUOTE', + 'cat' => 'mChat' + ), + 'u_mchat_flood_ignore' => array( + 'lang' => 'ACL_U_MCHAT_FLOOD_IGNORE', + 'cat' => 'mChat' + ), + 'u_mchat_archive' => array( + 'lang' => 'ACL_U_MCHAT_ARCHIVE', + 'cat' => 'mChat' + ), + 'u_mchat_bbcode' => array( + 'lang' => 'ACL_U_MCHAT_BBCODE', + 'cat' => 'mChat' + ), + 'u_mchat_smilies' => array( + 'lang' => 'ACL_U_MCHAT_SMILIES', + 'cat' => 'mChat' + ), + 'u_mchat_urls' => array( + 'lang' => 'ACL_U_MCHAT_URLS', + 'cat' => 'mChat' + ), + 'a_mchat' => array( + 'lang' => 'ACL_A_MCHAT', + 'cat' => 'mChat' + ), + ); + $event['permissions'] = $permissions; + $categories['mChat'] = 'ACP_CAT_MCHAT'; + $event['categories'] = array_merge($event['categories'], $categories); + } } diff --git a/language/en/info_acp_mchat.php b/language/en/info_acp_mchat.php index 562e9fb..e53303a 100644 --- a/language/en/info_acp_mchat.php +++ b/language/en/info_acp_mchat.php @@ -153,17 +153,17 @@ $lang = array_merge($lang, array( // 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', + 'ACL_U_MCHAT_EDIT' => 'Can edit messages', + 'ACL_U_MCHAT_DELETE' => 'Can delete messages', + 'ACL_U_MCHAT_IP' => 'Can view IP addresses', + 'ACL_U_MCHAT_PM' => 'Can use private message', + 'ACL_U_MCHAT_LIKE' => 'Can use like message', + 'ACL_U_MCHAT_QUOTE' => 'Can use quote message', + 'ACL_U_MCHAT_FLOOD_IGNORE' => 'Can ignore flood', + 'ACL_U_MCHAT_ARCHIVE' => 'Can view the archive', + 'ACL_U_MCHAT_BBCODE' => 'Can use bbcode', + 'ACL_U_MCHAT_SMILIES' => 'Can use smilies', + 'ACL_U_MCHAT_URLS' => 'Can post urls', // Admin perms 'ACL_A_MCHAT' => 'Can manage mChat settings', diff --git a/migrations/mchat_schema.php b/migrations/mchat_schema.php index b394e0b..6a1a2f0 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.9'; + var $ext_version = '0.2.0'; public function update_data() { @@ -29,20 +29,20 @@ class mchat_schema extends \phpbb\db\migration\migration array('config.add', array('mchat_version', $this->ext_version)), // Add permissions - array('permission.add', array('u_mchat_use')), - array('permission.add', array('u_mchat_view')), - array('permission.add', array('u_mchat_edit')), - array('permission.add', array('u_mchat_delete')), - array('permission.add', array('u_mchat_ip')), - array('permission.add', array('u_mchat_pm')), - array('permission.add', array('u_mchat_like')), - array('permission.add', array('u_mchat_quote')), - array('permission.add', array('u_mchat_flood_ignore')), - array('permission.add', array('u_mchat_archive')), - array('permission.add', array('u_mchat_bbcode')), - array('permission.add', array('u_mchat_smilies')), - array('permission.add', array('u_mchat_urls')), - array('permission.add', array('a_mchat')), + array('permission.add', array('u_mchat_use', true)), + array('permission.add', array('u_mchat_view', true)), + array('permission.add', array('u_mchat_edit', true)), + array('permission.add', array('u_mchat_delete', true)), + array('permission.add', array('u_mchat_ip', true)), + array('permission.add', array('u_mchat_pm', true)), + array('permission.add', array('u_mchat_like', true)), + array('permission.add', array('u_mchat_quote', true)), + array('permission.add', array('u_mchat_flood_ignore', true)), + array('permission.add', array('u_mchat_archive', true)), + array('permission.add', array('u_mchat_bbcode', true)), + array('permission.add', array('u_mchat_smilies', true)), + array('permission.add', array('u_mchat_urls', true)), + array('permission.add', array('a_mchat', true)), // Set permissions array('permission.permission_set', array('ADMINISTRATORS', 'u_mchat_use', 'group')), @@ -61,6 +61,9 @@ class mchat_schema extends \phpbb\db\migration\migration array('permission.permission_set', array('ADMINISTRATORS', 'a_mchat', 'group')), array('permission.permission_set', array('REGISTERED', 'u_mchat_use', 'group')), array('permission.permission_set', array('REGISTERED', 'u_mchat_view', 'group')), + array('permission.permission_set', array('REGISTERED', 'u_mchat_pm', 'group')), + array('permission.permission_set', array('REGISTERED', 'u_mchat_like', 'group')), + array('permission.permission_set', array('REGISTERED', 'u_mchat_quote', 'group')), array('permission.permission_set', array('REGISTERED', 'u_mchat_archive', 'group')), array('permission.permission_set', array('REGISTERED', 'u_mchat_bbcode', 'group')), array('permission.permission_set', array('REGISTERED', 'u_mchat_smilies', 'group')), diff --git a/styles/prosilver/template/editor.js b/styles/prosilver/template/editor.js deleted file mode 100644 index 9eed25a..0000000 --- a/styles/prosilver/template/editor.js +++ /dev/null @@ -1,461 +0,0 @@ -/** -* bbCode control by subBlue design [ www.subBlue.com ] -* Includes unixsafe colour palette selector by SHS` -*/ - -// Startup variables -var imageTag = false; -var theSelection = false; - -var bbcodeEnabled = true; -// Check for Browser & Platform for PC & IE specific bits -// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html -var clientPC = navigator.userAgent.toLowerCase(); // Get client info -var clientVer = parseInt(navigator.appVersion); // Get browser version - -var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1)); -var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); -var baseHeight; - -/** -* Shows the help messages in the helpline window -*/ -function helpline(help) -{ - document.forms[form_name].helpbox.value = help_line[help]; -} - -/** -* Fix a bug involving the TextRange object. From -* http://www.frostjedi.com/terra/scripts/demo/caretBug.html -*/ -function initInsertions() -{ - var doc; - - if (document.forms[form_name]) - { - doc = document; - } - else - { - doc = opener.document; - } - - var textarea = doc.forms[form_name].elements[text_name]; - - if (is_ie && typeof(baseHeight) != 'number') - { - /* === mChat focus fix Start === */ - if(!mChat.focusFix) - { - textarea.focus(); - } - baseHeight = doc.selection.createRange().duplicate().boundingHeight; - /* ==== mChat focus fix End ==== */ - if (!document.forms[form_name]) - { - document.body.focus(); - } - } -} - -/** -* bbstyle -*/ -function bbstyle(bbnumber) -{ - if (bbnumber != -1) - { - bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]); - } - else - { - insert_text('[*]'); - document.forms[form_name].elements[text_name].focus(); - } -} - -/** -* Apply bbcodes -*/ -function bbfontstyle(bbopen, bbclose) -{ - theSelection = false; - - var textarea = document.forms[form_name].elements[text_name]; - - textarea.focus(); - - if ((clientVer >= 4) && is_ie && is_win) - { - // Get text selection - theSelection = document.selection.createRange().text; - - if (theSelection) - { - // Add tags around selection - document.selection.createRange().text = bbopen + theSelection + bbclose; - document.forms[form_name].elements[text_name].focus(); - theSelection = ''; - return; - } - } - else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) - { - mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose); - document.forms[form_name].elements[text_name].focus(); - theSelection = ''; - return; - } - - //The new position for the cursor after adding the bbcode - var caret_pos = getCaretPosition(textarea).start; - var new_pos = caret_pos + bbopen.length; - - // Open tag - insert_text(bbopen + bbclose); - - // Center the cursor when we don't have a selection - // Gecko and proper browsers - if (!isNaN(textarea.selectionStart)) - { - textarea.selectionStart = new_pos; - textarea.selectionEnd = new_pos; - } - // IE - else if (document.selection) - { - var range = textarea.createTextRange(); - range.move("character", new_pos); - range.select(); - storeCaret(textarea); - } - - textarea.focus(); - return; -} - -/** -* Insert text at position -*/ -function insert_text(text, spaces, popup) -{ - var textarea; - - if (!popup) - { - textarea = document.forms[form_name].elements[text_name]; - } - else - { - textarea = opener.document.forms[form_name].elements[text_name]; - } - if (spaces) - { - text = ' ' + text + ' '; - } - - // Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way. - // Therefore we simply add a !is_ie here until IE fixes the text-selection completely. - if (!isNaN(textarea.selectionStart) && !is_ie) - { - var sel_start = textarea.selectionStart; - var sel_end = textarea.selectionEnd; - - mozWrap(textarea, text, ''); - textarea.selectionStart = sel_start + text.length; - textarea.selectionEnd = sel_end + text.length; - } - else if (textarea.createTextRange && textarea.caretPos) - { - if (baseHeight != textarea.caretPos.boundingHeight) - { - textarea.focus(); - storeCaret(textarea); - } - - var caret_pos = textarea.caretPos; - caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text; - } - else - { - textarea.value = textarea.value + text; - } - if (!popup) - { - textarea.focus(); - } -} - -/** -* Add inline attachment at position -*/ -function attach_inline(index, filename) -{ - insert_text('[attachment=' + index + ']' + filename + '[/attachment]'); - document.forms[form_name].elements[text_name].focus(); -} - -/** -* Add quote text to message -*/ -function addquote(post_id, username, l_wrote) -{ - var message_name = 'message_' + post_id; - var theSelection = ''; - var divarea = false; - - if (l_wrote === undefined) - { - // Backwards compatibility - l_wrote = 'wrote'; - } - - if (document.all) - { - divarea = document.all[message_name]; - } - else - { - divarea = document.getElementById(message_name); - } - - // Get text selection - not only the post content :( - // IE9 must use the document.selection method but has the *.getSelection so we just force no IE - if (window.getSelection && !is_ie && !window.opera) - { - theSelection = window.getSelection().toString(); - } - else if (document.getSelection && !is_ie) - { - theSelection = document.getSelection(); - } - else if (document.selection) - { - theSelection = document.selection.createRange().text; - } - - if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null) - { - if (divarea.innerHTML) - { - theSelection = divarea.innerHTML.replace(/
/ig, '\n'); - theSelection = theSelection.replace(/
');
- document.write(' ');
- document.writeln(' | ');
- }
-
- if (dir == 'v')
- {
- document.writeln('