ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 9802


Ignore:
Timestamp:
Dec 31, 2008, 5:28:38 AM (11 years ago)
Author:
ebihara
Message:

#3241:changed the base of authentication to restore an authentication mode to register

Location:
OpenPNE3/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE3/trunk/apps/pc_frontend/templates/_requestRegisterURLMail.php

    r9039 r9802  
    11以下のURLから<?php echo OpenPNEConfig::get('sns_name') ?>に登録してください。
    22
    3 <?php echo url_for('pcAddress/register?token=' . $token, true) ?>
     3<?php echo url_for(sprintf('pcAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
  • OpenPNE3/trunk/lib/form/InviteForm.class.php

    r9593 r9802  
    3636  protected function sendConfirmMail($token, $to, $params = array())
    3737  {
     38    $param = array(
     39      'token'    => $token,
     40      'authMode' => sfContext::getInstance()->getUser()->getCurrentAuthMode(),
     41    );
     42
    3843    $mail = new sfOpenPNEMailSend();
    3944    $mail->setSubject(OpenPNEConfig::get('sns_name').'の招待状が届いています');
    40     $mail->setTemplate('global/requestRegisterURLMail', array('token' => $token));
     45    $mail->setTemplate('global/requestRegisterURLMail', $param);
    4146    $mail->send($to, OpenPNEConfig::get('admin_mail_address'));
    4247  }
     
    4651    parent::save();
    4752
     53    $user = sfContext::getInstance()->getUser();
     54
     55    $this->member->setConfig('register_auth_mode', $user->getCurrentAuthMode());
     56
    4857    if ($this->getOption('is_link'))
    4958    {
    50       $fromMemberId = sfContext::getInstance()->getUser()->getMemberId();
     59      $fromMemberId = $user->getMemberId();
    5160      $toMemberId = $this->member->getId();
    5261      $relation = MemberRelationshipPeer::retrieveByFromAndTo($fromMemberId, $toMemberId);
  • OpenPNE3/trunk/lib/form/MemberConfigForm.class.php

    r9633 r9802  
    107107  public function isValid()
    108108  {
     109    opActivateBehavior::disable();
     110
    109111    foreach ($this->getValues() as $key => $value)
    110112    {
     
    123125    }
    124126
     127    opActivateBehavior::enable();
    125128    return parent::isValid();
    126129  }
Note: See TracChangeset for help on using the changeset viewer.