merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -2,6 +2,7 @@
<module>
<grants />
<permissions>
<permission action="getApiGroups" target="manager" />
</permissions>
<actions>
<action name="dispMemberInfo" type="view" standalone="true" />
@ -21,21 +22,21 @@
<action name="dispSavedDocumentList" type="view" standalone="true" />
<action name="dispMemberAdminList" type="view" standalone="true" index="true" admin_index="true" menu_name="userList" menu_index="true"/>
<!--action name="dispMemberAdminConfig" type="view" menu_name="userSetting" menu_index="true" /-->
<action name="dispMemberAdminConfig" type="view" menu_name="userSetting" menu_index="true" />
<action name="dispMemberAdminSignUpConfig" type="view" menu_name="userSetting" />
<action name="dispMemberAdminLoginConfig" type="view" menu_name="userSetting" />
<action name="dispMemberAdminDesignConfig" type="view" menu_name="userSetting" />
<action name="dispMemberAdminInsert" type="view" menu_name="userList" />
<action name="dispMemberAdminDeleteForm" type="view" standalone="true" />
<action name="dispMemberAdminGroupList" type="view" menu_name="userGroup" menu_index="true" />
<action name="dispMemberAdminJoinFormList" type="view" standalone="true" />
<action name="dispMemberAdminInfo" type="view" menu_name="userList" />
<action name="dispMemberAdminInsertJoinForm" type="view" standalone="true" />
<action name="dispMemberAdminDeniedIDList" type="view" standalone="true" />
<action name="dispMemberAdminManageGroup" type="view" standalone="true" />
<action name="dispMemberAdminDeleteMembers" type="view" standalone="true" />
<action name="getMemberMenu" type="model" standalone="true" />
<action name="getMemberAdminColorset" type="model" standalone="true" />
<action name="getMemberAdminInsertJoinForm" type="model" />
<action name="getMemberAdminIPCheck" type="model" standalone="true" />
<action name="getApiGroups" type="model" standalone="true" />
<action name="procMemberLogin" type="controller" standalone="true" ruleset="@login" />
<action name="procMemberLogout" type="controller" standalone="true" />
@ -62,15 +63,18 @@
<action name="procMemberFindAccount" type="controller" standalone="true" />
<action name="procMemberFindAccountByQuestion" type="controller" standalone="true" />
<action name="procMemberAuthAccount" type="controller" standalone="true" />
<action name="procMemberAuthEmailAddress" type="controller" />
<action name="procMemberAuthAccount" type="controller" standalone="true" method="GET|POST" />
<action name="procMemberAuthEmailAddress" type="controller" method="GET|POST" />
<action name="procMemberUpdateAuthMail" type="controller" standalone="true" />
<action name="procMemberResendAuthMail" type="controller" standalone="true" ruleset="resendAuthMail" />
<action name="procMemberResetAuthMail" type="controller" ruleset="resetAuthMail" />
<action name="procMemberAdminInsert" type="controller" standalone="true" ruleset="insertAdminMember" />
<action name="procMemberAdminDelete" type="controller" standalone="true" />
<action name="procMemberAdminInsertConfig" type="controller" standalone="true" ruleset="insertConfig" />
<action name="procMemberAdminInsertDefaultConfig" type="controller" ruleset="insertDefaultConfig" />
<action name="procMemberAdminInsertSignupConfig" type="controller" />
<action name="procMemberAdminInsertLoginConfig" type="controller" />
<action name="procMemberAdminInsertDesignConfig" type="controller" />
<action name="procMemberAdminInsertGroup" type="controller" standalone="true" ruleset="insertGroup" />
<action name="procMemberAdminUpdateGroup" type="controller" standalone="true" ruleset="updateGroup" />
<action name="procMemberAdminDeleteGroup" type="controller" standalone="true" ruleset="deleteGroup" />