Project

General

Profile

Download (5.83 KB)

Bug #14984 » utf8_JS_2005-10-26.patch

Administrator Admin, 2005-10-26 17:56

View differences:

TYPO3core.utfjs/t3lib/class.t3lib_div.php 2005-10-22 18:12:41.922450248 +0200
return $paramsArr;
}
function quoteJSvalue($value, $inScriptTags = false) {
$value = addcslashes($value, '\'');
if (!$inScriptTags) {
$value = htmlspecialchars($value);
}
return '\''.$value.'\'';
}
}
?>
TYPO3core.utfjs/t3lib/class.t3lib_tsfebeuserauth.php 2005-10-22 19:49:29.268925576 +0200
#include('./'.TYPO3_mainDir.'sysext/lang/locallang_tsfe.php');
if (!is_array($LOCAL_LANG)) $LOCAL_LANG=array();
}
$labelStr = htmlspecialchars($GLOBALS['LANG']->getLL($key)); // Label string in the default backend output charset.
// Convert to utf-8, then to entities:
if ($GLOBALS['LANG']->charSet!='utf-8') {
$labelStr = $GLOBALS['LANG']->csConvObj->utf8_encode($labelStr,$GLOBALS['LANG']->charSet);
$labelStr = $GLOBALS['LANG']->csConvObj->utf8_encode($GLOBALS['LANG']->getLL($key), $GLOBALS['LANG']->charSet);
}
$labelStr = $GLOBALS['LANG']->csConvObj->utf8_to_entities($labelStr);
$labelStr = htmlspecialchars($GLOBALS['LANG']->getLL($key)); // Label string in the default backend output charset.
// Return the result:
return $labelStr;
TYPO3core.utfjs/t3lib/jsfunc.menu.js 2005-10-22 18:43:20.576103584 +0200
function JSmenuAddItem (parent,prevItem,openID,title,url,target) {
this.count++;
var entryID = this.count;
this.entry[entryID] = new JSmenuItem (this, entryID, 0, parent, openID, unescape(title), unescape(url), target);
this.entry[entryID] = new JSmenuItem (this, entryID, 0, parent, openID, title, url, target);
if (prevItem) {
this.entry[prevItem].nextItem = entryID;
} else if(parent) {
TYPO3core.utfjs/typo3/sysext/cms/tslib/class.tslib_content.php 2005-10-22 19:47:30.798935752 +0200
$hiddenfields = '<div style="display:none;">'.$hiddenfields.'</div>';
if ($conf['REQ']) {
$validateForm=' onsubmit="return validateForm(\''.$formname.'\',\''.implode(',',$fieldlist).'\',\''.rawurlencode($conf['goodMess']).'\',\''.rawurlencode($conf['badMess']).'\',\''.rawurlencode($conf['emailMess']).'\')"';
$validateForm=' onsubmit="return validateForm(\''.$formname.'\',\''.implode(',',$fieldlist).'\','.t3lib_div::quoteJSvalue($conf['goodMess']).','.t3lib_div::quoteJSvalue($conf['badMess']).','.t3lib_div::quoteJSvalue($conf['emailMess']).')"';
$GLOBALS['TSFE']->additionalHeaderData['JSFormValidate'] = '<script type="text/javascript" src="'.$GLOBALS['TSFE']->absRefPrefix.'t3lib/jsfunc.validateform.js"></script>';
} else $validateForm='';
......
reset($value);
while(list(,$Nvalue)=each($value)) {
$JSPart.="
updateForm('".$formName."','".$arrPrefix."[".$fKey."][]',unescape('".rawurlencode($Nvalue)."'))";
updateForm('".$formName."','".$arrPrefix."[".$fKey."][]',".t3lib_div::quoteJSvalue($Nvalue, true).")";
}
} else {
$JSPart.="
updateForm('".$formName."','".$arrPrefix."[".$fKey."]',unescape('".rawurlencode($value)."'))";
updateForm('".$formName."','".$arrPrefix."[".$fKey."]',".t3lib_div::quoteJSvalue($value, true).")";
}
}
$JSPart='<script type="text/javascript">
......
}
} else {
if ($confirm) {
$cf1="if (confirm(unescape('".t3lib_div::rawurlencodeJS($confirm)."'))){";
$cf1="if (confirm(".str_replace(chr(10), '\n', t3lib_div::quoteJSvalue($confirm, true)).")){"; // Gets htmlspecialchared later
$cf2='}';
} else {
$cf1=$cf2='';
TYPO3core.utfjs/typo3/sysext/cms/tslib/class.tslib_menu.php 2005-10-22 19:09:45.506669096 +0200
} else {
$addLines = '';
}
$title=rawurlencode($data['title']);
$title=$data['title'];
$url='';
$target='';
if ((!$addLines && !$levelConf['noLink']) || $levelConf['alwaysLink']) {
......
$url = rawurlencode($LD['totalURL']);
$target = rawurlencode($LD['target']);
}
$codeLines.="\n".$var.$count."=".$menuName.".add(".$parent.",".$prev.",0,'".$title."','".$GLOBALS['TSFE']->baseUrlWrap($url)."','".$target."');";
$codeLines.="\n".$var.$count."=".$menuName.".add(".$parent.",".$prev.",0,".t3lib_div::quoteJSvalue($title, true).",'".$GLOBALS['TSFE']->baseUrlWrap($url)."','".$target."');";
// If the active one should be chosen...
$active = ($levelConf['showActive'] && $data['uid'] == $this->tmpl->rootLine[$count]['uid']);
// If the first item should be shown
......
$levelConf['firstLabel'] = $this->mconf['firstLabelGeneral'];
}
if ($levelConf['firstLabel'] && $codeLines) {
$codeLines.="\n".$menuName.".defTopTitle[".$count."] = unescape('".rawurlencode($levelConf['firstLabel'])."');";
$codeLines.= chr(10).$menuName.'.defTopTitle['.$count.'] = '.t3lib_div::quoteJSvalue($levelConf['firstLabel'], true).';';
}
return $codeLines;
}
(3-3/3)