Minahito
minah****@users*****
2006年 8月 18日 (金) 14:35:30 JST
Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.13 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.14
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.13 Wed Aug 9 18:38:29 2006
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php Fri Aug 18 14:35:30 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.13 2006/08/09 09:38:29 minahito Exp $
+ * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.14 2006/08/18 05:35:30 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -48,12 +48,12 @@
}
if (!$memberHandler->insertUser($this->mNewUser)) {
- $this->mRedirectMessage = _US_REGISTERNG;
+ $this->mRedirectMessage = _MD_USER_LANG_REGISTERNG;
return USER_FRAME_VIEW_ERROR;
}
if (!$memberHandler->addUserToGroup(XOOPS_GROUP_USERS, $this->mNewUser->get('uid'))) {
- $this->mRedirectMessage = _US_REGISTERNG;
+ $this->mRedirectMessage = _MD_USER_LANG_REGISTERNG;
return USER_FRAME_VIEW_ERROR;
}
@@ -147,21 +147,21 @@
if ($activationType == 0) {
$render->setTemplateName("user_register_finish.html");
- $render->setAttribute("complete_message", _US_YOURREGISTERED);
+ $render->setAttribute("complete_message", _MD_USER_MESSAGE_YOURREGISTERED);
}
elseif ($activationType == 1) {
- $controller->executeRedirect(XOOPS_URL, 4, _US_ACTLOGIN);
+ $controller->executeRedirect(XOOPS_URL, 4, _MD_USER_MESSAGE_ACTLOGIN);
}
elseif($activationType == 2) {
$render->setTemplateName("user_register_finish.html");
- $render->setAttribute("complete_message", _US_YOURREGISTERED2);
+ $render->setAttribute("complete_message", _MD_USER_MESSAGE_YOURREGISTERED2);
}
else {
//
// This case is never.
//
$render->setTemplateName("user_register_finish.html");
- $render->setAttribute("complete_message", _US_YOURREGISTERED2);
+ $render->setAttribute("complete_message", _MD_USER_MESSAGE_YOURREGISTERED2);
}
}
}
Index: xoops2jp/html/modules/user/actions/UserActivateAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.4 xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.4 Sat Aug 5 10:54:48 2006
+++ xoops2jp/html/modules/user/actions/UserActivateAction.class.php Fri Aug 18 14:35:30 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: UserActivateAction.class.php,v 1.1.2.4 2006/08/05 01:54:48 nobunobu Exp $
+ * @version $Id: UserActivateAction.class.php,v 1.1.2.5 2006/08/18 05:35:30 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -47,11 +47,11 @@
}
if ($this->mObject->get('actkey') != xoops_getrequest('actkey')) {
- $controller->executeRedirect(XOOPS_URL, 3, _US_ACTKEYNOT);
+ $controller->executeRedirect(XOOPS_URL, 3, _MD_USER_MESSAGE_ACTKEYNOT);
}
if ($this->mObject->get('level') > 1) {
- $controller->executeRedirect(XOOPS_URL . '/user.php', 3, _US_ACONTACT);
+ $controller->executeRedirect(XOOPS_URL . '/user.php', 3, _MD_USER_MESSAGE_ACONTACT);
}
$this->mObject->set('level', '1');
@@ -67,12 +67,12 @@
$director->contruct($builder);
$mailer=&$builder->getResult();
if ($mailer->send()) {
- $controller->executeRedirect(XOOPS_URL, 5, sprintf(_US_ACTVMAILOK, $this->mObject->get('uname')));
+ $controller->executeRedirect(XOOPS_URL, 5, sprintf(_MD_USER_MESSAGE_ACTVMAILOK, $this->mObject->get('uname')));
} else {
- $controller->executeRedirect(XOOPS_URL, 5, sprintf(_US_ACTVMAILNG, $this->mObject->get('uname')));
+ $controller->executeRedirect(XOOPS_URL, 5, sprintf(_MD_USER_MESSAGE_ACTVMAILNG, $this->mObject->get('uname')));
}
} else {
- $controller->executeRedirect(XOOPS_URL . '/user.php', 5, _US_ACTLOGIN);
+ $controller->executeRedirect(XOOPS_URL . '/user.php', 5, _MD_USER_MESSAGE_ACTLOGIN);
}
}
}
Index: xoops2jp/html/modules/user/actions/UserRegisterAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.8 xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.9
--- xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.8 Wed Jul 19 19:20:33 2006
+++ xoops2jp/html/modules/user/actions/UserRegisterAction.class.php Fri Aug 18 14:35:30 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: UserRegisterAction.class.php,v 1.1.2.8 2006/07/19 10:20:33 minahito Exp $
+ * @version $Id: UserRegisterAction.class.php,v 1.1.2.9 2006/08/18 05:35:30 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -32,7 +32,7 @@
$controller->executeForward(XOOPS_URL . "/user.php");
}
if (empty($this->mConfig['allow_register'])) {
- $controller->executeRedirect(XOOPS_URL, 6, _US_NOREGISTER);
+ $controller->executeRedirect(XOOPS_URL, 6, _MD_USER_LANG_NOREGISTER);
}
}