Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba

[friendica.git] / include / user.php

diff --git a/include/user.php b/include/user.php
index 989c8b0e049fdb983639cf62c8ce523c81199cbe..08719cd7c135feb9f27090f984c801f46c9f47b2 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -97,13 +97,6 @@ function create_user($arr) {
        if(mb_strlen($username) < 3)
                $result['message'] .= t('Name too short.') . EOL;
 
-       // I don't really like having this rule, but it cuts down
-       // on the number of auto-registrations by Russian spammers
-
-       //  Using preg_match was completely unreliable, due to mixed UTF-8 regex support
-       //      $no_utf = get_config('system','no_utf');
-       //      $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' );
-
        // So now we are just looking for a space in the full name.
 
        $loose_reg = get_config('system','no_regfullname');
@@ -130,7 +123,7 @@ function create_user($arr) {
                $r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
                        dbesc($email)
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        $result['message'] .= t('Cannot use that email.') . EOL;
        }
 
@@ -143,7 +136,7 @@ function create_user($arr) {
                WHERE `nickname` = '%s' LIMIT 1",
                dbesc($nickname)
        );
-       if(count($r))
+       if (dbm::is_result($r))
                $result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
 
        // Check deleted accounts that had this nickname. Doesn't matter to us,
@@ -153,7 +146,7 @@ function create_user($arr) {
                WHERE `username` = '%s' LIMIT 1",
                dbesc($nickname)
        );
-       if(count($r))
+       if (dbm::is_result($r))
                $result['message'] .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
 
        if(strlen($result['message'])) {
@@ -182,17 +175,7 @@ function create_user($arr) {
        $prvkey = $keys['prvkey'];
        $pubkey = $keys['pubkey'];
 
-       /**
-        *
-        * Create another keypair for signing/verifying
-        * salmon protocol messages. We have to use a slightly
-        * less robust key because this won't be using openssl
-        * but the phpseclib. Since it is PHP interpreted code
-        * it is not nearly as efficient, and the larger keys
-        * will take several minutes each to process.
-        *
-        */
-
+       // Create another keypair for signing/verifying salmon protocol messages.
        $sres    = new_keypair(512);
        $sprvkey = $sres['prvkey'];
        $spubkey = $sres['pubkey'];
@@ -216,13 +199,13 @@ function create_user($arr) {
                dbesc($default_service_class)
        );
 
-       if($r) {
+       if ($r) {
                $r = q("SELECT * FROM `user`
                        WHERE `username` = '%s' AND `password` = '%s' LIMIT 1",
                        dbesc($username),
                        dbesc($new_password_encoded)
                );
-               if($r !== false && count($r)) {
+               if (dbm::is_result($r)) {
                        $u = $r[0];
                        $newuid = intval($r[0]['uid']);
                }
@@ -241,11 +224,9 @@ function create_user($arr) {
                WHERE `nickname` = '%s' ",
                dbesc($nickname)
        );
-       if((count($r) > 1) && $newuid) {
+       if ((dbm::is_result($r)) && (count($r) > 1) && $newuid) {
                $result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
-               q("DELETE FROM `user` WHERE `uid` = %d",
-                       intval($newuid)
-               );
+               dba::delete('user', array('uid' => $newuid));
                return $result;
        }
 
@@ -262,11 +243,10 @@ function create_user($arr) {
                        intval($netpublish)
 
                );
-               if($r === false) {
+               if ($r === false) {
                        $result['message'] .=  t('An error occurred creating your default profile. Please try again.') . EOL;
                        // Start fresh next time.
-                       $r = q("DELETE FROM `user` WHERE `uid` = %d",
-                               intval($newuid));
+                       dba::delete('user', array('uid' => $newuid));
                        return $result;
                }
 
@@ -283,7 +263,7 @@ function create_user($arr) {
                        intval($newuid),
                        dbesc(t('Friends'))
                );
-               if($r && count($r)) {
+               if (dbm::is_result($r)) {
                        $def_gid = $r[0]['id'];
 
                        q("UPDATE `user` SET `def_gid` = %d WHERE `uid` = %d",
@@ -325,24 +305,27 @@ function create_user($arr) {
 
                        $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
 
-                       if($r === false)
+                       if ($r === false) {
                                $photo_failure = true;
+                       }
 
                        $img->scaleImage(80);
 
                        $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
 
-                       if($r === false)
+                       if ($r === false) {
                                $photo_failure = true;
+                       }
 
                        $img->scaleImage(48);
 
                        $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
 
-                       if($r === false)
+                       if ($r === false) {
                                $photo_failure = true;
+                       }
 
-                       if(! $photo_failure) {
+                       if (! $photo_failure) {
                                q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
                                        dbesc($hash)
                                );