Minahito
minah****@users*****
2006年 9月 25日 (月) 08:10:16 JST
Index: xoops2jp/html/modules/user/actions/EditUserAction.class.php diff -u xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.12 xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.13 --- xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.12 Sun Sep 24 19:37:40 2006 +++ xoops2jp/html/modules/user/actions/EditUserAction.class.php Mon Sep 25 08:10:16 2006 @@ -1,7 +1,7 @@ <?php /** * @package user - * @version $Id: EditUserAction.class.php,v 1.1.2.12 2006/09/24 10:37:40 minahito Exp $ + * @version $Id: EditUserAction.class.php,v 1.1.2.13 2006/09/24 23:10:16 minahito Exp $ */ if (!defined('XOOPS_ROOT_PATH')) exit(); @@ -66,10 +66,10 @@ * 1) The current user is the target user. * 2) The current user is administrators. */ - function hasPerm(&$controller, &$xoopsUser, $moduleConfig) + function hasPermission(&$controller, &$xoopsUser, $moduleConfig) { if ($this->mObject != null) { - return ($this->mObject->get('uid') == $xoopsUser->get('uid') || $xoopsUser->isAdmin()); + return ($this->mObject->get('uid') == $xoopsUser->get('uid') || $xoopsUser->isAdmin()); //< FIXME } return false; Index: xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php diff -u xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.7 xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.8 --- xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.7 Fri Aug 4 13:38:44 2006 +++ xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php Mon Sep 25 08:10:16 2006 @@ -1,7 +1,7 @@ <?php /** * @package user - * @version $Id: AvatarSelectAction.class.php,v 1.1.2.7 2006/08/04 04:38:44 minahito Exp $ + * @version $Id: AvatarSelectAction.class.php,v 1.1.2.8 2006/09/24 23:10:16 minahito Exp $ */ if (!defined('XOOPS_ROOT_PATH')) exit(); @@ -72,13 +72,13 @@ * 2) A current user has to equal the specified user, or a current user has * to be a administrator. */ - function hasPerm(&$controller, &$xoopsUser) + function hasPermission(&$controller, &$xoopsUser) { if (!is_object($this->mObject)) { return false; } - if ($this->mObject->isAdmin()) { + if ($this->mObject->isAdmin()) { //< FIXME return true; } elseif ($this->mObject->get('uid') == $xoopsUser->get('uid')) { Index: xoops2jp/html/modules/user/actions/AvatarEditAction.class.php diff -u xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.7 xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.8 --- xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.7 Fri Aug 4 13:38:30 2006 +++ xoops2jp/html/modules/user/actions/AvatarEditAction.class.php Mon Sep 25 08:10:16 2006 @@ -1,7 +1,7 @@ <?php /** * @package user - * @version $Id: AvatarEditAction.class.php,v 1.1.2.7 2006/08/04 04:38:30 minahito Exp $ + * @version $Id: AvatarEditAction.class.php,v 1.1.2.8 2006/09/24 23:10:16 minahito Exp $ */ if (!defined('XOOPS_ROOT_PATH')) exit(); @@ -133,13 +133,13 @@ * 2) A current user has to equal the specified user, or a current user has * to be a administrator. */ - function hasPerm(&$controller, &$xoopsUser) + function hasPermission(&$controller, &$xoopsUser) { if (!is_object($this->mObject)) { return false; } - if ($this->mObject->isAdmin()) { + if ($this->mObject->isAdmin()) { //< FIXME return true; } elseif ($this->mObject->get('uid') == $xoopsUser->get('uid')) { Index: xoops2jp/html/modules/user/actions/LostPassAction.class.php diff -u xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.7 xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8 --- xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.7 Sun Sep 24 19:37:30 2006 +++ xoops2jp/html/modules/user/actions/LostPassAction.class.php Mon Sep 25 08:10:16 2006 @@ -1,7 +1,7 @@ <?php /** * @package user - * @version $Id: LostPassAction.class.php,v 1.1.2.7 2006/09/24 10:37:30 minahito Exp $ + * @version $Id: LostPassAction.class.php,v 1.1.2.8 2006/09/24 23:10:16 minahito Exp $ */ if (!defined('XOOPS_ROOT_PATH')) exit(); @@ -36,7 +36,7 @@ /** * Allow anonymous users only. */ - function hasPerm(&$controller, &$xoopsUser, $moduleConfig) + function hasPermission(&$controller, &$xoopsUser, $moduleConfig) { return !is_object($xoopsUser); }