diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-03 15:55:22 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-03 15:55:22 -0700 |
| commit | f2f2b534e611c37105b1dc56470735c13641c944 (patch) | |
| tree | 2eed3379df931bccd56dd7be8e3a56394fa3e0f9 /Zotlabs/Module/Connedit.php | |
| parent | 2d9ae8ff2c581b8981c9c7308c4cf98bfee934b1 (diff) | |
| parent | a9bda2b12e3d393fa854e23207a081052e2e7bfd (diff) | |
| download | volse-hubzilla-f2f2b534e611c37105b1dc56470735c13641c944.tar.gz volse-hubzilla-f2f2b534e611c37105b1dc56470735c13641c944.tar.bz2 volse-hubzilla-f2f2b534e611c37105b1dc56470735c13641c944.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Connedit.php')
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 72bd3e86e..484e69b52 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -388,30 +388,22 @@ class Connedit extends \Zotlabs\Web\Controller { $section = ((array_key_exists('section',$_REQUEST)) ? $_REQUEST['section'] : ''); $channel = \App::get_channel(); - $my_perms = get_channel_default_perms(local_channel()); - $role = get_pconfig(local_channel(),'system','permissions_role'); - if($role) { - $x = \Zotlabs\Access\PermissionRoles::role_perms($role); - if($x['perms_connect']) - $my_perms = $x['perms_connect']; - } $yes_no = array(t('No'),t('Yes')); - if($my_perms) { - $o .= "<script>function connectDefaultShare() { - \$('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).prop('checked', false); - });\n\n"; - $perms = get_perms(); - foreach($perms as $p => $v) { - if($my_perms & $v[1]) { - $o .= "\$('#me_id_perms_" . $p . "').prop('checked', true); \n"; - } + $connect_perms = \Zotlabs\Access\Permissions::connect_perms(local_channel()); + + $o .= "<script>function connectDefaultShare() { + \$('.abook-edit-me').each(function() { + if(! $(this).is(':disabled')) + $(this).prop('checked', false); + });\n\n"; + foreach($connect_perms['perms'] as $p => $v) { + if($v) { + $o .= "\$('#me_id_perms_" . $p . "').prop('checked', true); \n"; } - $o .= " }\n</script>\n"; } + $o .= " }\n</script>\n"; if(argc() == 3) { |