Development

Changeset 12894

You must first sign up to be able to contribute.

Changeset 12894

Show
Ignore:
Timestamp:
11/10/08 19:29:48 (5 years ago)
Author:
gimler
Message:

sfGuardExtraPlugin

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfGuardExtraPlugin/branches/1.1/modules/sfGuardRegister/lib/BasesfGuardRegisterActions.class.php

    r12887 r12894  
    22class BasesfGuardRegisterActions extends sfActions 
    33{ 
     4  /** 
     5   * preExecute 
     6   * 
     7   * @access public 
     8   * @return void 
     9   */ 
    410  public function preExecute() 
    511  { 
    …… 
    915    } 
    1016  } 
    11    
     17 
     18  /** 
     19   * executeRegister 
     20   * 
     21   * @access public 
     22   * @return void 
     23   */ 
    1224  public function executeRegister($request) 
    1325  { 
    …… 
    3143          'password' => $values['password'] 
    3244        ); 
    33         $message = $this->getComponent('sfGuardRegister', 'send_request_confirm_register', $messageParams); 
     45        $message = $this->getComponent('sfGuardRegister', 'send_request_confirm', $messageParams); 
    3446 
    3547        $mailParams = array( 
    3648          'to' => $this->sfGuardUser->getEmailAddress(), 
    37           'subject' => 'Register confirmation', 
     49          'subject' => 'Confirm Registration', 
    3850          'message' => $message 
    3951        ); 
    …… 
    5466  { 
    5567  } 
    56    
     68 
     69  /** 
     70   * executeRegister_confirm 
     71   * 
     72   * @access public 
     73   * @return void 
     74   */ 
    5775  public function executeRegister_confirm() 
    5876  { 
    …… 
    6179    $query = new Doctrine_Query(); 
    6280    $query->from('sfGuardUser u')->where('u.password = ? AND u.id = ?', $params)->limit(1); 
    63      
    64     $this->sfGuardUser = $query->execute()->getFirst(); 
    65     $this->sfGuardUser->setIsActive(1); 
    66     $this->sfGuardUser->confirm(); 
    67     $this->sfGuardUser->save(); 
    68      
    69     $this->forward404Unless($this->sfGuardUser); 
    70      
    71     $rawEmail = $this->sendEmail('sfGuardRegister', 'send_register_complete'); 
    72     $this->logMessage($rawEmail, 'debug'); 
    73      
    74     $this->setFlash('notice', 'You have successfully confirmed your registration!'); 
    75     $this->redirect('@sf_guard_register_complete?id='.$this->sfGuardUser->getId()); 
    76   } 
    77    
    78 //  public function executeRegister_complete() 
    79 //  { 
    80 //     
    81 //  } 
    82    
    83 //  public function handleErrorRegister() 
    84 //  { 
    85 //    $this->setFlash('error', 'An error occurred with your registration, please try again!'); 
    86 //    $this->forward('sfGuardRegister', 'index'); 
    87 //  } 
    8881 
    89   public function executeSend_confirm_registration() 
    90   { 
    91     $this->sfGuardUser = sfGuardUserTable::retrieveByUsernameOrEmailAddress($this->getRequestParameter('user[username]'), false); 
    92      
    93     $mail = new sfMail(); 
    94     $mail->setContentType('text/html'); 
    95     $mail->setSender(sfConfig::get('app_outgoing_emails_sender')); 
    96     $mail->setFrom(sfConfig::get('app_outgoing_emails_from')); 
    97     $mail->addReplyTo(sfConfig::get('app_outgoing_emails_reply_to')); 
    98     $mail->addAddress($this->sfGuardUser->getEmailAddress()); 
    99     $mail->setSubject('Confirm Registration'); 
    100      
    101     $this->mail = $mail; 
     82    $sfGuardUser = $query->execute()->getFirst(); 
     83    $sfGuardUser->setIsActive(1); 
     84    $sfGuardUser->confirm(); 
     85    $sfGuardUser->save(); 
     86 
     87    $this->forward404Unless($sfGuardUser); 
     88 
     89    $messageParams = array( 
     90      'sfGuardUser' => $sfGuardUser, 
     91    ); 
     92    $message = $this->getComponent('sfGuardRegister', 'send_complete', $messageParams); 
     93 
     94    $mailParams = array( 
     95      'to' => $sfGuardUser->getEmailAddress(), 
     96      'subject' => 'Registration Complete', 
     97      'message' => $message 
     98    ); 
     99    sfGuardExtraMail::send($mailParams); 
     100 
     101    $this->redirect('@sf_guard_register_complete?id='.$sfGuardUser->getId()); 
    102102  } 
    103103 
    104   public function executeSend_register_complete() 
     104  /** 
     105   * executeRegister_complete 
     106   * 
     107   * @access public 
     108   * @return void 
     109   */ 
     110  public function executeRegister_complete() 
    105111  { 
    106     $params = array($this->getRequestParameter('key'), $this->getRequestParameter('id')); 
    107      
    108     $query = new Doctrine_Query(); 
    109     $query->from('sfGuardUser u')->where('u.password = ? AND u.id = ?', $params)->limit(1); 
    110      
    111     $this->sfGuardUser = $query->execute()->getFirst(); 
    112      
    113     $mail = new sfMail(); 
    114     $mail->setContentType('text/html'); 
    115     $mail->setSender(sfConfig::get('app_outgoing_emails_sender')); 
    116     $mail->setFrom(sfConfig::get('app_outgoing_emails_from')); 
    117     $mail->addReplyTo(sfConfig::get('app_outgoing_emails_reply_to')); 
    118     $mail->addAddress($this->sfGuardUser->getEmailAddress()); 
    119     $mail->setSubject('Registration Complete'); 
    120  
    121     $this->mail = $mail; 
    122112  } 
    123113} 

  • plugins/sfGuardExtraPlugin/branches/1.1/modules/sfGuardRegister/lib/BasesfGuardRegisterComponents.class.php

    r12885 r12894  
    1818class BasesfGuardRegisterComponents extends sfComponents 
    1919{ 
    20   public function executeSend_request_confirm_register() 
     20  public function executeSend_request_confirm() 
     21  { 
     22  } 
     23 
     24  public function executeSend_complete() 
    2125  { 
    2226  } 

  • plugins/sfGuardExtraPlugin/branches/1.1/modules/sfGuardRegister/templates/_send_request_confirm.php

    • Property svn:mergeinfo set