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;
* @return boolean|array
*/
public static function getOwnerDataById($uid) {
- $r = DBA::fetch_first("SELECT
+ $r = DBA::fetchFirst("SELECT
`contact`.*,
`user`.`prvkey` AS `uprvkey`,
`user`.`timezone`,
LIMIT 1",
$uid
);
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
return false;
}
return $r;
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']);
}
{
$default_group = 0;
- if ($network == NETWORK_OSTATUS) {
+ if ($network == Protocol::OSTATUS) {
$default_group = PConfig::get($uid, "ostatus", "default_group");
}
$user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]);
- if (DBM::is_result($user)) {
+ if (DBA::isResult($user)) {
$default_group = $user["def_gid"];
}
$user = DBA::selectFirst('user', $fields, $condition);
}
- if (!DBM::is_result($user)) {
+ if (!DBA::isResult($user)) {
throw new Exception(L10n::t('User not found'));
}
}
public static function isNicknameBlocked($nickname)
{
$forbidden_nicknames = Config::get('system', 'forbidden_nicknames', '');
+
// if the config variable is empty return false
- if (!x($forbidden_nicknames)) {
+ if (empty($forbidden_nicknames)) {
return false;
}
+
// check if the nickname is in the list of blocked nicknames
$forbidden = explode(',', $forbidden_nicknames);
$forbidden = array_map('trim', $forbidden);
if (in_array(strtolower($nickname), $forbidden)) {
return true;
}
+
// else return false
return false;
}
$using_invites = Config::get('system', 'invitation_only');
$num_invites = Config::get('system', 'number_invites');
- $invite_id = x($data, 'invite_id') ? notags(trim($data['invite_id'])) : '';
- $username = x($data, 'username') ? notags(trim($data['username'])) : '';
- $nickname = x($data, 'nickname') ? notags(trim($data['nickname'])) : '';
- $email = x($data, 'email') ? notags(trim($data['email'])) : '';
- $openid_url = x($data, 'openid_url') ? notags(trim($data['openid_url'])) : '';
- $photo = x($data, 'photo') ? notags(trim($data['photo'])) : '';
- $password = x($data, 'password') ? trim($data['password']) : '';
- $password1 = x($data, 'password1') ? trim($data['password1']) : '';
- $confirm = x($data, 'confirm') ? trim($data['confirm']) : '';
- $blocked = x($data, 'blocked') ? intval($data['blocked']) : 0;
- $verified = x($data, 'verified') ? intval($data['verified']) : 0;
- $language = x($data, 'language') ? notags(trim($data['language'])) : 'en';
-
- $publish = x($data, 'profile_publish_reg') && intval($data['profile_publish_reg']) ? 1 : 0;
+ $invite_id = !empty($data['invite_id']) ? notags(trim($data['invite_id'])) : '';
+ $username = !empty($data['username']) ? notags(trim($data['username'])) : '';
+ $nickname = !empty($data['nickname']) ? notags(trim($data['nickname'])) : '';
+ $email = !empty($data['email']) ? notags(trim($data['email'])) : '';
+ $openid_url = !empty($data['openid_url']) ? notags(trim($data['openid_url'])) : '';
+ $photo = !empty($data['photo']) ? notags(trim($data['photo'])) : '';
+ $password = !empty($data['password']) ? trim($data['password']) : '';
+ $password1 = !empty($data['password1']) ? trim($data['password1']) : '';
+ $confirm = !empty($data['confirm']) ? trim($data['confirm']) : '';
+ $blocked = !empty($data['blocked']) ? intval($data['blocked']) : 0;
+ $verified = !empty($data['verified']) ? intval($data['verified']) : 0;
+ $language = !empty($data['language']) ? notags(trim($data['language'])) : 'en';
+
+ $publish = !empty($data['profile_publish_reg']) && intval($data['profile_publish_reg']) ? 1 : 0;
$netpublish = strlen(Config::get('system', 'directory')) ? $publish : 0;
if ($password1 != $confirm) {
}
}
- if (!x($username) || !x($email) || !x($nickname)) {
+ if (empty($username) || empty($email) || empty($nickname)) {
if ($openid_url) {
if (!Network::isUrlValid($openid_url)) {
throw new Exception(L10n::t('Invalid OpenID url'));
$spubkey = $sres['pubkey'];
$insert_result = DBA::insert('user', [
- 'guid' => generate_user_guid(),
+ 'guid' => System::createGUID(32),
'username' => $username,
'password' => $new_password_encoded,
'email' => $email,
* @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,
$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),
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(DateTimeFormat::utcNow() . " + 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']);