Changeset 3422
- Timestamp:
- 02/07/07 12:57:05 (2 years ago)
- Files:
-
- plugins/sfGuardPlugin/modules/sfGuardAuth/lib/BasesfGuardAuthActions.class.php (modified) (2 diffs)
- plugins/sfGuardPlugin/modules/sfGuardAuth/templates/signinSuccess.php (modified) (1 diff)
- plugins/sfGuardPlugin/modules/sfGuardUser/actions/actions.class.php (modified) (2 diffs)
- plugins/sfGuardPlugin/package.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/sfGuardPlugin/modules/sfGuardAuth/lib/BasesfGuardAuthActions.class.php
r1949 r3422 23 23 { 24 24 // display the form 25 $this->getRequest()->getParameterHolder()->set('referer', $this->getRequest()->getReferer()); 25 if (!$this->getUser()->hasAttribute('referer')) 26 { 27 $referer = $this->getContext()->getActionStack()->getSize() == 1 ? $this->getRequest()->getReferer() : $this->getRequest()->getUri(); 28 29 $this->getUser()->setAttribute('referer', $referer); 30 } 26 31 } 27 32 else … … 29 34 // handle the form submission 30 35 // redirect to last page 31 $this->redirect($this->getRequestParameter('referer', '@homepage')); 36 $referer = $this->getUser()->getAttribute('referer', '@homepage'); 37 $this->getUser()->getAttributeHolder()->remove('referer'); 38 $this->redirect($referer); 32 39 } 33 40 } plugins/sfGuardPlugin/modules/sfGuardAuth/templates/signinSuccess.php
r3190 r3422 23 23 </fieldset> 24 24 25 <?php echo input_hidden_tag('referer', $sf_data->get('sf_request')->getParameter('referer')) ?>26 27 25 <?php echo submit_tag('sign in') ?> 28 26 <?php echo link_to('Forgot your password?', '@sf_guard_password', array('id' => 'sf_guard_auth_forgot_password')) ?> plugins/sfGuardPlugin/modules/sfGuardUser/actions/actions.class.php
r3303 r3422 9 9 */ 10 10 11 require_once(dirname(__FILE__).'/../lib/BasesfGuardUserActions.class.php'); 12 11 13 /** 12 14 * User management. … … 17 19 * @version SVN: $Id$ 18 20 */ 19 require_once(dirname(__FILE__).'/../lib/BasesfGuardUserActions.class.php');20 21 class sfGuardUserActions extends BasesfGuardUserActions 21 22 { plugins/sfGuardPlugin/package.xml
r3406 r3422 23 23 <active>yes</active> 24 24 </lead> 25 <date>2007-02-0 6</date>25 <date>2007-02-07</date> 26 26 <version> 27 <release>1.1. 5</release>27 <release>1.1.6</release> 28 28 <api>1.1.0</api> 29 29 </version>