ProfilesettingsAction and related stuff modernised
This commit is contained in:
parent
53e820b466
commit
9f82da07f1
@ -82,7 +82,6 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
*/
|
*/
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
$profile = $this->scoped;
|
|
||||||
$user = $this->scoped->getUser();
|
$user = $this->scoped->getUser();
|
||||||
|
|
||||||
$this->elementStart('form', array('method' => 'post',
|
$this->elementStart('form', array('method' => 'post',
|
||||||
@ -100,7 +99,7 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
// TRANS: Field label in form for profile settings.
|
// TRANS: Field label in form for profile settings.
|
||||||
$this->input('nickname', _('Nickname'),
|
$this->input('nickname', _('Nickname'),
|
||||||
$this->arg('nickname') ?: $profile->nickname,
|
$this->trimmed('nickname') ?: $this->scoped->getNickname(),
|
||||||
// TRANS: Tooltip for field label in form for profile settings.
|
// TRANS: Tooltip for field label in form for profile settings.
|
||||||
_('1-64 lowercase letters or numbers, no punctuation or spaces.'),
|
_('1-64 lowercase letters or numbers, no punctuation or spaces.'),
|
||||||
null, false, // "name" (will be set to id), then "required"
|
null, false, // "name" (will be set to id), then "required"
|
||||||
@ -111,12 +110,12 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
// TRANS: Field label in form for profile settings.
|
// TRANS: Field label in form for profile settings.
|
||||||
$this->input('fullname', _('Full name'),
|
$this->input('fullname', _('Full name'),
|
||||||
($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname);
|
$this->trimmed('fullname') ?: $this->scoped->getFullname());
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
// TRANS: Field label in form for profile settings.
|
// TRANS: Field label in form for profile settings.
|
||||||
$this->input('homepage', _('Homepage'),
|
$this->input('homepage', _('Homepage'),
|
||||||
($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage,
|
$this->trimmed('homepage') ?: $this->scoped->getHomepage(),
|
||||||
// TRANS: Tooltip for field label in form for profile settings.
|
// TRANS: Tooltip for field label in form for profile settings.
|
||||||
_('URL of your homepage, blog, or profile on another site.'));
|
_('URL of your homepage, blog, or profile on another site.'));
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
@ -137,13 +136,13 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
// TRANS: Text area label in form for profile settings where users can provide
|
// TRANS: Text area label in form for profile settings where users can provide
|
||||||
// TRANS: their biography.
|
// TRANS: their biography.
|
||||||
$this->textarea('bio', _('Bio'),
|
$this->textarea('bio', _('Bio'),
|
||||||
($this->arg('bio')) ? $this->arg('bio') : $profile->bio,
|
$this->trimmed('bio') ?: $this->scoped->getDescription(),
|
||||||
$bioInstr);
|
$bioInstr);
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
// TRANS: Field label in form for profile settings.
|
// TRANS: Field label in form for profile settings.
|
||||||
$this->input('location', _('Location'),
|
$this->input('location', _('Location'),
|
||||||
($this->arg('location')) ? $this->arg('location') : $profile->location,
|
$this->trimmed('location') ?: $this->scoped->location,
|
||||||
// TRANS: Tooltip for field label in form for profile settings.
|
// TRANS: Tooltip for field label in form for profile settings.
|
||||||
_('Where you are, like "City, State (or Region), Country".'));
|
_('Where you are, like "City, State (or Region), Country".'));
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
@ -152,14 +151,14 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
// TRANS: Checkbox label in form for profile settings.
|
// TRANS: Checkbox label in form for profile settings.
|
||||||
$this->checkbox('sharelocation', _('Share my current location when posting notices'),
|
$this->checkbox('sharelocation', _('Share my current location when posting notices'),
|
||||||
($this->arg('sharelocation')) ?
|
($this->arg('sharelocation')) ?
|
||||||
$this->arg('sharelocation') : $this->scoped->shareLocation());
|
$this->boolean('sharelocation') : $this->scoped->shareLocation());
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
}
|
}
|
||||||
Event::handle('EndProfileFormData', array($this));
|
Event::handle('EndProfileFormData', array($this));
|
||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
// TRANS: Field label in form for profile settings.
|
// TRANS: Field label in form for profile settings.
|
||||||
$this->input('tags', _('Tags'),
|
$this->input('tags', _('Tags'),
|
||||||
($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()),
|
$this->trimmed('tags') ?: implode(' ', Profile_tag::getSelfTagsArray($this->scoped)),
|
||||||
// TRANS: Tooltip for field label in form for profile settings.
|
// TRANS: Tooltip for field label in form for profile settings.
|
||||||
_('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated.'));
|
_('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated.'));
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
@ -228,17 +227,8 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function handlePost()
|
protected function doPost()
|
||||||
{
|
{
|
||||||
// CSRF protection
|
|
||||||
$token = $this->trimmed('token');
|
|
||||||
if (!$token || $token != common_session_token()) {
|
|
||||||
// TRANS: Form validation error.
|
|
||||||
$this->showForm(_('There was a problem with your session token. '.
|
|
||||||
'Try again, please.'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Event::handle('StartProfileSaveForm', array($this))) {
|
if (Event::handle('StartProfileSaveForm', array($this))) {
|
||||||
|
|
||||||
// $nickname will only be set if this changenick value is true.
|
// $nickname will only be set if this changenick value is true.
|
||||||
@ -246,15 +236,13 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
try {
|
try {
|
||||||
$nickname = Nickname::normalize($this->trimmed('nickname'), true);
|
$nickname = Nickname::normalize($this->trimmed('nickname'), true);
|
||||||
} catch (NicknameTakenException $e) {
|
} catch (NicknameTakenException $e) {
|
||||||
// Abort only if the nickname is occupied by another local profile
|
// Abort only if the nickname is occupied by _another_ local user profile
|
||||||
if ($e->profile->id != $this->scoped->id) {
|
if (!$this->scoped->sameAs($e->profile)) {
|
||||||
$this->showForm($e->getMessage());
|
throw $e;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
$nickname = Nickname::normalize($this->trimmed('nickname')); // without in-use check this time
|
// Since the variable wasn't set before the exception was thrown, let's run
|
||||||
} catch (NicknameException $e) {
|
// the normalize sequence again, but without in-use check this time.
|
||||||
$this->showForm($e->getMessage());
|
$nickname = Nickname::normalize($this->trimmed('nickname'));
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -273,33 +261,27 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
if (!is_null($homepage) && (strlen($homepage) > 0) &&
|
if (!is_null($homepage) && (strlen($homepage) > 0) &&
|
||||||
!common_valid_http_url($homepage)) {
|
!common_valid_http_url($homepage)) {
|
||||||
// TRANS: Validation error in form for profile settings.
|
// TRANS: Validation error in form for profile settings.
|
||||||
$this->showForm(_('Homepage is not a valid URL.'));
|
throw new ClientException(_('Homepage is not a valid URL.'));
|
||||||
return;
|
|
||||||
} else if (!is_null($fullname) && mb_strlen($fullname) > 191) {
|
} else if (!is_null($fullname) && mb_strlen($fullname) > 191) {
|
||||||
// TRANS: Validation error in form for profile settings.
|
// TRANS: Validation error in form for profile settings.
|
||||||
$this->showForm(_('Full name is too long (maximum 191 characters).'));
|
throw new ClientException(_('Full name is too long (maximum 191 characters).'));
|
||||||
return;
|
|
||||||
} else if (Profile::bioTooLong($bio)) {
|
} else if (Profile::bioTooLong($bio)) {
|
||||||
// TRANS: Validation error in form for profile settings.
|
// TRANS: Validation error in form for profile settings.
|
||||||
// TRANS: Plural form is used based on the maximum number of allowed
|
// TRANS: Plural form is used based on the maximum number of allowed
|
||||||
// TRANS: characters for the biography (%d).
|
// TRANS: characters for the biography (%d).
|
||||||
$this->showForm(sprintf(_m('Bio is too long (maximum %d character).',
|
throw new ClientException(sprintf(_m('Bio is too long (maximum %d character).',
|
||||||
'Bio is too long (maximum %d characters).',
|
'Bio is too long (maximum %d characters).',
|
||||||
Profile::maxBio()),
|
Profile::maxBio()),
|
||||||
Profile::maxBio()));
|
Profile::maxBio()));
|
||||||
return;
|
|
||||||
} else if (!is_null($location) && mb_strlen($location) > 191) {
|
} else if (!is_null($location) && mb_strlen($location) > 191) {
|
||||||
// TRANS: Validation error in form for profile settings.
|
// TRANS: Validation error in form for profile settings.
|
||||||
$this->showForm(_('Location is too long (maximum 191 characters).'));
|
throw new ClientException(_('Location is too long (maximum 191 characters).'));
|
||||||
return;
|
|
||||||
} else if (is_null($timezone) || !in_array($timezone, DateTimeZone::listIdentifiers())) {
|
} else if (is_null($timezone) || !in_array($timezone, DateTimeZone::listIdentifiers())) {
|
||||||
// TRANS: Validation error in form for profile settings.
|
// TRANS: Validation error in form for profile settings.
|
||||||
$this->showForm(_('Timezone not selected.'));
|
throw new ClientException(_('Timezone not selected.'));
|
||||||
return;
|
|
||||||
} else if (!is_null($language) && strlen($language) > 50) {
|
} else if (!is_null($language) && strlen($language) > 50) {
|
||||||
// TRANS: Validation error in form for profile settings.
|
// TRANS: Validation error in form for profile settings.
|
||||||
$this->showForm(_('Language is too long (maximum 50 characters).'));
|
throw new ClientException(_('Language is too long (maximum 50 characters).'));
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$tags = array();
|
$tags = array();
|
||||||
@ -315,15 +297,14 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
if (!common_valid_profile_tag($tag)) {
|
if (!common_valid_profile_tag($tag)) {
|
||||||
// TRANS: Validation error in form for profile settings.
|
// TRANS: Validation error in form for profile settings.
|
||||||
// TRANS: %s is an invalid tag.
|
// TRANS: %s is an invalid tag.
|
||||||
$this->showForm(sprintf(_('Invalid tag: "%s".'), $tag));
|
throw new ClientException(sprintf(_('Invalid tag: "%s".'), $tag));
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$tag_priv[$tag] = $private;
|
$tag_priv[$tag] = $private;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = common_current_user();
|
$user = $this->scoped->getUser();
|
||||||
$user->query('BEGIN');
|
$user->query('BEGIN');
|
||||||
|
|
||||||
// $user->nickname is updated through Profile->update();
|
// $user->nickname is updated through Profile->update();
|
||||||
@ -346,54 +327,53 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
$result = $user->update($original);
|
$result = $user->update($original);
|
||||||
if ($result === false) {
|
if ($result === false) {
|
||||||
common_log_db_error($user, 'UPDATE', __FILE__);
|
common_log_db_error($user, 'UPDATE', __FILE__);
|
||||||
|
$user->query('ROLLBACK');
|
||||||
// TRANS: Server error thrown when user profile settings could not be updated to
|
// TRANS: Server error thrown when user profile settings could not be updated to
|
||||||
// TRANS: automatically subscribe to any subscriber.
|
// TRANS: automatically subscribe to any subscriber.
|
||||||
$this->serverError(_('Could not update user for autosubscribe or subscribe_policy.'));
|
throw new ServerException(_('Could not update user for autosubscribe or subscribe_policy.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Re-initialize language environment if it changed
|
// Re-initialize language environment if it changed
|
||||||
common_init_language();
|
common_init_language();
|
||||||
}
|
}
|
||||||
|
|
||||||
$profile = $user->getProfile();
|
$original = clone($this->scoped);
|
||||||
|
|
||||||
$orig_profile = clone($profile);
|
if (common_config('profile', 'changenick') == true && $this->scoped->getNickname() !== $nickname) {
|
||||||
|
|
||||||
if (common_config('profile', 'changenick') == true && $profile->nickname !== $nickname) {
|
|
||||||
assert(Nickname::normalize($nickname)===$nickname);
|
assert(Nickname::normalize($nickname)===$nickname);
|
||||||
common_debug("Changing user nickname from '{$profile->nickname}' to '{$nickname}'.");
|
common_debug("Changing user nickname from '{$this->scoped->getNickname()}' to '{$nickname}'.");
|
||||||
$profile->nickname = $nickname;
|
$this->scoped->nickname = $nickname;
|
||||||
$profile->profileurl = common_profile_url($profile->nickname);
|
$this->scoped->profileurl = common_profile_url($this->scoped->getNickname());
|
||||||
}
|
}
|
||||||
$profile->fullname = $fullname;
|
$this->scoped->fullname = $fullname;
|
||||||
$profile->homepage = $homepage;
|
$this->scoped->homepage = $homepage;
|
||||||
$profile->bio = $bio;
|
$this->scoped->bio = $bio;
|
||||||
$profile->location = $location;
|
$this->scoped->location = $location;
|
||||||
|
|
||||||
$loc = Location::fromName($location);
|
$loc = Location::fromName($location);
|
||||||
|
|
||||||
if (empty($loc)) {
|
if (empty($loc)) {
|
||||||
$profile->lat = null;
|
$this->scoped->lat = null;
|
||||||
$profile->lon = null;
|
$this->scoped->lon = null;
|
||||||
$profile->location_id = null;
|
$this->scoped->location_id = null;
|
||||||
$profile->location_ns = null;
|
$this->scoped->location_ns = null;
|
||||||
} else {
|
} else {
|
||||||
$profile->lat = $loc->lat;
|
$this->scoped->lat = $loc->lat;
|
||||||
$profile->lon = $loc->lon;
|
$this->scoped->lon = $loc->lon;
|
||||||
$profile->location_id = $loc->location_id;
|
$this->scoped->location_id = $loc->location_id;
|
||||||
$profile->location_ns = $loc->location_ns;
|
$this->scoped->location_ns = $loc->location_ns;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (common_config('location', 'share') == 'user') {
|
if (common_config('location', 'share') == 'user') {
|
||||||
|
|
||||||
$exists = false;
|
$exists = false;
|
||||||
|
|
||||||
$prefs = User_location_prefs::getKV('user_id', $user->id);
|
$prefs = User_location_prefs::getKV('user_id', $this->scoped->getID());
|
||||||
|
|
||||||
if (empty($prefs)) {
|
if (empty($prefs)) {
|
||||||
$prefs = new User_location_prefs();
|
$prefs = new User_location_prefs();
|
||||||
|
|
||||||
$prefs->user_id = $user->id;
|
$prefs->user_id = $this->scoped->getID();
|
||||||
$prefs->created = common_sql_now();
|
$prefs->created = common_sql_now();
|
||||||
} else {
|
} else {
|
||||||
$exists = true;
|
$exists = true;
|
||||||
@ -410,42 +390,37 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
|
|
||||||
if ($result === false) {
|
if ($result === false) {
|
||||||
common_log_db_error($prefs, ($exists) ? 'UPDATE' : 'INSERT', __FILE__);
|
common_log_db_error($prefs, ($exists) ? 'UPDATE' : 'INSERT', __FILE__);
|
||||||
|
$user->query('ROLLBACK');
|
||||||
// TRANS: Server error thrown when user profile location preference settings could not be updated.
|
// TRANS: Server error thrown when user profile location preference settings could not be updated.
|
||||||
$this->serverError(_('Could not save location prefs.'));
|
throw new ServerException(_('Could not save location prefs.'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
common_debug('Old profile: ' . common_log_objstring($orig_profile), __FILE__);
|
common_debug('Old profile: ' . common_log_objstring($original), __FILE__);
|
||||||
common_debug('New profile: ' . common_log_objstring($profile), __FILE__);
|
common_debug('New profile: ' . common_log_objstring($this->scoped), __FILE__);
|
||||||
|
|
||||||
$result = $profile->update($orig_profile);
|
$result = $this->scoped->update($original);
|
||||||
|
|
||||||
if ($result === false) {
|
if ($result === false) {
|
||||||
common_log_db_error($profile, 'UPDATE', __FILE__);
|
common_log_db_error($this->scoped, 'UPDATE', __FILE__);
|
||||||
|
$user->query('ROLLBACK');
|
||||||
// TRANS: Server error thrown when user profile settings could not be saved.
|
// TRANS: Server error thrown when user profile settings could not be saved.
|
||||||
$this->serverError(_('Could not save profile.'));
|
throw new ServerException(_('Could not save profile.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set the user tags
|
// Set the user tags
|
||||||
$result = $user->setSelfTags($tags, $tag_priv);
|
$result = Profile_tag::setSelfTags($this->scoped, $tags, $tag_priv);
|
||||||
|
|
||||||
if (!$result) {
|
|
||||||
// TRANS: Server error thrown when user profile settings tags could not be saved.
|
|
||||||
$this->serverError(_('Could not save tags.'));
|
|
||||||
}
|
|
||||||
|
|
||||||
$user->query('COMMIT');
|
$user->query('COMMIT');
|
||||||
Event::handle('EndProfileSaveForm', array($this));
|
Event::handle('EndProfileSaveForm', array($this));
|
||||||
|
|
||||||
// TRANS: Confirmation shown when user profile settings are saved.
|
// TRANS: Confirmation shown when user profile settings are saved.
|
||||||
$this->showForm(_('Settings saved.'), true);
|
return _('Settings saved.');
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function showAside() {
|
function showAside() {
|
||||||
$user = common_current_user();
|
|
||||||
|
|
||||||
$this->elementStart('div', array('id' => 'aside_primary',
|
$this->elementStart('div', array('id' => 'aside_primary',
|
||||||
'class' => 'aside'));
|
'class' => 'aside'));
|
||||||
|
|
||||||
@ -453,7 +428,7 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
'class' => 'section'));
|
'class' => 'section'));
|
||||||
$this->elementStart('ul');
|
$this->elementStart('ul');
|
||||||
if (Event::handle('StartProfileSettingsActions', array($this))) {
|
if (Event::handle('StartProfileSettingsActions', array($this))) {
|
||||||
if ($user->hasRight(Right::BACKUPACCOUNT)) {
|
if ($this->scoped->hasRight(Right::BACKUPACCOUNT)) {
|
||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
$this->element('a',
|
$this->element('a',
|
||||||
array('href' => common_local_url('backupaccount')),
|
array('href' => common_local_url('backupaccount')),
|
||||||
@ -461,7 +436,7 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
_('Backup account'));
|
_('Backup account'));
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
}
|
}
|
||||||
if ($user->hasRight(Right::DELETEACCOUNT)) {
|
if ($this->scoped->hasRight(Right::DELETEACCOUNT)) {
|
||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
$this->element('a',
|
$this->element('a',
|
||||||
array('href' => common_local_url('deleteaccount')),
|
array('href' => common_local_url('deleteaccount')),
|
||||||
@ -469,7 +444,7 @@ class ProfilesettingsAction extends SettingsAction
|
|||||||
_('Delete account'));
|
_('Delete account'));
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
}
|
}
|
||||||
if ($user->hasRight(Right::RESTOREACCOUNT)) {
|
if ($this->scoped->hasRight(Right::RESTOREACCOUNT)) {
|
||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
$this->element('a',
|
$this->element('a',
|
||||||
array('href' => common_local_url('restoreaccount')),
|
array('href' => common_local_url('restoreaccount')),
|
||||||
|
@ -1407,6 +1407,11 @@ class Profile extends Managed_DataObject
|
|||||||
return $this->fullname;
|
return $this->fullname;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getHomepage()
|
||||||
|
{
|
||||||
|
return $this->homepage;
|
||||||
|
}
|
||||||
|
|
||||||
public function getDescription()
|
public function getDescription()
|
||||||
{
|
{
|
||||||
return $this->bio;
|
return $this->bio;
|
||||||
|
@ -2,22 +2,15 @@
|
|||||||
/**
|
/**
|
||||||
* Table Definition for profile_tag
|
* Table Definition for profile_tag
|
||||||
*/
|
*/
|
||||||
require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
|
|
||||||
|
|
||||||
class Profile_tag extends Managed_DataObject
|
class Profile_tag extends Managed_DataObject
|
||||||
{
|
{
|
||||||
###START_AUTOCODE
|
|
||||||
/* the code below is auto generated do not remove the above tag */
|
|
||||||
|
|
||||||
public $__table = 'profile_tag'; // table name
|
public $__table = 'profile_tag'; // table name
|
||||||
public $tagger; // int(4) primary_key not_null
|
public $tagger; // int(4) primary_key not_null
|
||||||
public $tagged; // int(4) primary_key not_null
|
public $tagged; // int(4) primary_key not_null
|
||||||
public $tag; // varchar(64) primary_key not_null
|
public $tag; // varchar(64) primary_key not_null
|
||||||
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
|
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
|
||||||
|
|
||||||
/* the code above is auto generated do not remove the tag below */
|
|
||||||
###END_AUTOCODE
|
|
||||||
|
|
||||||
public static function schemaDef()
|
public static function schemaDef()
|
||||||
{
|
{
|
||||||
return array(
|
return array(
|
||||||
@ -52,6 +45,16 @@ class Profile_tag extends Managed_DataObject
|
|||||||
return Profile_list::pkeyGet(array('tagger' => $this->tagger, 'tag' => $this->tag));
|
return Profile_list::pkeyGet(array('tagger' => $this->tagger, 'tag' => $this->tag));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static function getSelfTagsArray(Profile $target)
|
||||||
|
{
|
||||||
|
return self::getTagsArray($target->getID(), $target->getID(), $target);
|
||||||
|
}
|
||||||
|
|
||||||
|
static function setSelfTags(Profile $target, array $newtags, array $privacy=array())
|
||||||
|
{
|
||||||
|
return self::setTags($target->getID(), $target->getID(), $newtags, $privacy);
|
||||||
|
}
|
||||||
|
|
||||||
static function getTags($tagger, $tagged, $auth_user=null) {
|
static function getTags($tagger, $tagged, $auth_user=null) {
|
||||||
|
|
||||||
$profile_list = new Profile_list();
|
$profile_list = new Profile_list();
|
||||||
@ -88,7 +91,7 @@ class Profile_tag extends Managed_DataObject
|
|||||||
return $profile_list;
|
return $profile_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
static function getTagsArray($tagger, $tagged, $auth_user_id=null)
|
static function getTagsArray($tagger, $tagged, Profile $scoped=null)
|
||||||
{
|
{
|
||||||
$ptag = new Profile_tag();
|
$ptag = new Profile_tag();
|
||||||
|
|
||||||
@ -100,7 +103,7 @@ class Profile_tag extends Managed_DataObject
|
|||||||
'and profile_tag.tagged = %d ',
|
'and profile_tag.tagged = %d ',
|
||||||
$tagger, $tagged);
|
$tagger, $tagged);
|
||||||
|
|
||||||
if ($auth_user_id != $tagger) {
|
if (!$scoped instanceof Profile || $scoped->getID() !== $tagger) {
|
||||||
$qry .= 'and profile_list.private = 0';
|
$qry .= 'and profile_list.private = 0';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -115,10 +118,10 @@ class Profile_tag extends Managed_DataObject
|
|||||||
return $tags;
|
return $tags;
|
||||||
}
|
}
|
||||||
|
|
||||||
static function setTags($tagger, $tagged, $newtags, $privacy=array()) {
|
static function setTags($tagger, $tagged, array $newtags, array $privacy=array()) {
|
||||||
|
|
||||||
$newtags = array_unique($newtags);
|
$newtags = array_unique($newtags);
|
||||||
$oldtags = self::getTagsArray($tagger, $tagged, $tagger);
|
$oldtags = self::getTagsArray($tagger, $tagged, Profile::getByID($tagger));
|
||||||
|
|
||||||
$ptag = new Profile_tag();
|
$ptag = new Profile_tag();
|
||||||
|
|
||||||
@ -149,19 +152,18 @@ class Profile_tag extends Managed_DataObject
|
|||||||
'tag' => $tag));
|
'tag' => $tag));
|
||||||
|
|
||||||
# if tag already exists, return it
|
# if tag already exists, return it
|
||||||
if(!empty($ptag)) {
|
if ($ptag instanceof Profile_tag) {
|
||||||
return $ptag;
|
return $ptag;
|
||||||
}
|
}
|
||||||
|
|
||||||
$tagger_profile = Profile::getKV('id', $tagger);
|
$tagger_profile = Profile::getByID($tagger);
|
||||||
$tagged_profile = Profile::getKV('id', $tagged);
|
$tagged_profile = Profile::getByID($tagged);
|
||||||
|
|
||||||
if (Event::handle('StartTagProfile', array($tagger_profile, $tagged_profile, $tag))) {
|
if (Event::handle('StartTagProfile', array($tagger_profile, $tagged_profile, $tag))) {
|
||||||
|
|
||||||
if (!$tagger_profile->canTag($tagged_profile)) {
|
if (!$tagger_profile->canTag($tagged_profile)) {
|
||||||
// TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
|
// TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
|
||||||
throw new ClientException(_('You cannot tag this user.'));
|
throw new ClientException(_('You cannot tag this user.'));
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$tags = new Profile_list();
|
$tags = new Profile_list();
|
||||||
@ -174,7 +176,6 @@ class Profile_tag extends Managed_DataObject
|
|||||||
'which is the maximum allowed number of tags. ' .
|
'which is the maximum allowed number of tags. ' .
|
||||||
'Try using or deleting some existing tags.'),
|
'Try using or deleting some existing tags.'),
|
||||||
common_config('peopletag', 'maxtags')));
|
common_config('peopletag', 'maxtags')));
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$plist = new Profile_list();
|
$plist = new Profile_list();
|
||||||
@ -188,7 +189,6 @@ class Profile_tag extends Managed_DataObject
|
|||||||
'which is the maximum allowed number. ' .
|
'which is the maximum allowed number. ' .
|
||||||
'Try unlisting others first.'),
|
'Try unlisting others first.'),
|
||||||
common_config('peopletag', 'maxpeople'), $tag));
|
common_config('peopletag', 'maxpeople'), $tag));
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$newtag = new Profile_tag();
|
$newtag = new Profile_tag();
|
||||||
@ -199,9 +199,9 @@ class Profile_tag extends Managed_DataObject
|
|||||||
|
|
||||||
$result = $newtag->insert();
|
$result = $newtag->insert();
|
||||||
|
|
||||||
|
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
common_log_db_error($newtag, 'INSERT', __FILE__);
|
common_log_db_error($newtag, 'INSERT', __FILE__);
|
||||||
|
$plist->query('ROLLBACK');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -212,7 +212,6 @@ class Profile_tag extends Managed_DataObject
|
|||||||
$newtag->delete();
|
$newtag->delete();
|
||||||
$profile_list->delete();
|
$profile_list->delete();
|
||||||
throw $e;
|
throw $e;
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$profile_list->taggedCount(true);
|
$profile_list->taggedCount(true);
|
||||||
@ -233,12 +232,11 @@ class Profile_tag extends Managed_DataObject
|
|||||||
if (Event::handle('StartUntagProfile', array($ptag))) {
|
if (Event::handle('StartUntagProfile', array($ptag))) {
|
||||||
$orig = clone($ptag);
|
$orig = clone($ptag);
|
||||||
$result = $ptag->delete();
|
$result = $ptag->delete();
|
||||||
if (!$result) {
|
if ($result === false) {
|
||||||
common_log_db_error($this, 'DELETE', __FILE__);
|
common_log_db_error($this, 'DELETE', __FILE__);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
Event::handle('EndUntagProfile', array($orig));
|
Event::handle('EndUntagProfile', array($orig));
|
||||||
if ($result) {
|
|
||||||
$profile_list = Profile_list::pkeyGet(array('tag' => $tag, 'tagger' => $tagger));
|
$profile_list = Profile_list::pkeyGet(array('tag' => $tag, 'tagger' => $tagger));
|
||||||
if (!empty($profile_list)) {
|
if (!empty($profile_list)) {
|
||||||
$profile_list->taggedCount(true);
|
$profile_list->taggedCount(true);
|
||||||
@ -246,8 +244,6 @@ class Profile_tag extends Managed_DataObject
|
|||||||
self::blowCaches($tagger, $tagged);
|
self::blowCaches($tagger, $tagged);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// @fixme: move this to Profile_list?
|
// @fixme: move this to Profile_list?
|
||||||
|
@ -462,16 +462,6 @@ class User extends Managed_DataObject
|
|||||||
return $this->getProfile()->getNotices($offset, $limit, $since_id, $before_id);
|
return $this->getProfile()->getNotices($offset, $limit, $since_id, $before_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getSelfTags()
|
|
||||||
{
|
|
||||||
return Profile_tag::getTagsArray($this->id, $this->id, $this->id);
|
|
||||||
}
|
|
||||||
|
|
||||||
function setSelfTags($newtags, $privacy)
|
|
||||||
{
|
|
||||||
return Profile_tag::setTags($this->id, $this->id, $newtags, $privacy);
|
|
||||||
}
|
|
||||||
|
|
||||||
function block(Profile $other)
|
function block(Profile $other)
|
||||||
{
|
{
|
||||||
// Add a new block record
|
// Add a new block record
|
||||||
|
Loading…
Reference in New Issue
Block a user