Merge branch 'master' of github.com:ASKBOT/askbot-devel into user-groups

Conflicts:
	askbot/deps/django_authopenid/views.py
	askbot/doc/source/changelog.rst
	askbot/views/meta.py

2 files changed, 49 insertions, 4 deletions

diff --git a/askbot/conf/access_control.py b/askbot/conf/access_control.py
index cd2364b5..5da88936 100644
--- a/askbot/conf/access_control.py
+++ b/askbot/conf/access_control.py
@@ -13,9 +13,45 @@ settings.register(
     livesettings.BooleanValue(
         ACCESS_CONTROL,
         'ASKBOT_CLOSED_FORUM_MODE',
-        default = False,
+        default=False,
         description=_('Allow only registered user to access the forum'),
     )
 )
 
+EMAIL_VALIDATION_CASE_CHOICES = (
+    ('nothing', _('nothing - not required')),
+    ('see-content', _('access to content')),
+    #'post-content', _('posting content'),
+)
+
+settings.register(
+    livesettings.StringValue(
+        ACCESS_CONTROL,
+        'REQUIRE_VALID_EMAIL_FOR',
+        default='nothing',
+        choices=EMAIL_VALIDATION_CASE_CHOICES,
+        description=_(
+            'Require valid email for'
+        )
+    )
+)
 
+settings.register(
+    livesettings.LongStringValue(
+        ACCESS_CONTROL,
+        'ALLOWED_EMAILS',
+        default='',
+        description=_('Allowed email addresses'),
+        help_text=_('Please use space to separate the entries')
+    )
+)
+
+settings.register(
+    livesettings.LongStringValue(
+        ACCESS_CONTROL,
+        'ALLOWED_EMAIL_DOMAINS',
+        default='',
+        description=_('Allowed email domain names'),
+        help_text=_('Please use space to separate the entries, do not use the @ symbol!')
+    )
+)
diff --git a/askbot/conf/user_settings.py b/askbot/conf/user_settings.py
index e7dea7c8..a1d5a55c 100644
--- a/askbot/conf/user_settings.py
+++ b/askbot/conf/user_settings.py
@@ -16,11 +16,20 @@ USER_SETTINGS = livesettings.ConfigurationGroup(
                 )
 
 settings.register(
-    livesettings.StringValue(
+    livesettings.LongStringValue(
         USER_SETTINGS,
         'NEW_USER_GREETING',
-        default = '',
-        description = _('On-screen greeting shown to the new users')
+        default='',
+        description=_('On-screen greeting shown to the new users')
+    )
+)
+
+settings.register(
+    livesettings.BooleanValue(
+        USER_SETTINGS,
+        'ALLOW_ANONYMOUS_FEEDBACK',
+        default=True,
+        description=_('Allow anonymous users send feedback')
     )
 )