wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use updateKeys() for updating the user

Browse Source 
darcs-hash:20080622151611-34904-1d952df08b5247ab391bb76fd50d7b90498f0c96.gz
This commit is contained in:
Evan Prodromou 2008-06-22 11:16:11 -04:00
parent 2b258b1a9a
commit acf562b3dd
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/confirmemail.php
View File

@ -51,11 +51,13 @@ class ConfirmemailAction extends Action {
$cur->query('BEGIN'); $cur->query('BEGIN');
$orig_user = clone($cur); $orig_user = clone($cur);
$cur->email = $confirm_email->email; $cur->email = $confirm_email->email;
$result = $cur->update($orig_user); $result = $cur->updateKeys($orig_user);
if (!$result) { if (!$result) {
common_log_db_error($cur, 'UPDATE', __FILE__); common_log_db_error($cur, 'UPDATE', __FILE__);
$this->server_error(_t('Couldn\'t update user.'));
return; return;
} }
@ -63,6 +65,7 @@ class ConfirmemailAction extends Action {
if (!$result) { if (!$result) {
common_log_db_error($confirm_email, 'DELETE', __FILE__); common_log_db_error($confirm_email, 'DELETE', __FILE__);
$this->server_error(_t('Couldn\'t delete email confirmation.'));
return; return;
} }

26
actions/profilesettings.php
View File

@ -113,20 +113,23 @@ class ProfilesettingsAction extends SettingsAction {
assert(!is_null($user)); # should already be checked assert(!is_null($user)); # should already be checked
$user->query('BEGIN'); $user->query('BEGIN');
$original = clone($user);
$user->nickname = $nickname; if ($user->nickname != $nickname) {
$result = $user->update($original); $original = clone($user);
if (!$result) { $user->nickname = $nickname;
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_t('Couldnt update user.')); $result = $user->updateKeys($original);
return;
if (!$result) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_t('Couldnt update user.'));
return;
}
} }
if ($email != $original->email) { if ($email != $user->email) {
$confirm = new Confirm_email(); $confirm = new Confirm_email();
$confirm->code = common_good_rand(16); $confirm->code = common_good_rand(16);
@ -134,6 +137,7 @@ class ProfilesettingsAction extends SettingsAction {
$confirm->email = $email; $confirm->email = $email;
$result = $confirm->insert(); $result = $confirm->insert();
if (!$result) { if (!$result) {
common_log_db_error($confirm, 'INSERT', __FILE__); common_log_db_error($confirm, 'INSERT', __FILE__);
common_server_error(_t('Couldnt confirm email.')); common_server_error(_t('Couldnt confirm email.'));

4
classes/User.php
View File

@ -68,12 +68,12 @@ class User extends DB_DataObject
$parts = array(); $parts = array();
foreach (array('nickname', 'email') as $k) { foreach (array('nickname', 'email') as $k) {
if ($this->$k != $orig->$k) { if ($this->$k != $orig->$k) {
$parts[] = $k . '=' . $this->_quote($this->$k); $parts[] = $k . ' = ' . $this->_quote($this->$k);
} }
} }
if (count($parts) == 0) { if (count($parts) == 0) {
# No changes # No changes
return; return true;
} }
$toupdate = implode(', ', $parts); $toupdate = implode(', ', $parts);
$qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate . $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate .