Add option to make pages available only on one domain

- 2021년에 next 브랜치 적용을 목표로 작업했던 것 가져옴
- modules 테이블에 domain_srl을 추가하여 특정 도메인에서만 유효하도록 설정 가능
- site_srl 변수를 사용하던 곳 중 삭제할 수 있는 곳은 모두 삭제함
This commit is contained in:
Kijin Sung 2023-06-18 02:40:09 +09:00
parent ded3b97208
commit f596947d0e
57 changed files with 163 additions and 197 deletions

View file

@ -3,7 +3,6 @@
<table name="lang" />
</tables>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" />
<condition operation="equal" column="name" var="name" notnull="notnull" pipe="and" />
<condition operation="equal" column="name" var="name" notnull="notnull" />
</conditions>
</query>

View file

@ -3,6 +3,5 @@
<table name="lang" />
</tables>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" />
</conditions>
</query>

View file

@ -4,6 +4,5 @@
</tables>
<conditions>
<condition operation="equal" column="module" var="module" notnull="notnull" />
<condition operation="equal" column="site_srl" var="site_srl" default="0" pipe="and" />
</conditions>
</query>

View file

@ -1,8 +0,0 @@
<query id="deleteSiteAdmin" action="delete">
<tables>
<table name="site_admin" />
</tables>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" filter="number" notnull="notnull" />
</conditions>
</query>

View file

@ -6,7 +6,7 @@
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" notnull="notnull" />
<condition operation="equal" column="domain_srl" var="domain_srl" default="0" notnull="notnull" />
<condition operation="equal" column="is_default" default="Y" pipe="and" />
</conditions>
</query>

View file

@ -8,7 +8,7 @@
</table>
</tables>
<columns>
<column name="modules.site_srl" />
<column name="modules.domain_srl" />
<column name="modules.module" />
<column name="modules.mid" />
<column name="modules.browser_title" />
@ -16,7 +16,7 @@
<column name="modules.module_srl" />
</columns>
<conditions>
<condition operation="equal" column="modules.site_srl" var="site_srl" default="0" notnull="notnull" />
<condition operation="equal" column="modules.domain_srl" var="domain_srl" />
</conditions>
<navigation>
<index var="sort_index" default="modules.module" order="asc" />

View file

@ -6,8 +6,7 @@
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" />
<condition operation="equal" column="name" var="name" pipe="and" />
<condition operation="equal" column="name" var="name" />
<condition operation="equal" column="lang_code" var="lang_code" pipe="and" />
</conditions>
</query>

View file

@ -6,8 +6,7 @@
<column name="COUNT(*)" alias="count" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" />
<condition operation="equal" column="name" var="name" pipe="and" />
<condition operation="equal" column="name" var="name" />
<condition operation="equal" column="lang_code" var="lang_code" pipe="and" />
</conditions>
</query>

View file

@ -6,7 +6,6 @@
<column name="name" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" />
</conditions>
<navigation>
<index var="sort_index" default="list_order" order="order_type" />

View file

@ -7,7 +7,7 @@
<column name="value" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" filter="number" />
<condition operation="in" column="lang_code" var="lang_code" />
<condition operation="in" column="lang_code" var="langCode" pipe="and" />
<condition operation="like" column="value" var="search_keyword" pipe="and" />
<condition operation="equal" column="name" var="name" pipe="and" />

View file

@ -6,7 +6,7 @@
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" />
<condition operation="in" column="name" var="name" />
<condition operation="in" column="name" var="langName" pipe="and" />
</conditions>
<navigation>

View file

@ -6,8 +6,7 @@
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" />
<condition operation="like_prefix" column="value" var="value" pipe="and" />
<condition operation="like_prefix" column="value" var="value" />
</conditions>
<groups>
<group column="name" />

View file

@ -8,6 +8,6 @@
<conditions>
<condition operation="equal" column="mid" var="mid" />
<condition operation="equal" column="module_srl" var="module_srl" pipe="and" />
<condition operation="equal" column="site_srl" var="site_srl" pipe="and" />
<condition operation="equal" column="domain_srl" var="domain_srl" pipe="and" />
</conditions>
</query>

View file

@ -10,6 +10,7 @@
<condition operation="in" column="module_srl" var="module_srls" pipe="and" />
<condition operation="equal" column="module" var="module" pipe="and" />
<condition operation="equal" column="module_category_srl" var="module_category_srl" />
<condition operation="in" column="domain_srl" var="domain_srls" pipe="and" />
</conditions>
<navigation>
<index var="sort_index" default="browser_title" order="asc" />

View file

@ -7,6 +7,5 @@
</columns>
<conditions>
<condition operation="equal" column="module" var="module" />
<condition operation="equal" column="site_srl" var="site_srl" pipe="and" />
</conditions>
</query>

View file

@ -6,7 +6,7 @@
<column name="count(*)" alias="count" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" />
<condition operation="equal" column="domain_srl" var="domain_srl" />
<condition operation="equal" column="module" var="module" pipe="and" />
</conditions>
</query>

View file

@ -7,7 +7,7 @@
<column name="count(*)" alias="instanceCount" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" filter="number" />
<condition operation="equal" column="domain_srl" var="domain_srl" filter="number" />
</conditions>
<groups>
<group column="module" />

View file

@ -7,7 +7,7 @@
</columns>
<conditions>
<condition operation="equal" column="module" var="module" notnull="notnull" />
<condition operation="in" column="site_srl" var="site_srl" default="0" notnull="notnull" pipe="and" />
<condition operation="in" column="domain_srl" var="domain_srl" pipe="and" />
<condition operation="in" column="module_srl" var="module_srl" pipe="and" />
<group pipe="and">
<condition operation="like" column="mid" var="s_mid" pipe="or" />

View file

@ -10,6 +10,5 @@
<conditions>
<condition operation="equal" column="module_part_config.module" var="module" notnull="notnull" />
<condition operation="equal" column="modules.module_srl" default="module_part_config.module_srl" pipe="and" />
<condition operation="equal" column="modules.site_srl" var="site_srl" pipe="and" />
</conditions>
</query>

View file

@ -1,14 +1,14 @@
<query id="getModuleSites" action="select">
<tables>
<table name="modules" />
<table name="sites" />
<table name="domains" />
</tables>
<columns>
<column name="modules.module_srl" alias="module_srl" />
<column name="sites.domain" alias="domain" />
<column name="domains.domain" alias="domain" />
</columns>
<conditions>
<condition operation="in" column="modules.module_srl" var="module_srls" notnull="notnull" />
<condition operation="equal" column="sites.site_srl" default="modules.site_srl" notnull="notnull" pipe="and" />
<condition operation="equal" column="domains.domain_srl" default="modules.domain_srl" notnull="notnull" pipe="and" />
</conditions>
</query>

View file

@ -7,7 +7,7 @@
<column name="mid" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" />
<condition operation="in" column="domain_srl" var="domain_srl" />
<condition operation="in" column="mid" var="mid" notnull="notnull" pipe="and" />
</conditions>
</query>

View file

@ -7,6 +7,5 @@
</columns>
<conditions>
<condition operation="equal" column="menu_srl" default="0" />
<condition operation="equal" column="site_srl" var="site_srl" default="0" notnull="notnull" pipe="and" />
</conditions>
</query>

View file

@ -1,14 +0,0 @@
<query id="getSiteAdmin" action="select">
<tables>
<table name="site_admin" />
<table name="member" />
</tables>
<columns>
<column name="site_admin.site_srl" />
<column name="member.*" />
</columns>
<conditions>
<condition operation="equal" column="site_admin.site_srl" var="site_srl" notnull="notnull" />
<condition operation="equal" column="member.member_srl" default="site_admin.member_srl" notnull="notnull" pipe="and" />
</conditions>
</query>

View file

@ -1,14 +0,0 @@
<query id="getSiteInfoByDomain" action="select">
<tables>
<table name="sites" />
</tables>
<columns>
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="sites.domain" var="domain" notnull="notnull" />
</conditions>
<navigation>
<index var="sort_index" default="site_srl" order="desc" />
</navigation>
</query>

View file

@ -8,7 +8,7 @@
</table>
</tables>
<columns>
<column name="modules.site_srl" alias="module_site_srl" />
<column name="sites.site_srl" alias="module_site_srl" />
<column name="modules.module_srl" alias="module_srl" />
<column name="modules.module" alias="module" />
<column name="modules.module_category_srl" alias="module_category_srl" />

View file

@ -1,17 +0,0 @@
<query id="getSiteInfoByDomain" action="select">
<tables>
<table name="sites" />
<table name="modules" />
</tables>
<columns>
<column name="sites.site_srl" alias="site_srl" />
<column name="sites.domain" alias="domain" />
<column name="sites.index_module_srl" alias="index_module_srl" />
<column name="sites.default_language" alias="default_language" />
<column name="modules.*" />
</columns>
<conditions>
<condition operation="equal" column="sites.domain" var="domain" notnull="notnull" />
<condition operation="equal" column="modules.module_srl" default="sites.index_module_srl" notnull="notnull" pipe="and" />
</conditions>
</query>

View file

@ -8,7 +8,7 @@
</table>
</tables>
<columns>
<column name="modules.site_srl" />
<column name="modules.domain_srl" />
<column name="modules.module" />
<column name="modules.module_category_srl" />
<column name="modules.layout_srl" />

View file

@ -3,7 +3,6 @@
<table name="lang" />
</tables>
<columns>
<column name="site_srl" var="site_srl" default="0" />
<column name="name" var="name" notnull="notnull" />
<column name="lang_code" var="lang_code" notnull="notnull" />
<column name="value" var="value" notnull="notnull" />

View file

@ -8,6 +8,7 @@
<column name="module_category_srl" var="module_category_srl" default="0" />
<column name="menu_srl" var="menu_srl" filter="number" />
<column name="site_srl" var="site_srl" default="0" />
<column name="domain_srl" var="domain_srl" default="-1" />
<column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40" />
<column name="layout_srl" var="layout_srl" />
<column name="mlayout_srl" var="mlayout_srl" />

View file

@ -5,7 +5,6 @@
<columns>
<column name="module" var="module" notnull="notnull" />
<column name="config" var="config" />
<column name="site_srl" var="site_srl" default="0" />
<column name="regdate" default="curdate()" />
</columns>
</query>

View file

@ -1,10 +0,0 @@
<query id="insertSiteAdmin" action="insert">
<tables>
<table name="site_admin" />
</tables>
<columns>
<column name="site_srl" var="site_srl" notnull="notnull" />
<column name="member_srl" var="member_srl" notnull="notnull" />
<column name="regdate" default="curdate()" />
</columns>
</query>

View file

@ -6,7 +6,7 @@
<column name="count(*)" alias="count" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" />
<condition operation="equal" column="domain_srl" var="domain_srl" />
<condition operation="equal" column="mid" var="mid" notnull="notnull" pipe="and" />
<condition operation="notequal" column="module_srl" var="module_srl" default="0" notnull="notnull" pipe="and" />
</conditions>

View file

@ -1,11 +0,0 @@
<query id="isExistsSiteDomain" action="select">
<tables>
<table name="sites" />
</tables>
<columns>
<column name="count(*)" alias="count" />
</columns>
<conditions>
<condition operation="equal" column="domain" var="domain" notnull="notnull" />
</conditions>
</query>

View file

@ -1,12 +0,0 @@
<query id="isSiteAdmin" action="select">
<tables>
<table name="site_admin" />
</tables>
<columns>
<column name="member_srl" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" filter="number" />
<condition operation="equal" column="member_srl" var="member_srl" pipe="and" />
</conditions>
</query>

View file

@ -1,4 +1,4 @@
<query id="updateModule" action="update">
<query id="updateAllModuleSkinInSiteWithTheme" action="update">
<tables>
<table name="modules" />
</tables>
@ -6,7 +6,7 @@
<column name="skin" var="skin" notnull="notnull" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="domain_srl" var="domain_srl" />
<condition operation="equal" column="module" var="module" notnull="notnull" pipe="and" />
<condition operation="equal" column="is_skin_fix" default="N" pipe="and" />
<condition operation="in" column="module_srl" var="module_srls" pipe="and" />

View file

@ -5,6 +5,7 @@
<columns>
<column name="module" var="module" notnull="notnull" maxlength="80" />
<column name="module_category_srl" var="module_category_srl" />
<column name="domain_srl" var="domain_srl" />
<column name="layout_srl" var="layout_srl" />
<column name="skin" var="skin" minlength="0" maxlength="250" />
<column name="is_skin_fix" var="is_skin_fix" default="N" />

View file

@ -1,12 +0,0 @@
<query id="updateModuleInSites" action="update">
<tables>
<table name="modules" />
</tables>
<columns>
<column name="mlayout_srl" var="mlayout_srl" />
<column name="use_mobile" var="use_mobile" />
</columns>
<conditions>
<condition operation="in" column="site_srl" var="site_srls" filter="number" notnull="notnull" />
</conditions>
</query>

View file

@ -1,12 +0,0 @@
<query id="updateModuleSite" action="update">
<tables>
<table name="modules" />
</tables>
<columns>
<column name="site_srl" var="site_srl" default="0" />
<column name="layout_srl" var="layout_srl" notnull="notnull" default="0" />
</columns>
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" pipe="and" />
</conditions>
</query>