We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit f1efb845 authored by Evan Prodromou's avatar Evan Prodromou

don't allow sandboxed users to post public notices

parent d2145a5b
......@@ -203,12 +203,11 @@ class Notice extends Memcached_DataObject
$notice = new Notice();
$notice->profile_id = $profile_id;
$blacklist = common_config('public', 'blacklist');
$autosource = common_config('public', 'autosource');
# Blacklisted are non-false, but not 1, either
# Sandboxed are non-false, but not 1, either
if (($blacklist && in_array($profile_id, $blacklist)) ||
if (!$user->hasRight(Right::PUBLICNOTICE) ||
($source && $autosource && in_array($source, $autosource))) {
$notice->is_local = Notice::LOCAL_NONPUBLIC;
} else {
......
......@@ -692,6 +692,9 @@ class Profile extends Memcached_DataObject
case Right::NEWNOTICE:
$result = !$this->isSilenced();
break;
case Right::PUBLICNOTICE:
$result = !$this->isSandboxed();
break;
default:
$result = false;
break;
......
......@@ -51,5 +51,6 @@ class Right
const SILENCEUSER = 'silenceuser';
const SANDBOXUSER = 'sandboxuser';
const NEWNOTICE = 'newnotice';
const PUBLICNOTICE = 'publicnotice';
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment