From bb97446dfc4e41b2a0de303cdc5c7cc69b989dbf Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 8 Apr 2009 10:10:17 +0000 Subject: [PATCH] =?UTF-8?q?Virtual=20Site=20=EC=83=9D=EC=84=B1=EC=8B=9C=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=8B=A8=EC=9C=84(=EC=84=9C?= =?UTF-8?q?=EB=B8=8C=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=98=90=EB=8A=94=20?= =?UTF-8?q?=EB=8F=85=EB=A6=BD=20=EB=8F=84=EB=A9=94=EC=9D=B8)=EC=9D=B4=20?= =?UTF-8?q?=EC=95=84=EB=8B=8C=20ID=20=ED=98=95=EC=8B=9D=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20=EA=B0=9C=EC=84=A0.=20SID=20?= =?UTF-8?q?=EB=A1=9C=20=EB=B6=88=EB=A6=AC=EB=8A=94=20=EC=9D=B4=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8ID=EB=8A=94=20MID=EC=99=80=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=EC=9D=B4=20=EB=B6=88=EA=B0=80=EB=8A=A5=ED=95=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6051 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .htaccess | 110 ++++++++---------- classes/context/Context.class.php | 72 +++++------- common/js/xml_handler.js | 2 + common/lang/en.lang.php | 1 + common/lang/es.lang.php | 1 + common/lang/fr.lang.php | 1 + common/lang/ge.lang.php | 1 + common/lang/jp.lang.php | 1 + common/lang/ko.lang.php | 1 + common/lang/ru.lang.php | 1 + common/lang/zh-CN.lang.php | 1 + common/lang/zh-TW.lang.php | 1 + common/tpl/common_layout.html | 1 + config/func.inc.php | 7 ++ index.php | 5 +- modules/editor/tpl/js/uploader.js | 1 + .../homepage/homepage.admin.controller.php | 35 +++--- modules/homepage/lang/en.lang.php | 4 +- modules/homepage/lang/es.lang.php | 4 +- modules/homepage/lang/jp.lang.php | 4 +- modules/homepage/lang/ko.lang.php | 4 +- modules/homepage/lang/zh-CN.lang.php | 4 +- modules/homepage/lang/zh-TW.lang.php | 4 +- .../homepage/tpl/filter/insert_homepage.xml | 8 +- .../homepage/tpl/filter/update_homepage.xml | 4 - modules/homepage/tpl/index.html | 31 ++--- modules/homepage/tpl/js/homepage.js | 15 +++ modules/homepage/tpl/setup.html | 6 +- modules/menu/menu.admin.controller.php | 22 ++-- modules/module/lang/en.lang.php | 8 ++ modules/module/lang/es.lang.php | 8 ++ modules/module/lang/fr.lang.php | 7 ++ modules/module/lang/jp.lang.php | 8 ++ modules/module/lang/ko.lang.php | 8 ++ modules/module/lang/ru.lang.php | 7 ++ modules/module/lang/zh-CN.lang.php | 8 ++ modules/module/lang/zh-TW.lang.php | 7 ++ modules/module/module.controller.php | 26 +++-- modules/module/module.model.php | 61 ++++++++-- modules/module/queries/getMidInfo.xml | 2 +- 40 files changed, 313 insertions(+), 189 deletions(-) diff --git a/.htaccess b/.htaccess index 4faa4a59b..d1fcecb8c 100644 --- a/.htaccess +++ b/.htaccess @@ -1,82 +1,64 @@ RewriteEngine On -# image... -RewriteRule ^(.+)/files/attach/images/(.*) ./files/attach/images/$2 [L] -RewriteRule ^(.+)/files/attach/menu_button/(.*) ./files/attach/menu_button/$2 [L] -RewriteRule ^(.+)/files/member_extra_info/(.*) ./files/member_extra_info/$2 [L] -RewriteRule ^(.+)/files/cache/(.*) ./files/cache/$2 [L] -RewriteRule ^(.+)/modules/(.*) ./modules/$2 [L] -RewriteRule ^(.+)/common/css/(.*) ./common/css/$2 [L] -RewriteRule ^(.+)/common/js/(.*) ./common/js/$2 [L] -RewriteRule ^(.+)/common/tpl/(.*) ./common/tpl/$2 [L] -RewriteRule ^(.+)/widgets/(.*) ./widgets/$2 [L] -RewriteRule ^(.+)/layouts/(.*) ./layouts/$2 [L] -RewriteRule ^(.+)/addons/(.*) ./addons/$2 [L] +# static files +RewriteRule ^([a-zA-Z0-9_]+)/files/(.*) ./files/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/modules/(.*) ./modules/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/common/(.*) ./common/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/widgets/(.*) ./widgets/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/widgetstyle/(.*) ./widgetstyle/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/layouts/(.*) ./layouts/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/addons/(.*) ./addons/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/entry/files/(.*) ./files/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/entry/modules/(.*) ./modules/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/entry/common/(.*) ./common/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/entry/widgets/(.*) ./widgets/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/entry/widgetstyle/(.*) ./widgetstyle/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/entry/layouts/(.*) ./layouts/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/entry/addons/(.*) ./addons/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/files/(.*) ./files/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/modules/(.*) ./modules/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/common/(.*) ./common/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/widgets/(.*) ./widgets/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/widgetstyle/(.*) ./widgetstyle/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/layouts/(.*) ./layouts/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/addons/(.*) ./addons/$2 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/files/(.*) ./files/$3 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/modules/(.*) ./modules/$3 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/common/(.*) ./common/$3 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/widgets/(.*) ./widgets/$3 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/widgetstyle/(.*) ./widgetstyle/$3 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/layouts/(.*) ./layouts/$3 [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/addons/(.*) ./addons/$3 [L] -# page -RewriteRule ^([a-zA-Z0-9_]+)/([[:digit:]]+)page$ ./index.php?mid=$1&page=$2 [L] - -# total rss -RewriteRule ^rss/([[:digit:]]+){0,14}/([[:digit:]]+){0,14}/([[:digit:]]+)$ ./index.php?module=rss&act=rss&start_date=$1&end_date=$2&page=$3 [L] -RewriteRule ^rss/([[:digit:]]+)$ ./index.php?module=rss&act=rss&page=$1 [L] +# rss , blogAPI RewriteRule ^rss$ ./index.php?module=rss&act=rss [L] -RewriteRule ^atom/([[:digit:]]+){0,14}/([[:digit:]]+){0,14}/([[:digit:]]+)$ ./index.php?module=rss&act=atom&start_date=$1&end_date=$2&page=$3 [L] -RewriteRule ^atom/([[:digit:]]+)$ ./index.php?module=rss&act=atom&page=$1 [L] RewriteRule ^atom$ ./index.php?module=rss&act=atom [L] +RewriteRule ^([a-zA-Z0-9_]+)/rss$ ./index.php?mid=$1&act=rss [L] +RewriteRule ^([a-zA-Z0-9_]+)/atom$ ./index.php?mid=$1&act=atom [L] +RewriteRule ^([a-zA-Z0-9_]+)/api$ ./index.php?mid=$1&act=api [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/rss$ ./index.php?sid=$1&mid=$2&act=rss [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/atom$ ./index.php?sid=$1&mid=$2&act=atom [L] +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/api$ ./index.php?sid=$1&mid=$2&act=api [L] # administrator page RewriteRule ^admin/?$ ./index.php?module=admin [L] -# mid + act -RewriteRule ^([a-zA-Z0-9_]+)/api$ ./index.php?mid=$1&act=api [L] - # document permanent link RewriteRule ^([[:digit:]]+)$ ./index.php?document_srl=$1 [L] +# sid + document permanent link +RewriteRule ^([a-zA-Z0-9_]+)/([[:digit:]]+)$ ./index.php?sid=$1&document_srl=$2 [L] -# document + act link -RewriteRule ^([[:digit:]]+)/([a-zA-Z0-9_]+)$ ./index.php?document_srl=$1&act=$2 [L] - -# document + key + act link -RewriteRule ^([[:digit:]]+)/([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ ./index.php?document_srl=$1&act=$3&key=$2 [L] +# mid link +RewriteRule ^([a-zA-Z0-9_]+)(/){0,1}$ ./index.php?mid=$1 [L] +# sid + mid link +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)(/){0,1}$ ./index.php?sid=$1&mid=$2 [L] # mid + document link RewriteRule ^([a-zA-Z0-9_]+)/([[:digit:]]+)$ ./index.php?mid=$1&document_srl=$2 [L] - -# mid + act link -RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ ./index.php?mid=$1&act=$2 [L] - -# mid + page link -RewriteRule ^([a-zA-Z0-9_]+)/page/([[:digit:]]+)$ ./index.php?mid=$1&page=$2 [L] +# sid + mid + document link +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([[:digit:]]+)$ ./index.php?sid=$1&mid=$2&document_srl=$3 [L] # mid + entry title RewriteRule ^([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?mid=$1&entry=$2 [L] - -# mid + category link -RewriteRule ^([a-zA-Z0-9_]+)/category/([[:digit:]]+)$ ./index.php?mid=$1&category=$2 [L] - -# mid + act + document_Srl -RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z])([a-zA-Z0-9_]+)/([[:digit:]]+)$ ./index.php?mid=$1&document_srl=$4&act=$2$3 [L] - -# mid + document_Srl + page -RewriteRule ^([a-zA-Z0-9_]+)/([[:digit:]]+)/page/([[:digit:]]+)$ ./index.php?mid=$1&document_srl=$2&page=$3 [L] - -# mid + category + page -RewriteRule ^([a-zA-Z0-9_]+)/category/([[:digit:]]+)/page/([[:digit:]]+)$ ./index.php?mid=$1&category=$2&page=$3 [L] - -# mid + search target regdate (year+month) -RewriteRule ^([a-zA-Z0-9_]+)/([[:digit:]]+)/([[:digit:]]+)$ ./index.php?mid=$1&search_target=regdate&search_keyword=$2$3 [L] - -# mid + search target regdate (year+month+day) -RewriteRule ^([a-zA-Z0-9_]+)/([[:digit:]]+)/([[:digit:]]+)/([[:digit:]]+)$ ./index.php?mid=$1&search_target=regdate&search_keyword=$2$3$4 [L] - -# mid + search target tag -RewriteRule ^([a-zA-Z0-9_]+)/tag/(.*)$ ./index.php?mid=$1&search_target=tag&search_keyword=$2 [L] - -# mid + search target writer -RewriteRule ^([a-zA-Z0-9_]+)/writer/(.*)$ ./index.php?mid=$1&search_target=nick_name&search_keyword=$2 [L] - -# mid + document_Srl + page + act -RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([[:digit:]]+)/page/([[:digit:]]+)$ ./index.php?mid=$1&document_srl=$3&page=$4&act=$2 [L] - -# module link -RewriteRule ^([a-zA-Z0-9_]+)(/){0,1}$ ./index.php?mid=$1 [L] +# sid + mid + entry title +RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?sid=$1&mid=$2&entry=$3 [L] diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 28df9134a..4795e13a6 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -104,6 +104,8 @@ $oModuleModel = &getModel('module'); $site_module_info = $oModuleModel->getDefaultMid(); Context::set('site_module_info', $site_module_info); + + if($site_module_info->site_srl && isSiteID($site_module_info->sid)) Context::set('sid', $site_module_info->sid); } // 사용자 설정 언어 타입이 없으면 기본 언어타입으로 지정 @@ -766,14 +768,24 @@ $site_module_info = Context::get('site_module_info'); } + // SiteID 요청시 전처리 + if($domain && isSiteID($domain)) { + $sid = $domain; + $domain = ''; + } + + // SiteID가 요청되지 않았다면 현재 site_module_info에서 SiteID 판별 + if(!$sid && $site_module_info->domain && isSiteID($site_module_info->domain)) { + $sid = $site_module_info->domain; + } + if(!$domain) { - if($site_module_info->domain) $domain = $site_module_info->domain; + if($site_module_info->domain && !isSiteID($site_module_info->domain)) $domain = $site_module_info->domain; else { if($this->db_info->default_url) $domain = $this->db_info->default_url; else if(!$domain) $domain = Context::getRequestUri(); } } - $domain = preg_replace('/^(http|https):\/\//i','', trim($domain)); if(substr($domain,-1) != '/') $domain .= '/'; @@ -796,6 +808,7 @@ } $get_vars[$key] = $val; } + unset($get_vars['sid']); /* member module중의 쪽지함/친구 관리 기능이 communication 모듈로 이전하여 하위 호환성을 위한 act값 변경 */ if($get_vars['act'] == 'dispMemberFriend') $get_vars['act'] = 'dispCommunicationFriend'; @@ -808,9 +821,16 @@ else $path = $this->getRequestUri(RELEASE_SSL, $domain); $var_count = count($get_vars); - if(!$var_count) return $path; + if(!$var_count) { + if($sid) { + if($this->allow_rewrite) $path .= $sid; + else $path .= '?sid='.$sid; + } + return $path; + } // rewrite모듈을 사용할때 getUrl()을 이용한 url 생성 + // 2009. 4. 8 mid, document_srl, site id, entry 를 제외하고는 rewrite rule 사용하지 않도록 변경 if($this->allow_rewrite) { if(count($get_vars)) foreach($get_vars as $key => $value) if(!isset($value) || $value === '') unset($get_vars[$key]); @@ -818,46 +838,23 @@ asort($var_keys); $target = implode('.',$var_keys); + if($sid) $rpath = $path.$sid .'/'; + else $rpath = $path; + switch($target) { case 'mid' : - return $path.$get_vars['mid']; + return $rpath.$get_vars['mid']; case 'document_srl' : - return $path.$get_vars['document_srl']; - case 'act.mid' : - return sprintf('%s%s/%s',$path,$get_vars['mid'],$get_vars['act']); + return $rpath.$get_vars['document_srl']; case 'document_srl.mid' : - return sprintf('%s%s/%s',$path,$get_vars['mid'],$get_vars['document_srl']); - case 'act.document_srl' : - return sprintf('%s%s/%s',$path,$get_vars['document_srl'],$get_vars['act']); - case 'mid.page' : - return sprintf('%s%s/page/%s',$path,$get_vars['mid'],$get_vars['page']); - case 'category.mid' : - return sprintf('%s%s/category/%s',$path,$get_vars['mid'],$get_vars['category']); - case 'act.document_srl.key' : - return sprintf('%s%s/%s/%s',$path,$get_vars['document_srl'],$get_vars['key'],$get_vars['act']); - case 'document_srl.mid.page' : - return sprintf('%s%s/%s/page/%s',$path,$get_vars['mid'],$get_vars['document_srl'],$get_vars['page']); - case 'category.mid.page' : - return sprintf('%s%s/category/%s/page/%s',$path,$get_vars['mid'],$get_vars['category'],$get_vars['page']); - case 'mid.search_keyword.search_target' : - switch($get_vars['search_target']) { - case 'tag' : - return sprintf('%s%s/tag/%s',$path,$get_vars['mid'],str_replace(' ','+',$get_vars['search_keyword'])); - case 'nick_name' : - return sprintf('%s%s/writer/%s',$path,$get_vars['mid'],str_replace(' ','+',$get_vars['search_keyword'])); - case 'regdate' : - if(strlen($get_vars['search_keyword'])==8) return sprintf('%s%s/%04d/%02d/%02d',$path,$get_vars['mid'],substr($get_vars['search_keyword'],0,4),substr($get_vars['search_keyword'],4,2),substr($get_vars['search_keyword'],6,2)); - elseif(strlen($get_vars['search_keyword'])==6) return sprintf('%s%s/%04d/%02d',$path,$get_vars['mid'],substr($get_vars['search_keyword'],0,4),substr($get_vars['search_keyword'],4,2)); - } - break; - case 'act.document_srl.mid' : - return sprintf('%s%s/%s/%s',$path,$get_vars['mid'], $get_vars['act'],$get_vars['document_srl']); + return sprintf('%s%s/%s',$rpath,$get_vars['mid'],$get_vars['document_srl']); case 'entry.mid' : - return sprintf('%s%s/entry/%s',$path,$get_vars['mid'],$get_vars['entry']); + return sprintf('%s%s/entry/%s',$rpath,$get_vars['mid'],$get_vars['entry']); } } // rewrite 모듈을 사용하지 않고 인자의 값이 2개 이상이거나 rewrite모듈을 위한 인자로 적당하지 않을 경우 + if($sid) $url = 'sid='.$sid; foreach($get_vars as $key => $val) { if(!isset($val)) continue; if(is_array($val) && count($val)) { @@ -868,7 +865,6 @@ $url .= ($url?'&':'').$key.'='.urlencode($val); } } - return $path.'?'.htmlspecialchars($url); } @@ -1361,13 +1357,9 @@ // body 내의 를 header로 이동 $content = preg_replace_callback('!!is', array($this,'moveStyleToHeader'), $content); - // 코드 변환 - //$content = preg_replace('/<(img|br)([^>]*)(\/>|>)/i','<$1$2 />', $content); - $content = preg_replace('/<(img|br)([^>\/]*)(\/>|>)/i','<$1$2 />', $content); - // templateHandler의 이미지 경로로 인하여 생기는 절대경로 이미지등의 경로 중복 처리 //$content = preg_replace('/<(img|input)([^>]*)src=(["|\']?)http:\/\/([^ ]+)http:\/\//is','<$1$2src=$3http://', $content); - $content = preg_replace('/src=(["|\']?)http:\/\/([^ ]+)http:\/\//is','src=$1http://', $content); + $content = preg_replace('/src=(["|\']?)http:\/\/([^ ]+)http:\/\//is','src=$1http://', $content); return $content; } diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js index c74fde0fe..ab2c36587 100644 --- a/common/js/xml_handler.js +++ b/common/js/xml_handler.js @@ -18,6 +18,7 @@ function exec_xml(module, act, params, callback_func, response_tags, callback_fu } oXml.addParam("module", module); oXml.addParam("act", act); + if(typeof(xeSid)!='undefined') oXml.addParam('sid', xeSid); if(typeof(response_tags)=="undefined" || response_tags.length<1) response_tags = new Array('error','message'); @@ -429,6 +430,7 @@ $.exec_json = function(action,data,func){ } $.extend(data,{module:action[0],act:action[1]}); + if(typeof(xeSid)!='undefined') $.extend(data,{sid:xeSid}); $.ajax({ type:"POST" ,dataType:"json" diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php index 070d8c6b2..1c7f39c5c 100644 --- a/common/lang/en.lang.php +++ b/common/lang/en.lang.php @@ -124,6 +124,7 @@ $lang->file = 'file'; $lang->mid = 'Module Name'; + $lang->sid = 'Site Name'; $lang->layout = 'Layout'; $lang->widget = 'Widget'; $lang->module = 'Module'; diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php index 978c4f714..de2cfaaa8 100644 --- a/common/lang/es.lang.php +++ b/common/lang/es.lang.php @@ -123,6 +123,7 @@ $lang->file = 'file'; $lang->mid = 'ID del Módulo'; + $lang->sid = 'Site Name'; $lang->layout = 'Composición'; $lang->widget = 'Widget'; $lang->module = 'Módulo'; diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php index e3c79053a..0c71d639b 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -124,6 +124,7 @@ $lang->file = 'file'; $lang->mid = 'Nom'; + $lang->sid = 'Site Name'; $lang->layout = 'Mise en Page'; $lang->widget = 'Gadget'; $lang->module = 'Module'; diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php index 5c8491c8b..032e7998b 100644 --- a/common/lang/ge.lang.php +++ b/common/lang/ge.lang.php @@ -124,6 +124,7 @@ $lang->file = 'file'; $lang->mid = 'Module Name'; + $lang->sid = 'Site Name'; $lang->layout = 'Layout'; $lang->widget = 'Widget'; $lang->module = 'Modul'; diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php index fc684ee90..573b0721e 100644 --- a/common/lang/jp.lang.php +++ b/common/lang/jp.lang.php @@ -124,6 +124,7 @@ $lang->file = 'ファイル'; $lang->mid = 'モジュール名'; + $lang->sid = 'Site Name'; $lang->layout = 'レイアウト'; $lang->widget = 'ウィジェット'; $lang->module = 'モジュール'; diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php index 5f3db74e5..b53e43e7f 100644 --- a/common/lang/ko.lang.php +++ b/common/lang/ko.lang.php @@ -124,6 +124,7 @@ $lang->file = '파일'; $lang->mid = '모듈이름'; + $lang->sid = '가상 사이트 이름'; $lang->layout = '레이아웃'; $lang->widget = '위젯 '; $lang->module = '모듈'; diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php index e4d0d4fa8..269e12f0a 100644 --- a/common/lang/ru.lang.php +++ b/common/lang/ru.lang.php @@ -122,6 +122,7 @@ $lang->order_desc = 'спустится'; $lang->mid = 'Имя Модуля'; + $lang->sid = 'Site Name'; $lang->layout = 'Лейаут'; $lang->widget = 'Виджет'; $lang->module = 'Модуль'; diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php index 033d939c3..de533b306 100644 --- a/common/lang/zh-CN.lang.php +++ b/common/lang/zh-CN.lang.php @@ -124,6 +124,7 @@ $lang->file = '文件'; $lang->mid = '模块名称'; + $lang->sid = 'Site Name'; $lang->layout = '布局'; $lang->widget = '控件 '; $lang->module = '模块'; diff --git a/common/lang/zh-TW.lang.php b/common/lang/zh-TW.lang.php index 1fff8d413..1e14b740d 100644 --- a/common/lang/zh-TW.lang.php +++ b/common/lang/zh-TW.lang.php @@ -124,6 +124,7 @@ $lang->file = '檔案'; $lang->mid = '模組名稱'; + $lang->sid = 'Site Name'; $lang->layout = '版面'; $lang->widget = '控件 '; $lang->module = '模組'; diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 34fd1de4a..956862cdf 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -52,6 +52,7 @@