scrape_dfrn now scrapes the address as well.

[friendica.git] / include / user.php

diff --git a/include/user.php b/include/user.php
index bf29daf1a649e371418b08487f018187aa7efab1..d989664acd72999f16ec1432765124cd23c39f01 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -27,11 +27,19 @@ function create_user($arr) {
        $openid_url = ((x($arr,'openid_url')) ? notags(trim($arr['openid_url'])) : '');
        $photo      = ((x($arr,'photo'))      ? notags(trim($arr['photo']))      : '');
        $password   = ((x($arr,'password'))   ? trim($arr['password'])           : '');
+       $password1  = ((x($arr,'password1'))  ? trim($arr['password1'])          : '');
+       $confirm    = ((x($arr,'confirm'))    ? trim($arr['confirm'])            : '');
        $blocked    = ((x($arr,'blocked'))    ? intval($arr['blocked'])  : 0);
        $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;
+               return $result;
+       } elseif ($password1 != "")
+               $password = $password1;
 
        $tmp_str = $openid_url;
 
@@ -128,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)
@@ -189,8 +197,8 @@ function create_user($arr) {
        $spubkey = $sres['pubkey'];
 
        $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
-               `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class` )
-               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s' )",
+               `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class`, `default-location` )
+               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s', '' )",
                dbesc(generate_user_guid()),
                dbesc($username),
                dbesc($new_password_encoded),
@@ -382,7 +390,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor
                The login details are as follows:
                        Site Location:  %3$s
                        Login Name:     %1$s
-                       Password:       %5$
+                       Password:       %5$s
 
                You may change your password from your account "Settings" page after logging
                in.
@@ -407,7 +415,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor
                $preamble = sprintf($preamble, $username, $sitename);
                $body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
 
-               notification(array(
+               return notification(array(
                        'type' => "SYSTEM_EMAIL",
                        'to_email' => $email,
                        'subject'=> sprintf( t('Registration details for %s'), $sitename),