aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2014-11-21 15:35:59 -0800
committerHabeas Codice <habeascodice@federated.social>2014-11-21 15:35:59 -0800
commitb224f8056cbf9b41994b44e48a7ad154976d1c88 (patch)
treea2486bbb2bde84aaaa22117e8b7668bfbf023013
parentdb29dc6bff8ed465277c919303d119f52340fdfe (diff)
downloadvolse-hubzilla-b224f8056cbf9b41994b44e48a7ad154976d1c88.tar.gz
volse-hubzilla-b224f8056cbf9b41994b44e48a7ad154976d1c88.tar.bz2
volse-hubzilla-b224f8056cbf9b41994b44e48a7ad154976d1c88.zip
new system config reserved_channels
prevents members from creating channels in a reserved list
-rw-r--r--doc/hidden_configs.bb2
-rw-r--r--include/text.php7
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 7b7a688c4..da5134123 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -100,6 +100,8 @@ This document assumes you're an administrator.
the main logs as well.
[b]system > hide_in_statistics[/b]
Tell the red statistics servers to completely hide this hub in hub lists.
+ [b]system > reserved_channels[/b]
+ Don't allow members to register channels with this comma separated list of names (no spaces)
#include doc/macros/main_footer.bb;
diff --git a/include/text.php b/include/text.php
index 22a1a78c4..ce729ac1b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1815,8 +1815,13 @@ function legal_webbie($s) {
function check_webbie($arr) {
+ $reservechan = get_config('system','reserved_channels');
+ if(strlen($reservechan))
+ $taken = explode(',', $reservechan);
+ else
+ $taken = array();
+
$str = '';
- $taken = array();
if(count($arr)) {
foreach($arr as $x) {
$y = legal_webbie($x);