1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 19:30:25 +02:00

Make calls to toHTML which use $modifiers consistent to avoid potential future problems.

This commit is contained in:
e107steved
2007-01-07 15:59:42 +00:00
parent 1843e9fed9
commit fab4a3bc10
18 changed files with 75 additions and 75 deletions

View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/download_shortcodes.php,v $
| $Revision: 1.5 $
| $Date: 2007-01-03 20:29:13 $
| $Revision: 1.6 $
| $Date: 2007-01-07 15:59:42 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -27,7 +27,7 @@ if($parm == "nolink"){
}
if($parm == "request"){
$agreetext = $tp->toJS($tp->toHTML($pref['agree_text'],FALSE,"parse_sc defs"));
$agreetext = $tp->toJS($tp->toHTML($pref['agree_text'],FALSE,"parse_sc, defs"));
if($row['download_mirror_type']){
$text = ($pref['agree_flag'] ? "<a href='".e_BASE."download.php?mirror.".$row['download_id']."' onclick= \"return confirm('{$agreetext}');\">" : "<a href='".e_BASE."download.php?mirror.".$row['download_id']."' title='".LAN_dl_32."'>");
}else{
@@ -115,7 +115,7 @@ SC_END
SC_BEGIN DOWNLOAD_LIST_LINK
global $tp,$row,$pref;
$agreetext = $tp->toJS($tp->toHTML($pref['agree_text'],FALSE,"parse_sc defs"));
$agreetext = $tp->toJS($tp->toHTML($pref['agree_text'],FALSE,"parse_sc, defs"));
if($row['download_mirror_type']){
return ($pref['agree_flag'] ? "<a href='".e_BASE."download.php?mirror.".$row['download_id']."' onclick= \"return confirm('{$agreetext}');\">" : "<a href='".e_BASE."download.php?mirror.".$row['download_id']."' >");
}else{
@@ -177,7 +177,7 @@ SC_END
SC_BEGIN DOWNLOAD_VIEW_NAME_LINKED
global $pref,$dl,$tp;
if ($pref['agree_flag'] == 1) {
return "<a href='".e_BASE."request.php?".$dl['download_id']."' onclick= \"return confirm('".$tp->toJS($tp->toHTML($pref['agree_text'],FALSE,"parse_sc defs"))."' title='".LAN_dl_46."'>".$dl['download_name']."</a>";
return "<a href='".e_BASE."request.php?".$dl['download_id']."' onclick= \"return confirm('".$tp->toJS($tp->toHTML($pref['agree_text'],FALSE,"parse_sc, defs"))."' title='".LAN_dl_46."'>".$dl['download_name']."</a>";
} else {
return "<a href='".e_BASE."request.php?".$dl['download_id']."' title='".LAN_dl_46."'>".$dl['download_name']."</a>";
}
@@ -254,7 +254,7 @@ SC_END
SC_BEGIN DOWNLOAD_VIEW_LINK
global $pref,$dl,$tp;
if ($pref['agree_flag'] == 1) {
$dnld_link = "<a href='".e_BASE."request.php?".$dl['download_id']."' onclick= \"return confirm('".$tp->toJS($tp->toHTML($pref['agree_text'],FALSE,"parse_sc defs"))."');\">";
$dnld_link = "<a href='".e_BASE."request.php?".$dl['download_id']."' onclick= \"return confirm('".$tp->toJS($tp->toHTML($pref['agree_text'],FALSE,"parse_sc, defs"))."');\">";
} else {
$dnld_link = "<a href='".e_BASE."request.php?".$dl['download_id']."'>";
}

View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/signup_shortcodes.php,v $
| $Revision: 1.3 $
| $Date: 2006-12-27 22:26:41 $
| $Revision: 1.4 $
| $Date: 2007-01-07 15:59:42 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -172,7 +172,7 @@ foreach($extList as $ext)
if($ext['user_extended_struct_required'] == 1 || $ext['user_extended_struct_required'] == 2)
{
$replace = array(
$tp->toHTML($ext['user_extended_struct_text'], '', 'emotes_off defs'),
$tp->toHTML($ext['user_extended_struct_text'], '', 'emotes_off, defs'),
($ext['user_extended_struct_required'] == 1 ? $EXTENDED_USER_FIELD_REQUIRED : ''),
$usere->user_extended_edit($ext, $_POST['ue']['user_'.$ext['user_extended_struct_name']])
);

View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/usersettings_shortcodes.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:33:41 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2007-01-07 15:59:42 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
@@ -322,7 +322,7 @@ if(!$fInfo)
if($fInfo)
{
$fname = $tp->toHTML($fInfo['user_extended_struct_text'], "", "emotes_off defs");
$fname = $tp->toHTML($fInfo['user_extended_struct_text'], "", "emotes_off, defs");
if($fInfo['user_extended_struct_required'] == 1)
{
$fname = str_replace("{FIELDNAME}", $fname, $REQUIRED_FIELD);

View File

@@ -3,9 +3,9 @@
| e107 website system
|
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/sitelinks_alt.sc,v $
| $Revision: 1.2 $
| $Date: 2006-12-07 15:41:50 $
| $Author: sweetas $
| $Revision: 1.3 $
| $Date: 2007-01-07 15:59:42 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -39,7 +39,7 @@
if ($cat_open == 1){
$text .= " rel='external' ";
}
$text .= ">".$tp->toHTML($cat_title,"","defs no_hook")."</a>";
$text .= ">".$tp->toHTML($cat_title,"","defs, no_hook")."</a>";
return $text;
}
@@ -71,7 +71,7 @@
if ($cat_img != 'no_icons') {
$text .= "<span class='menuItemBuffer'>".$cat_img."</span>";
}
$text .= "<span class='menuItemText'>".$tp->toHTML($cat_title,"","defs no_hook")."</span>";
$text .= "<span class='menuItemText'>".$tp->toHTML($cat_title,"","defs, no_hook")."</span>";
if ($cat_id) {
$text .= "<span class=\"menuItemArrow\">&#9654;</span>";
}

View File

@@ -1,4 +1,4 @@
// $Id: wmessage.sc,v 1.1.1.1 2006-12-02 04:33:40 mcfly_e107 Exp $
// $Id: wmessage.sc,v 1.2 2007-01-07 15:59:42 e107steved Exp $
$prefwmsc = isset($pref['wmessage_sc']) && $pref['wmessage_sc'];
if (($prefwmsc && $parm == "header") || (!$prefwmsc && ($parm !='header')) ){
return;
@@ -59,7 +59,7 @@ if (($prefwmsc && $parm == "header") || (!$prefwmsc && ($parm !='header')) ){
{
while ($row = $sql->db_Fetch())
{
$wmessage .= $tp->toHTML($row['gen_chardata'], TRUE, 'parse_sc defs', 'admin')."<br />";
$wmessage .= $tp->toHTML($row['gen_chardata'], TRUE, 'parse_sc, defs', 'admin')."<br />";
if(!$wmcaption){
$wmcaption = $tp->toHTML($row['gen_ip'], TRUE, 'defs');
}