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

convertHTML() 로 변경

Browse source
This commit is contained in:
conory 2017-07-13 11:15:12 +09:00
parent da0ad3bd39
commit 820c725d69
5 changed files with 44 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/comment/comment.controller.php
View file

@ -438,9 +438,9 @@ class commentController extends comment
// if use editor of nohtml, Remove HTML tags from the contents. // if use editor of nohtml, Remove HTML tags from the contents.
if(!$manual_inserted) if(!$manual_inserted)
{ {
$obj->content = $oCommentModel->filterHtml($obj); $obj->content = getModel('editor')->convertHTML($obj);
} }
if(!$obj->regdate) if(!$obj->regdate)
{ {
$obj->regdate = date("YmdHis"); $obj->regdate = date("YmdHis");
@ -784,13 +784,13 @@ class commentController extends comment
{ {
return new Object(-1, 'msg_empty_content'); return new Object(-1, 'msg_empty_content');
} }
// if use editor of nohtml, Remove HTML tags from the contents. // if use editor of nohtml, Remove HTML tags from the contents.
if(!$manual_updated) if(!$manual_updated)
{ {
$obj->content = $oCommentModel->filterHtml($obj); $obj->content = getModel('editor')->convertHTML($obj);
} }
// remove iframe and script if not a top administrator on the session // remove iframe and script if not a top administrator on the session
if($logged_info->is_admin != 'Y') if($logged_info->is_admin != 'Y')
{ {

36
modules/comment/comment.model.php
View file

@ -952,42 +952,6 @@ class commentModel extends comment
return $comment_config; return $comment_config;
} }
/**
* 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_comment_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;
}
/** /**
* Return a list of voting member * Return a list of voting member
* @return void * @return void

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

@ -457,9 +457,9 @@ class documentController extends document
// if use editor of nohtml, Remove HTML tags from the contents. // if use editor of nohtml, Remove HTML tags from the contents.
if(!$manual_inserted) if(!$manual_inserted)
{ {
$obj->content = $oDocumentModel->filterHtml($obj); $obj->content = getModel('editor')->convertHTML($obj);
} }
// Remove iframe and script if not a top adminisrator in the session. // Remove iframe and script if not a top adminisrator in the session.
if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content); if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
// An error appears if both log-in info and user name don't exist. // An error appears if both log-in info and user name don't exist.
@ -695,7 +695,7 @@ class documentController extends document
// if use editor of nohtml, Remove HTML tags from the contents. // if use editor of nohtml, Remove HTML tags from the contents.
if(!$manual_updated) if(!$manual_updated)
{ {
$obj->content = $oDocumentModel->filterHtml($obj); $obj->content = getModel('editor')->convertHTML($obj);
} }
// Change not extra vars but language code of the original document if document's lang_code is different from author's setting. // Change not extra vars but language code of the original document if document's lang_code is different from author's setting.

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

@ -1247,42 +1247,6 @@ class documentModel extends document
else return $lang->status_name_list; 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 * Setting sort index
* @param object $obj * @param object $obj

36
modules/editor/editor.model.php
View file

@ -869,6 +869,42 @@ class editorModel extends editor
return $component_info; return $component_info;
} }
/**
* Return converted content
* @param object $obj
* @return string
*/
function convertHTML($obj)
{
$no_html = false;
$editor_config = $this->getEditorConfig($obj->module_srl);
if ($editor_config->allow_html === 'N')
{
$no_html = true;
}
elseif (strpos($obj->title ? $editor_config->sel_editor_colorset : $editor_config->sel_comment_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;
}
} }
/* End of file editor.model.php */ /* End of file editor.model.php */
/* Location: ./modules/editor/editor.model.php */ /* Location: ./modules/editor/editor.model.php */