scrape_dfrn now scrapes the address as well.

[friendica.git] / include / user.php

diff --git a/include/user.php b/include/user.php
index 580af56f981ac21bf790021959c31b4b613fe148..d989664acd72999f16ec1432765124cd23c39f01 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -33,7 +33,7 @@ function create_user($arr) {
        $verified   = ((x($arr,'verified'))   ? intval($arr['verified']) : 0);
 
        $publish    = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0);
-       $netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
+       $netpublish = ((strlen(get_config('system','directory'))) ? $publish : 0);
 
        if ($password1 != $confirm) {
                $result['message'] .= t('Passwords do not match. Password unchanged.') . EOL;
@@ -136,8 +136,8 @@ function create_user($arr) {
 
        $nickname = $arr['nickname'] = strtolower($nickname);
 
-       if(! preg_match("/^[a-z][a-z0-9\-\_]*$/",$nickname))
-               $result['message'] .= t('Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.') . EOL;
+       if(! preg_match("/^[a-z0-9][a-z0-9\_]*$/",$nickname))
+               $result['message'] .= t('Your "nickname" can only contain "a-z", "0-9" and "_".') . EOL;
        $r = q("SELECT `uid` FROM `user`
                        WHERE `nickname` = '%s' LIMIT 1",
                        dbesc($nickname)