Changeset 9779
- Timestamp:
- Dec 29, 2008, 11:54:32 PM (14 years ago)
- Location:
- OpenPNE3/trunk/lib
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
OpenPNE3/trunk/lib/action/sfOpenPNEMemberAction.class.php
r9767 r9779 35 35 if ($request->hasParameter('authMode')) 36 36 { 37 if ($ this->getUser()->login())37 if ($uri = $this->getUser()->login()) 38 38 { 39 39 $this->redirectIf($this->getUser()->hasCredential('SNSRegisterBegin'), 'member/registerInput'); 40 40 $this->redirectIf($this->getUser()->hasCredential('SNSRegisterFinish'), $this->getUser()->getRegisterEndAction()); 41 $this->redirectIf($this->getUser()->hasCredential('SNSMember'), 'member/home');41 $this->redirectIf($this->getUser()->hasCredential('SNSMember'), $uri); 42 42 } 43 43 return sfView::ERROR; -
OpenPNE3/trunk/lib/form/opAuthLoginForm.class.php
r9727 r9779 31 31 parent::__construct($defaults, $options, $CSRFSecret); 32 32 33 $this->setWidget('next_uri', new opWidgetFormInputHiddenNextUri()); 34 $this->setValidator('next_uri', new opValidatorNextUri()); 35 33 36 $this->widgetSchema->setNameFormat('auth'.$this->adapter->getAuthModeName().'[%s]'); 34 37 } -
OpenPNE3/trunk/lib/form/sfOpenPNEAuthForm.class.php
r9677 r9779 35 35 36 36 parent::__construct($defaults, $options, $CSRFSecret); 37 38 $this->setWidget('next_uri', new opWidgetFormInputHiddenNextUri()); 39 $this->setValidator('next_uri', new opValidatorNextUri()); 37 40 } 38 41 … … 99 102 public function setForRegisterWidgets($member = null) 100 103 { 101 if (!$member) { 104 unset($this['next_uri']); 105 106 if (!$member) 107 { 102 108 $member = new Member(); 103 109 } -
OpenPNE3/trunk/lib/user/sfOpenPNESecurityUser.class.php
r9777 r9779 110 110 $this->initializeCredentials(); 111 111 112 return $this->isAuthenticated(); 112 if ($this->isAuthenticated()) 113 { 114 $uri = $this->getAuthAdapter()->getAuthForm()->getValue('next_uri'); 115 return $uri; 116 } 117 118 return false; 113 119 } 114 120
Note: See TracChangeset
for help on using the changeset viewer.