diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-15 08:56:41 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-15 08:56:41 +0100 |
| commit | d868ebe4ba1cb2f7e577346fbece613e094699ad (patch) | |
| tree | 966b3f87eeb8aa918a01df16b34265aa28172607 | |
| parent | b49e09939a5b4222f3edf2b39430c13a4d14baeb (diff) | |
| parent | ef11b3eb2bea74f0714402256e677fe7835c43ab (diff) | |
| download | volse-hubzilla-d868ebe4ba1cb2f7e577346fbece613e094699ad.tar.gz volse-hubzilla-d868ebe4ba1cb2f7e577346fbece613e094699ad.tar.bz2 volse-hubzilla-d868ebe4ba1cb2f7e577346fbece613e094699ad.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
| -rw-r--r-- | Zotlabs/Module/Admin/Site.php | 4 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index 50756c654..60cb39277 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -29,7 +29,7 @@ class Site { $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); $register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); - + $minimum_age = ((x($_POST,'minimum_age')) ? intval(trim($_POST['minimum_age'])) : 13); $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); @@ -127,6 +127,7 @@ class Site { set_config('system','maximagesize', $maximagesize); set_config('system','register_policy', $register_policy); + set_config('system','minimum_age', $minimum_age); set_config('system','invitation_only', $invite_only); set_config('system','access_policy', $access_policy); set_config('system','account_abandon_days', $abandon_days); @@ -303,6 +304,7 @@ class Site { '$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.")), + '$minimum_age' => array('minimum_age', t("Minimum age"), (x(get_config('system','minimum_age'))?get_config('system','minimum_age'):13), t("Minimum age (in years) for who may register on this site.")), '$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.")), diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 2b4e8c9f9..97c14b6e3 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -70,6 +70,7 @@ {{include file="field_input.tpl" field=$register_text}} {{include file="field_select.tpl" field=$register_policy}} {{include file="field_checkbox.tpl" field=$invite_only}} + {{include file="field_input.tpl" field=$minimum_age}} {{include file="field_select.tpl" field=$access_policy}} {{include file="field_input.tpl" field=$location}} {{include file="field_input.tpl" field=$sellpage}} |