Merge #1344 이메일 호스트 제한/허용 기능에 대한 PR by misol

* pr/1344:
  fix for var $arg init.
  #1343 Email hosts of members can be allowed or not.

Conflicts:
	modules/member/member.controller.php
This commit is contained in:
Kijin Sung 2015-10-08 14:09:46 +09:00
commit ec11ccc4f5
12 changed files with 384 additions and 18 deletions

View file

@ -83,6 +83,7 @@
<action name="procMemberAdminDeleteMembers" type="controller" />
<action name="procMemberAdminInsertJoinForm" type="controller" ruleset="insertJoinForm" />
<action name="procMemberAdminUpdateJoinForm" type="controller" />
<action name="procMemberAdminUpdateManagedEmailHosts" type="controller" />
<action name="procMemberAdminDeleteJoinForm" type="controller" />
<action name="procMemberAdminUpdateDeniedNickName" type="controller" />
<action name="procMemberAdminInsertDeniedID" type="controller" ruleset="insertDeniedId" />