config to disable email validation

diff --git a/boot.php b/boot.php
index b9272c9a68dd19ca13e4cfc7fb543be4a8cec69a..26593bc8f02cf389323515054136935841d21bb8 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -10,7 +10,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1390' );
+define ( 'FRIENDICA_VERSION',      '3.0.1391' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1151      );
 

diff --git a/include/network.php b/include/network.php
index c1a76000ef2b021174a29af69b56004fddb7512f..9e6f8355b75d5b1168f02da9e8bd8ea0f11e7ad2 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -607,6 +607,9 @@ function validate_url(&$url) {
 if(! function_exists('validate_email')) {
 function validate_email($addr) {
 
+       if(get_config('system','disable_email_validation'))
+               return true;
+
        if(! strpos($addr,'@'))
                return false;
        $h = substr($addr,strpos($addr,'@') + 1);

diff --git a/include/text.php b/include/text.php
index 3b0050d387a559c93fc391f59c27fc775f5b98e7..c3558c6418de0c09a317c1aa0c06f2307c9208a1 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -656,6 +656,10 @@ function search($s,$id='search-box',$url='/search',$save = false) {
 
 if(! function_exists('valid_email')) {
 function valid_email($x){
+
+       if(get_config('system','disable_email_validation'))
+               return true;
+
        if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
                return true;
        return false;

diff --git a/include/user.php b/include/user.php
index 383a3b3e1cf76fe7a9ba484b5443d7e9c2071130..039b30bbd10ef7eee76be202f58cd5b93e5476cf 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -99,11 +99,11 @@ function create_user($arr) {
 
 
        if(! allowed_email($email))
-                       $result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
+               $result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
 
        if((! valid_email($email)) || (! validate_email($email)))
                $result['message'] .= t('Not a valid email address.') . EOL;
-
+               
        // Disallow somebody creating an account using openid that uses the admin email address,
        // since openid bypasses email verification. We'll allow it if there is not yet an admin account.
 

diff --git a/util/messages.po b/util/messages.po
index 4cd8ca80a425a7afc547815ef8854f360d49c997..7283a5928aa9b059202ec43c9b97dd008ade3f09 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1390\n"
+"Project-Id-Version: 3.0.1391\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-30 10:00-0700\n"
+"POT-Creation-Date: 2012-07-01 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -137,7 +137,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:617
 #: ../../addon/snautofollow/snautofollow.php:64
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:208
+#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210
 #: ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
@@ -4685,23 +4685,23 @@ msgstr ""
 msgid "Forums:"
 msgstr ""
 
-#: ../../addon/page/page.php:163
+#: ../../addon/page/page.php:165
 msgid "Page settings updated."
 msgstr ""
 
-#: ../../addon/page/page.php:192
+#: ../../addon/page/page.php:194
 msgid "Page Settings"
 msgstr ""
 
-#: ../../addon/page/page.php:194
+#: ../../addon/page/page.php:196
 msgid "How many forums to display on sidebar without paging"
 msgstr ""
 
-#: ../../addon/page/page.php:197
+#: ../../addon/page/page.php:199
 msgid "Randomise Page/Forum list"
 msgstr ""
 
-#: ../../addon/page/page.php:200
+#: ../../addon/page/page.php:202
 msgid "Show pages/forums on profile page"
 msgstr ""