diff options
| -rw-r--r-- | include/api.php | 4 | ||||
| -rw-r--r-- | mod/acl.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/js/acl.js | 42 |
4 files changed, 34 insertions, 16 deletions
diff --git a/include/api.php b/include/api.php index 53adcc868..f781987d1 100644 --- a/include/api.php +++ b/include/api.php @@ -909,7 +909,7 @@ require_once('include/api_auth.php'); function red_item(&$a, $type) { if (api_user() === false) { - logger('api_red_item_new: no user'); + logger('api_red_item_full: no user'); return false; } @@ -2196,7 +2196,7 @@ require_once('include/api_auth.php'); } } - $id = send_message($recipient['id'], $_POST['text'], $sub, $replyto); + $id = send_message(api_user(),$recipient['guid'], $_POST['text'], $sub, $replyto); if ($id>-1) { $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id)); diff --git a/mod/acl.php b/mod/acl.php index dc29e3eff..aaf056b60 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -1,6 +1,6 @@ <?php -/* ACL selector json backend */ +/* ACL selector json backend */ require_once("include/acl_selectors.php"); function acl_init(&$a){ diff --git a/version.inc b/version.inc index e9eed26db..1cf2edada 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-15.1217 +2015-11-16.1218 diff --git a/view/js/acl.js b/view/js/acl.js index 626d1a750..847997de0 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -25,7 +25,6 @@ function ACL(backend_url, preset) { /*events*/ $(document).ready(function() { -// setTimeout( function() { that.showall.click(that.on_showall); $(document).on('click','.acl-button-show',that.on_button_show); $(document).on('click','.acl-button-hide',that.on_button_hide); @@ -34,11 +33,10 @@ function ACL(backend_url, preset) { /* startup! */ that.get(0,100); that.on_submit(); -// }, 5000 ); }); } -// no longer called on submit - call to update whenever a change occurs to the acl list. +// no longer called only on submit - call to update whenever a change occurs to the acl list. ACL.prototype.on_submit = function() { aclfileds = $("#acl-fields").html(""); @@ -66,7 +64,9 @@ ACL.prototype.search = function() { }; ACL.prototype.on_search = function(event) { - if (that.kp_timer) clearTimeout(that.kp_timer); + if (that.kp_timer) { + clearTimeout(that.kp_timer); + } that.kp_timer = setTimeout( that.search, 1000); }; @@ -90,15 +90,37 @@ ACL.prototype.on_showall = function(event) { return false; }; +ACL.prototype.on_selectall = function(event) { + event.preventDefault(); + event.stopPropagation(); + + /* This function has not yet been completed. */ + /* The goal is to select all ACL "show" entries with one action. */ + + $('.acl-button-show').each(function(){}); + + if (that.showall.hasClass("btn-warning")) { + return false; + } + that.showall.removeClass("btn-default").addClass("btn-warning"); + + that.allow_cid = []; + that.allow_gid = []; + that.deny_cid = []; + that.deny_gid = []; + + that.update_view(); + that.on_submit(); + + return false; +}; + + ACL.prototype.on_button_show = function(event) { event.preventDefault(); event.stopImmediatePropagation(); event.stopPropagation(); - /*that.showall.removeClass("selected"); - $(this).siblings(".acl-button-hide").removeClass("selected"); - $(this).toggleClass("selected");*/ - that.set_allow($(this).parent().attr('id')); that.on_submit(); @@ -110,10 +132,6 @@ ACL.prototype.on_button_hide = function(event) { event.stopImmediatePropagation(); event.stopPropagation(); - /*that.showall.removeClass("selected"); - $(this).siblings(".acl-button-show").removeClass("selected"); - $(this).toggleClass("selected");*/ - that.set_deny($(this).parent().attr('id')); that.on_submit(); |