GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

whitespace and fixup problem with blank string

Browse Source 
darcs-hash:20081124150638-5ed1f-994af62567660c7f09985bf449a344df104548eb.gz
This commit is contained in:
Evan Prodromou 2008-11-24 10:06:38 -05:00
parent 07c4547a2f
commit 138b1b2767
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
actions/tagother.php
View File

@ -22,16 +22,16 @@ if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/settingsaction.php'); require_once(INSTALLDIR.'/lib/settingsaction.php');
class TagotherAction extends Action { class TagotherAction extends Action {
function handle($args) { function handle($args) {
parent::handle($args); parent::handle($args);
if (!common_logged_in()) { if (!common_logged_in()) {
$this->client_error(_('Not logged in'), 403); $this->client_error(_('Not logged in'), 403);
return; return;
} }
if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->save_tags(); $this->save_tags();
} else { } else {
@ -48,16 +48,16 @@ class TagotherAction extends Action {
$this->show_form($profile); $this->show_form($profile);
} }
} }
function show_form($profile, $error=NULL) { function show_form($profile, $error=NULL) {
$user = common_current_user(); $user = common_current_user();
common_show_header(_('Tag a person'), common_show_header(_('Tag a person'),
NULL, array($profile, $error), array($this, 'show_top')); NULL, array($profile, $error), array($this, 'show_top'));
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE), common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
'class' => 'avatar stream', 'class' => 'avatar stream',
'width' => AVATAR_PROFILE_SIZE, 'width' => AVATAR_PROFILE_SIZE,
@ -65,11 +65,11 @@ class TagotherAction extends Action {
'alt' => 'alt' =>
($profile->fullname) ? $profile->fullname : ($profile->fullname) ? $profile->fullname :
$profile->nickname)); $profile->nickname));
common_element('a', array('href' => $profile->profileurl, common_element('a', array('href' => $profile->profileurl,
'class' => 'external profile nickname'), 'class' => 'external profile nickname'),
$profile->nickname); $profile->nickname);
if ($profile->fullname) { if ($profile->fullname) {
common_element_start('div', 'fullname'); common_element_start('div', 'fullname');
if ($profile->homepage) { if ($profile->homepage) {
@ -86,7 +86,7 @@ class TagotherAction extends Action {
if ($profile->bio) { if ($profile->bio) {
common_element('div', 'bio', $profile->bio); common_element('div', 'bio', $profile->bio);
} }
common_element_start('form', array('method' => 'post', common_element_start('form', array('method' => 'post',
'id' => 'tag_user', 'id' => 'tag_user',
'name' => 'tagother', 'name' => 'tagother',
@ -100,38 +100,44 @@ class TagotherAction extends Action {
common_submit('save', _('Save')); common_submit('save', _('Save'));
common_element_end('form'); common_element_end('form');
common_show_footer(); common_show_footer();
} }
function save_tags() { function save_tags() {
$id = $this->trimmed('id'); $id = $this->trimmed('id');
$tagstring = $this->trimmed('tags'); $tagstring = $this->trimmed('tags');
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$this->show_form(_('There was a problem with your session token. Try again, please.')); $this->show_form(_('There was a problem with your session token. Try again, please.'));
return; return;
} }
$profile = Profile::staticGet('id', $id); $profile = Profile::staticGet('id', $id);
if (!$profile) { if (!$profile) {
$this->client_error(_('No such profile.')); $this->client_error(_('No such profile.'));
return; return;
} }
$tags = array_map('common_canonical_tag', preg_split('/[\s,]+/', $tagstring)); if (is_string($tagstring) && strlen($tagstring) > 0) {
foreach ($tags as $tag) { $tags = array_map('common_canonical_tag',
if (!common_valid_profile_tag($tag)) { preg_split('/[\s,]+/', $tagstring));
$this->show_form($profile, sprintf(_('Invalid tag: "%s"'), $tag));
return; foreach ($tags as $tag) {
if (!common_valid_profile_tag($tag)) {
$this->show_form($profile, sprintf(_('Invalid tag: "%s"'), $tag));
return;
}
} }
} else {
$tags = array();
} }
$user = common_current_user(); $user = common_current_user();
if (!Subscription::pkeyGet(array('subscriber' => $user->id, if (!Subscription::pkeyGet(array('subscriber' => $user->id,
'subscribed' => $profile->id)) && 'subscribed' => $profile->id)) &&
!Subscription::pkeyGet(array('subscriber' => $profile->id, !Subscription::pkeyGet(array('subscriber' => $profile->id,
@ -140,16 +146,16 @@ class TagotherAction extends Action {
$this->client_error(_('You can only tag people you are subscribed to or who are subscribed to you.')); $this->client_error(_('You can only tag people you are subscribed to or who are subscribed to you.'));
return; return;
} }
$result = Profile_tag::setTags($user->id, $profile->id, $tags); $result = Profile_tag::setTags($user->id, $profile->id, $tags);
if (!$result) { if (!$result) {
$this->client_error(_('Could not save tags.')); $this->client_error(_('Could not save tags.'));
return; return;
} }
$action = $user->isSubscribed($profile) ? 'subscriptions' : 'subscribers'; $action = $user->isSubscribed($profile) ? 'subscriptions' : 'subscribers';
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
common_start_html('text/xml'); common_start_html('text/xml');
common_element_start('head'); common_element_start('head');
@ -171,7 +177,7 @@ class TagotherAction extends Action {
$user->nickname))); $user->nickname)));
} }
} }
function show_top($arr = NULL) { function show_top($arr = NULL) {
list($profile, $error) = $arr; list($profile, $error) = $arr;
if ($error) { if ($error) {