Minahito
minah****@users*****
2006年 11月 10日 (金) 20:30:01 JST
Index: xoops2jp/html/modules/user/actions/EditUserAction.class.php
diff -u xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.13.2.1 xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.13.2.2
--- xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.13.2.1 Sun Oct 15 15:09:39 2006
+++ xoops2jp/html/modules/user/actions/EditUserAction.class.php Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: EditUserAction.class.php,v 1.1.2.13.2.1 2006/10/15 06:09:39 minahito Exp $
+ * @version $Id: EditUserAction.class.php,v 1.1.2.13.2.2 2006/11/10 11:30:01 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -29,12 +29,15 @@
function _getId()
{
- return isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0;
+ $root =& XCube_Root::getSingleton();
+ $uid = is_object($root->mContext->mXoopsUser) ? $root->mContext->mXoopsUser->get('uid') : 0;
+
+ return isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : $uid;
}
function &_getHandler()
{
- $handler =& xoops_getmodulehandler('users');
+ $handler =& xoops_getmodulehandler('users', 'user');
return $handler;
}
@@ -146,7 +149,7 @@
function executeViewSuccess(&$controller,&$xoopsUser,&$render)
{
- $controller->executeForward('./index.php?action=UserInfo&uid=' . $this->mObject->get('uid'));
+ $controller->executeForward(XOOPS_URL . '/userinfo.php?uid=' . $this->mObject->getShow('uid'));
}
function executeViewError(&$controller, &$xoopsUser, &$render)
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.2.2 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16.2.3
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16.2.2 Fri Oct 13 18:21:56 2006
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.16.2.2 2006/10/13 09:21:56 minahito Exp $
+ * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.16.2.3 2006/11/10 11:30:01 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -80,7 +80,7 @@
{
$this->mRegistForm =& unserialize($_SESSION['user_register_actionform']);
if (!is_object($this->mRegistForm)) {
- $controller->executeForward('./index.php?action=UserRegister');
+ $controller->executeForward('./register.php?action=UserRegister');
}
}
Index: xoops2jp/html/modules/user/actions/AvatarEditAction.class.php
diff -u xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.4 xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.5
--- xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.4 Fri Nov 10 15:19:11 2006
+++ xoops2jp/html/modules/user/actions/AvatarEditAction.class.php Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: AvatarEditAction.class.php,v 1.1.2.9.2.4 2006/11/10 06:19:11 minahito Exp $
+ * @version $Id: AvatarEditAction.class.php,v 1.1.2.9.2.5 2006/11/10 11:30:01 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -94,7 +94,7 @@
function &_getHandler()
{
- $handler =& xoops_getmodulehandler('users');
+ $handler =& xoops_getmodulehandler('users', 'user');
return $handler;
}
@@ -151,8 +151,8 @@
*/
function getDefaultView(&$controller, &$xoopsUser)
{
- $navi =& new XCube_PageNavigator("index.php?action=AvatarEdit&uid=" . $xoopsUser->get('uid'), XCUBE_PAGENAVI_START);
- $handler =& xoops_getmodulehandler('avatar');
+ $navi =& new XCube_PageNavigator(XOOPS_URL . "/edituser.php?op=avatarform&uid=" . $xoopsUser->get('uid'), XCUBE_PAGENAVI_START);
+ $handler =& xoops_getmodulehandler('avatar', 'user');
$this->mSystemAvatars[] =& $handler->createNoavatar();
@@ -178,7 +178,7 @@
if ($this->mObject == null) {
return USER_FRAME_VIEW_ERROR;
}
-
+
$this->mActionForm->load($this->mObject);
$this->mActionForm->fetch();
@@ -208,7 +208,7 @@
}
if ($this->mActionForm->mOldAvatarFilename != null && $this->mActionForm->mOldAvatarFilename != "blank.gif") {
- $avatarHandler =& xoops_getmodulehandler('avatar');
+ $avatarHandler =& xoops_getmodulehandler('avatar', 'user');
$criteria =& new Criteria('avatar_file', $this->mActionForm->mOldAvatarFilename);
$avatarArr =& $avatarHandler->getObjects($criteria);
if (count($avatarArr) > 0 && is_object($avatarArr[0]) && $avatarArr[0]->get('avatar_type') == 'C') {
@@ -220,10 +220,10 @@
$avatar =& $this->mActionForm->createAvatar();
if ($avatar != null) {
$avatar->set('avatar_name', $this->mObject->get('uname'));
- $avatarHandler =& xoops_getmodulehandler('avatar');
+ $avatarHandler =& xoops_getmodulehandler('avatar', 'user');
$avatarHandler->insert($avatar);
- $linkHandler =& xoops_getmodulehandler('avatar_user_link');
+ $linkHandler =& xoops_getmodulehandler('avatar_user_link', 'user');
$linkHandler->deleteAllByUser($this->mObject);
$link =& $linkHandler->create();
@@ -258,12 +258,12 @@
function executeViewSuccess(&$controller, &$xoopsUser, $render)
{
- $controller->executeForward("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'));
+ $controller->executeForward(XOOPS_URL . "/userinfo.php?uid=" . $this->mActionForm->get('uid'));
}
function executeViewError(&$controller,&$xoopsUser,&$render)
{
- $controller->executeRedirect("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
+ $controller->executeRedirect(XOOPS_URL . "/userinfo.php?uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
}
}
Index: xoops2jp/html/modules/user/actions/UserRegisterAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.11.2.1 xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.11.2.2
--- xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.11.2.1 Sun Oct 15 15:43:34 2006
+++ xoops2jp/html/modules/user/actions/UserRegisterAction.class.php Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: UserRegisterAction.class.php,v 1.1.2.11.2.1 2006/10/15 06:43:34 minahito Exp $
+ * @version $Id: UserRegisterAction.class.php,v 1.1.2.11.2.2 2006/11/10 11:30:01 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -46,7 +46,7 @@
return USER_FRAME_VIEW_INPUT;
} else {
$_SESSION['user_register_actionform'] = serialize(&$this->mActionForm);
- $controller->executeForward('./index.php?action=UserRegister_confirm');
+ $controller->executeForward('./register.php?action=confirm');
}
}
Index: xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php
diff -u xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.9.2.2 xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.9.2.3
--- xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.9.2.2 Sun Oct 15 15:09:31 2006
+++ xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: AvatarSelectAction.class.php,v 1.1.2.9.2.2 2006/10/15 06:09:31 minahito Exp $
+ * @version $Id: AvatarSelectAction.class.php,v 1.1.2.9.2.3 2006/11/10 11:30:01 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -23,7 +23,7 @@
{
parent::prepare($controller, $xoopsUser, $moduleConfig);
- $handler =& xoops_getmodulehandler('avatar');
+ $handler =& xoops_getmodulehandler('avatar', 'user');
$criteria =& new Criteria('avatar_file', $xoopsUser->get('user_avatar'));
$avatarArr =& $handler->getObjects($criteria);
if (count($avatarArr) > 0) {
@@ -38,7 +38,7 @@
function &_getHandler()
{
- $handler =& xoops_getmodulehandler('users');
+ $handler =& xoops_getmodulehandler('users', 'user');
return $handler;
}
@@ -91,7 +91,7 @@
function _doExecute()
{
if ($this->mObjectHandler->insert($this->mObject)) {
- $avatarHandler =& xoops_getmodulehandler('avatar');
+ $avatarHandler =& xoops_getmodulehandler('avatar', 'user');
//
// If old avatar is a cutom avatar, delete it.
@@ -103,7 +103,7 @@
//
// Delete all of links about this user from avatar_user_link.
//
- $linkHandler =& xoops_getmodulehandler('avatar_user_link');
+ $linkHandler =& xoops_getmodulehandler('avatar_user_link', 'user');
$linkHandler->deleteAllByUser($this->mObject);
//
@@ -127,17 +127,17 @@
*/
function getDefaultView(&$controller, &$xoopsUser)
{
- $controller->executeForward("./index.php?action=AvatarUpload&uid=" . $this->mObject->get('uid'));
+ $controller->executeForward(XOOPS_URL . "/edituser.php?op=avatarform&uid=" . $this->mObject->get('uid'));
}
function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
{
- $controller->executeForward("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'));
+ $controller->executeForward(XOOPS_URL . "/userinfo.php?op=avatarform&uid=" . $this->mActionForm->get('uid'));
}
function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
{
- $controller->executeRedirect("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
+ $controller->executeRedirect(XOOPS_URL . "/userinfo.php?op=avatarform&uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
}
}
Index: xoops2jp/html/modules/user/actions/UserInfoAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9 xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9.2.1
--- xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9 Thu Sep 14 17:17:39 2006
+++ xoops2jp/html/modules/user/actions/UserInfoAction.class.php Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package user
- * @version $Id: UserInfoAction.class.php,v 1.1.2.9 2006/09/14 08:17:39 minahito Exp $
+ * @version $Id: UserInfoAction.class.php,v 1.1.2.9.2.1 2006/11/10 11:30:01 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -47,7 +47,7 @@
return USER_FRAME_VIEW_ERROR;
}
- $rankHandler =& xoops_getmodulehandler('ranks');
+ $rankHandler =& xoops_getmodulehandler('ranks', 'user');
$this->mRankObject =& $rankHandler->get($this->mObject->get('rank'));
$root =& $controller->mRoot;
@@ -119,7 +119,7 @@
function executeViewError(&$controller, &$xoopsUser, &$render)
{
- $controller->executeForward("./index.php");
+ $controller->executeForward(XOOPS_URL . '/user.php');
}
}