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

whitespace fixup

Browse Source
This commit is contained in:
Evan Prodromou 2009-12-23 07:38:09 -08:00
parent 185e229f79
commit 71b7bdbcbe
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
actions/profilesettings.php
View File

@ -69,7 +69,7 @@ class ProfilesettingsAction extends AccountSettingsAction
function getInstructions() function getInstructions()
{ {
return _('You can update your personal profile info here '. return _('You can update your personal profile info here '.
'so people know more about you.'); 'so people know more about you.');
} }
function showScripts() function showScripts()
@ -92,9 +92,9 @@ class ProfilesettingsAction extends AccountSettingsAction
$profile = $user->getProfile(); $profile = $user->getProfile();
$this->elementStart('form', array('method' => 'post', $this->elementStart('form', array('method' => 'post',
'id' => 'form_settings_profile', 'id' => 'form_settings_profile',
'class' => 'form_settings', 'class' => 'form_settings',
'action' => common_local_url('profilesettings'))); 'action' => common_local_url('profilesettings')));
$this->elementStart('fieldset'); $this->elementStart('fieldset');
$this->element('legend', null, _('Profile information')); $this->element('legend', null, _('Profile information'));
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
@ -185,7 +185,7 @@ class ProfilesettingsAction extends AccountSettingsAction
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$this->showForm(_('There was a problem with your session token. '. $this->showForm(_('There was a problem with your session token. '.
'Try again, please.')); 'Try again, please.'));
return; return;
} }
@ -203,15 +203,15 @@ class ProfilesettingsAction extends AccountSettingsAction
// Some validation // Some validation
if (!Validate::string($nickname, array('min_length' => 1, if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64, 'max_length' => 64,
'format' => NICKNAME_FMT))) { 'format' => NICKNAME_FMT))) {
$this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.')); $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.'));
return; return;
} else if (!User::allowed_nickname($nickname)) { } else if (!User::allowed_nickname($nickname)) {
$this->showForm(_('Not a valid nickname.')); $this->showForm(_('Not a valid nickname.'));
return; return;
} else if (!is_null($homepage) && (strlen($homepage) > 0) && } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
!Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) { !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
$this->showForm(_('Homepage is not a valid URL.')); $this->showForm(_('Homepage is not a valid URL.'));
return; return;
} else if (!is_null($fullname) && mb_strlen($fullname) > 255) { } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
@ -253,15 +253,15 @@ class ProfilesettingsAction extends AccountSettingsAction
$user->query('BEGIN'); $user->query('BEGIN');
if ($user->nickname != $nickname || if ($user->nickname != $nickname ||
$user->language != $language || $user->language != $language ||
$user->timezone != $timezone) { $user->timezone != $timezone) {
common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname, common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname,
__FILE__); __FILE__);
common_debug('Updating user language from ' . $user->language . ' to ' . $language, common_debug('Updating user language from ' . $user->language . ' to ' . $language,
__FILE__); __FILE__);
common_debug('Updating user timezone from ' . $user->timezone . ' to ' . $timezone, common_debug('Updating user timezone from ' . $user->timezone . ' to ' . $timezone,
__FILE__); __FILE__);
$original = clone($user); $original = clone($user);
@ -281,7 +281,7 @@ class ProfilesettingsAction extends AccountSettingsAction
} }
} }
// XXX: XOR // XXX: XOR
if ($user->autosubscribe ^ $autosubscribe) { if ($user->autosubscribe ^ $autosubscribe) {
$original = clone($user); $original = clone($user);
@ -351,7 +351,7 @@ class ProfilesettingsAction extends AccountSettingsAction
$user = common_current_user(); $user = common_current_user();
$other = User::staticGet('nickname', $nickname); $other = User::staticGet('nickname', $nickname);
if (!$other) { if (!$other) {
return false; return false;
} else { } else {
return $other->id != $user->id; return $other->id != $user->id;
} }