diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/network.php | 3 | ||||
| -rw-r--r-- | include/text.php | 4 | ||||
| -rw-r--r-- | include/user.php | 4 | ||||
| -rw-r--r-- | util/messages.po | 16 |
5 files changed, 18 insertions, 11 deletions
@@ -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 c1a76000e..9e6f8355b 100644 --- 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 3b0050d38..c3558c641 100644 --- 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 383a3b3e1..039b30bbd 100644 --- 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 4cd8ca80a..7283a5928 100644 --- 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 "" |