Minahito
minah****@users*****
2006年 10月 5日 (木) 19:18:12 JST
Index: xoops2jp/html/modules/user/actions/UserActivateAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.6 xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.6.2.1
--- xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.6 Sun Sep 24 19:37:30 2006
+++ xoops2jp/html/modules/user/actions/UserActivateAction.class.php Thu Oct 5 19:18:12 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: UserActivateAction.class.php,v 1.1.2.6 2006/09/24 10:37:30 minahito Exp $
+ * @version $Id: UserActivateAction.class.php,v 1.1.2.6.2.1 2006/10/05 10:18:12 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -63,7 +63,7 @@
if ($this->mConfig['activation_type'] == 2) {
$builder =& new RegistAdminCommitMailBuilder();
- $director =& new UserRegistMailDirector($this->mObject, $controller->getConfig(), $this->mConfig);
+ $director =& new UserRegistMailDirector($this->mObject, $controller->mRoot->mContext->getXoopsConfig(), $this->mConfig);
$director->contruct($builder);
$mailer=&$builder->getResult();
if ($mailer->send()) {
Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16.2.1
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16 Sun Sep 24 19:38:02 2006
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php Thu Oct 5 19:18:12 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.16 2006/09/24 10:38:02 minahito Exp $
+ * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.16.2.1 2006/10/05 10:18:12 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -41,8 +41,8 @@
$memberHandler =& xoops_gethandler('member');
$this->mNewUser =& $memberHandler->createUser();
$this->mRegistForm->update($this->mNewUser);
- $this->mNewUser->set('uorder', $controller->getConfig('com_order'), true);
- $this->mNewUser->set('umode', $controller->getConfig('com_mode'), true);
+ $this->mNewUser->set('uorder', $controller->mRoot->mContext->getXoopsConfig('com_order'), true);
+ $this->mNewUser->set('umode', $controller->mRoot->mContext->getXoopsConfig('com_mode'), true);
if ($this->mConfig['activation_type'] == 1) {
$this->mNewUser->setVar('level', 1, true);
}
@@ -105,7 +105,7 @@
$builder = ($activationType == 0) ? new User_RegistUserActivateMailBuilder()
: new User_RegistUserAdminActivateMailBuilder();
- $director =& new User_UserRegistMailDirector($builder, $this->mNewUser, $controller->getConfig(), $this->mConfig);
+ $director =& new User_UserRegistMailDirector($builder, $this->mNewUser, $controller->mRoot->mContext->getXoopsConfig(), $this->mConfig);
$director->contruct();
$mailer =& $builder->getResult();
@@ -117,7 +117,7 @@
{
if($this->mConfig['new_user_notify'] == 1 && !empty($this->mConfig['new_user_notify_group'])) {
$builder =& new User_RegistUserNotifyMailBuilder();
- $director =& new User_UserRegistMailDirector($builder, $this->mNewUser, $controller->getConfig(), $this->mConfig);
+ $director =& new User_UserRegistMailDirector($builder, $this->mNewUser, $controller->mRoot->mContext->getXoopsConfig(), $this->mConfig);
$director->contruct();
$mailer =& $builder->getResult();
$mailer->send();