X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fuser.php;h=08719cd7c135feb9f27090f984c801f46c9f47b2;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=a3cd27e6cefe93afaf639171231aadba85b94ede;hpb=f4c52f5a0e0ba502ba5c18a96f17a387834d4561;p=friendica.git

diff --git a/include/user.php b/include/user.php
index a3cd27e6ce..08719cd7c1 100644
--- 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,35 +243,15 @@ 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;
 		}
-		$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 +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",
@@ -344,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)
 				);
@@ -377,6 +341,49 @@ 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
@@ -384,6 +391,7 @@ function create_user($arr) {
  * @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('