diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-15 15:17:39 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-15 15:17:39 -0800 |
| commit | 38d513181d4d28fa2c525fac9ac53ba23649b17e (patch) | |
| tree | b5812d4b2c8e8ab3026aa8e3e8f6341e393d652b /mod/admin.php | |
| parent | f121b74bec445b7dc5e01c5ee8898e15ecfc1df1 (diff) | |
| parent | 5a59cd9b8cd6e0c00260f47c50e5433b070155d1 (diff) | |
| download | volse-hubzilla-38d513181d4d28fa2c525fac9ac53ba23649b17e.tar.gz volse-hubzilla-38d513181d4d28fa2c525fac9ac53ba23649b17e.tar.bz2 volse-hubzilla-38d513181d4d28fa2c525fac9ac53ba23649b17e.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod/admin.php')
| -rw-r--r-- | mod/admin.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mod/admin.php b/mod/admin.php index bac0148e0..070c06ea0 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -164,7 +164,7 @@ function admin_page_summary(&$a) { } // pending registrations - $r = q("SELECT COUNT(id) AS `count` FROM register"); + $r = q("SELECT COUNT(id) AS `count` FROM `register` WHERE `uid` != '0'"); $pending = $r[0]['count']; // available channels, primary and clones @@ -231,7 +231,9 @@ function admin_page_site_post(&$a){ $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); $register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); + $access_policy = ((x($_POST,'access_policy')) ? intval(trim($_POST['access_policy'])) : 0); + $invite_only = ((x($_POST,'invite_only')) ? True : False); $abandon_days = ((x($_POST,'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0); $register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : ''); @@ -299,6 +301,7 @@ function admin_page_site_post(&$a){ set_config('system','maximagesize', $maximagesize); set_config('system','register_policy', $register_policy); + set_config('system','invitation_only', $invite_only); set_config('system','access_policy', $access_policy); set_config('system','account_abandon_days', $abandon_days); set_config('system','register_text', $register_text); @@ -457,6 +460,7 @@ function admin_page_site(&$a) { '$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')), '$maximagesize' => array('maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), '$register_policy' => array('register_policy', t("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices), + '$invite_only' => array('invite_only', t("Invitation only"), get_config('system','invitation_only'), t("Only allow new member registrations with an invitation code. Above register policy must be set to Yes.")), '$access_policy' => array('access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system','access_policy'), "This is displayed on the public server site list.", $access_choices), '$register_text' => array('register_text', t("Register text"), htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), '$frontpage' => array('frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system','frontpage'), t("example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")), |