fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-02 08:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

converter() 로 변경 및 개선

Browse source
This commit is contained in:
conory 2017-07-14 16:17:26 +09:00
parent 146975f277
commit 35646700fe
6 changed files with 63 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -438,7 +438,7 @@ class commentController extends comment
// if use editor of nohtml, Remove HTML tags from the contents.
if(!$manual_inserted)
{
$obj->content = getModel('editor')->convertHTML($obj);
$obj->content = getModel('editor')->converter($obj, 'comment');
}
if(!$obj->regdate)
@ -788,7 +788,7 @@ class commentController extends comment
// if use editor of nohtml, Remove HTML tags from the contents.
if(!$manual_updated)
{
$obj->content = getModel('editor')->convertHTML($obj);
$obj->content = getModel('editor')->converter($obj, 'comment');
}
// remove iframe and script if not a top administrator on the session

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

@ -457,7 +457,7 @@ class documentController extends document
// if use editor of nohtml, Remove HTML tags from the contents.
if(!$manual_inserted)
{
$obj->content = getModel('editor')->convertHTML($obj);
$obj->content = getModel('editor')->converter($obj, 'document');
}
// Remove iframe and script if not a top adminisrator in the session.
@ -695,7 +695,7 @@ class documentController extends document
// if use editor of nohtml, Remove HTML tags from the contents.
if(!$manual_updated)
{
$obj->content = getModel('editor')->convertHTML($obj);
$obj->content = getModel('editor')->converter($obj, 'document');
}
// Change not extra vars but language code of the original document if document's lang_code is different from author's setting.

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

@ -891,61 +891,84 @@ class editorModel extends editor
* @param object $obj
* @return string
*/
function convertHTML($obj)
function converter($obj, $type = null)
{
$type = array();
$converter = array();
$add_converters = array();
$config = $this->getEditorConfig($obj->module_srl);
if($obj->module_srl)
// Get editor skin
if (in_array($type, array('document', 'comment')))
{
$converter = array();
$skin = $config->editor_skin;
$skin = ($type == 'comment') ? $config->comment_editor_skin : $config->editor_skin;
}
else
{
$converter = array($obj->converter);
$add_converters[] = $obj->converter;
$skin = $obj->editor_skin ?: $config->editor_skin;
}
$converter = array_merge($converter, explode(',', $this->getSkinConfig($skin)->converter));
// Get converter from skin
$add_converters[] = $this->getSkinConfig($skin)->converter;
// Add converter
foreach($add_converter as $name)
{
if(!$name)
{
continue;
}
if (is_array($name))
{
$converter = array_merge($converter, $name);
}
else
{
$converter[] = $name;
}
}
// Check
if (in_array('text', $converter) || $config->allow_html === 'N' || $obj->use_html === 'N')
if ($config->allow_html === 'N' || $obj->use_html === 'N')
{
$type[] = 'to_Text';
$converter[] = 'Text';
}
elseif (strpos($obj->title ? $config->sel_editor_colorset : $config->sel_comment_editor_colorset, 'nohtml') !== false)
elseif (strpos($type == 'comment' ? $config->sel_comment_editor_colorset : $config->sel_editor_colorset, 'nohtml') !== false)
{
$type[] = 'to_Text';
$converter[] = 'Text';
}
if (!is_html_content($obj->content) || in_array('to_Text', $type) || $obj->use_editor === 'N')
if (!is_html_content($obj->content) || $obj->use_editor === 'N')
{
$type[] = 'to_HTML';
}
if (in_array('markdown', $converter))
{
$type[] = 'Markdown2HTML';
$converter[] = 'default';
}
// Convert
if ($type)
if ($converter)
{
if (in_array('to_Text', $type))
// To Text
if (in_array('Text', $converter))
{
$obj->content = escape(strip_tags($obj->content), false);
}
if (in_array('to_HTML', $type))
// To HTML
if (in_array('Text2HTML', $converter))
{
$obj->content = nl2br($obj->content);
$obj->content = Rhymix\Framework\Formatter::text2html($obj->content);
}
if (in_array('Markdown2HTML', $type))
elseif (in_array('Markdown2HTML', $converter))
{
$obj->content = Rhymix\Framework\Formatter::markdown2html($obj->content);
}
elseif (in_array('Bbcode2HTML', $converter))
{
$obj->content = Rhymix\Framework\Formatter::bbcode($obj->content);
}
else
{
$obj->content = nl2br($obj->content);
}
}
return $obj->content;

2
modules/editor/skins/textarea/skin.xml
View file

@ -13,6 +13,6 @@
</color>
</colorset>
<extra_vars>
<var name="converter" value="text"></var>
<var name="converter" value="Text"></var>
</extra_vars>
</skin>

13
modules/member/member.controller.php
View file

@ -1624,13 +1624,16 @@ class memberController extends member
return;
}
if(getModel('member')->getMemberConfig()->signature_html == 'N')
// Editor converter
$obj = new stdClass;
$config = getModel('member')->getMemberConfig();
if($config->signature_html == 'N')
{
$obj = new stdClass;
$obj->use_html = 'N';
$obj->content = $signature;
$signature = getModel('editor')->convertHTML($obj);
$obj->converter = 'Text';
}
$obj->content = $signature;
$obj->editor_skin = $config->signature_editor_skin;
$signature = getModel('editor')->converter($obj);
$filename = sprintf('files/member_extra_info/signature/%s%d.signature.php', getNumberingPath($member_srl), $member_srl);
$buff = sprintf('<?php if(!defined("__XE__")) exit();?>%s', $signature);

4
modules/module/module.model.php
View file

@ -1218,9 +1218,9 @@ class moduleModel extends module
$obj->value = $val->attrs->value;
$obj->default = $val->attrs->default;
if(strpos($obj->value, '|@|') !== false)
if(preg_match('/,|\|@\|/', $obj->value, $delimiter) && $delimiter[0])
{
$obj->value = explode('|@|', $obj->value);
$obj->value = explode($delimiter[0], $obj->value);
}
if($obj->type == 'mid_list' && !is_array($obj->value))
{