aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2015-01-29 20:27:35 +0100
committerChristian Vogeley <christian.vogeley@hotmail.de>2015-01-29 20:27:35 +0100
commitf81df92ef8edea69f12ed60bdf9b141febbeb534 (patch)
tree5221df9aa77f0fe8cfe79a969d35123c56c5fd5b
parent872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff)
downloadvolse-hubzilla-f81df92ef8edea69f12ed60bdf9b141febbeb534.tar.gz
volse-hubzilla-f81df92ef8edea69f12ed60bdf9b141febbeb534.tar.bz2
volse-hubzilla-f81df92ef8edea69f12ed60bdf9b141febbeb534.zip
Add allowed and not allowed emails to the UI in the
admin menu
-rw-r--r--mod/admin.php3
-rwxr-xr-xview/tpl/admin_site.tpl3
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>