]> git.mxchange.org Git - friendica.git/blobdiff - include/user.php
merged 2 if() into one as requested by CR
[friendica.git] / include / user.php
index 3997a8a61f12584da6469808d767fb93c53c2db6..df871c5468ac7d3abb7087adb87635b453633d25 100644 (file)
@@ -130,7 +130,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 +143,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 +153,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'])) {
@@ -216,13 +216,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,7 +241,7 @@ 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)
@@ -262,35 +262,16 @@ 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));
                        return $result;
                }
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
-                       `addr`, `request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness` )
-                       VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0 ) ",
-                       intval($newuid),
-                       datetime_convert(),
-                       dbesc($username),
-                       dbesc($nickname),
-                       dbesc(z_root() . "/photo/profile/{$newuid}.jpg"),
-                       dbesc(z_root() . "/photo/avatar/{$newuid}.jpg"),
-                       dbesc(z_root() . "/photo/micro/{$newuid}.jpg"),
-                       dbesc(z_root() . "/profile/$nickname"),
-                       dbesc(normalise_link(z_root() . "/profile/$nickname")),
-                       dbesc($nickname . '@' . substr(z_root(), strpos(z_root(),'://') + 3 )),
-                       dbesc(z_root() . "/dfrn_request/$nickname"),
-                       dbesc(z_root() . "/dfrn_notify/$nickname"),
-                       dbesc(z_root() . "/dfrn_poll/$nickname"),
-                       dbesc(z_root() . "/dfrn_confirm/$nickname"),
-                       dbesc(z_root() . "/poco/$nickname"),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert())
-               );
+
+               // Create the self contact
+               user_create_self_contact($newuid);
 
                // Create a group with no members. This allows somebody to use it
                // right away as a default group for new contacts.
@@ -302,7 +283,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",
@@ -344,24 +325,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)
                                );
@@ -377,6 +361,72 @@ function create_user($arr) {
 
 }
 
+/**
+ * @brief create the "self" contact from data from the user table
+ *
+ * @param integer $uid
+ */
+function user_create_self_contact($uid) {
+
+       // Only create the entry if it doesn't exist yet
+       $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($uid));
+       if (dbm::is_result($r)) {
+               return;
+       }
+
+       $r = q("SELECT `uid`, `username`, `nickname` FROM `user` WHERE `uid` = %d", intval($uid));
+       if (!dbm::is_result($r)) {
+               return;
+       }
+
+       $user = $r[0];
+
+       q("INSERT INTO `contact` (`uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
+               `addr`, `request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness`)
+               VALUES (%d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0)",
+               intval($user['uid']),
+               datetime_convert(),
+               dbesc($user['username']),
+               dbesc($user['nickname']),
+               dbesc(z_root()."/photo/profile/".$user['uid'].".jpg"),
+               dbesc(z_root()."/photo/avatar/".$user['uid'].".jpg"),
+               dbesc(z_root()."/photo/micro/".$user['uid'].".jpg"),
+               dbesc(z_root()."/profile/".$user['nickname']),
+               dbesc(normalise_link(z_root()."/profile/".$user['nickname'])),
+               dbesc($user['nickname'].'@'.substr(z_root(), strpos(z_root(),'://') + 3)),
+               dbesc(z_root()."/dfrn_request/".$user['nickname']),
+               dbesc(z_root()."/dfrn_notify/".$user['nickname']),
+               dbesc(z_root()."/dfrn_poll/".$user['nickname']),
+               dbesc(z_root()."/dfrn_confirm/".$user['nickname']),
+               dbesc(z_root()."/poco/".$user['nickname']),
+               dbesc(datetime_convert()),
+               dbesc(datetime_convert()),
+               dbesc(datetime_convert())
+       );
+}
+
+/**
+ * @brief send registration confiƕmation with the intormation that reg is pending
+ *
+ * @param string $email
+ * @param string $sitename
+ * @param string $username
+ * @return NULL|boolean from notification() and email() inherited 
+ */
+function send_register_pending_eml($email, $sitename, $username) {
+       $body = deindent(t('
+               Dear %1$s,
+                       Thank you for registering at %2$s. Your account is pending for approval by the administrator.
+       '));
+
+       $body = sprintf($body, $username, $sitename);
+
+       return notification(array(
+               'type' => "SYSTEM_EMAIL",
+               'to_email' => $email,
+               'subject'=> sprintf( t('Registration at %s'), $sitename),
+               'body' => $body));
+}
 
 /*
  * send registration confirmation.