fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-28 23:03:25 +09:00
Code Issues Projects Releases Packages Wiki Activity

에디터 모듈에 HTML 허용 설정 추가

Browse source 
회원 모듈에도 no html 서명을 위한 옵션 추가
This commit is contained in:
conory 2017-07-13 00:46:28 +09:00
parent f7915f8204
commit da0ad3bd39
20 changed files with 179 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

48
modules/document/document.controller.php
View file

@ -457,28 +457,7 @@ class documentController extends document
// if use editor of nohtml, Remove HTML tags from the contents.
if(!$manual_inserted)
{
$editor_config = getModel('editor')->getEditorConfig($obj->module_srl);
if (strpos($editor_config->sel_editor_colorset, 'nohtml') !== false)
{
$is_html_content = false;
}
elseif ($obj->use_editor === 'Y' || $obj->use_html === 'Y')
{
$is_html_content = true;
}
elseif ($obj->use_editor === 'N' || $obj->use_html === 'N')
{
$is_html_content = false;
}
else
{
$is_html_content = is_html_content($obj->content);
}
if (!$is_html_content)
{
$obj->content = nl2br($obj->use_html === 'Y' ? $obj->content : escape($obj->content, false));
}
$obj->content = $oDocumentModel->filterHtml($obj);
}
// Remove iframe and script if not a top adminisrator in the session.
@ -716,30 +695,9 @@ class documentController extends document
// if use editor of nohtml, Remove HTML tags from the contents.
if(!$manual_updated)
{
$editor_config = getModel('editor')->getEditorConfig($obj->module_srl);
if (strpos($editor_config->sel_editor_colorset, 'nohtml') !== false)
{
$is_html_content = false;
}
elseif ($obj->use_editor === 'Y' || $obj->use_html === 'Y')
{
$is_html_content = true;
}
elseif ($obj->use_editor === 'N' || $obj->use_html === 'N')
{
$is_html_content = false;
}
else
{
$is_html_content = is_html_content($obj->content);
}
if (!$is_html_content)
{
$obj->content = nl2br($obj->use_html === 'Y' ? $obj->content : escape($obj->content, false));
}
$obj->content = $oDocumentModel->filterHtml($obj);
}
// Change not extra vars but language code of the original document if document's lang_code is different from author's setting.
if($source_obj->get('lang_code') != Context::getLangType())
{

38
modules/document/document.model.php
View file

@ -1246,7 +1246,43 @@ class documentModel extends document
return array_flip($this->getStatusList());
else return $lang->status_name_list;
}
/**
* Return filtered content
* @param object $obj
* @return string
*/
function filterHtml($obj)
{
$no_html = false;
$editor_config = getModel('editor')->getEditorConfig($obj->module_srl);
if ($editor_config->allow_html === 'N')
{
$no_html = true;
}
elseif (strpos($editor_config->sel_editor_colorset, 'nohtml') !== false)
{
$no_html = true;
}
elseif ($obj->use_html === 'N')
{
$no_html = true;
}
if ($no_html || $obj->use_editor === 'N' || !is_html_content($obj->content))
{
if ($no_html)
{
$obj->content = escape(strip_tags($obj->content), false);
}
$obj->content = nl2br($obj->content);
}
return $obj->content;
}
/**
* Setting sort index
* @param object $obj