Minahito
minah****@users*****
2006年 10月 5日 (木) 18:11:11 JST
Index: xoops2jp/html/modules/user/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.1 xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.2
--- xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.1 Thu Sep 28 14:04:21 2006
+++ xoops2jp/html/modules/user/class/ActionFrame.class.php Thu Oct 5 18:11:11 2006
@@ -62,7 +62,7 @@
die();
}
- if ($this->mAction->isSecure() && !is_object($controller->getXoopsUser())) {
+ if ($this->mAction->isSecure() && !is_object($controller->mRoot->mContext->mXoopsUser)) {
//
// error
//
@@ -70,9 +70,9 @@
die("TODO");
}
- $this->mAction->prepare($controller, $controller->getXoopsUser(), $controller->mModuleController->mConfig);
+ $this->mAction->prepare($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModuleConfig);
- if (!$this->mAction->hasPermission($controller, $controller->getXoopsUser(), $controller->mModuleController->mConfig)) {
+ if (!$this->mAction->hasPermission($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModuleConfig)) {
//
// error
//
@@ -81,35 +81,35 @@
}
if (xoops_getenv("REQUEST_METHOD") == "POST") {
- $viewStatus = $this->mAction->execute($controller, $controller->getXoopsUser());
+ $viewStatus = $this->mAction->execute($controller, $controller->mRoot->mContext->mXoopsUser);
}
else {
- $viewStatus = $this->mAction->getDefaultView($controller, $controller->getXoopsUser());
+ $viewStatus = $this->mAction->getDefaultView($controller, $controller->mRoot->mContext->mXoopsUser);
}
-
+
switch($viewStatus) {
case USER_FRAME_VIEW_SUCCESS:
- $this->mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
case USER_FRAME_VIEW_ERROR:
- $this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
case USER_FRAME_VIEW_INDEX:
- $this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
case USER_FRAME_VIEW_INPUT:
- $this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
case USER_FRAME_VIEW_PREVIEW:
- $this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
case USER_FRAME_VIEW_CANCEL:
- $this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mModuleController->mRenderTarget);
+ $this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
break;
}
}