Merge pull request #10 from redmatrix/dev

Dev
This commit is contained in:
mrjive 2018-04-22 10:54:41 +02:00 committed by GitHub
commit 51c533536f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 4 deletions

View File

@ -41,10 +41,8 @@ class PermissionLimits {
$limits = []; $limits = [];
$perms = Permissions::Perms(); $perms = Permissions::Perms();
$anon_comments = get_config('system','anonymous_comments',true);
foreach($perms as $k => $v) { foreach($perms as $k => $v) {
if(strstr($k, 'view') || ($k === 'post_comments' && $anon_comments)) if(strstr($k, 'view'))
$limits[$k] = PERMS_PUBLIC; $limits[$k] = PERMS_PUBLIC;
else else
$limits[$k] = PERMS_SPECIFIC; $limits[$k] = PERMS_SPECIFIC;

26
Zotlabs/Update/_1212.php Normal file
View File

@ -0,0 +1,26 @@
<?php
namespace Zotlabs\Update;
class _1212 {
function run() {
$r = q("select channel_id from channel where true");
if($r) {
foreach($r as $rv) {
$role = get_pconfig($rv['channel_id'],'system','permissions_role');
if($role !== 'custom') {
$role_permissions = \Zotlabs\Access\PermissionRoles::role_perms($role);
if(array_key_exists('limits',$role_permissions) && array_key_exists('post_comments',$role_permissions['limits'])) {
set_pconfig($rv['channel_id'],'perm_limits','post_comments',$role_permissions['limits']['post_comments']);
}
}
}
}
return UPDATE_SUCCESS;
}
}

View File

@ -54,7 +54,7 @@ define ( 'STD_VERSION', '3.5' );
define ( 'ZOT_REVISION', '6.0a' ); define ( 'ZOT_REVISION', '6.0a' );
define ( 'DB_UPDATE_VERSION', 1211 ); define ( 'DB_UPDATE_VERSION', 1212 );
define ( 'PROJECT_BASE', __DIR__ ); define ( 'PROJECT_BASE', __DIR__ );