git-svn-id: http://xe-core.googlecode.com/svn/trunk@572 201d5d3c-b55e-5fd7-737f-ddc643e51545

This commit is contained in:
zero 2007-03-20 08:25:14 +00:00
parent 0f62d5b189
commit ba7c2e3b02
2 changed files with 7 additions and 4 deletions

View file

@ -678,10 +678,10 @@
$content = preg_replace_callback('!<(div|img)([^\>]*)editor_component=([^\>]*?)>!is', array($this,'_transEditorComponent'), $content); $content = preg_replace_callback('!<(div|img)([^\>]*)editor_component=([^\>]*?)>!is', array($this,'_transEditorComponent'), $content);
// <br> 코드 변환 // <br> 코드 변환
$content = str_replace(array("<BR>","<br>","<Br>"),"<br />", $content); $content = preg_replace('/<br([^>]*)>/i','<br$1/>', $content);
// <img ...> 코드를 <img ... /> 코드로 변환 // <img ...> 코드를 <img ... /> 코드로 변환
$content = preg_replace('!<img(.*?)(\/){0,1}>!is','<img\\1 />', $content); $content = preg_replace('/<img([^>^\/]*)(\/>|>)/i','<img$1 />', $content);
return $content; return $content;
} }

View file

@ -92,10 +92,13 @@
} }
$style .= "display:none;"; $style .= "display:none;";
$output .= sprintf('<div id="folder_open_%s" style="margin:%spx;display:block;"><a class="%s" href="#" onclick="zbxe_folder_open(\'%s\');return false;">%s</a></div>', $folder_id, $margin, $class, $folder_id, $folder_opener);
$output .= sprintf('<div id="folder_close_%s" style="margin:%spx;display:none;"><a class="%s" href="#" onclick="zbxe_folder_close(\'%s\');return false;">%s</a></div>', $folder_id, $margin, $class, $folder_id, $folder_closer); $folder_margin = sprintf("%spx %spx %spx %spx", $margin, $margin, 10, $margin);
$output .= sprintf('<div id="folder_open_%s" style="margin:%s;display:block;"><a class="%s" href="#" onclick="zbxe_folder_open(\'%s\');return false;">%s</a></div>', $folder_id, $folder_margin, $class, $folder_id, $folder_opener);
$output .= sprintf('<div id="folder_close_%s" style="margin:%s;display:none;"><a class="%s" href="#" onclick="zbxe_folder_close(\'%s\');return false;">%s</a></div>', $folder_id, $folder_margin, $class, $folder_id, $folder_closer);
$output .= sprintf('<div style="%s" id="folder_%s">', $style, $folder_id); $output .= sprintf('<div style="%s" id="folder_%s">', $style, $folder_id);
debugPrint($output);
} else { } else {
$output .= sprintf('<div style="%s">', $style); $output .= sprintf('<div style="%s">', $style);
} }