From 9a94c35120480c5a12de8ab0954a16e9f10f7eb6 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Wed, 18 Dec 2013 10:17:38 -0500 Subject: [PATCH 1/3] acl selector add and remove mentions when a forum is selected. --- include/acl_selectors.php | 6 +++-- js/acl.js | 48 ++++++++++++++++++++++++++++++--- js/fk.autocomplete.js | 2 +- view/templates/acl_selector.tpl | 6 +---- 4 files changed, 50 insertions(+), 12 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 6c0222e1c4..01c2f1d706 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -474,14 +474,15 @@ function acl_lookup(&$a, $out_type = 'json') { "name" => $g['name'], "id" => intval($g['id']), "uids" => array_map("intval", explode(",",$g['uids'])), - "link" => '' + "link" => '', + "forum" => '0' ); } } if ($type=='' || $type=='c'){ - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` + $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, forum FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != '' $sql_extra2 ORDER BY `name` ASC ", @@ -541,6 +542,7 @@ function acl_lookup(&$a, $out_type = 'json') { "network" => $g['network'], "link" => $g['url'], "nick" => ($g['attag']) ? $g['attag'] : $g['nick'], + "forum" => $g['forum'] ); } } diff --git a/js/acl.js b/js/acl.js index fc6a6c0c1d..f258a29c73 100644 --- a/js/acl.js +++ b/js/acl.js @@ -26,10 +26,42 @@ function ACL(backend_url, preset){ $("#acl-search").keypress(that.on_search); $("#acl-wrapper").parents("form").submit(that.on_submit); + /* add/remove mentions */ + that.element = $("#profile-jot-text"); + that.htmlelm = that.element.get()[0]; + /* startup! */ that.get(0,100); } +ACL.prototype.remove_mention = function(nick) { + searchText = '@'+nick+ " "; + // 'editor' is defined in jot-header.tpl : false=plaintext, true:tinyMCE + if (editor==false) { + start = that.element.val().search(searchText); + if ( start<0) return; + end = start+searchText.length; + that.element.setSelection(start,end).replaceSelectedText('').collapseSelection(false); + } else { + start = tinyMCE.activeEditor.getContent({format : 'raw'}).search( searchText ); + if ( start<0 ) return; + txt = tinyMCE.activeEditor.getContent(); + newtxt = txt.replace(searchText, ''); + tinyMCE.activeEditor.setContent(newtxt); + } +} + +ACL.prototype.add_mention = function(nick) { + // 'editor' is defined in jot-header.tpl : false=plaintext, true:tinyMCE + if (editor==false) { + if ( that.element.val().search( '@'+nick) >= 0 ) return; + that.element.val( "@"+nick+" " + that.element.val() ); + } else { + if ( tinyMCE.activeEditor.getContent({format : 'raw'}).search( '@'+nick) >= 0 ) return; + tinyMCE.activeEditor.dom.add(tinyMCE.activeEditor.getBody(), 'span', {}, '@'+nick+" "); + } +} + ACL.prototype.on_submit = function(){ aclfileds = $("#acl-fields").html(""); $(that.allow_gid).each(function(i,v){ @@ -105,7 +137,8 @@ ACL.prototype.on_button_hide = function(event){ ACL.prototype.set_allow = function(itemid){ type = itemid[0]; - id = parseInt(itemid.substr(1)); + id = parseInt(itemid.substr(1)); + switch(type){ case "g": if (that.allow_gid.indexOf(id)<0){ @@ -118,8 +151,10 @@ ACL.prototype.set_allow = function(itemid){ case "c": if (that.allow_cid.indexOf(id)<0){ that.allow_cid.push(id) + if (that.data[id].forum=="1") that.add_mention(that.data[id].nick); } else { that.allow_cid.remove(id); + if (that.data[id].forum=="1") that.remove_mention(that.data[id].nick); } if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id); break; @@ -129,7 +164,8 @@ ACL.prototype.set_allow = function(itemid){ ACL.prototype.set_deny = function(itemid){ type = itemid[0]; - id = parseInt(itemid.substr(1)); + id = parseInt(itemid.substr(1)); + switch(type){ case "g": if (that.deny_gid.indexOf(id)<0){ @@ -140,6 +176,7 @@ ACL.prototype.set_deny = function(itemid){ if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id); break; case "c": + if (that.data[id].forum=="1") that.remove_mention(that.data[id].nick); if (that.deny_cid.indexOf(id)<0){ that.deny_cid.push(id) } else { @@ -246,17 +283,20 @@ ACL.prototype.get = function(start,count, search){ ACL.prototype.populate = function(data){ var height = Math.ceil(data.tot / that.nw) * 42; that.list_content.height(height); + that.data = {}; $(data.items).each(function(){ - html = "
"+that.item_tpl+"
"; - html = html.format(this.photo, this.name, this.type, this.id, '', this.network, this.link); + html = "
"+that.item_tpl+"
"; + html = html.format(this.photo, this.name, this.type, this.id, (this.forum=='1'?'forum':''), this.network, this.link); if (this.uids!=undefined) that.group_uids[this.id] = this.uids; //console.log(html); that.list_content.append(html); + that.data[this.id] = this; }); $(".acl-list-item img[data-src]", that.list_content).each(function(i, el){ // Add src attribute for images with a data-src attribute $(el).attr('src', $(el).data("src")); }); + that.update_view(); } diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index b1bc40be28..2334bb4a2c 100644 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js @@ -89,7 +89,7 @@ ACPopup.prototype._search = function(){ }); } - ACPopup.prototype.add = function(label, value){ +ACPopup.prototype.add = function(label, value){ var that=this; var elm = $("
"+label+"
"); elm.click(function(e){ diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl index 5fd11e7569..7a9514ea86 100644 --- a/view/templates/acl_selector.tpl +++ b/view/templates/acl_selector.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +
{{$showall}} From 53dc1ce31fd5cf19211b000f4eccfc73d7ba4a42 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Wed, 18 Dec 2013 10:48:09 -0500 Subject: [PATCH 2/3] fix textarea/tinymce, add contact id to mention --- js/acl.js | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/js/acl.js b/js/acl.js index f258a29c73..76c2f4c195 100644 --- a/js/acl.js +++ b/js/acl.js @@ -34,11 +34,11 @@ function ACL(backend_url, preset){ that.get(0,100); } -ACL.prototype.remove_mention = function(nick) { - searchText = '@'+nick+ " "; - // 'editor' is defined in jot-header.tpl : false=plaintext, true:tinyMCE - if (editor==false) { - start = that.element.val().search(searchText); +ACL.prototype.remove_mention = function(id) { + var nick = that.data[id].nick; + var searchText = "@"+nick+"+"+id+" "; + if (tinyMCE.activeEditor===null) { + start = that.element.val().indexOf(searchText); if ( start<0) return; end = start+searchText.length; that.element.setSelection(start,end).replaceSelectedText('').collapseSelection(false); @@ -51,14 +51,15 @@ ACL.prototype.remove_mention = function(nick) { } } -ACL.prototype.add_mention = function(nick) { - // 'editor' is defined in jot-header.tpl : false=plaintext, true:tinyMCE - if (editor==false) { - if ( that.element.val().search( '@'+nick) >= 0 ) return; - that.element.val( "@"+nick+" " + that.element.val() ); +ACL.prototype.add_mention = function(id) { + var nick = that.data[id].nick; + var searchText = "@"+nick+"+"+id+" "; + if (tinyMCE.activeEditor===null) { + if ( that.element.val().indexOf( searchText) >= 0 ) return; + that.element.val( searchText + that.element.val() ); } else { - if ( tinyMCE.activeEditor.getContent({format : 'raw'}).search( '@'+nick) >= 0 ) return; - tinyMCE.activeEditor.dom.add(tinyMCE.activeEditor.getBody(), 'span', {}, '@'+nick+" "); + if ( tinyMCE.activeEditor.getContent({format : 'raw'}).search(searchText) >= 0 ) return; + tinyMCE.activeEditor.dom.add(tinyMCE.activeEditor.getBody(), 'span', {}, searchText); } } @@ -151,10 +152,10 @@ ACL.prototype.set_allow = function(itemid){ case "c": if (that.allow_cid.indexOf(id)<0){ that.allow_cid.push(id) - if (that.data[id].forum=="1") that.add_mention(that.data[id].nick); + if (that.data[id].forum=="1") that.add_mention(id); } else { that.allow_cid.remove(id); - if (that.data[id].forum=="1") that.remove_mention(that.data[id].nick); + if (that.data[id].forum=="1") that.remove_mention(id); } if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id); break; @@ -176,7 +177,7 @@ ACL.prototype.set_deny = function(itemid){ if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id); break; case "c": - if (that.data[id].forum=="1") that.remove_mention(that.data[id].nick); + if (that.data[id].forum=="1") that.remove_mention(id); if (that.deny_cid.indexOf(id)<0){ that.deny_cid.push(id) } else { @@ -188,9 +189,13 @@ ACL.prototype.set_deny = function(itemid){ that.update_view(); } +ACL.prototype.is_show_all = function() { + return (that.allow_gid.length==0 && that.allow_cid.length==0 && + that.deny_gid.length==0 && that.deny_cid.length==0); +} + ACL.prototype.update_view = function(){ - if (that.allow_gid.length==0 && that.allow_cid.length==0 && - that.deny_gid.length==0 && that.deny_cid.length==0){ + if (this.is_show_all()){ that.showall.addClass("selected"); /* jot acl */ $('#jot-perms-icon').removeClass('lock').addClass('unlock'); From ad5a47aecfe843199c50fb394cca6a77d5c12f3d Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Fri, 3 Jan 2014 14:40:43 +0100 Subject: [PATCH 3/3] add fetaure switch for acl-automention --- include/acl_selectors.php | 4 ++++ include/features.php | 1 + include/network.php | 1 - js/acl.js | 5 ++++- view/templates/acl_selector.tpl | 3 ++- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 01c2f1d706..3306871d00 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -1,6 +1,7 @@ json_encode($perms['allow_gid']), '$denycid' => json_encode($perms['deny_cid']), '$denygid' => json_encode($perms['deny_gid']), + '$features' => array( + "aclautomention"=>(feature_enabled($user,"aclautomention")?"true":"false") + ), )); diff --git a/include/features.php b/include/features.php index b2712665e1..24955ba104 100644 --- a/include/features.php +++ b/include/features.php @@ -30,6 +30,7 @@ function get_features() { t('Post Composition Features'), array('richtext', t('Richtext Editor'), t('Enable richtext editor')), array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them')), + array('aclautomention', t('Auto-mention Forums'), t('Add/remove mention when a fourm page is selected/deselected in ACL window.')), ), // Network sidebar widgets diff --git a/include/network.php b/include/network.php index a4538e88ed..a663a6d942 100644 --- a/include/network.php +++ b/include/network.php @@ -617,7 +617,6 @@ function fetch_xrd_links($url) { if(! function_exists('validate_url')) { function validate_url(&$url) { - // no naked subdomains (allow localhost for tests) if(strpos($url,'.') === false && strpos($url,'/localhost/') === false) return false; diff --git a/js/acl.js b/js/acl.js index 76c2f4c195..b57a925462 100644 --- a/js/acl.js +++ b/js/acl.js @@ -1,7 +1,8 @@ -function ACL(backend_url, preset){ +function ACL(backend_url, preset, automention){ that = this; that.url = backend_url; + that.automention = automention; that.kp_timer = null; @@ -35,6 +36,7 @@ function ACL(backend_url, preset){ } ACL.prototype.remove_mention = function(id) { + if (!that.aclautomention) return; var nick = that.data[id].nick; var searchText = "@"+nick+"+"+id+" "; if (tinyMCE.activeEditor===null) { @@ -52,6 +54,7 @@ ACL.prototype.remove_mention = function(id) { } ACL.prototype.add_mention = function(id) { + if (!that.aclautomention) return; var nick = that.data[id].nick; var searchText = "@"+nick+"+"+id+" "; if (tinyMCE.activeEditor===null) { diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl index 7a9514ea86..6b6f1be4a9 100644 --- a/view/templates/acl_selector.tpl +++ b/view/templates/acl_selector.tpl @@ -20,7 +20,8 @@ $(document).ready(function() { if(typeof acl=="undefined"){ acl = new ACL( baseurl+"/acl", - [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ] + [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ], + {{$features.aclautomention}} ); } });