Minahito
minah****@users*****
2006年 10月 13日 (金) 15:50:35 JST
Index: xoops2jp/html/modules/user/actions/AvatarEditAction.class.php
diff -u xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.1 xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.2
--- xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.1 Fri Oct 13 14:10:17 2006
+++ xoops2jp/html/modules/user/actions/AvatarEditAction.class.php Fri Oct 13 15:50:34 2006
@@ -1,11 +1,13 @@
<?php
/**
* @package user
- * @version $Id: AvatarEditAction.class.php,v 1.1.2.9.2.1 2006/10/13 05:10:17 minahito Exp $
+ * @version $Id: AvatarEditAction.class.php,v 1.1.2.9.2.2 2006/10/13 06:50:34 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
+require_once XOOPS_ROOT_PATH . "/core/XCube_PageNavigator.class.php";
+
require_once XOOPS_MODULE_PATH . "/user/class/AbstractEditAction.class.php";
require_once XOOPS_MODULE_PATH . "/user/forms/AvatarEditForm.class.php";
require_once XOOPS_MODULE_PATH . "/user/forms/AvatarSelectForm.class.php";
@@ -51,11 +53,6 @@
var $_mAllowUpload = false;
/**
- * @var User_PageNavigator
- */
- var $mNavi;
-
- /**
* @var User_AvatarFilterForm
*/
var $mFilter;
@@ -154,12 +151,13 @@
*/
function getDefaultView(&$controller, &$xoopsUser)
{
- $this->mNavi =& new XCube_PageNavigator("index.php?AvatarUpload", XCUBE_PAGENAVI_START);
+ $navi =& new XCube_PageNavigator("index.php?action=AvatarEdit&uid=" . $xoopsUser->get('uid'), XCUBE_PAGENAVI_START);
+ $handler =& xoops_gethandler('avatar');
- $this->mFilter =& new User_AvatarFilterForm($this->mNavi, xoops_gethandler('avatar'));
- $this->mFilter->mNavi->fetch();
+ $this->mFilter =& new User_AvatarFilterForm($navi, $handler);
+ $this->mFilter->fetch();
- $criteria = $this->mFilter->getCriteria($this->mNavi->getStart(), $this->mNavi->getPerpage());
+ $criteria = $this->mFilter->getCriteria();
$this->mSystemAvatars =& $handler->getObjects($criteria);
$this->mAvatarSelectForm =& new User_AvatarSelectForm();
@@ -248,7 +246,7 @@
$render->setAttribute("avatarHeight", $this->mAvatarHeight);
$render->setAttribute("avatarMaxfilesize", $this->mAvatarMaxfilesize);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
$render->setAttribute("systemAvatars", $this->mSystemAvatars);
$render->setAttribute("avatarSelectForm", $this->mAvatarSelectForm);
}