Minahito
minah****@users*****
2006年 3月 28日 (火) 22:32:04 JST
Index: xoops2jp/html/modules/user/class/AbstractListAction.class.php
diff -u xoops2jp/html/modules/user/class/AbstractListAction.class.php:1.1.2.1 xoops2jp/html/modules/user/class/AbstractListAction.class.php:1.1.2.2
--- xoops2jp/html/modules/user/class/AbstractListAction.class.php:1.1.2.1 Thu Jan 19 21:12:42 2006
+++ xoops2jp/html/modules/user/class/AbstractListAction.class.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
class User_AbstractListAction extends User_Action
Index: xoops2jp/html/modules/user/class/groups_users_link.php
diff -u xoops2jp/html/modules/user/class/groups_users_link.php:1.1.2.1 xoops2jp/html/modules/user/class/groups_users_link.php:1.1.2.2
--- xoops2jp/html/modules/user/class/groups_users_link.php:1.1.2.1 Thu Jan 12 01:43:37 2006
+++ xoops2jp/html/modules/user/class/groups_users_link.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class UserGroups_users_linkObject extends XoopsSimpleObject
{
function UserGroups_users_linkObject()
Index: xoops2jp/html/modules/user/class/avatar.php
diff -u xoops2jp/html/modules/user/class/avatar.php:1.1.2.2 xoops2jp/html/modules/user/class/avatar.php:1.1.2.3
--- xoops2jp/html/modules/user/class/avatar.php:1.1.2.2 Wed Mar 8 19:24:11 2006
+++ xoops2jp/html/modules/user/class/avatar.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class UserAvatarObject extends XoopsSimpleObject
{
function UserAvatarObject()
Index: xoops2jp/html/modules/user/class/AbstractEditAction.class.php
diff -u xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.4 xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.4 Sun Feb 5 19:33:39 2006
+++ xoops2jp/html/modules/user/class/AbstractEditAction.class.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class User_AbstractEditAction extends User_Action
{
var $mObject = null;
Index: xoops2jp/html/modules/user/class/users.php
diff -u xoops2jp/html/modules/user/class/users.php:1.1.2.1 xoops2jp/html/modules/user/class/users.php:1.1.2.2
--- xoops2jp/html/modules/user/class/users.php:1.1.2.1 Thu Jan 12 01:44:00 2006
+++ xoops2jp/html/modules/user/class/users.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class UserUsersObject extends XoopsSimpleObject
{
var $Groups = array();
Index: xoops2jp/html/modules/user/class/mailjob.php
diff -u xoops2jp/html/modules/user/class/mailjob.php:1.1.2.2 xoops2jp/html/modules/user/class/mailjob.php:1.1.2.3
--- xoops2jp/html/modules/user/class/mailjob.php:1.1.2.2 Thu Jan 12 20:26:27 2006
+++ xoops2jp/html/modules/user/class/mailjob.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class UserMailjobObject extends XoopsSimpleObject
{
function UserMailjobObject()
Index: xoops2jp/html/modules/user/class/ranks.php
diff -u xoops2jp/html/modules/user/class/ranks.php:1.1.2.1 xoops2jp/html/modules/user/class/ranks.php:1.1.2.2
--- xoops2jp/html/modules/user/class/ranks.php:1.1.2.1 Thu Jan 19 21:12:16 2006
+++ xoops2jp/html/modules/user/class/ranks.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class UserRanksObject extends XoopsSimpleObject
{
function UserRanksObject()
Index: xoops2jp/html/modules/user/class/RegistMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.4 xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.5
--- xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.4 Sun Feb 5 19:33:39 2006
+++ xoops2jp/html/modules/user/class/RegistMailBuilder.class.php Tue Mar 28 22:32:03 2006
@@ -1,151 +1,153 @@
-<?php
-
-class UserRegistMailDirector
-{
- var $mBuilder;
- var $mUser;
- var $mXoopsConfig;
- var $mUserConfig;
-
- function UserRegistMailDirector(&$user,$xoopsConfig,$userConfig)
- {
- $this->mUser=&$user;
- $this->mXoopsConfig=$xoopsConfig;
- $this->mUserConfig=$userConfig;
- }
-
- function contruct(&$builder)
- {
- $builder->setTemplate();
- $builder->setToUsers($this->mUser,$this->mUserConfig);
- $builder->setFromEmail($this->mXoopsConfig);
- $builder->setSubject($this->mUser,$this->mXoopsConfig);
- $builder->setBody($this->mUser,$this->mXoopsConfig);
- }
-}
-
-class RegistUserActivateMailBuilder
-{
- var $mMailer;
-
- function RegistUserActivateMailBuilder()
- {
- $this->mMailer=&getMailer();
- $this->mMailer->useMail();
- }
-
- function setTemplate()
- {
- $root=&XCube_Root::getSingleton();
- $language = $root->mController->getConfig('language');
- $this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
- $this->mMailer->setTemplate('register.tpl');
- }
-
- function setToUsers($user,$userConfig)
- {
- $this->mMailer->setToUsers($user);
- }
-
- function setFromEmail($xoopsConfig)
- {
- $this->mMailer->setFromEmail($xoopsConfig['adminmail']);
- $this->mMailer->setFromName($xoopsConfig['sitename']);
- }
-
- function setSubject($user,$xoopsConfig)
- {
- $this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname')));
- }
-
- function setBody($user,$xoopsConfig)
- {
- $this->mMailer->assign('SITENAME',$xoopsConfig['sitename']);
- $this->mMailer->assign('ADMINMAIL',$xoopsConfig['adminmail']);
- $this->mMailer->assign('SITEURL',XOOPS_URL.'/');
- $this->mMailer->assign('USERACTLINK', XOOPS_URL.'/modules/user/index.php?action=UserActivate&uid='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
- }
-
- function &getResult()
- {
- return $this->mMailer;
- }
-}
-
-class RegistUserAdminActivateMailBuilder extends RegistUserActivateMailBuilder
-{
- function setTemplate()
- {
- $root=&XCube_Root::getSingleton();
- $language = $root->mController->getConfig('language');
- $this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
- $this->mMailer->setTemplate('adminactivate.tpl');
- }
-
- function setToUsers($user,$userConfig)
- {
- $memberHandler=&xoops_gethandler('member');
- $this->mMailer->setToGroups($memberHandler->getGroup($userConfig['activation_group']));
- $this->mMailer->setToUsers($user);
- }
-
- function setFromUser($xoopsConfig)
- {
- $this->mMailer->setFromEmail($xoopsConfig['adminmail']);
- $this->mMailer->setFromName($xoopsConfig['sitename']);
- }
-
- function setSubject($user,$xoopsConfig)
- {
- $this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname')));
- }
-
- function setBody($user,$xoopsConfig)
- {
- parent::setBody($user,$xoopsConfig);
- $this->mMailer->assign('USERNAME', $user->getVar('uname'));
- $this->mMailer->assign('USEREMAIL', $user->getVar('email'));
- $this->mMailer->assign('USERACTLINK', XOOPS_URL.'/modules/user/index.php?action=UserActivate&uid='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
- }
-}
-
-class RegistUserNotifyMailBuilder extends RegistUserActivateMailBuilder
-{
- function setTemplate()
- {
- }
-
- function setToUsers($user,$userConfig)
- {
- $memberHandler=&xoops_gethandler('member');
- $this->mMailer->setToGroups($memberHandler->getGroup($userConfig['new_user_notify_group']));
- }
-
- function setSubject($user,$xoopsConfig)
- {
- $this->mMailer->setSubject(@sprintf(_US_NEWUSERREGAT,$xoopsConfig['sitename']));
- }
-
- function setBody($user,$xoopsConfig)
- {
- $this->mMailer->setBody(@sprintf(_US_HASJUSTREG, $user->getVar('uname')));
- }
-}
-
-class RegistAdminCommitMailBuilder extends RegistUserActivateMailBuilder
-{
- function setTemplate()
- {
- $root=&XCube_Root::getSingleton();
- $language = $root->mController->getConfig('language');
- $this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
- $this->mMailer->setTemplate('activated.tpl');
- }
-
- function setSubject($user,$xoopsConfig)
- {
- $this->mMailer->setSubject(@sprintf(_US_YOURACCOUNT,$xoopsConfig['sitename']));
- }
-}
-
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class UserRegistMailDirector
+{
+ var $mBuilder;
+ var $mUser;
+ var $mXoopsConfig;
+ var $mUserConfig;
+
+ function UserRegistMailDirector(&$user,$xoopsConfig,$userConfig)
+ {
+ $this->mUser=&$user;
+ $this->mXoopsConfig=$xoopsConfig;
+ $this->mUserConfig=$userConfig;
+ }
+
+ function contruct(&$builder)
+ {
+ $builder->setTemplate();
+ $builder->setToUsers($this->mUser,$this->mUserConfig);
+ $builder->setFromEmail($this->mXoopsConfig);
+ $builder->setSubject($this->mUser,$this->mXoopsConfig);
+ $builder->setBody($this->mUser,$this->mXoopsConfig);
+ }
+}
+
+class RegistUserActivateMailBuilder
+{
+ var $mMailer;
+
+ function RegistUserActivateMailBuilder()
+ {
+ $this->mMailer=&getMailer();
+ $this->mMailer->useMail();
+ }
+
+ function setTemplate()
+ {
+ $root=&XCube_Root::getSingleton();
+ $language = $root->mController->getConfig('language');
+ $this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+ $this->mMailer->setTemplate('register.tpl');
+ }
+
+ function setToUsers($user,$userConfig)
+ {
+ $this->mMailer->setToUsers($user);
+ }
+
+ function setFromEmail($xoopsConfig)
+ {
+ $this->mMailer->setFromEmail($xoopsConfig['adminmail']);
+ $this->mMailer->setFromName($xoopsConfig['sitename']);
+ }
+
+ function setSubject($user,$xoopsConfig)
+ {
+ $this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname')));
+ }
+
+ function setBody($user,$xoopsConfig)
+ {
+ $this->mMailer->assign('SITENAME',$xoopsConfig['sitename']);
+ $this->mMailer->assign('ADMINMAIL',$xoopsConfig['adminmail']);
+ $this->mMailer->assign('SITEURL',XOOPS_URL.'/');
+ $this->mMailer->assign('USERACTLINK', XOOPS_URL.'/modules/user/index.php?action=UserActivate&uid='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
+ }
+
+ function &getResult()
+ {
+ return $this->mMailer;
+ }
+}
+
+class RegistUserAdminActivateMailBuilder extends RegistUserActivateMailBuilder
+{
+ function setTemplate()
+ {
+ $root=&XCube_Root::getSingleton();
+ $language = $root->mController->getConfig('language');
+ $this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+ $this->mMailer->setTemplate('adminactivate.tpl');
+ }
+
+ function setToUsers($user,$userConfig)
+ {
+ $memberHandler=&xoops_gethandler('member');
+ $this->mMailer->setToGroups($memberHandler->getGroup($userConfig['activation_group']));
+ $this->mMailer->setToUsers($user);
+ }
+
+ function setFromUser($xoopsConfig)
+ {
+ $this->mMailer->setFromEmail($xoopsConfig['adminmail']);
+ $this->mMailer->setFromName($xoopsConfig['sitename']);
+ }
+
+ function setSubject($user,$xoopsConfig)
+ {
+ $this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname')));
+ }
+
+ function setBody($user,$xoopsConfig)
+ {
+ parent::setBody($user,$xoopsConfig);
+ $this->mMailer->assign('USERNAME', $user->getVar('uname'));
+ $this->mMailer->assign('USEREMAIL', $user->getVar('email'));
+ $this->mMailer->assign('USERACTLINK', XOOPS_URL.'/modules/user/index.php?action=UserActivate&uid='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
+ }
+}
+
+class RegistUserNotifyMailBuilder extends RegistUserActivateMailBuilder
+{
+ function setTemplate()
+ {
+ }
+
+ function setToUsers($user,$userConfig)
+ {
+ $memberHandler=&xoops_gethandler('member');
+ $this->mMailer->setToGroups($memberHandler->getGroup($userConfig['new_user_notify_group']));
+ }
+
+ function setSubject($user,$xoopsConfig)
+ {
+ $this->mMailer->setSubject(@sprintf(_US_NEWUSERREGAT,$xoopsConfig['sitename']));
+ }
+
+ function setBody($user,$xoopsConfig)
+ {
+ $this->mMailer->setBody(@sprintf(_US_HASJUSTREG, $user->getVar('uname')));
+ }
+}
+
+class RegistAdminCommitMailBuilder extends RegistUserActivateMailBuilder
+{
+ function setTemplate()
+ {
+ $root=&XCube_Root::getSingleton();
+ $language = $root->mController->getConfig('language');
+ $this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+ $this->mMailer->setTemplate('activated.tpl');
+ }
+
+ function setSubject($user,$xoopsConfig)
+ {
+ $this->mMailer->setSubject(@sprintf(_US_YOURACCOUNT,$xoopsConfig['sitename']));
+ }
+}
+
?>
\ No newline at end of file
Index: xoops2jp/html/modules/user/class/AbstractDeleteAction.class.php
diff -u xoops2jp/html/modules/user/class/AbstractDeleteAction.class.php:1.1.2.4 xoops2jp/html/modules/user/class/AbstractDeleteAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/class/AbstractDeleteAction.class.php:1.1.2.4 Thu Jan 26 20:12:10 2006
+++ xoops2jp/html/modules/user/class/AbstractDeleteAction.class.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
require_once XOOPS_MODULE_PATH . "/user/class/AbstractEditAction.class.php";
class User_AbstractDeleteAction extends User_AbstractEditAction
Index: xoops2jp/html/modules/user/class/avatar_user_link.php
diff -u xoops2jp/html/modules/user/class/avatar_user_link.php:1.1.2.2 xoops2jp/html/modules/user/class/avatar_user_link.php:1.1.2.3
--- xoops2jp/html/modules/user/class/avatar_user_link.php:1.1.2.2 Wed Mar 8 19:23:34 2006
+++ xoops2jp/html/modules/user/class/avatar_user_link.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class UserAvatar_user_linkObject extends XoopsSimpleObject
{
function UserAvatar_user_linkObject()
Index: xoops2jp/html/modules/user/class/groups.php
diff -u xoops2jp/html/modules/user/class/groups.php:1.1.2.1 xoops2jp/html/modules/user/class/groups.php:1.1.2.2
--- xoops2jp/html/modules/user/class/groups.php:1.1.2.1 Thu Jan 19 21:12:07 2006
+++ xoops2jp/html/modules/user/class/groups.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class UserGroupsObject extends XoopsSimpleObject
{
function UserGroupsObject()
Index: xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.1 xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.2
--- xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.1 Sun Feb 5 22:14:25 2006
+++ xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class LostPassMailDirector
{
var $mBuilder;
@@ -52,9 +54,9 @@
function setTemplate()
{
- $root=&XCube_Root::getSingleton();
- $language = $root->mController->getConfig('language');
- $this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+ $root=&XCube_Root::getSingleton();
+ $language = $root->mController->getConfig('language');
+ $this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
$this->mMailer->setTemplate("lostpass1.tpl");
}
@@ -76,9 +78,9 @@
{
function setTemplate()
{
- $root=&XCube_Root::getSingleton();
- $language = $root->mController->getConfig('language');
- $this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+ $root=&XCube_Root::getSingleton();
+ $language = $root->mController->getConfig('language');
+ $this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
$this->mMailer->setTemplate("lostpass2.tpl");
}
Index: xoops2jp/html/modules/user/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.3 xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.4
--- xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.3 Sat Feb 4 03:14:33 2006
+++ xoops2jp/html/modules/user/class/ActionFrame.class.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
require_once XOOPS_ROOT_PATH . "/class/XCube_ActionStrategy.class.php";
define ("USER_FRAME_PERFORM_SUCCESS", 1);
Index: xoops2jp/html/modules/user/class/PageNavigator.class.php
diff -u xoops2jp/html/modules/user/class/PageNavigator.class.php:1.1.2.1 xoops2jp/html/modules/user/class/PageNavigator.class.php:1.1.2.2
--- xoops2jp/html/modules/user/class/PageNavigator.class.php:1.1.2.1 Thu Jan 19 21:12:07 2006
+++ xoops2jp/html/modules/user/class/PageNavigator.class.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
require_once XOOPS_ROOT_PATH . "/class/XCube_PageNavigator.class.php";
class User_PageNavigator extends XCube_PageNavigator
Index: xoops2jp/html/modules/user/class/mailjob_link.php
diff -u xoops2jp/html/modules/user/class/mailjob_link.php:1.1.2.1 xoops2jp/html/modules/user/class/mailjob_link.php:1.1.2.2
--- xoops2jp/html/modules/user/class/mailjob_link.php:1.1.2.1 Thu Jan 12 20:26:14 2006
+++ xoops2jp/html/modules/user/class/mailjob_link.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class UserMailjob_linkObject extends XoopsSimpleObject
{
function UserMailjob_linkObject()
Index: xoops2jp/html/modules/user/class/AbstractFilterForm.class.php
diff -u xoops2jp/html/modules/user/class/AbstractFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/user/class/AbstractFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/class/AbstractFilterForm.class.php:1.1.2.2 Thu Jan 26 20:12:29 2006
+++ xoops2jp/html/modules/user/class/AbstractFilterForm.class.php Tue Mar 28 22:32:03 2006
@@ -1,5 +1,7 @@
<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
class User_AbstractFilterForm
{
var $mSort = 0;