diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index c2c6c5456..0234313a9 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -133,23 +133,23 @@ if(!$url_info['port']) $url_info['port'] = 80; - $fp = fsockopen($url_info['host'], $url_info['port']); + $fp = @fsockopen($url_info['host'], $url_info['port']); if(!$fp) return; $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); - $ft = fopen($target_filename, 'w'); + $ft = @fopen($target_filename, 'w'); if(!$ft) return; $begin = false; while(!feof($fp)) { $str = fgets($fp, 1024); - if($begin) fwrite($ft, $str); + if($begin) @fwrite($ft, $str); if(!trim($str)) $begin = true; } - fclose($ft); - fclose($fp); + @fclose($ft); + @fclose($fp); return true; } diff --git a/modules/document/queries/insertDocument.xml b/modules/document/queries/insertDocument.xml index fe2660d53..f9a4ee7cb 100644 --- a/modules/document/queries/insertDocument.xml +++ b/modules/document/queries/insertDocument.xml @@ -12,8 +12,8 @@ - - + + diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index 823d33375..c98fa9357 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -1,4 +1,5 @@ +
@@ -6,14 +7,15 @@ {$lang->page_count} : {number_format($page)} / {number_format($total_page)}
-
+
- + + diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js new file mode 100644 index 000000000..92eff1785 --- /dev/null +++ b/modules/document/tpl/js/document_admin.js @@ -0,0 +1,6 @@ +function doCheckAll() { + var fo_obj = xGetElementById('fo_list'); + for(var i=0;i +
@@ -6,14 +7,15 @@ {$lang->page_count} : {number_format($page)} / {number_format($total_page)}
- +
{$lang->no}{$lang->no} {$lang->module} {$lang->title} {$lang->user_name}
- + + diff --git a/modules/file/tpl/js/file_admin.js b/modules/file/tpl/js/file_admin.js new file mode 100644 index 000000000..92eff1785 --- /dev/null +++ b/modules/file/tpl/js/file_admin.js @@ -0,0 +1,6 @@ +function doCheckAll() { + var fo_obj = xGetElementById('fo_list'); + for(var i=0;imodule_srl = Context::get('module_srl'); @@ -110,8 +110,8 @@ $this->oXml = new XmlParser(); // module_srl이 있으면 module데이터로 판단하여 처리, 아니면 회원정보로.. - if($this->module_srl) $this->importDocument($xml_file); - else $this->importMember($xml_file); + if($this->module_srl) $is_finished = $this->importDocument($xml_file); + else $is_finished = $this->importMember($xml_file); if($this->position+$this->limit_count > $this->imported_count) { $this->add('is_finished', 'Y'); @@ -131,6 +131,8 @@ $this->oMemberController = &getController('member'); + $is_finished = true; + $fp = @fopen($xml_file, "r"); if($fp) { $buff = ''; @@ -140,10 +142,15 @@ $buff = preg_replace_callback("!(.*?)<\/member>!is", array($this, '_importMember'), trim($buff)); - if($this->position+$this->limit_count <= $this->imported_count) break; + if($this->position+$this->limit_count <= $this->imported_count) { + $is_finished = false; + break; + } } fclose($fp); } + + return $is_finished; } function _importMember($matches) { @@ -201,6 +208,8 @@ $this->oCommentController = &getController('comment'); $this->oTrackbackController = &getController('trackback'); + $is_finished = true; + $fp = @fopen($xml_file, "r"); if($fp) { $buff = ''; @@ -210,10 +219,15 @@ flush(); $buff = preg_replace_callback("!(.*?)<\/document>!is", array($this, '_importDocument'), trim($buff)); - if($this->position+$this->limit_count <= $this->imported_count) break; + if($this->position+$this->limit_count <= $this->imported_count) { + $is_finished = false; + break; + } } fclose($fp); } + + return $is_finished; } function _importDocument($matches) {
{$lang->no}{$lang->no} {$lang->module} {$lang->file_name} {$lang->file_size}