Minahito
minah****@users*****
2006年 10月 5日 (木) 18:10:30 JST
Index: xoops2jp/html/modules/pm/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.6.2.1 xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.6.2.2
--- xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.6.2.1 Thu Sep 28 14:04:20 2006
+++ xoops2jp/html/modules/pm/class/ActionFrame.class.php Thu Oct 5 18:10:30 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package pm
- * @version $Id: ActionFrame.class.php,v 1.1.2.6.2.1 2006/09/28 05:04:20 minahito Exp $
+ * @version $Id: ActionFrame.class.php,v 1.1.2.6.2.2 2006/10/05 09:10:30 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -70,43 +70,43 @@
$handler =& xoops_gethandler('config');
$moduleConfig =& $handler->getConfigsByDirname('pm');
- $this->mAction->prepare($controller, $controller->getXoopsUser(), $moduleConfig);
+ $this->mAction->prepare($controller, $controller->mRoot->mContext->mXoopsUser, $moduleConfig);
- if (!$this->mAction->hasPermission($controller, $controller->getXoopsUser(), $moduleConfig)) {
+ if (!$this->mAction->hasPermission($controller, $controller->mRoot->mContext->mXoopsUser, $moduleConfig)) {
$this->doPermissionError($controller);
return;
}
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 PM_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 PM_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 PM_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 PM_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 PM_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 PM_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;
}
}