mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

Case cleanup toHtml() should be toHTML()

Browse Source
This commit is contained in:
Cameron
2019-02-26 12:22:36 -08:00
parent beb1734681
commit 1dbc90143f
64 changed files with 147 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/admin.php
View File

@@ -701,7 +701,7 @@ TMPO;
if (isset($potential))
{
//$text = ADLAN_ERR_3."<br /><br />";
$mes->addWarning($tp->toHtml(ADLAN_ERR_3, true));
$mes->addWarning($tp->toHTML(ADLAN_ERR_3, true));
$text = '<ul>';
foreach ($potential as $p_file)
{

2
e107_admin/admin_log.php
View File

@@ -626,7 +626,7 @@ class admin_log_form_ui extends e_admin_form_ui
case 'read': // List Page
$text = preg_replace_callback("#\[!(\w+?)(=.+?){0,1}!]#", 'log_process', $curVal);
$text = $tp->toHtml($text,false,'E_BODY');
$text = $tp->toHTML($text,false,'E_BODY');
if(strpos($text,'Array')!==false || strlen($text)>300)
{

6
e107_admin/cron.php
View File

@@ -443,7 +443,7 @@ class cron_admin_ui extends e_admin_ui
if (method_exists($obj, $method_name))
{
$message = str_replace('[x]', $class_name." : ".$method_name, LAN_CRON_62);//Executing config function [b][x][/b]
$message = e107::getParser()->toHtml($message,true);
$message = e107::getParser()->toHTML($message,true);
$mes->add($message, E_MESSAGE_DEBUG);
if ($return == 'boolean')
{
@@ -458,7 +458,7 @@ class cron_admin_ui extends e_admin_ui
else
{
$message = str_replace('[x]', $method_name."()", LAN_CRON_63 );//Config function [b][x][/b] NOT found.
$message = e107::getParser()->toHtml($message,true);
$message = e107::getParser()->toHTML($message,true);
$mes->add($message, E_MESSAGE_DEBUG);
}
}
@@ -861,7 +861,7 @@ class cron
{
if ($func['function'] == $method)
{
return $tp->toHtml($func['name']);
return $tp->toHTML($func['name']);
}
}
}

4
e107_admin/db.php
View File

@@ -761,7 +761,7 @@ class system_tools
$message .= '<li>'.DBLAN_88.'</li>';
$message .= '</ul>';
$mes->add($tp->toHtml($message,true), E_MESSAGE_WARNING);
$mes->add($tp->toHTML($message,true), E_MESSAGE_WARNING);
$text .= "
<form method='post' action='".e_SELF."' id='linkform'>
@@ -1601,7 +1601,7 @@ class system_tools
$text .= "
<tr>
<td>".$tp->toHtml($row['plugin_name'], FALSE, "defs,emotes_off")."</td>
<td>".$tp->toHTML($row['plugin_name'], FALSE, "defs,emotes_off")."</td>
<td>".$row['plugin_path']."</td>
<td>";

2
e107_admin/eurl.php
View File

@@ -748,7 +748,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4>'.$tp->toHtml($title,false,'TITLE').'</h4>
<h4>'.$tp->toHTML($title,false,'TITLE').'</h4>
</div>
<div class="modal-body">
<p>';

2
e107_admin/links.php
View File

@@ -613,7 +613,7 @@ class links_admin_form_ui extends e_admin_form_ui
{
$newkey .= "(".$val['parm'].")";
}
$func[$newkey] = $tp->toHtml($val['name'],'','TITLE');
$func[$newkey] = $tp->toHTML($val['name'],'','TITLE');
}
$this->linkFunctions[$cat] = $func;
}

4
e107_admin/menus.php
View File

@@ -1496,12 +1496,12 @@ class e_layout
$checked = ($listtype == 1) ? " checked='checked' " : "";
$text .= $frm->radio('listtype', 1, $checked, array('label'=> $tp->toHtml(MENLAN_26,true), 'class'=> 'e-save'));
$text .= $frm->radio('listtype', 1, $checked, array('label'=> $tp->toHTML(MENLAN_26,true), 'class'=> 'e-save'));
$text .= "<br />";
// $text .= "<input type='radio' class='e-save' {$checked} name='listtype' value='1' /> ".MENLAN_26."<br />";
$checked = ($listtype == 2) ? " checked='checked' " : "";
$text .= $frm->radio('listtype', 2, $checked, array('label'=> $tp->toHtml(MENLAN_27,true), 'class'=> 'e-save'));
$text .= $frm->radio('listtype', 2, $checked, array('label'=> $tp->toHTML(MENLAN_27,true), 'class'=> 'e-save'));
// $text .= "<input type='radio' class='e-save' {$checked} name='listtype' value='2' /> ".MENLAN_27."<br />";

2
e107_admin/newspost.php
View File

@@ -321,7 +321,7 @@ class news_sub_form_ui extends e_admin_form_ui
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4>'.$tp->toHtml($submitnews_title,false,'TITLE').'</h4>
<h4>'.$tp->toHTML($submitnews_title,false,'TITLE').'</h4>
</div>
<div class="submitnews modal-body">
<p>';

12
e107_admin/plugin.php
View File

@@ -732,7 +732,7 @@ class plugin_ui extends e_admin_ui
$text = "
<form action='".e_SELF."?".e_QUERY."' method='post'>
<fieldset id='core-plugin-confirmUninstall'>
<legend>".EPL_ADLAN_54." ".$tp->toHtml($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable")."</legend>
<legend>".EPL_ADLAN_54." ".$tp->toHTML($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable")."</legend>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
@@ -861,7 +861,7 @@ class plugin_ui extends e_admin_ui
";
return $text;
// e107::getRender()->tablerender(EPL_ADLAN_63.SEP.$tp->toHtml($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable"),$mes->render(). $text);
// e107::getRender()->tablerender(EPL_ADLAN_63.SEP.$tp->toHTML($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable"),$mes->render(). $text);
}
/*
@@ -2165,7 +2165,7 @@ class pluginmanager_form extends e_form
if ($this->plug['plugin_version'] != $this->plug_vars['@attributes']['version'] && $this->plug['plugin_installflag'])
{
// $text .= "<br /><input type='button' class='btn' onclick=\"location.href='".e_SELF."?upgrade.{$this->plug['plugin_id']}'\" title='".EPL_UPGRADE." to v".$this->plug_vars['@attributes']['version']."' value='".EPL_UPGRADE."' />";
e107::getMessage()->addInfo("<b>".$tp->toHtml($this->plug['plugin_name'],false,'TITLE')."</b> is ready to be upgraded. (see below)"); // TODO LAN
e107::getMessage()->addInfo("<b>".$tp->toHTML($this->plug['plugin_name'],false,'TITLE')."</b> is ready to be upgraded. (see below)"); // TODO LAN
$text .= "<a class='btn btn-default' href='".e_SELF."?upgrade.{$this->plug['plugin_id']}' title=\"".EPL_UPGRADE." v".$this->plug_vars['@attributes']['version']."\" >".ADMIN_UPGRADEPLUGIN_ICON."</a>";
}
@@ -3289,7 +3289,7 @@ class pluginManager{
$text = "
<form action='".e_SELF."?".e_QUERY."' method='post'>
<fieldset id='core-plugin-confirmUninstall'>
<legend>".EPL_ADLAN_54." ".$tp->toHtml($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable")."</legend>
<legend>".EPL_ADLAN_54." ".$tp->toHTML($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable")."</legend>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
@@ -3411,7 +3411,7 @@ class pluginManager{
</fieldset>
</form>
";
// e107::getRender()->tablerender(EPL_ADLAN_63.SEP.$tp->toHtml($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable"),$mes->render(). $text);
// e107::getRender()->tablerender(EPL_ADLAN_63.SEP.$tp->toHTML($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable"),$mes->render(). $text);
}
@@ -3582,7 +3582,7 @@ class pluginBuilder
$info .= "<li>".EPL_ADLAN_106."</li>";
$info .= "</ul>";
// $mes->addInfo($tp->toHtml($info,true));
// $mes->addInfo($tp->toHTML($info,true));
$text = $frm->open('createPlugin','get', e_SELF);
$text .= $frm->hidden('action', 'build');

2
e107_admin/update_routines.php
View File

@@ -252,7 +252,7 @@ class e107Update
foreach($list as $path=>$val)
{
$name = !empty($val['@attributes']['lan']) ? $tp->toHtml($val['@attributes']['lan'],false,'TITLE') : $val['@attributes']['name'];
$name = !empty($val['@attributes']['lan']) ? $tp->toHTML($val['@attributes']['lan'],false,'TITLE') : $val['@attributes']['name'];
$text .= "<tr>
<td>".$name."</td>

8
e107_admin/users.php
View File

@@ -380,7 +380,7 @@ class users_admin_ui extends e_admin_ui
{
$field = "user_".$row['user_extended_struct_name'];
// $title = ucfirst(str_replace("user_","",$field));
$label = $tp->toHtml($row['user_extended_struct_text'],false,'defs');
$label = $tp->toHTML($row['user_extended_struct_text'],false,'defs');
$this->fields[$field] = array('__tableField'=>'ue.'.$field, 'title' => $label,'width' => 'auto', 'type'=>'method', 'readParms'=>array('ueType'=>$row['user_extended_struct_type']), 'method'=>'user_extended', 'data'=>false, 'tab'=>1, 'noedit'=>false);
$this->extended[] = $field;
@@ -943,9 +943,9 @@ class users_admin_ui extends e_admin_ui
$rplc_from = array('[x]', '[y]', '[z]');
$rplc_to = array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email'));
$message = str_replace($rplc_from, $rplc_to, USRLAN_228);
$message = e107::getParser()->toHtml($message,true);
$message = e107::getParser()->toHTML($message,true);
$mes->addWarning($message);
$mes->addWarning(e107::getParser()->toHtml(USRLAN_229,true));
$mes->addWarning(e107::getParser()->toHTML(USRLAN_229,true));
}
}
@@ -1414,7 +1414,7 @@ class users_admin_ui extends e_admin_ui
{
$allData['data']['user_name'] = $allData['data']['user_loginname'];
$message = str_replace('[x]', $allData['data']['user_loginname'], USRLAN_237);
$message = e107::getParser()->toHtml($message,true);
$message = e107::getParser()->toHTML($message,true);
$mes->addWarning($message);
//$allData['errors']['user_name'] = ERR_FIELDS_DIFFERENT;
}

4
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -2126,8 +2126,8 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$subid = $c;
$link = (substr($lk['link_url'],0,1)!="/" && substr($lk['link_url'],0,3)!="{e_" && substr($lk['link_url'],0,4)!='http') ? "{e_BASE}".$lk['link_url'] : $lk['link_url'];
$tmp[$c]['text'] = $tp->toHtml($lk['link_name'],'','defs');
$tmp[$c]['description'] = $tp->toHtml($lk['link_description'],'','defs');
$tmp[$c]['text'] = $tp->toHTML($lk['link_name'],'','defs');
$tmp[$c]['description'] = $tp->toHTML($lk['link_description'],'','defs');
$tmp[$c]['link'] = $tp->replaceConstants($link,'full');
$tmp[$c]['image'] = vartrue($lk['link_button']) ? "<img class='icon S16' src='".$tp->replaceConstants($lk['link_button'])."' alt='".$tp->toAttribute($lk['link_description'],'','defs')."' />": "" ;
$tmp[$c]['image_large'] = '';

2
e107_core/shortcodes/batch/bbcode_shortcodes.php
View File

@@ -305,7 +305,7 @@ class bbcode_shortcodes extends e_shortcode
foreach($sizes as $s)
{
$text .= "<li><a href=\"javascript:addtext('[size=".$s."][/size]')\">".$tp->toHtml("[size=".$s."]".LANHELP_65." ".$s."[/size]",true)."</a></li>\n";
$text .= "<li><a href=\"javascript:addtext('[size=".$s."][/size]')\">".$tp->toHTML("[size=".$s."]".LANHELP_65." ".$s."[/size]",true)."</a></li>\n";
}
$text .= "</ul>";

8
e107_core/shortcodes/batch/news_shortcodes.php
View File

@@ -224,7 +224,7 @@ class news_shortcodes extends e_shortcode
$caption = vartrue($parm['text'],LAN_BACK);
$text = '<ul class="pager hidden-print">
<li><a href="'.$url.'">'.e107::getParser()->toHtml($caption,false,'defs').'</a></li>
<li><a href="'.$url.'">'.e107::getParser()->toHTML($caption,false,'defs').'</a></li>
</ul>';
return $text;
@@ -322,7 +322,7 @@ class news_shortcodes extends e_shortcode
if(!empty($user['user_signature']))
{
return e107::getParser()->toHtml($user['user_signature'], true, 'DESCRIPTION');
return e107::getParser()->toHTML($user['user_signature'], true, 'DESCRIPTION');
}
}
@@ -639,7 +639,7 @@ class news_shortcodes extends e_shortcode
elseif($this->news_item['news_body']) // Auto-generate from first 2 sentences of news-body. //TODO Add Pref?
{
$tp = e107::getParser();
$text = $tp->toHtml($this->news_item['news_body'],true);
$text = $tp->toHTML($this->news_item['news_body'],true);
$breaks = array('<br />','<br>');
$text = str_replace($breaks,"\n",$text);
$text = strip_tags($text);
@@ -1188,7 +1188,7 @@ class news_shortcodes extends e_shortcode
function sc_newsmetadiz($parm=null)
{
$text = e107::getParser()->toHtml($this->news_item['news_meta_description'],true);
$text = e107::getParser()->toHTML($this->news_item['news_meta_description'],true);
if(!empty($parm['limit']))
{

8
e107_core/shortcodes/batch/page_shortcodes.php
View File

@@ -455,7 +455,7 @@ class cpage_shortcodes extends e_shortcode
$tp = e107::getParser();
$row = $this->getBook();
return $tp->toHtml($row['chapter_name'], false, 'TITLE');
return $tp->toHTML($row['chapter_name'], false, 'TITLE');
}
function sc_book_anchor()
@@ -479,7 +479,7 @@ class cpage_shortcodes extends e_shortcode
$tp = e107::getParser();
$row = $this->getBook();
return $tp->toHtml($row['chapter_meta_description'], true, 'BODY');
return $tp->toHTML($row['chapter_meta_description'], true, 'BODY');
}
function sc_book_url()
@@ -510,7 +510,7 @@ class cpage_shortcodes extends e_shortcode
$tp = e107::getParser();
$row = $this->getChapter();
return $tp->toHtml($row['chapter_name'], false, 'TITLE');
return $tp->toHTML($row['chapter_name'], false, 'TITLE');
}
/**
@@ -561,7 +561,7 @@ class cpage_shortcodes extends e_shortcode
$tp = e107::getParser();
$row = $this->getChapter();
return $tp->toHtml($row['chapter_meta_description'], true, 'BODY');
return $tp->toHTML($row['chapter_meta_description'], true, 'BODY');
}
/**

2
e107_handlers/admin_ui.php
View File

@@ -6108,7 +6108,7 @@ class e_admin_ui extends e_admin_controller_ui
// Option for working with tables having no PID
if(!varset($this->pid) && vartrue($this->fields) && false !== $this->pid)
{
$message = e107::getParser()->toHtml(LAN_UI_NOPID_ERROR,true);
$message = e107::getParser()->toHTML(LAN_UI_NOPID_ERROR,true);
e107::getMessage()->add($message, E_MESSAGE_WARNING);
}

6
e107_handlers/e_customfields_class.php
View File

@@ -198,7 +198,7 @@
case "url":
case "email":
return ($raw) ? $value : $tp->toHtml($value);
return ($raw) ? $value : $tp->toHTML($value);
break;
case "user":
@@ -220,7 +220,7 @@
case "textarea":
case "bbarea":
return $tp->toHtml($value, true);
return $tp->toHTML($value, true);
break;
@@ -248,7 +248,7 @@
break;
default:
return $tp->toHtml($value);
return $tp->toHTML($value);
}
}

42
e107_handlers/e_parse_class.php
View File

@@ -800,7 +800,7 @@ class e_parse extends e_parser
if(is_string($text) && substr($text,0,6) == '[html]')
{
// $text = $this->toHtml($text,true);
// $text = $this->toHTML($text,true);
$search = array('&quot;','&#039;','&#092;', '&',); // '&' must be last.
$replace = array('"',"'","\\", '&amp;');
@@ -1751,6 +1751,7 @@ class e_parse extends e_parser
if ($className)
{
/** @var e_bb_base $tempCode */
$tempCode = new $className();
$full_text = $tempCode->bbPreDisplay($matches[4], $parm);
@@ -2368,7 +2369,7 @@ class e_parse extends e_parser
{
if($tags != true)
{
$text = $this -> toHTML($text, true);
$text = $this->toHTML($text, true);
$text = strip_tags($text);
}
@@ -2438,14 +2439,14 @@ class e_parse extends e_parser
function toText($text)
{
if($this->isBbcode($text) === true) // convert any bbcodes to html
if($this->isBBcode($text) === true) // convert any bbcodes to html
{
$text = $this->toHtml($text,true);
$text = $this->toHTML($text,true);
}
if($this->isHtml($text) === true) // strip any html.
{
$text = $this->toHtml($text,true);
$text = $this->toHTML($text,true);
$text = strip_tags($text);
}
@@ -3730,12 +3731,15 @@ class e_parse extends e_parser
}
/**
* New v2 Parser
* Start Fresh and Build on it over time to become eventual replacement to e_parse.
* Cameron's DOM-based parser.
*
*/
/**
* New v2 Parser
* Start Fresh and Build on it over time to become eventual replacement to e_parse.
* Cameron's DOM-based parser.
*
* @method replaceConstants($file, $string)
* @method toAttribute($title)
* @method thumbUrl($icon)
*/
class e_parser
{
/**
@@ -3946,7 +3950,10 @@ class e_parser
{
$tmp = $doc->getElementsByTagName($find);
/**
* @var $k
* @var DOMDocument $node
*/
foreach($tmp as $k=>$node)
{
$tag = $node->nodeName;
@@ -4399,6 +4406,7 @@ class e_parser
}
}
/** @var e_parse $tp */
$tp = $this;
// e107::getDebug()->log($file);
@@ -4904,7 +4912,7 @@ TMPL;
// -------------------- Encoding ----------------
$acc = $this->getScriptAccess();
$accName = e107::getUserclass()->uc_get_classname($acc);
$accName = e107::getUserClass()->uc_get_classname($acc);
echo "<h2>e107 Parser Test <small>with script access by <span class='label label-warning'>".$accName."</span></small></h2>";
echo"<h3>User-input <small>(eg. from \$_POST)</small></h3>";
@@ -4978,11 +4986,11 @@ TMPL;
}
echo "<h3>toDB() &gg; toHtml()</h3>";
$html = $tp->toHtml($dbText,true);
echo "<h3>toDB() &gg; toHTML()</h3>";
$html = $tp->toHTML($dbText,true);
print_a($html);
echo "<h3>toDB &gg; toHtml() <small>(rendered)</small></h3>";
echo "<h3>toDB &gg; toHTML() <small>(rendered)</small></h3>";
echo $html;
echo "<h3>toDB &gg; toForm()</h3>";
@@ -5063,7 +5071,7 @@ return;
print_a($tp->dataFilter($html));
$sql->db_Mark_Time('tp->dataFilter');
echo "<h3>\$tp->toHtml()</h3>";
echo "<h3>\$tp->toHTML()</h3>";
// echo $tp->dataFilter($html); // Remove Comment for a real mess!
print_a($tp->toHTML($html));
$sql->db_Mark_Time('tp->toHtml');

4
e107_handlers/form_handler.php
View File

@@ -4315,7 +4315,7 @@ class e_form
'RELATED_URL' => $tp->replaceConstants($val['url'],'full'),
'RELATED_TITLE' => $val['title'],
'RELATED_IMAGE' => $tp->toImage($val['image']),
'RELATED_SUMMARY' => $tp->toHtml($val['summary'],true,'BODY')
'RELATED_SUMMARY' => $tp->toHTML($val['summary'],true,'BODY')
);
$list[] = $tp->simpleParse($TEMPLATE['item'], $row);
@@ -6298,7 +6298,7 @@ class e_form
}
else
{
$ret .= vartrue($parms['help']) ? '<div class="field-help">'.$tp->toHtml($parms['help'],false,'defs').'</div>' : '';
$ret .= vartrue($parms['help']) ? '<div class="field-help">'.$tp->toHTML($parms['help'],false,'defs').'</div>' : '';
}
return $ret;

2
e107_handlers/mail.php
View File

@@ -568,7 +568,7 @@ class e107Email extends PHPMailer
if ($want_HTML !== FALSE)
{
// $message = e107::getParser()->toHtml("[html]".$message."[/html]",true); // using toHtml will break media attachment links. (need to retain {e_XXXX )
// $message = e107::getParser()->toHTML("[html]".$message."[/html]",true); // using toHtml will break media attachment links. (need to retain {e_XXXX )
if ($this->debug) echo "Generating multipart email<br />";
if ($add_HTML_header)

2
e107_handlers/mailout_admin_class.php
View File

@@ -900,7 +900,7 @@ class mailoutAdminClass extends e107MailManager
if($k == 'mail_body')
{
// $text .= print_a($mailSource,true);
// $text .= $tp->toHtml($val,true);
// $text .= $tp->toHTML($val,true);
$text .= "<iframe src='".e_ADMIN."mailout.php?mode=main&action=preview&id=".$mailSource['mail_source_id']."' width='100%' height='350'>Loading...</iframe>";
continue;
}

2
e107_handlers/news_class.php
View File

@@ -938,7 +938,7 @@ class e_news_category_item extends e_front_model
return e107::getParser()->toAttribute($this->cat('name'));
}
return e107::getParser()->toHtml($this->cat('name'),true,'TITLE_PLAIN');
return e107::getParser()->toHTML($this->cat('name'),true,'TITLE_PLAIN');
}
public function sc_news_category_url($parm = '')

4
e107_handlers/notify_class.php
View File

@@ -406,9 +406,9 @@ class notify
$shortcodes = array(
'NEWS_URL' => e107::getUrl()->create('news/view/item', $data,'full=1&encode=0'),
'NEWS_TITLE' => $tp->toHtml($data['news_title']),
'NEWS_TITLE' => $tp->toHTML($data['news_title']),
'NEWS_SUMMARY' => $tp->toEmail($data['news_summary']),
'NEWS_AUTHOR' => $tp->toHtml($author)
'NEWS_AUTHOR' => $tp->toHTML($author)
);
$img = explode(",",$data['news_thumbnail']);

2
e107_handlers/sitelinks_class.php
View File

@@ -2021,7 +2021,7 @@ class navigation_shortcodes extends e_shortcode
$link = $this->var['link_name'];
}
return e107::getParser()->toHtml($link, false,'defs');
return e107::getParser()->toHTML($link, false,'defs');
}

4
e107_handlers/user_extended_class.php
View File

@@ -344,7 +344,7 @@ class e107_user_extended
$err = $this->user_extended_validate_entry($val, $defs);
if ($err === true)
{ // General error - usually empty field; could be unacceptable value, or regex fail and no error message defined
$eufVals['errortext'][$f] = str_replace('[x]',$tp->toHtml(defset($defs['user_extended_struct_text'], $defs['user_extended_struct_text']),FALSE,'defs'),LAN_USER_75);
$eufVals['errortext'][$f] = str_replace('[x]',$tp->toHTML(defset($defs['user_extended_struct_text'], $defs['user_extended_struct_text']),FALSE,'defs'),LAN_USER_75);
$eufVals['errors'][$f] = ERR_GENERIC;
}
elseif ($err)
@@ -788,7 +788,7 @@ class e107_user_extended
}
$parms = explode("^,^",$struct['user_extended_struct_parms']);
$include = preg_replace("/\n/", " ", $tp->toHtml($parms[0]));
$include = preg_replace("/\n/", " ", $tp->toHTML($parms[0]));
$regex = $tp->toText(varset($parms[1]));
$regexfail = $tp->toText(varset($parms[2]));
$fname = "ue[user_".$struct['user_extended_struct_name']."]";

2
e107_languages/English/admin/help/menus.php
View File

@@ -57,5 +57,5 @@ If you find the menus are not updating correctly, clicking the refresh button be
[/html]
";
$text = $tp->toHtml($text, true);
$text = $tp->toHTML($text, true);
$ns->tablerender("Menu Manager Help", $text);

2
e107_plugins/_blank/_blank.php
View File

@@ -55,7 +55,7 @@ class _blank_front
// $sc->setVars($value); // if shortcodes are enabled.
// $text .= $tp->parseTemplate($template['item'],true, $sc);
$text .= $tp->toHtml($value['blank_type'])."<br />";
$text .= $tp->toHTML($value['blank_type'])."<br />";
}
// $text .= $tp->parseTemplate($template['end'],true, $sc);

2
e107_plugins/_blank/e_parse.php
View File

@@ -37,7 +37,7 @@ class _blank_parse
* @param string $context Current context ie. OLDDEFAULT | BODY | TITLE | SUMMARY | DESCRIPTION | WYSIWYG etc.
* @return string
*/
function toHtml($text, $context='')
function toHTML($text, $context='')
{
$text = str_replace('****', '<hr>', $text);
return $text;

2
e107_plugins/_blank/e_sitelink.php
View File

@@ -83,7 +83,7 @@ class _blank_sitelink // include plugin-folder in the name.
while($row = $sql->fetch())
{
$sublinks[] = array(
'link_name' => $tp->toHtml($row['blank_name'],'','TITLE'),
'link_name' => $tp->toHTML($row['blank_name'],'','TITLE'),
'link_url' => e107::url('_blank', 'other', $row),
'link_description' => '',
'link_button' => $row['blank_icon'],

2
e107_plugins/banner/e_shortcode.php
View File

@@ -94,7 +94,7 @@ class banner_shortcodes extends e_shortcode
if(!empty($row['banner_description']))
{
$text .= "<div class='e-banner-description'>".$start.$tp->toHtml($row['banner_description'], true).$end. "</div>";
$text .= "<div class='e-banner-description'>".$start.$tp->toHTML($row['banner_description'], true).$end. "</div>";
}
return $text;

2
e107_plugins/comment_menu/comment_menu_shortcodes.php
View File

@@ -55,7 +55,7 @@ class comment_menu_shortcodes extends e_shortcode
$text = $this->var['comment_title'];
}
return e107::getParser()->toHtml($text,false,'TITLE');
return e107::getParser()->toHTML($text,false,'TITLE');
}
function sc_cm_url_pre()

2
e107_plugins/download/e_search.php
View File

@@ -72,7 +72,7 @@ class download_search extends e_search // include plugin-folder in the name.
$datestamp = $tp->toDate($row['download_datestamp'], "long");
$res['link'] = e107::url('download', 'item', $row);
$res['pre_title'] = $tp->toHtml($row['download_category_name'],false,'TITLE_PLAIN')." | ";
$res['pre_title'] = $tp->toHTML($row['download_category_name'],false,'TITLE_PLAIN')." | ";
$res['title'] = $row['download_name'];
$res['pre_summary'] = "<div class='smalltext'><a href='download.php'>".LAN_197."</a> -> <a href='download.php?list.".$row['download_category_id']."'>".$row['download_category_name']."</a></div>";
$res['summary'] = $row['download_description'];

2
e107_plugins/download/e_sitelink.php
View File

@@ -65,7 +65,7 @@ class download_sitelink // include plugin-folder in the name.
}
$sublinks[] = array(
'link_name' => $tp->toHtml($row['download_category_name'],'','TITLE'),
'link_name' => $tp->toHTML($row['download_category_name'],'','TITLE'),
'link_url' => e107::url('download', 'category', $row),
'link_description' => '',
'link_button' => $row['download_category_icon'],

2
e107_plugins/download/handlers/download_class.php
View File

@@ -370,7 +370,7 @@ class download
$tp = e107::getParser();
$metaImage = $tp->thumbUrl($row['download_image'], array('w'=>500), null, true);
$metaDescription = $tp->toHtml($row['download_description'],true);
$metaDescription = $tp->toHTML($row['download_description'],true);
e107::meta('description', $tp->toText($metaDescription));
e107::meta('keywords', $row['download_keywords']);

2
e107_plugins/faqs/e_sitelink.php
View File

@@ -52,7 +52,7 @@ class faqs_sitelink // include plugin-folder in the name.
while($row = $sql->fetch())
{
$sublinks[] = array(
'link_name' => $tp->toHtml($row['faq_info_title'],'','TITLE'),
'link_name' => $tp->toHTML($row['faq_info_title'],'','TITLE'),
'link_url' => e107::url('faqs', 'category', $row),
'link_description' => $row['faq_info_about'],
'link_button' => $row['faq_info_icon'],

4
e107_plugins/faqs/faqs.php
View File

@@ -250,7 +250,7 @@ class faq
if($sql->insert('faqs',$insert))
{
$message = !empty($this->pref['submit_question_acknowledgement']) ? e107::getParser()->toHtml($this->pref['submit_question_acknowledgement'],true, 'BODY') : LAN_FAQS_004;
$message = !empty($this->pref['submit_question_acknowledgement']) ? e107::getParser()->toHTML($this->pref['submit_question_acknowledgement'],true, 'BODY') : LAN_FAQS_004;
e107::getMessage()->addSuccess($message);
}
@@ -289,7 +289,7 @@ class faq
if (!empty($this->pref['page_title'][e_LANGUAGE]))
{
$ret['caption'] = e107::getParser()->toHtml($this->pref['page_title'][e_LANGUAGE], true, 'TITLE');
$ret['caption'] = e107::getParser()->toHTML($this->pref['page_title'][e_LANGUAGE], true, 'TITLE');
}
else
{

4
e107_plugins/faqs/faqs_shortcodes.php
View File

@@ -233,7 +233,7 @@ class faqs_shortcodes extends e_shortcode
if(!empty($customCaption))
{
return e107::getParser()->toHtml($customCaption,true);
return e107::getParser()->toHTML($customCaption,true);
}
return LAN_PLUGIN_FAQS_FRONT_NAME;
@@ -346,7 +346,7 @@ class faqs_shortcodes extends e_shortcode
foreach($list as $row)
{
$text .= "<li>".$tp->toHtml($row['faq_question'],true)."</li>";
$text .= "<li>".$tp->toHTML($row['faq_question'],true)."</li>";
}
$text .= "</ul>";

4
e107_plugins/forum/forum_post.php
View File

@@ -950,7 +950,7 @@ class forum_post_handler
<a class='pull-right btn btn-xs btn-primary e-expandit' href='#post-info'>".LAN_FORUM_2026."</a>
</div>
<div id='post-info' class='e-hideme alert alert-block alert-danger'>
".$tp->toHtml($this->data['post_entry'],true)."
".$tp->toHTML($this->data['post_entry'],true)."
</div>
<div class='form-group' >
<div class='col-md-12'>
@@ -975,7 +975,7 @@ class forum_post_handler
<td style='width:50%'>
".LAN_FORUM_2025.': '.$thread_name." <a class='e-expandit' href='#post-info'><span class='smalltext'>".LAN_FORUM_2026."</span></a>
<div id='post-info' class='e-hideme alert alert-block alert-danger'>
".$tp->toHtml($this->data['post_entry'],true)."
".$tp->toHTML($this->data['post_entry'],true)."
</div>
</td>
<td style='text-align:center;width:50%'></td>

2
e107_plugins/forum/forum_viewtopic.php
View File

@@ -1056,7 +1056,7 @@ class e107ForumThread
<a class='pull-right btn btn-xs btn-primary e-expandit' href='#post-info'>View Post</a>
</div>
<div id='post-info' class='e-hideme alert alert-block alert-danger'>
".$tp->toHtml($postInfo['post_entry'],true)."
".$tp->toHTML($postInfo['post_entry'],true)."
</div>
<div class='form-group' >
<div class='col-md-12'>

2
e107_plugins/gallery/controllers/index.php
View File

@@ -199,7 +199,7 @@ class plugin_gallery_index_controller extends eControllerFront
$orderBy = varset($plugPrefs['orderby'], 'media_id DESC');
$list = e107::getMedia()->getImages($cid, $sc->from, $sc->amount, null, $orderBy);
$catname = $tp->toHtml($this->catList[$cid]['media_cat_title'], false, 'defs');
$catname = $tp->toHTML($this->catList[$cid]['media_cat_title'], false, 'defs');
$cat = $this->catList[$cid];
$inner = "";

4
e107_plugins/gallery/e_shortcode.php
View File

@@ -150,10 +150,10 @@ class gallery_shortcodes extends e_shortcode
$url = e107::getUrl()->create('gallery/index/list', $this->var);
if($parm == 'title')
{
return $tp->toHtml($this->var['media_cat_title'], false, 'TITLE');
return $tp->toHTML($this->var['media_cat_title'], false, 'TITLE');
}
$text = "<a href='" . $url . "'>";
$text .= $tp->toHtml($this->var['media_cat_title'], false, 'TITLE');
$text .= $tp->toHTML($this->var['media_cat_title'], false, 'TITLE');
$text .= "</a>";
return $text;
}

2
e107_plugins/gallery/gallery.php
View File

@@ -140,7 +140,7 @@ class gallery
$orderBy = varset($plugPrefs['orderby'], 'media_id DESC');
$list = e107::getMedia()->getImages($cat, $sc->from, $sc->amount, null, $orderBy);
$catname = $tp->toHtml($this->catList[$cat]['media_cat_title'], false, 'defs');
$catname = $tp->toHTML($this->catList[$cat]['media_cat_title'], false, 'defs');
$inner = "";

2
e107_plugins/gallery/shortcodes/batch/gallery_shortcodes.php
View File

@@ -43,7 +43,7 @@ class gallery_shortcodes extends e_shortcode
{
$tp = e107::getParser();
$text = "<a href='".e_SELF."?cat=".$this->var['media_cat_category']."'>";
$text .= $tp->toHtml($this->var['media_cat_title']);
$text .= $tp->toHTML($this->var['media_cat_title']);
$text .= "</a>";
return $text;
}

4
e107_plugins/list_new/list_new_menu.php
View File

@@ -45,8 +45,8 @@ $rc->mode = "new_menu";
$text = $rc->displayMenu();
$caption = vartrue($rc->list_pref[$rc->mode."_caption"], LIST_MENU_1);
$caption = e107::getParser()->toHtml($caption, FALSE, 'USER_TITLE');
$text = e107::getParser()->toHtml($text, TRUE, 'USER_BODY');
$caption = e107::getParser()->toHTML($caption, FALSE, 'USER_TITLE');
$text = e107::getParser()->toHTML($text, TRUE, 'USER_BODY');
e107::getRender()->tablerender($caption, $text, 'list_new');
unset($caption);

4
e107_plugins/list_new/list_recent_menu.php
View File

@@ -45,8 +45,8 @@ $rc->mode = "recent_menu";
$text = $rc->displayMenu();
$caption = vartrue($rc->list_pref[$rc->mode."_caption"], LIST_MENU_1);
$caption = $rc->e107->tp->toHtml($caption, FALSE, 'USER_TITLE');
$text = $rc->e107->tp->toHtml($text, TRUE, 'USER_BODY');
$caption = $rc->e107->tp->toHTML($caption, FALSE, 'USER_TITLE');
$text = $rc->e107->tp->toHTML($text, TRUE, 'USER_BODY');
$rc->e107->ns->tablerender($caption, $text, 'list_recent');
unset($caption);
unset($text);

4
e107_plugins/news/e_rss.php
View File

@@ -127,12 +127,12 @@ class news_rss // plugin-folder + '_rss'
if($row['news_summary'] && $this->summaryDescription == true)
{
$text = $tp->toHtml($row['news_summary'],true);
$text = $tp->toHTML($row['news_summary'],true);
}
else
{
$text= $tp->toHtml($row['news_body'],true). "<br />".$tp->toHtml($row['news_extended'], true);
$text= $tp->toHTML($row['news_body'],true). "<br />".$tp->toHTML($row['news_extended'], true);
}
if($this->showImages == true && !empty($row['news_thumbnail']))

2
e107_plugins/news/e_search.php
View File

@@ -73,7 +73,7 @@ class news_search extends e_search // include plugin-folder in the name.
$res = array();
$res['link'] = e107::getUrl()->create('news/view/item', $row);//$row['news_allow_comments'] ? "news.php?item.".$row['news_id'] : "comment.php?comment.news.".$row['news_id'];
$res['pre_title'] = $tp->toHtml($row['category_name'],false,'TITLE')." | ";
$res['pre_title'] = $tp->toHTML($row['category_name'],false,'TITLE')." | ";
$res['title'] = $row['news_title'];
$res['summary'] = $row['news_body'].' '.$row['news_extended'];
$res['detail'] = LAN_SEARCH_3.$tp->toDate($row['news_datestamp'], "long");

4
e107_plugins/news/news.php
View File

@@ -473,7 +473,7 @@ class news_front
break;
case "list":
$title = $tp->toHtml($news['category_name'],false,'TITLE_PLAIN');
$title = $tp->toHTML($news['category_name'],false,'TITLE_PLAIN');
if(!defined('e_PAGETITLE'))
{
define('e_PAGETITLE', $title );
@@ -599,7 +599,7 @@ class news_front
if($news['category_name'] && !defined('e_PAGETITLE') && $type == 'cat')
{
define('e_PAGETITLE', $tp->toHtml($news['category_name'],false,'TITLE_PLAIN'));
define('e_PAGETITLE', $tp->toHTML($news['category_name'],false,'TITLE_PLAIN'));
}
if($news['category_meta_keywords'] && !defined('META_KEYWORDS'))

2
e107_plugins/news/news_archive_menu.php
View File

@@ -86,7 +86,7 @@ foreach($arr as $year=>$val)
{
$url = e107::getUrl()->create('news/view/item', $row, array('allow' => 'news_sef,news_title,news_id,category_sef,category_name,category_id'));
$var = array('ITEM_URL' => $url,
'ITEM_TITLE' => $tp->toHtml($row['news_title'],false,'TITLE'),
'ITEM_TITLE' => $tp->toHTML($row['news_title'],false,'TITLE'),
);
$text .= $tp->simpleParse($template['item'], $var);
}

6
e107_plugins/news/other_news2_menu.php
View File

@@ -58,11 +58,11 @@ if(!$OTHERNEWS2_STYLE)
{
if(isset($parms['caption'][e_LANGUAGE]))
{
$template['caption'] = e107::getParser()->toHtml($parms['caption'][e_LANGUAGE], true,'TITLE');
$template['caption'] = e107::getParser()->toHTML($parms['caption'][e_LANGUAGE], true,'TITLE');
}
else
{
$template['caption'] = e107::getParser()->toHtml($parms['caption'], true,'TITLE');
$template['caption'] = e107::getParser()->toHTML($parms['caption'], true,'TITLE');
}
@@ -76,7 +76,7 @@ if(!$OTHERNEWS2_STYLE)
if(!empty($parms['caption']))
{
$template['caption'] = e107::getParser()->toHtml($parms['caption'],true,'TITLE');
$template['caption'] = e107::getParser()->toHTML($parms['caption'],true,'TITLE');
}
else
{

4
e107_plugins/news/other_news_menu.php
View File

@@ -62,7 +62,7 @@ if(!$OTHERNEWS_STYLE)
if(!empty($parms['caption']))
{
$template['caption'] = e107::getParser()->toHtml($parms['caption'],true,'TITLE');
$template['caption'] = e107::getParser()->toHTML($parms['caption'],true,'TITLE');
}
$caption = "<div class='inline-text'>".$template['caption']." ".$item_selector."</div>";
@@ -74,7 +74,7 @@ if(!$OTHERNEWS_STYLE)
if(!empty($parms['caption']))
{
$caption = e107::getParser()->toHtml($parms['caption'], true,'TITLE');
$caption = e107::getParser()->toHTML($parms['caption'], true,'TITLE');
}
$template['start'] = '';

2
e107_plugins/newsfeed/newsfeed_functions.php
View File

@@ -316,7 +316,7 @@ class newsfeedClass
// $url = e_PLUGIN_ABS."newsfeed/newsfeed.php?show.".$feed['newsfeed_id'];
$url = e107::url('newsfeed','source',$feed);
$vars['FEEDNAME'] = "<a href='".$url."'>".$tp->toHtml($feed['newsfeed_name'],false,'TITLE')."</a>";
$vars['FEEDNAME'] = "<a href='".$url."'>".$tp->toHTML($feed['newsfeed_name'],false,'TITLE')."</a>";
$vars['FEEDDESCRIPTION'] = $feed['newsfeed_description'];
$vars['FEEDIMAGE'] = $rss['newsfeed_image_link'];
$vars['FEEDLANGUAGE'] = $rss['channel']['language'];

2
e107_plugins/page/chapter_menu.php
View File

@@ -36,7 +36,7 @@ foreach($data as $row)
$sc->setVars($row);
$sc->setChapter($row['chapter_id']);
$title = $tp->toHtml($row['chapter_name'],false,'TITLE'); // Used when tablerender style includes the caption.
$title = $tp->toHTML($row['chapter_name'],false,'TITLE'); // Used when tablerender style includes the caption.
$body .= $tp->parseTemplate($template['listChapters']['item'], true, $sc);
// check for $mode == 'page-menu' in tablestyle() if you need a simple 'echo' without rendering styles.

4
e107_plugins/page/e_search.php
View File

@@ -120,7 +120,7 @@ class page_search extends e_search // include plugin-folder in the name.
else // Page with book/chapter
{
$route = 'page/view/index';
$pre = $tp->toHtml($this->getName($book),false,'TITLE').' &raquo; '. $tp->toHtml($this->getName($row['page_chapter']),false,'TITLE'). " | ";
$pre = $tp->toHTML($this->getName($book),false,'TITLE').' &raquo; '. $tp->toHTML($this->getName($row['page_chapter']),false,'TITLE'). " | ";
}
@@ -128,7 +128,7 @@ class page_search extends e_search // include plugin-folder in the name.
$res['link'] = e107::getUrl()->create($route, $row, array('allow' => 'page_sef,page_title,page_id,chapter_sef,book_sef'));
$res['pre_title'] = $pre;
$res['title'] = $tp->toHtml($row['page_title'], false, 'TITLE');
$res['title'] = $tp->toHTML($row['page_title'], false, 'TITLE');
$res['summary'] = (!empty($row['page_metadscr'])) ? $row['page_metadscr'] : $row['page_text'];
$res['detail'] = LAN_SEARCH_3.$tp->toDate($row['page_datestamp'], "long");
$res['image'] = $row['menu_image'];

4
e107_plugins/page/e_shortcode.php
View File

@@ -111,13 +111,13 @@ class page_shortcodes extends e_shortcode
function sc_page_chapter_name($parm='')
{
return e107::getParser()->toHtml($this->var['chapter_name']);
return e107::getParser()->toHTML($this->var['chapter_name']);
}
function sc_page_chapter_description($parm='')
{
return e107::getParser()->toHtml($this->var['chapter_meta_description'],true);
return e107::getParser()->toHTML($this->var['chapter_meta_description'],true);
}
/**

2
e107_plugins/page/e_sitelink.php
View File

@@ -240,7 +240,7 @@ class page_sitelink // include plugin-folder in the name.
$sef['book_sef'] = $this->getSef($row['chapter_parent']);
$chapters[$id] = array(
'link_name' => $tp->toHtml($row['chapter_name'],'','TITLE'),
'link_name' => $tp->toHTML($row['chapter_name'],'','TITLE'),
'link_url' => e107::getUrl()->create('page/chapter/index', $sef), // 'page.php?ch='.$row['chapter_id'],
'link_description' => '',
'link_button' => $row['chapter_icon'],

4
e107_plugins/page/page_menu.php
View File

@@ -15,8 +15,8 @@ $data = $sql->retrieve("SELECT * FROM #page WHERE page_class IN (".USERCLASS_LIS
//TODO Use shortcodes and template.
foreach($data as $row)
{
$title = $tp->toHtml($row['page_title'],false,'TITLE');
$body = $tp->toHtml($row['page_text'],true,'BODY');
$title = $tp->toHTML($row['page_title'],false,'TITLE');
$body = $tp->toHTML($row['page_text'],true,'BODY');
$ns->tablerender($title, $body,'page-menu'); // check for $mode == 'page-menu' in tablestyle() if you need a simple 'echo' without rendering styles.

2
e107_plugins/poll/oldpolls.php
View File

@@ -132,7 +132,7 @@ if(e_QUERY)
$from = $tp->toDate($row['poll_datestamp'], "short");
$to = $tp->toDate($row['poll_end_datestamp'], "short");
$poll_title = $tp->toHtml($row['poll_title'], true, 'TITLE');
$poll_title = $tp->toHTML($row['poll_title'], true, 'TITLE');
$uparams = array('id' => $row['poll_admin_id'], 'name' => $row['user_name']);

2
e107_plugins/siteinfo/e_shortcode.php
View File

@@ -57,7 +57,7 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
$text = str_replace("YYYY", date('Y'), $text);
return e107::getParser()->toHtml($text, true, 'SUMMARY');
return e107::getParser()->toHTML($text, true, 'SUMMARY');
}

10
e107_plugins/tinymce4/plugins/e107/parser.php
View File

@@ -79,7 +79,7 @@ TEMPL;
if($_POST['mode'] == 'tohtml')
{
$html = $this->toHtml($_POST['content']);
$html = $this->toHTML($_POST['content']);
}
if($_POST['mode'] == 'tobbcode')
@@ -110,7 +110,7 @@ TEMPL;
public function toHtml($content)
public function toHTML($content)
{
// global $pref; //XXX faster?
$pref = e107::getPref();
@@ -135,7 +135,7 @@ TEMPL;
$content = nl2br($content, true);
}
$content = $tp->toHtml($content, true, 'WYSIWYG');
$content = $tp->toHTML($content, true, 'WYSIWYG');
}
$content = str_replace("{e_BASE}",e_HTTP,$content); // We want {e_BASE} in the final data going to the DB, but not the editor.
@@ -166,10 +166,10 @@ TEMPL;
{
// XXX @Cam this breaks new lines, currently we use \n instead [br]
//echo $tp->toHtml(str_replace("\n","",$content), true);
//echo $tp->toHTML(str_replace("\n","",$content), true);
$content = str_replace("{e_BASE}",e_HTTP, $content); // We want {e_BASE} in the final data going to the DB, but not the editor.
$content = $tp->toHtml($content, true, 'WYSIWYG');
$content = $tp->toHTML($content, true, 'WYSIWYG');
$content = str_replace(e_MEDIA_IMAGE,"{e_MEDIA_IMAGE}",$content);
$text = "";

2
e107_themes/landingzero/theme_shortcodes.php
View File

@@ -112,7 +112,7 @@ class theme_shortcodes extends e_shortcode
$text = '&copy; '. $copyYear . (($copyYear != $curYear) ? ' - ' . $curYear : '');
$text .= ' '.$sitedisclaimer;
return e107::getParser()->toHtml($text, true, 'SUMMARY');
return e107::getParser()->toHTML($text, true, 'SUMMARY');
}

2
gsitemap.php
View File

@@ -32,7 +32,7 @@ if(e_QUERY == "show" || !empty($_GET['show']))
if(deftrue('BOOTSTRAP'))
{
$bread = array(
0 => array('text' => $tp->toHtml(GSLAN_Name), 'url'=> null ) // e107::url('gsitemap','index')
0 => array('text' => $tp->toHTML(GSLAN_Name), 'url'=> null ) // e107::url('gsitemap','index')
);
$text = e107::getForm()->breadcrumb($bread);
}

28
page.php
View File

@@ -252,10 +252,10 @@ class pageClass
$listChapters = $this->listChapters(intval($row['chapter_id']), $row['chapter_sef']);
$var = array(
'BOOK_NAME' => $tp->toHtml($row['chapter_name']),
'BOOK_NAME' => $tp->toHTML($row['chapter_name']),
'BOOK_ANCHOR' => $frm->name2id($row['chapter_name']),
'BOOK_ICON' => $this->chapterIcon($row['chapter_icon']),
'BOOK_DESCRIPTION' => $tp->toHtml($row['chapter_meta_description'],true,'BODY'),
'BOOK_DESCRIPTION' => $tp->toHTML($row['chapter_meta_description'],true,'BODY'),
'CHAPTERS' => $listChapters['text'],
'BOOK_URL' => e107::getUrl()->create('page/book/index', $sef,'allow=chapter_id,chapter_sef,book_sef,page_sef')
);
@@ -327,10 +327,10 @@ class pageClass
$template = $tmpl['listChapters'];
$bvar = array(
'BOOK_NAME' => $tp->toHtml($brow['chapter_name']),
'BOOK_NAME' => $tp->toHTML($brow['chapter_name']),
'BOOK_ANCHOR' => $frm->name2id($brow['chapter_name']),
'BOOK_ICON' => $this->chapterIcon($brow['chapter_icon']),
'BOOK_DESCRIPTION' => $tp->toHtml($brow['chapter_meta_description'],true,'BODY'),
'BOOK_DESCRIPTION' => $tp->toHTML($brow['chapter_meta_description'],true,'BODY'),
);
$caption = $tp->simpleParse($template['caption'],$bvar);
@@ -357,15 +357,15 @@ class pageClass
$row['book_description'] = $this->getDescription($row['chapter_parent']);
$var = array(
'BOOK_NAME' => $tp->toHtml($row['book_name']),
'BOOK_NAME' => $tp->toHTML($row['book_name']),
'BOOK_ANCHOR' => $frm->name2id($row['book_name']),
'BOOK_ICON' => $this->chapterIcon($row['book_icon']),
'BOOK_DESCRIPTION' => $tp->toHtml($row['book_description'],true,'BODY'),
'BOOK_DESCRIPTION' => $tp->toHTML($row['book_description'],true,'BODY'),
'CHAPTER_NAME' => $tp->toHtml($row['chapter_name']),
'CHAPTER_NAME' => $tp->toHTML($row['chapter_name']),
'CHAPTER_ANCHOR' => $frm->name2id($row['chapter_name']),
'CHAPTER_ICON' => $this->chapterIcon($row['chapter_icon']),
'CHAPTER_DESCRIPTION' => $tp->toHtml($row['chapter_meta_description'],true,'BODY'),
'CHAPTER_DESCRIPTION' => $tp->toHTML($row['chapter_meta_description'],true,'BODY'),
'PAGES' => $tmp['text'],
'CHAPTER_URL' => e107::getUrl()->create('page/chapter/index', $row,'allow=chapter_id,chapter_sef,book_sef')
);
@@ -446,7 +446,7 @@ class pageClass
$urlData = array(
'chapter_id' => $row['chapter_id'],
'chapter_name' => $tp->toHtml($row['chapter_name']),
'chapter_name' => $tp->toHTML($row['chapter_name']),
'chapter_sef' => $bookSef,
'book_sef' => $bookSef,
'page_sef' => '',
@@ -460,14 +460,14 @@ class pageClass
$tmpl = varset($tml[$layout]);
$bread = array(
0 => array('text' => $tp->toHtml($bookTitle), 'url'=> e107::getUrl()->create('page/book/index', $urlData,'allow=chapter_id,chapter_sef,book_id,book_sef,page_sef'))
0 => array('text' => $tp->toHTML($bookTitle), 'url'=> e107::getUrl()->create('page/book/index', $urlData,'allow=chapter_id,chapter_sef,book_id,book_sef,page_sef'))
);
$var = array(
'CHAPTER_NAME' => $tp->toHtml($row['chapter_name']),
'CHAPTER_NAME' => $tp->toHTML($row['chapter_name']),
'CHAPTER_ANCHOR' => $frm->name2id($row['chapter_name']),
'CHAPTER_ICON' => $this->chapterIcon($row['chapter_icon']),
'CHAPTER_DESCRIPTION' => $tp->toHtml($row['chapter_meta_description'], true,'BODY'),
'CHAPTER_DESCRIPTION' => $tp->toHTML($row['chapter_meta_description'], true,'BODY'),
'CHAPTER_BREADCRUMB' => !empty($_GET['ch']) ? $frm->breadcrumb($bread) : ''
);
@@ -494,7 +494,7 @@ class pageClass
{
/*$data = array(
'title' => $page['page_title'],
'text' => $tp->toHtml($page['page_text'],true)
'text' => $tp->toHTML($page['page_text'],true)
);*/
$page['chapter_id'] = $page['page_chapter'];
$page['chapter_name'] = $this->getName($page['page_chapter']);
@@ -513,7 +513,7 @@ class pageClass
// $url = e107::getUrl()->create('page/view', $page, 'allow=page_id,page_sef,chapter_sef,book_sef');
// $text .= "<li><a href='".$url."'>".$tp->toHtml($page['page_title'])."</a></li>";
// $text .= "<li><a href='".$url."'>".$tp->toHTML($page['page_title'])."</a></li>";
$text .= e107::getParser()->parseTemplate($template['item'], true, $this->batch);
}

2
search.php
View File

@@ -536,7 +536,7 @@ class search extends e_shortcode
$ret['chars'] = $this->search_prefs[$type.'_handlers'][$id]['chars'];
$ret['results'] = $this->search_prefs[$type.'_handlers'][$id]['results'];
$ret['pre_title'] = $this->search_prefs[$type.'_handlers'][$id]['pre_title'];
$ret['pre_title_alt'] = $tp -> toHtml($this->search_prefs[$type.'_handlers'][$id]['pre_title_alt']);
$ret['pre_title_alt'] = $tp -> toHTML($this->search_prefs[$type.'_handlers'][$id]['pre_title_alt']);
// $ret['order'] = (isset($this->search_prefs[$type.'_handlers'][$id]['order']) && $this->search_prefs[$type.'_handlers'][$id]['order']) ? $this->search_prefs[$type.'_handlers'][$id]['order'] : $this->auto_order;
$this->auto_order++;