harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

translate more old perms calls

Browse Source
This commit is contained in:
redmatrix 2016-07-19 17:52:45 -07:00
parent 6a4573b935
commit ea83032863
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Connedit.php
View File

@ -209,7 +209,7 @@ class Connedit extends \Zotlabs\Web\Controller {
$role = get_pconfig(local_channel(),'system','permissions_role'); $role = get_pconfig(local_channel(),'system','permissions_role');
if($role) { if($role) {
$x = get_role_perms($role); $x = \Zotlabs\Access\PermissionRoles::role_perms($role);
if($x['perms_connect']) { if($x['perms_connect']) {
$abook_my_perms = $x['perms_connect']; $abook_my_perms = $x['perms_connect'];
} }
@ -395,7 +395,7 @@ class Connedit extends \Zotlabs\Web\Controller {
$my_perms = get_channel_default_perms(local_channel()); $my_perms = get_channel_default_perms(local_channel());
$role = get_pconfig(local_channel(),'system','permissions_role'); $role = get_pconfig(local_channel(),'system','permissions_role');
if($role) { if($role) {
$x = get_role_perms($role); $x = \Zotlabs\Access\PermissionRoles::role_perms($role);
if($x['perms_connect']) if($x['perms_connect'])
$my_perms = $x['perms_connect']; $my_perms = $x['perms_connect'];
} }

2
Zotlabs/Module/Settings.php
View File

@ -379,7 +379,7 @@ class Settings extends \Zotlabs\Web\Controller {
); );
} }
else { else {
$role_permissions = get_role_perms($_POST['permissions_role']); $role_permissions = \Zotlabs\Access\PermissionRoles::role_perms($_POST['permissions_role']);
if(! $role_permissions) { if(! $role_permissions) {
notice('Permissions category could not be found.'); notice('Permissions category could not be found.');
return; return;

2
include/follow.php
View File

@ -66,7 +66,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
$role = get_pconfig($uid,'system','permissions_role'); $role = get_pconfig($uid,'system','permissions_role');
if($role) { if($role) {
$x = get_role_perms($role); $x = \Zotlabs\Access\PermissionRoles::role_perms($role);
if($x['perms_connect']) if($x['perms_connect'])
$my_perms = $x['perms_connect']; $my_perms = $x['perms_connect'];
} }

2
include/zot.php
View File

@ -460,7 +460,7 @@ function zot_refresh($them, $channel = null, $force = false) {
$role = get_pconfig($channel['channel_id'],'system','permissions_role'); $role = get_pconfig($channel['channel_id'],'system','permissions_role');
if($role) { if($role) {
$xx = get_role_perms($role); $xx = \Zotlabs\Access\PermissionRoles::role_perms($role);
if($xx['perms_auto']) { if($xx['perms_auto']) {
$default_perms = $xx['perms_connect']; $default_perms = $xx['perms_connect'];
$my_perms = \Zotlabs\Access\Permissions::FilledPerms($default_perms); $my_perms = \Zotlabs\Access\Permissions::FilledPerms($default_perms);