diff options
| author | RedMatrix <info@friendica.com> | 2015-01-30 18:14:10 +1100 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2015-01-30 18:14:10 +1100 |
| commit | b381579959b3c241a19e6dd8fc4fb34914f39847 (patch) | |
| tree | 3a166feecb8a0cdbac7d777ba9e0c203773993c2 | |
| parent | 3e22de0be01cc53e74ffd00f5b9d14d4bcc9b6c5 (diff) | |
| parent | f81df92ef8edea69f12ed60bdf9b141febbeb534 (diff) | |
| download | volse-hubzilla-b381579959b3c241a19e6dd8fc4fb34914f39847.tar.gz volse-hubzilla-b381579959b3c241a19e6dd8fc4fb34914f39847.tar.bz2 volse-hubzilla-b381579959b3c241a19e6dd8fc4fb34914f39847.zip | |
Merge pull request #881 from cvogeley/master
Add allowed and not allowed emails to the UI in the
| -rw-r--r-- | mod/admin.php | 3 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mod/admin.php b/mod/admin.php index 3efa533c1..ec922cc72 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -250,6 +250,7 @@ function admin_page_site_post(&$a){ $allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : ''); $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); + $not_allowed_email = ((x($_POST,'not_allowed_email')) ? notags(trim($_POST['not_allowed_email'])) : ''); $block_public = ((x($_POST,'block_public')) ? True : False); $force_publish = ((x($_POST,'publish_all')) ? True : False); $disable_discover_tab = ((x($_POST,'disable_discover_tab')) ? True : False); @@ -308,6 +309,7 @@ function admin_page_site_post(&$a){ set_config('system','register_text', $register_text); set_config('system','allowed_sites', $allowed_sites); set_config('system','allowed_email', $allowed_email); + set_config('system','not_allowed_email', $not_allowed_email); set_config('system','block_public', $block_public); set_config('system','publish_all', $force_publish); set_config('system','disable_discover_tab', $disable_discover_tab); @@ -435,6 +437,7 @@ function admin_page_site(&$a) { '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), + '$not_allowed_email' => array('not_allowed_email', t("Not allowed email domains"), get_config('system','not_allowed_email'), t("Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined.")), '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")), '$verify_email' => array('verify_email', t("Verify Email Addresses"), get_config('system','verify_email'), t("Check to verify email addresses used in account registration (recommended).")), '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")), diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index caeddeecb..a30892f71 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -55,7 +55,8 @@ {{include file="field_input.tpl" field=$register_text}} {{include file="field_select.tpl" field=$register_policy}} {{include file="field_select.tpl" field=$access_policy}} - + {{include file="field_textarea.tpl" field=$allowed_email}} + {{include file="field_textarea.tpl" field=$not_allowed_email}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <h3>{{$upload}}</h3> |