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

copy sandbox to trunk

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7259 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-01-28 08:37:24 +00:00
commit 131a4b9092
26 changed files with 70 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

3
addons/autolink/autolink.js
View file

@ -9,10 +9,11 @@
var max_255_re = '(?:1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9]?[0-9])';
var ip_re = '(?:'+max_255_re+'\\.){3}'+max_255_re;
var port_re = '(?::([0-9]+))?';
var user_re = '(?:/~[\\w-]+)?';
var path_re = '((?:/[\\w!"$-/:-@]+)*)';
var hash_re = '(?:#([\\w!-@]+))?';
var url_regex = new RegExp('('+protocol_re+'('+domain_re+'|'+ip_re+'|localhost'+')'+port_re+path_re+hash_re+')', 'ig');
var url_regex = new RegExp('('+protocol_re+'('+domain_re+'|'+ip_re+'|localhost'+')'+port_re+user_re+path_re+hash_re+')', 'ig');
var AutoLink = xe.createPlugin("autolink", {
targets : [],

5
addons/autolink/autolink.spec.html
View file

@ -60,6 +60,10 @@ describe('AutoLink functionality', {
"#test9 - don't include parenthesis" : function() {
value_of( $('#test9 a').length ).should_be(1);
value_of( $('#test9 a').attr('href') ).should_be('http://www.naver.com');
},
"#test10 - include tild" : function() {
value_of( $('#test10 a').length ).should_be(1);
value_of( $('#test10 a').attr('href') ).should_be('http://www.xpressengine.com:8000/~user/?mid=def');
}
});
@ -102,6 +106,7 @@ describe('Autolink trigger', {
<div id="test7">http://mygony.com</div>
<div id="test8">Go to http://mygony.com</div>
<div id="test9">Naver(http://www.naver.com)</div>
<div id="test10">User homepage : http://www.xpressengine.com:8000/~user/?mid=def should be a link.</div>
</div>
</body>
</html>

6
classes/context/Context.class.php
View file

@ -87,7 +87,7 @@
Context::set('site_module_info', $site_module_info);
if($site_module_info->site_srl && isSiteID($site_module_info->vid)) Context::set('vid', $site_module_info->vid);
if($site_module_info->site_srl && isSiteID($site_module_info->domain)) Context::set('vid', $site_module_info->domain);
$this->db_info->lang_type = $site_module_info->default_language;
if(!$this->db_info->lang_type) $this->db_info->lang_type = 'en';
}
@ -1171,7 +1171,7 @@
function _addJsFile($file, $optimized, $targetie,$index) {
if(strpos($file,'://')===false && $file{0}!='/' && $file{0}!='.') $file = './'.$file;
$file = preg_replace('@/\./|(?<!:)\/\/@', '/', $file);
while(strpos($file,'/../')) $file = preg_replace('/\/([^\/]+)\/\.\.\//s','/',$file);
while(strpos($file,'/../')) $file = preg_replace('/\/([^\/]+)\/\.\.\//s','/',$file,1);
if(in_array($file, $this->js_files)) return;
@ -1269,7 +1269,7 @@
function _addCSSFile($file, $optimized, $media, $targetie, $index) {
if(strpos($file,'://')===false && substr($file,0,1)!='/' && substr($file,0,1)!='.') $file = './'.$file;
$file = str_replace(array('/./','//'),'/',$file);
while(strpos($file,'/../')) $file = preg_replace('/\/([^\/]+)\/\.\.\//s','/',$file);
while(strpos($file,'/../')) $file = preg_replace('/\/([^\/]+)\/\.\.\//s','/',$file,1);
if(in_array($file, $this->css_files)) return;

3
common/js/js_app.js
View file

@ -240,8 +240,7 @@ _app_base = {
if (!/^(?:AFTER_|BEFORE_)/.test(msg)) { // top level function
return vRet;
} else {
if (typeof vRet == 'undefined') vRet = true;
return $.isArray(vRet)?$.inArray(false, vRet):!!vRet;
return $.isArray(vRet)?($.inArray(false, vRet)<0):((typeof vRet=='undefined')?true:!!vRet);
}
}
};

6
common/js/xml_js_filter.js
View file

@ -59,7 +59,11 @@ var Validator = xe.createApp('Validator', {
if (oForm._filter) filter = oForm._filter.value;
return this.cast('VALIDATE', [oForm, filter]);
var params = [oForm, filter];
var result = this.cast('VALIDATE', params);
if (typeof result == 'undefined') result = false;
return result;
},
API_ONREADY : function() {
var self = this;

2
common/lang/zh-TW.lang.php
View file

@ -257,7 +257,7 @@
$lang->confirm_move = '確定要移動嗎?';
$lang->confirm_reset = '確定要重置嗎?';
$lang->confirm_leave = '確定要退出嗎?';
$lang->confirm_update = 'Are you sure to update?';
$lang->confirm_update = '確定要更新嗎?';
$lang->column_type = '格式';
$lang->column_type_list['text'] = '文字輸入(text)';

2
config/config.inc.php
View file

@ -13,7 +13,7 @@
* @brief XE의 전체 버전 표기
* 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
**/
define('__ZBXE_VERSION__', '1.4.0.2');
define('__ZBXE_VERSION__', '1.4.0.3');
/**
* @brief zbXE가 설치된 장소의 base path를 구함

4
modules/autoinstall/autoinstall.admin.controller.php
View file

@ -82,6 +82,10 @@
case "widgetstyle":
$config_file = "/skin.xml";
break;
case "drcomponent":
$config_file = "/info.xml";
$type = "component";
break;
default:
continue;

3
modules/comment/comment.item.php
View file

@ -252,9 +252,6 @@
// >, <, "를 다시 복구
$content = str_replace(array('<','>','"'),array('&lt;','&gt;','&quot;'), $content);
// 영문이 연결될 경우 개행이 안 되는 문제를 해결
$content = preg_replace('/([a-z0-9\+:\/\.\~,\|\!\@\#\$\%\^\&\*\(\)\_]){20}/is',"$0-",$content);
return $content;
}

3
modules/comment/queries/getCommentCount.xml
View file

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

2
modules/document/lang/zh-TW.lang.php
View file

@ -95,5 +95,5 @@
'trash_ipaddress' => '移除IP位址',
);
$lang->success_trashed = "Successfully moved to trashcan";
$lang->success_trashed = "成功地移到垃圾桶";
?>

2
modules/editor/components/image_gallery/tpl/popup.js
View file

@ -106,7 +106,7 @@ function insertSlideShow() {
selected_node.setAttribute("images_list", images_list);
selected_node.style.width = width+"px";
} else {
var text = "<img src=\"./common/tpl/images/blank.gif\" editor_component=\"image_gallery\" width=\""+width+"\" gallery_style=\""+gallery_style+"\" align=\""+gallery_align+"\" gallery_align=\""+gallery_align+"\" border_thickness=\""+border_thickness+"\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\"width:"+width+"px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;\" images_list=\""+images_list+"\" />";
var text = "<img src=\"../../../../common/tpl/images/blank.gif\" editor_component=\"image_gallery\" width=\""+width+"\" gallery_style=\""+gallery_style+"\" align=\""+gallery_align+"\" gallery_align=\""+gallery_align+"\" border_thickness=\""+border_thickness+"\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\"width:"+width+"px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;\" images_list=\""+images_list+"\" />";
opener.editorFocus(opener.editorPrevSrl);
var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
opener.editorReplaceHTML(iframe_obj, text);

2
modules/editor/components/multimedia_link/tpl/popup.js
View file

@ -55,7 +55,7 @@ function insertMultimedia(obj) {
return;
}
var text = "<img src=\"./common/tpl/images/blank.gif\" editor_component=\"multimedia_link\" multimedia_src=\""+url+"\" width=\""+width+"\" height=\""+height+"\" wmode=\""+wmode+"\" style=\"display:block;width:"+width+"px;height:"+height+"px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;\" auto_start=\""+auto_start+"\" alt=\""+caption+"\" />";
var text = "<img src=\"../../../../common/tpl/images/blank.gif\" editor_component=\"multimedia_link\" multimedia_src=\""+url+"\" width=\""+width+"\" height=\""+height+"\" wmode=\""+wmode+"\" style=\"display:block;width:"+width+"px;height:"+height+"px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;\" auto_start=\""+auto_start+"\" alt=\""+caption+"\" />";
opener.editorFocus(opener.editorPrevSrl);

7
modules/editor/components/poll_maker/tpl/popup.html
View file

@ -61,9 +61,6 @@
</select>
</td>
</tr>
<tr>
<th scope="row"><div><label>{$lang->poll_chk_count}</label></div></th>
<td><input type="text" name="checkcount_tidx" value="1" size="1" class="inputTypeText" /></td>
</table>
<div id="poll_source" class="clear" style="display:none">
@ -72,6 +69,10 @@
<table cellspacing="0" class="rowTable gap1">
<col width="100" />
<col />
<tr>
<th scope="row"><div><label>{$lang->poll_chk_count}</label></div></th>
<td><input type="text" name="checkcount_tidx" value="1" size="1" class="inputTypeText" /></td>
</tr>
<tr>
<th scope="row"><div>{$lang->poll_title}</div></th>
<td><input type="text" name="title_tidx" class="inputTypeText w400" /></td>

2
modules/editor/components/poll_maker/tpl/popup.js
View file

@ -39,7 +39,7 @@ function completeInsertPoll(ret_obj) {
var poll_srl = ret_obj["poll_srl"];
if(!poll_srl) return null;
var text = "<img src=\"./common/tpl/images/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" skin=\""+skin+"\" style=\"width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\" />";
var text = "<img src=\"../../../../common/tpl/images/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" skin=\""+skin+"\" style=\"width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\" />";
alert(ret_obj['message']);

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

@ -228,6 +228,6 @@
$lang->edit->confirm_submit_without_saving = '有內容尚未儲存。\\n是否要繼續進行?';
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
$lang->edit->image_align = '圖片對齊';
$lang->edit->attached_files = '附加檔案';
?>

2
modules/editor/skins/xpresseditor/css/default.css
View file

@ -44,7 +44,7 @@
.xpress-editor .input_area textarea{ *margin:0 -10px; _margin-bottom:-2px;}
.xpress-editor .input_area textarea.blind{ display:none;}
.xpress-editor .input_control{ position:relative; display:block; width:100%; clear:both; text-align:center; background:#fbfbfb url(../img/btn_expand.gif) no-repeat center center; cursor:n-resize;}
.xpress-editor .input_control span{ display:block; height:10px; border-top:1px solid #dfdfdf; visibility:visible; font-size:0; line-height:200%; white-space:nowrap; color:#fff;}
.xpress-editor .input_control span{ display:block; height:10px; visibility:hidden; overflow:visible; font-size:0; line-height:200%; white-space:nowrap; color:#fff;}
.xpress-editor.black .input_control { background:#111 url(../img/btn_expand.black.gif) no-repeat center center;}
.xpress-editor.black .input_control span{ border-top:1px solid #333; color:#000;}

4
modules/editor/tpl/js/editor_common.js
View file

@ -38,7 +38,7 @@ function editorEnableAutoSave(fo_obj, editor_sequence) {
var title = fo_obj.title.value;
var content = editorRelKeys[editor_sequence]['content'].value;
editorAutoSaveObj = {"fo_obj":fo_obj, "editor_sequence":editor_sequence, "title":title, "content":content, locked:false};
setTimeout(_editorAutoSave, 50000);
setTimeout('_editorAutoSave()', 50000);
}
// ajax를 이용하여 editor.procEditorSaveDoc 호출하여 자동 저장시킴 exe는 강제 코드
@ -84,7 +84,7 @@ function _editorAutoSave(exe) {
}
// 50초마다 동기화를 시킴 강제 실행은 제외
if(!exe) setTimeout(_editorAutoSave, 50000);
if(!exe) setTimeout('_editorAutoSave()', 50000);
}
// 자동저장된 모든 메세지를 삭제하는 루틴

8
modules/importer/ttimport.class.php
View file

@ -117,6 +117,7 @@
$author_xml_id = $xmlDoc->post->author->body;
if($xmlDoc->post->category->body) {
$tmp_arr = explode('/',$xmlDoc->post->category->body);
$category = trim($tmp_arr[count($tmp_arr)-1]);
@ -218,6 +219,13 @@
}
}
if($module_name =='textyle'){
// 발행이 아닌 것들은 저장상태로
if($xmlDoc->post->visibility->body != 'syndicated'){
$obj->module_srl = $member_info->member_srl;
}
}
// 문서 입력
$output = executeQuery('document.insertDocument', $obj);

1
modules/member/skins/default/modify_info.html
View file

@ -27,6 +27,7 @@
<form id="fo_insert_member" action="{getUrl()}" method="post" onsubmit="return procFilter(this, modify_info)" <!--@if($member_config->profile_image == 'Y' || $member_config->image_name=='Y' || $member_config->image_mark=='Y')-->enctype="multipart/form-data"<!--@end--> target="tmp_upload_iframe">
<input type="hidden" name="act" value="" />
<input type="hidden" name="module" value="member" />
<input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
<input type="hidden" name="signature" value="{htmlspecialchars($member_info->signature)}" />
<input type="hidden" name="page" value="{$page}" />

6
modules/module/queries/updateModule.xml
View file

@ -10,12 +10,12 @@
<column name="menu_srl" var="menu_srl" filter="number" />
<column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40"/>
<column name="browser_title" var="browser_title" notnull="notnull" minlength="1" maxlength="250" />
<column name="description" var="description" />
<column name="description" var="description" default="" />
<column name="is_default" var="is_default" default="N" notnull="notnull" />
<column name="content" var="content" />
<column name="open_rss" var="open_rss" default="Y" notnull="notnull" />
<column name="header_text" var="header_text" />
<column name="footer_text" var="footer_text" />
<column name="header_text" var="header_text" default="" />
<column name="footer_text" var="footer_text" default="" />
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" default="0" filter="number" notnull="notnull" />

2
modules/trackback/queries/getTrackbackCount.xml
View file

@ -6,7 +6,7 @@
<column name="count(*)" alias="count" />
</columns>
<conditions>
<condition operation="equal" column="document_srl" var="document_srl" filter="number" default="0" />
<condition operation="equal" column="document_srl" var="document_srl" filter="number" />
<condition operation="equal" column="module_srl" var="module_srl" filter="number" pipe="and" />
</conditions>
</query>

13
modules/widget/tpl/js/widget.js
View file

@ -235,9 +235,16 @@ function doSyncPageContent() {
var obj = sel_obj.firstChild;
while(obj && obj.className != "widgetContent") obj = obj.nextSibling;
if(obj && obj.className == "widgetContent") {
if(!fo_obj.content.value) {
var content = Base64.decode(xInnerHtml(obj));
xGetElementById("content_fo").content.value = content;
if(!fo_obj.document_srl || fo_obj.document_srl.value == 0) {
try {
var content = Base64.decode(xInnerHtml(obj));
content = editorReplacePath(content);
xGetElementById("content_fo").content.value = content;
xe.Editors["1"].exec("SET_IR", [content]);
}
catch(e)
{
}
}
}
}

14
widgets/content/conf/info.xml
View file

@ -4,13 +4,13 @@
<title xml:lang="en">Content</title>
<title xml:lang="vi">Nội dung</title>
<title xml:lang="zh-CN">全局内容控件</title>
<title xml:lang="zh-TW">內容組件</title>
<title xml:lang="zh-TW">內容</title>
<title xml:lang="jp">コンテンツウィジェット</title>
<description xml:lang="ko">게시판, 코멘트, 첨부파일 등 Content를 출력하는 위젯입니다.</description>
<description xml:lang="en">This widget displays Content such as articles, comments, or attached files.</description>
<description xml:lang="vi">Widget này sẽ hiển thị những bài viết, bình luận, File đính kèm.</description>
<description xml:lang="zh-CN">以各种样式显示主题，评论，附件等站内内容的全局控件。</description>
<description xml:lang="zh-TW">是種可輸出討論板、評論，附加檔案等內容的組件。</description>
<description xml:lang="zh-TW">這個 Widget 可輸出討論板、評論，附加檔案等內容。</description>
<description xml:lang="jp">掲示板の書き込み、コメント、添付ファイルなどコンテンツを出力するウィジェットです。</description>
<version>0.1</version>
<date>2009-03-16</date>
@ -675,13 +675,13 @@
<name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
<description xml:lang="ko">피드 주소는 타입이 지원하는 문서 형식일 경우에만 등록 됩니다.
(지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
<description xml:lang="zh-CN">请输入RSS格式地址。
<description xml:lang="zh-CN">请输入RSS格式地址。
(支持文档格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
<description xml:lang="vi">Chỉ hỗ trợ những định dạng được dăng kí. (RSS 2.0 RSS 1.0 ATOM 1.0).</description>
<description xml:lang="jp">RSS URLはタイプが RSSの時だけ登録出来ます。
(サポートする文書形式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
<description xml:lang="zh-TW">피드 주소는 타입이 지원하는 문서 형식일 경우에만 등록 됩니다.
(지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
<description xml:lang="zh-TW">請輸入 RSS 位址。
(支援檔案格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
</var>
<var id="rss_url1">
<type>text</type>
@ -731,14 +731,14 @@
<name xml:lang="en">HTML Display Type</name>
<name xml:lang="vi">Hiển thị kiểu HTML</name>
<name xml:lang="ru">HTML 출력 방식</name>
<name xml:lang="zh-TW">HTML 출력 방식</name>
<name xml:lang="zh-TW">HTML 樣式選擇</name>
<description xml:lang="ko">TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)</description>
<description xml:lang="jp">TABLE(表)タグとUL(リスト型)タグを選択して表示します。(デフォールトはTABLE)</description>
<description xml:lang="zh-CN">TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)</description>
<description xml:lang="en">You can choose TABLE tag or UL tag to display. (default is TABLE)</description>
<description xml:lang="vi">Bạn có thể chọn Table Tag hay UL Tag để hiển thị. (Mặc định là Table)</description>
<description xml:lang="ru">TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)</description>
<description xml:lang="zh-TW">TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)</description>
<description xml:lang="zh-TW">可選擇 TABLE(表格) 或 UL(列表) 樣式。(預設是 TABLE 樣式)</description>
<options>
<value>table</value>
<name xml:lang="ko">Table</name>

2
widgets/content/content.class.php
View file

@ -633,7 +633,7 @@
$widget_info->subject_cut_size = $args->subject_cut_size;
$widget_info->content_cut_size = $args->content_cut_size;
$widget_info->duration_new = $duration_new * 60*60;
$widget_info->duration_new = $args->duration_new * 60*60;
$widget_info->thumbnail_type = $args->thumbnail_type;
$widget_info->thumbnail_width = $args->thumbnail_width;
$widget_info->thumbnail_height = $args->thumbnail_height;

6
widgets/content/skins/default/skin.xml
View file

@ -3,7 +3,7 @@
<title xml:lang="ko">Content 위젯 기본 스킨</title>
<title xml:lang="vi">Skin mặc định Widget Nội dung</title>
<title xml:lang="zh-CN">全局内容控件默认皮肤</title>
<title xml:lang="zh-TW">内容組件預設面板</title>
<title xml:lang="zh-TW">内容預設面板</title>
<title xml:lang="jp">コンテンツウィジェットのデフォルトスキン</title>
<description xml:lang="ko">Content 위젯 기본 스킨 입니다.
Html/Publish: 정찬명
@ -20,7 +20,7 @@
Design : mada
Programming : SOL
</description>
<description xml:lang="zh-TW">内容控件預設面板。
<description xml:lang="zh-TW">内容預設面板。
Html/Publish: Chan-Myung Jeong
Design : mada
Programming : SOL
@ -58,7 +58,7 @@
<title xml:lang="zh-CN">暗色背景</title>
<title xml:lang="en">Dark Background</title>
<title xml:lang="vi">Nền tối</title>
<title xml:lang="zh-TW">暗色背景</title>
<title xml:lang="zh-TW">黑色背景</title>
</color>
</colorset>
</skin>