Friendicaland

[friendica.git] / include / user.php

diff --git a/include/user.php b/include/user.php
index af43a2b52c490861a8c916d55fe56b7935db3e5f..2d06ef3742e092ff051d1596abe33bddea160ff3 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.
 
@@ -147,13 +147,18 @@ function create_user($arr) {
 
        require_once('include/crypto.php');
 
-       $keys = new_keypair(1024);
+       $keys = new_keypair(4096);
 
        if($keys === false) {
                $result['message'] .= t('SERIOUS ERROR: Generation of security keys failed.') . EOL;
                return $result;
        }
 
+       $default_service_class = get_config('system','default_service_class');
+       if(! $default_service_class)
+               $default_service_class = '';
+
+
        $prvkey = $keys['prvkey'];
        $pubkey = $keys['pubkey'];
 
@@ -173,8 +178,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` )
-               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC' )",
+               `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' )",
                dbesc(generate_user_guid()),
                dbesc($username),
                dbesc($new_password_encoded),
@@ -187,7 +192,8 @@ function create_user($arr) {
                dbesc($sprvkey),
                dbesc(datetime_convert()),
                intval($verified),
-               intval($blocked)
+               intval($blocked),
+               dbesc($default_service_class)
        );
 
        if($r) {
@@ -271,6 +277,20 @@ function create_user($arr) {
                require_once('include/group.php');
                group_add($newuid, t('Friends'));
 
+               if(! get_config('system', 'newuser_public')) {
+                       $r = q("SELECT id FROM `group` WHERE uid = %d AND name = '%s'",
+                               intval($newuid),
+                               dbesc(t('Friends'))
+                       );
+                       if($r) {
+                               q("UPDATE user SET def_gid = %d, allow_gid = '%s' WHERE uid = %d",
+                                  intval($r[0]['id']),
+                                  dbesc("<" . $r[0]['id'] . ">"),
+                                  intval($newuid)
+                               );
+                       }
+               }
+
        }
 
        // if we have no OpenID photo try to look up an avatar
@@ -284,7 +304,11 @@ function create_user($arr) {
 
                $filename = basename($photo);
                $img_str = fetch_url($photo,true);
-               $img = new Photo($img_str);
+               // guess mimetype from headers or filename
+               $type = guess_image_type($photo,true);
+
+               
+               $img = new Photo($img_str, $type);
                if($img->is_valid()) {
 
                        $img->scaleImageSquare(175);
@@ -324,4 +348,4 @@ function create_user($arr) {
        $result['user'] = $u;
        return $result;
 
-}
\ No newline at end of file
+}