Changeset 15136 for events/phpframework/piece_framework/trunk/web/frontend/webapp/actions/Account/SettingsAction.php

Timestamp:

07/04/08 01:30:16 (5 months ago)

Author:

kumatch

Message:

Adjusted the change of authenticated user (self) object.

Files:

• events/phpframework/piece_framework/trunk/web/frontend/webapp/actions/Account/SettingsAction.php (modified) (3 diffs)

events/phpframework/piece_framework/trunk/web/frontend/webapp/actions/Account/SettingsAction.php

@@ -53 +53 @@
     {
         if (is_null($this->_self)) {
-            $this->_loginUser = $this->_context->getSession()->getAttribute('loginUser');
+            $this->_self = $this->_context->getAttribute('self');
 
-            $this->_self = new Phwittr_Self($this->_loginUser->id);
-            $this->_user->userName = $this->_self->userName;
-            $this->_user->email = $this->_self->email;
+            $this->_user->userName    = $this->_self->userName;
+            $this->_user->email       = $this->_self->email;
             $this->_user->privateFlag = $this->_self->privateFlag;
         }
@@ -67 +66 @@
         $master->addForm('AccountSettings', '/account/settings');
         $master->setFormValue('AccountSettings', $this->_user);
-
-        $viewElement = $this->_context->getViewElement();
-        $viewElement->setElementByRef('self', $this->_self);
     }
 
@@ -80 +76 @@
 
         try {
-            Phwittr_Account::confirmNewUserName($this->_loginUser->id,
+            Phwittr_Account::confirmNewUserName($this->_self->id,
                                                 $this->_user->userName
                                                 );
-            Phwittr_Account::confirmNewEmail($this->_loginUser->id,
+            Phwittr_Account::confirmNewEmail($this->_self->id,
                                              $this->_user->email
                                              );
 
+            $user = clone($this->_self);
+            $user->userName    = $this->_user->userName;
+            $user->email       = $this->_user->email;
+            $user->privateFlag = $this->_user->privateFlag;
+
             $account = new Phwittr_Account();
-            $account->update($this->_user);
+            $account->update($user);
 
-            $this->_loginUser->userName = $this->_user->userName;
-            $this->_loginUser->email = $this->_user->email;
-            $this->_loginUser->privateFlag = $this->_user->privateFlag;
-
-            $this->_context->getSession()->setAttribute('loginUser', $this->_loginUser);
-            $this->_self = new Phwittr_Self($this->_loginUser->id);
+            $this->_self->userName = $this->_user->userName;
+            $this->_self->email    = $this->_user->email;
+            $this->_self->privateFlag = $this->_user->privateFlag;
 
             return 'DisplayForm';