fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-14 00:39:57 +09:00
Code Issues Projects Releases Packages Wiki Activity

Virtual Site 생성시 도메인 단위(서브도메인 또는 독립 도메인)이 아닌 ID 형식으로 생성 가능하도록 기능 개선.

Browse source 
SID 로 불리는 이 사이트ID는 MID와 중복이 불가능함.


git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6051 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2009-04-08 10:10:17 +00:00
parent 40e1740839
commit bb97446dfc
40 changed files with 313 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

35
modules/homepage/homepage.admin.controller.php
View file

@ -10,9 +10,19 @@
function init() {
}
/**
* @brief 접속 방법중 domain 이나 site id나 모두 sites 테이블의 domain 컬럼에 저장이 됨
* site id보다 domain이 우선 순위를 가짐
**/
function procHomepageAdminInsertHomepage() {
$title = Context::get('title');
$domain = preg_replace('/^(http|https):\/\//i','',Context::get('domain'));
$domain = preg_replace('/^(http|https):\/\//i','', trim(Context::get('domain')));
$sid = trim(Context::get('site_id'));
if($domain && $sid) unset($sid);
if(!$domain && $sid) $domain = $sid;
if(!$title) return new Object(-1, 'msg_invalid_request');
if(!$domain) return new Object(-1, 'msg_invalid_request');
@ -41,12 +51,10 @@
}
$lang = null;
// 도메인 검사
$domain_info = $oModuleModel->getSiteInfoByDomain($domain);
if($domain_info) return new Object(-1,'msg_already_registed_domain');
// virtual site 생성하고 site_srl을 보관
$info->site_srl = $oModuleController->insertSite($domain, 0);
$output = $oModuleController->insertSite($domain, 0);
if(!$output->toBool()) return $output;
$info->site_srl = $output->get('site_srl');
// 언어 코드 등록 (홈, 공지사항, 등업신청, 자유게시판, 전체 글 보기, 한줄이야기, 카페앨범, 메뉴등)
foreach($defined_lang as $lang_code => $v) {
@ -84,7 +92,10 @@
$oLayoutModel = &getModel('layout');
$layout_args = $oLayoutModel->getLayout($info->layout_srl);
$layout->colorset = 'white';
if($domain) $layout->index_url = 'http://'.$domain; else $layout->index_url = Context::getRequestUri();
// sid 형식일 경우
if(isSiteID($domain)) $layout->index_url = getSiteUrl($domain, '');
else $layout->index_url = 'http://'.$domain;
$layout->main_menu = $info->menu_srl;
$layout_args->extra_vars = serialize($layout);
@ -255,21 +266,15 @@
}
function procHomepageAdminUpdateHomepage() {
$args = Context::gets('site_srl','title','domain','homepage_admin');
$args = Context::gets('site_srl','homepage_admin');
if(!$args->site_srl) return new Object(-1,'msg_invalid_request');
$oHomepageModel = &getModel('homepage');
$homepage_info = $oHomepageModel->getHomepageInfo($args->site_srl);
if(!$homepage_info->site_srl) return new Object(-1,'msg_invalid_request');
$output = executeQuery('homepage.updateHomepageTitle', $args);
if(!$output->toBool()) return $output;
$oModuleController = &getController('module');
$output = $oModuleController->updateSite($args);
if(!$output->toBool()) return $output;
$admin_list = explode(',',$args->homepage_admin);
$oModuleController = &getController('module');
$output = $oModuleController->insertSiteAdmin($args->site_srl, $admin_list);
if(!$output->toBool()) return $output;

4
modules/homepage/lang/en.lang.php
View file

@ -16,6 +16,8 @@
$lang->cafe_admin = "CafeXE administrator";
$lang->do_selected_member = "Change the selected members into : ";
$lang->cmd_make_cafe = '카페 생성';
$lang->default_menus = array(
'home' => 'Home',
'notice' => 'Notice',
@ -61,7 +63,6 @@
);
$lang->about_cafe = "CafeXE package provides features to create cafes and to configure them conveniently";
$lang->about_cafe_title = "The title is only used for management, it would not be displayed.";
$lang->about_domain = "In order to create more than one cafe, each of them needs to have own domain name.<br />Sub-domain (e.g., aaa.bbb.com of bbb.com) also can be used. Input the address including the path installed xe. <br /> ex) www.xpressengine.com/zbxe";
$lang->about_menu_names = "You can set the title of the menu for each language displayed in the menus<br />If you input one of the titles, titles for other languages will be set as same.";
$lang->about_menu_option = "You can assign it to open a page in a new window when the menu clicked.<br />The option for menu expand may work depending on the layout.";
@ -76,5 +77,4 @@
$lang->confirm_change_layout = "If you change the layout, some information of the layout might be reset. Would you like to change it?";
$lang->confirm_delete_menu_item = "If you delete the menu item, the linked module(board or page) will be removed, too. Would you like to delete it?";
$lang->msg_already_registed_domain = "It is already registered domain name. Please use the different one.";
?>

4
modules/homepage/lang/es.lang.php
View file

@ -16,6 +16,8 @@
$lang->cafe_admin = 'Gerente de café';
$lang->do_selected_member = 'Los miembros seleccionados: ';
$lang->cmd_make_cafe = '카페 생성';
$lang->default_menus = array(
'home' => 'Inicio',
'notice' => 'Anuncios',
@ -61,7 +63,6 @@
);
$lang->about_cafe = 'Cafe 서비스 관리자는 다수의 Cafe를 만들 수 있고 또 각 Cafe를 편하게 설정할 수 있도록 합니다.';
$lang->about_cafe_title = 'Cafe 이름은 관리를 위해서만 사용될 뿐 서비스에는 나타나지 않습니다';
$lang->about_domain = 'Para crear un dominio privado de la cafetería requiere. <br/> Independiente de dominio o subdominio, y XE está instalado, el camino que en su conjunto. <br /> Ej.) www.xpressengine.com / zbxe';
$lang->about_menu_names = 'Café en el nombre del idioma que aparezca en el menú para que usted pueda especificar. <br/> Puede entrar en un sólo aplica a todos ustedes ';
$lang->about_menu_option = 'selección de menú puede elegir para abrir saechangeuro. <br /> Menús desplegables se comportarán de acuerdo con el diseño';
$lang->about_group_grant = 'Cuando aparezca el menú, seleccionar un grupo de grupos seleccionados. <br/> Miembros no pueden ver cuando se apaga todas las';
@ -75,5 +76,4 @@
$lang->confirm_change_layout = 'Si cambia el diseño de algunas de la información relativa al diseño puede desaparecer. ¿Te gustaría cambiar?';
$lang->confirm_delete_menu_item = 'Eliminación de un elemento de menú o de la página, el módulo está conectado con el boletín se eliminarán. Si desea eliminar?';
$lang->msg_already_registed_domain = 'Ya es de dominio registrado. Por favor, use un dominio diferente';
?>

4
modules/homepage/lang/jp.lang.php
View file

@ -16,6 +16,8 @@
$lang->cafe_admin = "ホームページ管理者";
$lang->do_selected_member = "選択した会員を : ";
$lang->cmd_make_cafe = '카페 생성';
$lang->default_menus = array(
'home' => 'ホーム',
'notice' => 'お知らせ',
@ -61,7 +63,6 @@
);
$lang->about_cafe = "ホームページサービス管理者は複数のホームページ作成、および各ホームページを簡単に管理が出来ます。";
$lang->about_cafe_title = "ホームページ名は管理をするためだけに使われ、実サービスには表示されません。";
$lang->about_domain = "複数のホームページを作成するためには、「オリジナルドメイン」や「サブ ドメイン」のような専用のドメインが必要です。<br />また、 XEインストールパスも一緒に記入して下さい。<br />ex) www.xpressengine.com/xe";
$lang->about_menu_names = "ホームページに使うメニュー名を言語別に指定出来ます。<br/>一個だけ記入した場合、他言語に一括適用されます。";
$lang->about_menu_option = "メニューを選択するとき新しいウィンドウズに開けるかを選択します。<br />拡張メニューはレイアウトによって動作します。";
$lang->about_group_grant = "選択グループのみ、メニューが見えます。<br/>全てを解除すると非会員にも見えます。";
@ -75,5 +76,4 @@
$lang->confirm_change_layout = "レイアウトの変更時、一部のレイアウト情報が失われる可能性があります。 変更しますか?";
$lang->confirm_delete_menu_item = "メニューの削除時、リンクされている掲示板やページモジュールも一緒に削除されます。削除しますか?";
$lang->msg_already_registed_domain = "既に登録されているドメインです。異なるドメインを利用して下さい。";
?>

4
modules/homepage/lang/ko.lang.php
View file

@ -16,6 +16,8 @@
$lang->cafe_admin = 'Cafe 관리자';
$lang->do_selected_member = '선택된 회원을 : ';
$lang->cmd_make_cafe = '카페 생성';
$lang->default_menus = array(
'home' => '홈',
'notice' => '공지사항',
@ -61,7 +63,6 @@
);
$lang->about_cafe = 'Cafe 서비스 관리자는 다수의 Cafe를 만들 수 있고 또 각 Cafe를 편하게 설정할 수 있도록 합니다.';
$lang->about_cafe_title = 'Cafe 이름은 관리를 위해서만 사용될 뿐 서비스에는 나타나지 않습니다';
$lang->about_domain = '1개 이상의 Cafe를 만들기 위해서는 전용 도메인이 있어야 합니다.<br/>독립 도메인이나 서브 도메인이 있으면 되고 XE가 설치된 경로까지 같이 넣어주세요.<br />ex) www.xpressengine.com/zbxe';
$lang->about_menu_names = 'Cafe에 나타날 메뉴 이름을 언어에 따라서 지정할 수 있습니다.<br/>하나만 입력하셔도 모두 같이 적용됩니다';
$lang->about_menu_option = '메뉴를 선택시 새창으로 열지를 선택할 수 있습니다.<br />펼침 메뉴는 레이아웃에 따라 동작합니다';
$lang->about_group_grant = '그룹을 선택하면 선택된 그룹만 메뉴가 보입니다.<br/>모두 해제하면 비회원도 볼 수 있습니다';
@ -75,5 +76,4 @@
$lang->confirm_change_layout = '레이아웃을 변경할 경우 레이아웃 정보들 중 일부가 사라질 수가 있습니다. 변경하시겠습니까?';
$lang->confirm_delete_menu_item = '메뉴 항목 삭제시 연결되어 있는 게시판이나 페이지 모듈도 같이 삭제가 됩니다. 그래도 삭제하시겠습니까?';
$lang->msg_already_registed_domain = '이미 등록된 도메인입니다. 다른 도메인을 사용해주세요';
?>

4
modules/homepage/lang/zh-CN.lang.php
View file

@ -16,6 +16,8 @@
$lang->cafe_admin = "管理员";
$lang->do_selected_member = "把所选用户 : ";
$lang->cmd_make_cafe = '카페 생성';
$lang->default_menus = array(
'home' => '首页',
'notice' => '站点公告',
@ -61,7 +63,6 @@
);
$lang->about_cafe = "站点工具不仅可以迅速建立多个站点，而且非常方便各项设置。";
$lang->about_cafe_title = "建议使用一个即简洁又直观的名称。此名称不会显示到用户页面当中。";
$lang->about_domain = "要创建一个站点必须有一个专用域名。<br/>一级域名或二级域名皆可。输入的时候请把XE安装路径也一起输入。<br />ex) www.xpressengine.com/zbxe";
$lang->about_menu_names = "在此可以指定多国语言菜单。<br/>如只输入一项，其他语言同时只应用此项语言。";
$lang->about_menu_option = "可以设置点击菜单时是否要在新窗口中打开。<br />展开选项随布局。";
$lang->about_group_grant = "如选择用户组，只有所属组用户才能看到此菜单。<br/>不选非用户也可以查看。";
@ -75,5 +76,4 @@
$lang->confirm_change_layout = "切换布局可能一些原有的信息将无法显示。你确定要切换吗？";
$lang->confirm_delete_menu_item = "删除菜单：即同时删除链接到此菜单的版面或页面模块。你确定要删除吗？";
$lang->msg_already_registed_domain = "对不起！已有相同的域名。请重新输入。";
?>

4
modules/homepage/lang/zh-TW.lang.php
View file

@ -16,6 +16,8 @@
$lang->cafe_admin = "網站管理者";
$lang->do_selected_member = "選擇會員 : ";
$lang->cmd_make_cafe = '카페 생성';
$lang->default_menus = array(
'home' => '首頁',
'notice' => '公告事項',
@ -61,7 +63,6 @@
);
$lang->about_cafe = "虛擬網站模組可快速建立網站，且容易進行設定。";
$lang->about_cafe_title = "只有在管理時才看的到此標題。";
$lang->about_domain = "要建立網站必須要有個專屬域名。<br/>頂級域名或次級域名都可以。輸入時，請將XE安裝路徑也一起輸入。<br />例) www.xpressengine.com/zbxe";
$lang->about_menu_names = "可指定語言。<br/>如果只輸入其中一項，其他語言將會顯示一樣。";
$lang->about_menu_option = "可設定案選單時，是否要以新視窗開啟。<br />選展開的話，是隨版面。";
@ -76,5 +77,4 @@
$lang->confirm_change_layout = "變換版面可能會使原來的資料無法顯示。確定要變換嗎？";
$lang->confirm_delete_menu_item = "刪除選單：刪除選單的同時，將會使連結到選單的討論板或頁面一起刪除。確定要刪除嗎？";
$lang->msg_already_registed_domain = "已註冊的域名。請使用其他的網域。";
?>

8
modules/homepage/tpl/filter/insert_homepage.xml
View file

@ -1,11 +1,13 @@
<filter name="insert_homepage" module="homepage" act="procHomepageAdminInsertHomepage" confirm_msg_code="confirm_submit">
<form>
<node target="homepage_title" required="true" maxlength="250" />
<node target="domain" required="true" maxlength="250" />
<node target="cafe_title" required="true" maxlength="250" />
<node target="domain" maxlength="250" />
<node target="sid" maxlength="250" filter="alpha_number" />
</form>
<parameter>
<param name="title" target="homepage_title" />
<param name="title" target="cafe_title" />
<param name="domain" target="domain" />
<param name="site_id" target="sid" />
</parameter>
<response callback_func="completeInsertHomepage">
<tag name="error" />

4
modules/homepage/tpl/filter/update_homepage.xml
View file

@ -1,13 +1,9 @@
<filter name="update_homepage" module="homepage" act="procHomepageAdminUpdateHomepage" confirm_msg_code="confirm_submit">
<form>
<node target="site_srl" required="true" maxlength="250" />
<node target="homepage_title" required="true" maxlength="250" />
<node target="domain" required="true" maxlength="250" />
</form>
<parameter>
<param name="site_srl" target="site_srl" />
<param name="title" target="homepage_title" />
<param name="domain" target="domain" />
<param name="homepage_admin" target="homepage_admin" />
</parameter>
<response callback_func="completeUpdateHomepage">

31
modules/homepage/tpl/index.html
View file

@ -12,7 +12,7 @@
<tr>
<th scope="col"><div>{$lang->no}</div></th>
<th scope="col" class="half_wide"><div>{$lang->title}</div></th>
<th scope="col" class="half_wide"><div>{$lang->domain}</div></th>
<th scope="col" class="half_wide"><div>{$lang->domain} / {$lang->sid}</div></th>
<th scope="col"><div>{$lang->regdate}</div></th>
<th scope="col" colspan="3"><div>&nbsp;</div></th>
</tr>
@ -22,7 +22,7 @@
<tr class="row{$cycle_idx}">
<td>{$no}</td>
<td><a href="{getSiteUrl($val->domain,'module','homepage','act','dispHomepageManage','site_srl',$val->site_srl)}">{htmlspecialchars($val->homepage_title)}</a></td>
<td>http://<a href="http://{$val->domain}" onclick="window.open(this.href);return false;">{$val->domain}</a></td>
<td><a href="{getSiteUrl($val->domain)}" onclick="window.open(this.href);return false;">{$val->domain}</a></td>
<td>{zdate($val->regdate,"Y-m-d")}</td>
<td><a href="{getUrl('act','dispHomepageAdminSetup','site_srl',$val->site_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
<td><a href="{getUrl('act','dispHomepageAdminDelete','site_srl',$val->site_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
@ -47,26 +47,31 @@
</div>
<div class="adminRightExtra">
<form action="./" method="post" onsubmit="return procFilter(this, insert_homepage)">
<table cellspacing="0" class="colTable">
<form action="./" method="post" onsubmit="return procFilter(this, insert_homepage)" id="cafeFo">
<h3 class="xeAdmin">{$lang->cmd_make_cafe}</h3>
<table cellspacing="0" class="rowTable">
<caption>&nbsp;</caption>
<tbody>
<tr>
<th scope="row"><div>{$lang->cafe_title}</div></th>
</tr>
<tr>
<td>
<input type="text" name="homepage_title" value="" class="inputTypeText w200" />
<input type="text" name="cafe_title" value="" class="inputTypeText w200" />
<p>{$lang->about_cafe_title}</p>
</td>
</tr>
<tr>
<th scope="row"><div>{$lang->domain}</div></th>
</tr>
<tr>
<tr>
<th scope="row"><div>{$lang->access_type}</div></th>
<td>
http://<input type="text" name="domain" value="" class="inputTypeText w200" />
<p>{$lang->about_domain}</p>
<label for="chkDomain"><input type="radio" id="chkDomain" name="access_type" value="domain" onclick="toggleAccessType('domain');" checked="checked" /> {$lang->access_domain}</label>
<label for="chkSid"><input type="radio" id="chkSid" name="access_type" value="sid" onclick="toggleAccessType('sid');" /> {$lang->access_sid}</label>
<div id="accessDomain" style="display:block; margin-top:10px;">
http://<input type="text" name="domain" value="" class="inputTypeText w200" />
<p>{$lang->about_domain}</p>
</div>
<div id="accessSid" style="display:none; margin-top:10px;">
<input type="text" name="sid" value="" class="inputTypeText w200" />
<p>{$lang->about_sid}</p>
</div>
</td>
</tr>
<tr class="row2">

15
modules/homepage/tpl/js/homepage.js
View file

@ -395,3 +395,18 @@ function doCompleteRemoveMember(ret_obj) {
alert(ret_obj['message']);
location.reload();
}
function toggleAccessType(target) {
switch(target) {
case 'domain' :
xGetElementById('cafeFo').domain.value = '';
xGetElementById('accessDomain').style.display = 'block';
xGetElementById('accessSid').style.display = 'none';
break;
case 'sid' :
xGetElementById('cafeFo').sid.value = '';
xGetElementById('accessDomain').style.display = 'none';
xGetElementById('accessSid').style.display = 'block';
break;
}
}

6
modules/homepage/tpl/setup.html
View file

@ -18,17 +18,15 @@
<tr>
<th scope="row"><div>{$lang->cafe_title}</div></th>
<td>
<input type="text" name="homepage_title" value="{$homepage_info->title}" class="inputTypeText w200" />
{$homepage_info->title}
<a href="{getSiteUrl($homepage_info->domain,'', 'module','homepage','act','dispHomepageManage')}" onclick="window.open(this.href); return false;" class="button"><span>{$lang->cmd_management}</span></a>
<p>{$lang->about_cafe_title}</p>
</td>
</tr>
<tr>
<th scope="row"><div>{$lang->domain}</div></th>
<td>
http://<input type="text" name="domain" value="{$homepage_info->domain}" class="inputTypeText w200" />
{getSiteUrl($homepage_info->domain)}
<a href="{getSiteUrl($homepage_info->domain, '')}" onclick="window.open(this.href); return false;" class="button"><span>{$lang->cmd_move}</span></a>
<p>{$lang->about_domain}</p>
</td>
</tr>
<tr>