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

more permissions work

Browse Source
This commit is contained in:
redmatrix 2016-07-09 21:08:02 -07:00
parent 917a465ccd
commit c9db8c6857
5 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Zotlabs/Access/Permissions.php
View File

@ -27,22 +27,22 @@ class Permissions {
static public function Perms($filter = '') { static public function Perms($filter = '') {
$perms = [ $perms = [
[ 'view_stream' => t('Can view my normal stream and posts') ], 'view_stream' => t('Can view my channel stream and posts'),
[ 'send_stream' => t('Can send me their channel stream and posts') ], 'send_stream' => t('Can send me their channel stream and posts'),
[ 'view_profile' => t('Can view my default channel profile') ], 'view_profile' => t('Can view my default channel profile'),
[ 'view_contacts' => t('Can view my connections') ], 'view_contacts' => t('Can view my connections'),
[ 'view_storage' => t('Can view my file storage and photos') ], 'view_storage' => t('Can view my file storage and photos'),
[ 'write_storage' => t('Can upload/modify my file storage and photos') ], 'write_storage' => t('Can upload/modify my file storage and photos'),
[ 'view_pages' => t('Can view my channel webpages') ], 'view_pages' => t('Can view my channel webpages'),
[ 'write_pages' => t('Can create/edit my channel webpages') ], 'write_pages' => t('Can create/edit my channel webpages'),
[ 'post_wall' => t('Can post on my channel (wall) page') ], 'post_wall' => t('Can post on my channel (wall) page'),
[ 'post_comments' => t('Can comment on or like my posts') ], 'post_comments' => t('Can comment on or like my posts'),
[ 'post_mail' => t('Can send me private mail messages') ], 'post_mail' => t('Can send me private mail messages'),
[ 'post_like' => t('Can like/dislike profiles and profile things') ], 'post_like' => t('Can like/dislike profiles and profile things'),
[ 'tag_deliver' => t('Can forward to all my channel connections via @+ mentions in posts') ], 'tag_deliver' => t('Can forward to all my channel connections via @+ mentions in posts'),
[ 'chat' => t('Can chat with me') ], 'chat' => t('Can chat with me'),
[ 'republish' => t('Can source my public posts in derived channels') ], 'republish' => t('Can source my public posts in derived channels'),
[ 'delegate' => t('Can administer my channel') ] 'delegate' => t('Can administer my channel')
]; ];
$x = array('permissions' => $perms, 'filter' => $filter); $x = array('permissions' => $perms, 'filter' => $filter);

17
Zotlabs/Module/Connedit.php
View File

@ -676,6 +676,18 @@ class Connedit extends \Zotlabs\Web\Controller {
if($slide && $multiprofs) if($slide && $multiprofs)
$affinity = t('Set Affinity & Profile'); $affinity = t('Set Affinity & Profile');
$theirs = q("select * from abconfig where chan = %d and xchan = '%s' and cat = 'their_perms'",
intval(local_channel()),
dbesc($contact['abook_xchan'])
);
$their_perms = array();
if($theirs) {
foreach($theirs as $t) {
$their_perms[$t['k']] = $t['v'];
}
}
logger('theris: ' . print_r($their_perms,true));
foreach($global_perms as $k => $v) { foreach($global_perms as $k => $v) {
$thisperm = get_abconfig(local_channel(),$contact['abook_xchan'],'my_perms',$k); $thisperm = get_abconfig(local_channel(),$contact['abook_xchan'],'my_perms',$k);
//fixme //fixme
@ -687,7 +699,10 @@ class Connedit extends \Zotlabs\Web\Controller {
if((! $self) && ($existing[$k])) if((! $self) && ($existing[$k]))
$thisperm = "1"; $thisperm = "1";
$perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4], $checkinherited);
$perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
} }
$locstr = ''; $locstr = '';

5
Zotlabs/Module/Settings.php
View File

@ -896,17 +896,18 @@ class Settings extends \Zotlabs\Web\Controller {
array( t('Anybody on the internet'), PERMS_PUBLIC) array( t('Anybody on the internet'), PERMS_PUBLIC)
); );
$limits = \Zotlabs\Access\PermissionLimits::Get(local_channel());
foreach($global_perms as $k => $perm) { foreach($global_perms as $k => $perm) {
$options = array(); $options = array();
foreach($perm_opts as $opt) { foreach($perm_opts as $opt) {
$options[$opt[1]] = $opt[0]; $options[$opt[1]] = $opt[0];
} }
$permiss[] = array($k,$perm,$channel[$perm[0]],$perm[4],$options); $permiss[] = array($k,$perm,$limits[$k],'',$options);
} }
// logger('permiss: ' . print_r($permiss,true)); //logger('permiss: ' . print_r($permiss,true));

2
include/config.php
View File

@ -99,7 +99,7 @@ function del_aconfig($account_id, $family, $key) {
function load_abconfig($chan,$xhash) { function load_abconfig($chan,$xhash) {
Zlib\AbConfig::Load($chan,$xhash); return Zlib\AbConfig::Load($chan,$xhash);
} }
function get_abconfig($chan,$xhash,$family,$key) { function get_abconfig($chan,$xhash,$family,$key) {

4
include/permissions.php
View File

@ -81,6 +81,8 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) {
$ret = array(); $ret = array();
$abperms = (($uid && $observer_xchan) ? load_abconfig($uid,$observer_xchan) : false);
foreach($global_perms as $perm_name => $permission) { foreach($global_perms as $perm_name => $permission) {
// First find out what the channel owner declared permissions to be. // First find out what the channel owner declared permissions to be.
@ -122,7 +124,7 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) {
dbesc($observer_xchan) dbesc($observer_xchan)
); );
} }
$abperms = load_abconfig($uid,$observer_xchan);
$abook_checked = true; $abook_checked = true;
} }