X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FUser.php;h=a43ef06f970619105a9cd8e29f84f86972697aa5;hb=0bc2fe66f54717a3f2e86fd9626dc565e9d00fd7;hp=bebfce3e0059f0c323a28b3b1d516eb68e95e22f;hpb=4eb6707dc9e793f37c2d5726a18922d9e776714d;p=friendica.git

diff --git a/src/Model/User.php b/src/Model/User.php
index bebfce3e00..a43ef06f97 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -11,10 +11,10 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
@@ -38,7 +38,7 @@ class User
 	 * @return boolean|array
 	 */
 	public static function getOwnerDataById($uid) {
-		$r = DBA::fetch_first("SELECT
+		$r = DBA::fetchFirst("SELECT
 			`contact`.*,
 			`user`.`prvkey` AS `uprvkey`,
 			`user`.`timezone`,
@@ -56,7 +56,7 @@ class User
 			LIMIT 1",
 			$uid
 		);
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return false;
 		}
 		return $r;
@@ -71,9 +71,11 @@ class User
 	public static function getOwnerDataByNick($nick)
 	{
 		$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nick]);
-		if (!DBM::is_result($user)) {
+
+		if (!DBA::isResult($user)) {
 			return false;
 		}
+
 		return self::getOwnerDataById($user['uid']);
 	}
 
@@ -89,7 +91,7 @@ class User
 	{
 		$default_group = 0;
 
-		if ($network == NETWORK_OSTATUS) {
+		if ($network == Protocol::OSTATUS) {
 			$default_group = PConfig::get($uid, "ostatus", "default_group");
 		}
 
@@ -99,7 +101,7 @@ class User
 
 		$user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]);
 
-		if (DBM::is_result($user)) {
+		if (DBA::isResult($user)) {
 			$default_group = $user["def_gid"];
 		}
 
@@ -215,7 +217,7 @@ class User
 				$user = DBA::selectFirst('user', $fields, $condition);
 			}
 
-			if (!DBM::is_result($user)) {
+			if (!DBA::isResult($user)) {
 				throw new Exception(L10n::t('User not found'));
 			}
 		}
@@ -493,7 +495,7 @@ class User
 		$spubkey = $sres['pubkey'];
 
 		$insert_result = DBA::insert('user', [
-			'guid'     => generate_user_guid(),
+			'guid'     => System::createGUID(32),
 			'username' => $username,
 			'password' => $new_password_encoded,
 			'email'    => $email,
@@ -660,7 +662,7 @@ class User
 	 * @param string $password
 	 * @return NULL|boolean from notification() and email() inherited
 	 */
-	public static function sendRegisterOpenEmail($email, $sitename, $siteurl, $username, $password)
+	public static function sendRegisterOpenEmail($email, $sitename, $siteurl, $username, $password, $user)
 	{
 		$preamble = deindent(L10n::t('
 			Dear %1$s,
@@ -698,6 +700,8 @@ class User
 		$body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
 
 		return notification([
+			'uid' => $user['uid'],
+			'language' => $user['language'],
 			'type' => SYSTEM_EMAIL,
 			'to_email' => $email,
 			'subject'=> L10n::t('Registration details for %s', $sitename),
@@ -726,11 +730,15 @@ class User
 		DBA::insert('userd', ['username' => $user['nickname']]);
 
 		// The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
-		DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utcNow()], ['uid' => $uid]);
+		DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc($t . " + 7 day")], ['uid' => $uid]);
 		Worker::add(PRIORITY_HIGH, "Notifier", "removeme", $uid);
 
 		// Send an update to the directory
-		Worker::add(PRIORITY_LOW, "Directory", $user['url']);
+		$self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
+		Worker::add(PRIORITY_LOW, "Directory", $self['url']);
+
+		// Remove the user relevant data
+		Worker::add(PRIORITY_LOW, "RemoveUser", $uid);
 
 		if ($uid == local_user()) {
 			unset($_SESSION['authenticated']);