use Friendica\App;
use Friendica\Content\Feature;
use Friendica\Content\Nav;
+ use Friendica\Core\ACL;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
+use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\User;
if (!x($newpass) || !x($confirm)) {
notice(L10n::t('Empty passwords are not allowed. Password unchanged.') . EOL);
$err = true;
- }
+ }
- // check if the old password was supplied correctly before changing it to the new value
- if (!User::authenticate(intval(local_user()), $_POST['opassword'])) {
- notice(L10n::t('Wrong password.') . EOL);
- $err = true;
- }
+ if (!Config::get('system', 'disable_password_exposed', false) && User::isPasswordExposed($newpass)) {
+ notice(L10n::t('The new password has been exposed in a public data dump, please choose another.') . EOL);
+ $err = true;
+ }
+
+ // check if the old password was supplied correctly before changing it to the new value
+ if (!User::authenticate(intval(local_user()), $_POST['opassword'])) {
+ notice(L10n::t('Wrong password.') . EOL);
+ $err = true;
+ }
if (!$err) {
$result = User::updatePassword(local_user(), $newpass);
$err = '';
- $name_change = false;
-
if ($username != $a->user['username']) {
- $name_change = true;
if (strlen($username) > 40) {
$err .= L10n::t(' Please use a shorter name.');
}
intval(local_user())
);
-
- if ($name_change) {
- q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self`",
- dbesc($username),
- dbesc(DateTimeFormat::utcNow()),
- intval(local_user())
- );
- }
+ Contact::updateSelfFromUserID(local_user());
if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
// Update global directory in background
* ACCOUNT SETTINGS
*/
- require_once('include/acl_selectors.php');
-
$profile = dba::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
if (!DBM::is_result($profile)) {
notice(L10n::t('Unable to find your profile. Please contact your admin.') . EOL);
'$permissions' => L10n::t('Default Post Permissions'),
'$permdesc' => L10n::t("\x28click to open/close\x29"),
'$visibility' => $profile['net-publish'],
- '$aclselect' => populate_acl($a->user),
+ '$aclselect' => ACL::getFullSelectorHTML($a->user),
'$suggestme' => $suggestme,
'$blockwall'=> $blockwall, // array('blockwall', L10n::t('Allow friends to post to your profile page:'), !$blockwall, ''),
'$blocktags'=> $blocktags, // array('blocktags', L10n::t('Allow friends to tag your posts:'), !$blocktags, ''),
'$detailed_notif' => ['detailed_notif', L10n::t('Show detailled notifications'),
PConfig::get(local_user(), 'system', 'detailed_notif'),
- L10n::t('Per default the notificiation are condensed to a single notification per item. When enabled, every notification is displayed.')],
+ L10n::t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')],
'$h_advn' => L10n::t('Advanced Account/Page Type Settings'),
'$h_descadvn' => L10n::t('Change the behaviour of this account for special situations'),
return $return;
}
+ /**
+ * Updates the self-contact for the provided user id
+ *
+ * @param int $uid
+ * @param boolean $update_avatar Force the avatar update
+ */
+ public static function updateSelfFromUserID($uid, $update_avatar = false)
+ {
+ $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar',
+ 'xmpp', 'contact-type', 'forum', 'prv'];
+ $self = dba::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
+ if (!DBM::is_result($self)) {
+ return;
+ }
+
+ $fields = ['nickname', 'page-flags', 'account-type'];
+ $user = dba::selectFirst('user', $fields, ['uid' => $uid]);
+ if (!DBM::is_result($user)) {
+ return;
+ }
+
+ $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
+ 'country-name', 'gender', 'pub_keywords', 'xmpp'];
+ $profile = dba::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+ if (!DBM::is_result($profile)) {
+ return;
+ }
+
+ $avatar_resource = dba::selectFirst('photo', ['resource-id'], ['uid' => $uid, 'profile' => true]);
+
+ $fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
+ 'location' => Profile::formatLocation($profile),
+ 'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
+ 'gender' => $profile['gender'], 'avatar' => $profile['photo'],
+ 'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']];
+
+/*
+ $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `self` AND `uid` = %d",
+- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
+- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
+- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $Image->getExt()),
+- intval(local_user())
+- );
+
+*/
+ $fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY;
+ $fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP;
+
+ $update = false;
+
+ foreach ($fields as $field => $content) {
+ if ($self[$field] != $content) {
+ $update = true;
+ }
+ }
+
+ if ($update) {
+ $fields['name-date'] = DateTimeFormat::utcNow();
+ dba::update('contact', $fields, ['id' => $self['id']]);
+ }
+
+ Contact::updateAvatar($fields['avatar'], $uid, $self['id'], $update_avatar);
+ }
+
/**
* @brief Marks a contact for removal
*
}
}
}
+
+ /**
+ * Remove the unavailable contact ids from the provided list
+ *
+ * @param array $contact_ids Contact id list
+ */
+ public static function pruneUnavailable(array &$contact_ids)
+ {
+ if (empty($contact_ids)) {
+ return;
+ }
+
+ $str = dbesc(implode(',', $contact_ids));
+
+ $stmt = dba::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
+
+ $return = [];
+ while($contact = dba::fetch($stmt)) {
+ $return[] = $contact['id'];
+ }
+
+ dba::close($stmt);
+
+ $contact_ids = $return;
+ }
}
projects / friendica.git / commitdiff