add fetaure switch for acl-automention
This commit is contained in:
parent
53dc1ce31f
commit
ad5a47aecf
5 changed files with 11 additions and 3 deletions
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
require_once("include/contact_selectors.php");
|
||||
require_once("include/features.php");
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -329,6 +330,9 @@ function populate_acl($user = null,$celeb = false) {
|
|||
'$allowgid' => 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")
|
||||
),
|
||||
));
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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}}
|
||||
);
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue