mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-25 22:29:55 +09:00
제로보드4, zb5beta xml데이터를 import시에 log보이는 부분 정리 및 첨부파일 받는 부분의 오류 수정 (url에 공백이 있을 경우 받지 못했음)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@1915 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
149cabe68b
commit
9d8feacbf0
5 changed files with 14 additions and 1 deletions
|
|
@ -137,6 +137,7 @@
|
||||||
$fp = @fsockopen($url_info['host'], $url_info['port']);
|
$fp = @fsockopen($url_info['host'], $url_info['port']);
|
||||||
if(!$fp) return;
|
if(!$fp) return;
|
||||||
|
|
||||||
|
$url_info['path'] = str_replace(' ','%20',$url_info['path']);
|
||||||
$header = sprintf("GET %s HTTP/1.0\r\nHost: %s\r\nReferer: %s://%s\r\n\r\n", $url_info['path'], $url_info['host'], $url_info['scheme'], $url_info['host']);
|
$header = sprintf("GET %s HTTP/1.0\r\nHost: %s\r\nReferer: %s://%s\r\n\r\n", $url_info['path'], $url_info['host'], $url_info['scheme'], $url_info['host']);
|
||||||
@fwrite($fp, $header);
|
@fwrite($fp, $header);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -127,6 +127,7 @@
|
||||||
|
|
||||||
$message = sprintf(Context::getLang('msg_importing'), $this->total_count, $this->imported_count);
|
$message = sprintf(Context::getLang('msg_importing'), $this->total_count, $this->imported_count);
|
||||||
if($this->msg) $message .= "<br />".$this->msg;
|
if($this->msg) $message .= "<br />".$this->msg;
|
||||||
|
$message .= "<br />";
|
||||||
$this->setMessage( $message );
|
$this->setMessage( $message );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
3
modules/importer/tpl/css/importer.css
Normal file
3
modules/importer/tpl/css/importer.css
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
@charset "utf-8";
|
||||||
|
|
||||||
|
#step2_position { height:150px; overflow-y:scroll; border:2px solid #DDDDDD; }
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
<!--%import("js/importer_admin.js")-->
|
<!--%import("js/importer_admin.js")-->
|
||||||
|
<!--%import("css/importer.js")-->
|
||||||
<!--%import("filter/step1.xml")-->
|
<!--%import("filter/step1.xml")-->
|
||||||
<!--%import("filter/step12.xml")-->
|
<!--%import("filter/step12.xml")-->
|
||||||
<!--%import("filter/import_xml.xml")-->
|
<!--%import("filter/import_xml.xml")-->
|
||||||
|
|
|
||||||
|
|
@ -95,8 +95,15 @@ function completeImport(ret_obj) {
|
||||||
var fo_obj = xGetElementById('fo_step2');
|
var fo_obj = xGetElementById('fo_step2');
|
||||||
fo_obj.position.value = position;
|
fo_obj.position.value = position;
|
||||||
message = message.replace(/</g,"<").replace(/>/g,">");
|
message = message.replace(/</g,"<").replace(/>/g,">");
|
||||||
xInnerHtml('step2_position', xInnerHtml('step2_position')+"<br />"+message);
|
|
||||||
|
var obj = xGetElementById('step2_position');
|
||||||
|
var txt = xInnerHtml(obj);
|
||||||
|
if(txt.length > 1024*256) txt = '';
|
||||||
|
xInnerHtml(obj, txt+message);
|
||||||
|
obj.scrollTop += xHeight(obj);
|
||||||
procFilter(fo_obj, import_xml);
|
procFilter(fo_obj, import_xml);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue