NobuNobu
nobun****@users*****
2006年 2月 4日 (土) 16:52:47 JST
Index: xoops2jp/html/modules/user/actions/UserRegisterAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.4 xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.4 Wed Nov 16 19:13:09 2005
+++ xoops2jp/html/modules/user/actions/UserRegisterAction.class.php Sat Feb 4 16:52:47 2006
@@ -1,8 +1,8 @@
<?php
-require_once XOOPS_MODULE_PATH."/user/forms/RegisterUserEditForm.class.php";
+require_once XOOPS_MODULE_PATH."/user/forms/UserRegisterEditForm.class.php";
-class UserRegisterAction extends UserAction
+class User_UserRegisterAction extends User_Action
{
var $mActionForm=null;
var $mConfig;
@@ -29,8 +29,8 @@
return USER_FRAME_VIEW_INPUT;
}
else {
- $_SESSION['user_register_actionform']=&$this->mActionForm;
- $controller->executeForward('./register_confirm.php');
+ $_SESSION['user_register_actionform']=serialize(&$this->mActionForm);
+ $controller->executeForward('./index.php?action=UserRegister_confirm');
}
}
@@ -45,10 +45,10 @@
{
if($this->mConfig['reg_dispdsclmr']!=0 && $this->mConfig['reg_disclaimer']!=null) {
$this->mEnableAgreeFlag=true;
- $this->mActionForm=new RegisterUserAgreeEditForm();
+ $this->mActionForm=new UserRegisterAgreeEditForm();
}
else {
- $this->mActionForm=new RegisterUserEditForm();
+ $this->mActionForm=new UserRegisterEditForm();
}
$this->mActionForm->prepare($this->mConfig);
@@ -56,6 +56,14 @@
function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
{
+ //
+ // Get some objects for input form.
+ //
+ $tzoneHandler =& xoops_gethandler('timezone');
+ $timezones =& $tzoneHandler->getObjects();
+
+ $renderSystem->setAttribute('timezones', $timezones);
+
$renderSystem->setTemplateName("user_register_form.html");
$renderSystem->setAttribute("actionForm",$this->mActionForm);
$renderSystem->setAttribute("enableAgree",$this->mEnableAgreeFlag);
Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.3 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.3 Thu Nov 10 19:18:20 2005
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php Sat Feb 4 16:52:47 2006
@@ -1,9 +1,8 @@
<?php
-
require_once XOOPS_MODULE_PATH."/user/forms/UserConfirmForm.class.php";
+require_once XOOPS_MODULE_PATH."/user/forms/UserRegisterEditForm.class.php";
require_once XOOPS_MODULE_PATH."/user/class/RegistMailBuilder.class.php";
-
-class UserRegister_confirmAction extends UserAction
+class User_UserRegister_confirmAction extends User_Action
{
var $mActionForm=null;
var $mRegistForm=null;
@@ -29,9 +28,9 @@
$memberHandler=&xoops_gethandler('member');
$this->mNewUser=&$memberHandler->createUser();
- $this->mRegistForm->update($newUser);
+ $this->mRegistForm->update($this->mNewUser);
$this->mNewUser->setVar('uorder',$controller->getConfig('com_order'),true);
- $$this->mNewUser->setVar('umode',$controller->getConfig('com_mode'),true);
+ $this->mNewUser->setVar('umode',$controller->getConfig('com_mode'),true);
if($this->mUserConfig['activation_type'] == 1) {
$this->mNewUsersetVar('level',1,true);
}
@@ -49,8 +48,8 @@
$this->_clearRegistForm($controller);
$this->_processMail($controller);
-
- $controller->mRoot->mEventManager->raiseEvent("Module.User.Regist.Success");
+ $eventArgs = array();
+ $controller->mRoot->mEventManager->raiseEvent("Module.User.Regist.Success",$controller,$eventArgs);
// TODO the following process
@@ -71,9 +70,10 @@
*/
function _getRegistForm(&$controller)
{
- $this->mRegistForm=&$_SESSION['user_register_actionform'];
- if(!is_object($this->mRegistForm))
- $controller->executeForward("./register.php");
+ $this->mRegistForm=& unserialize($_SESSION['user_register_actionform']);
+ if(!is_object($this->mRegistForm)) {
+ $controller->executeForward('./index.php?action=UserRegister');
+ }
}
/**
@@ -102,11 +102,11 @@
$mailer->send(); // CHECKS
}
- function eventNotifyMail()
+ function eventNotifyMail(&$controller,&$eventArgs)
{
if($this->mUserConfig['new_user_notify'] == 1 && !empty($this->mUserConfig['new_user_notify_group'])) {
$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mUserConfig);
- $bilder = new RegistUserNotifyMailBuilder();
+ $builder = new RegistUserNotifyMailBuilder();
$director->contruct($builder);
$mailer=&$builder->getResult();
$mailer->send();