';
$PM = 'join';
$LN = ($a==$c)?'blank':'line';
$BTM = ($a==$c)?'bottom':'';
Index: t3lib/class.t3lib_parsehtml_proc.php
===================================================================
--- t3lib/class.t3lib_parsehtml_proc.php (revision 6200)
+++ t3lib/class.t3lib_parsehtml_proc.php (working copy)
@@ -275,7 +275,7 @@
// Line breaks of content is unified into char-10 only (removing char 13)
if (!$this->procOptions['disableUnifyLineBreaks']) {
- $value = str_replace(chr(13).chr(10),chr(10),$value);
+ $value = str_replace(CRLF,LF,$value);
}
// In an entry-cleaner was configured, pass value through the HTMLcleaner with that:
@@ -309,7 +309,7 @@
break;
case 'ts_transform':
case 'css_transform':
- $value = str_replace(chr(13),'',$value); // Has a very disturbing effect, so just remove all '13' - depend on '10'
+ $value = str_replace(CR,'',$value); // Has a very disturbing effect, so just remove all '13' - depend on '10'
$this->allowedClasses = t3lib_div::trimExplode(',', $this->procOptions['allowedClasses'], 1);
$value = $this->TS_transform_db($value,$cmd=='css_transform');
break;
@@ -344,7 +344,7 @@
break;
case 'ts_transform':
case 'css_transform':
- $value = str_replace(chr(13),'',$value); // Has a very disturbing effect, so just remove all '13' - depend on '10'
+ $value = str_replace(CR,'',$value); // Has a very disturbing effect, so just remove all '13' - depend on '10'
$value = $this->TS_transform_rte($value,$cmd=='css_transform');
break;
default:
@@ -361,8 +361,8 @@
// Final clean up of linebreaks:
if (!$this->procOptions['disableUnifyLineBreaks']) {
- $value = str_replace(chr(13).chr(10),chr(10),$value); // Make sure no \r\n sequences has entered in the meantime...
- $value = str_replace(chr(10),chr(13).chr(10),$value); // ... and then change all \n into \r\n
+ $value = str_replace(CRLF,LF,$value); // Make sure no \r\n sequences has entered in the meantime...
+ $value = str_replace(LF,CRLF,$value); // ... and then change all \n into \r\n
}
// Return value:
@@ -832,7 +832,7 @@
// Traverse the blocks
foreach($blockSplit as $k => $v) {
$cc++;
- $lastBR = $cc==$aC ? '' : chr(10);
+ $lastBR = $cc==$aC ? '' : LF;
if ($k%2) { // Inside block:
@@ -853,23 +853,23 @@
if (!isset($this->procOptions['typolist']) || $this->procOptions['typolist']) {
$parts = $this->getAllParts($this->splitIntoBlock('LI',$this->removeFirstAndLastTag($blockSplit[$k])),1,0);
while(list($k2)=each($parts)) {
- $parts[$k2]=preg_replace('/['.preg_quote(chr(10).chr(13)).']+/','',$parts[$k2]); // remove all linesbreaks!
+ $parts[$k2]=preg_replace('/['.preg_quote(LF.CR).']+/','',$parts[$k2]); // remove all linesbreaks!
$parts[$k2]=$this->defaultTStagMapping($parts[$k2],'db');
$parts[$k2]=$this->cleanFontTags($parts[$k2],0,0,0);
$parts[$k2] = $this->HTMLcleaner_db($parts[$k2],strtolower($this->procOptions['allowTagsInTypolists']?$this->procOptions['allowTagsInTypolists']:'br,font,b,i,u,a,img,span,strong,em'));
}
if ($tagName=='ol') { $params=' type="1"'; } else { $params=''; }
- $blockSplit[$k]=''.chr(10).implode(chr(10),$parts).chr(10).''.$lastBR;
+ $blockSplit[$k]=''.LF.implode(LF,$parts).LF.''.$lastBR;
}
} else {
- $blockSplit[$k]=preg_replace('/['.preg_quote(chr(10).chr(13)).']+/',' ',$this->transformStyledATags($blockSplit[$k])).$lastBR;
+ $blockSplit[$k]=preg_replace('/['.preg_quote(LF.CR).']+/',' ',$this->transformStyledATags($blockSplit[$k])).$lastBR;
}
break;
case 'table': // Tables are NOT allowed in any form (unless preserveTables is set or CSS is the mode)
if (!$this->procOptions['preserveTables'] && !$css) {
$blockSplit[$k]=$this->TS_transform_db($this->removeTables($blockSplit[$k]));
} else {
- $blockSplit[$k]=preg_replace('/['.preg_quote(chr(10).chr(13)).']+/',' ',$this->transformStyledATags($blockSplit[$k])).$lastBR;
+ $blockSplit[$k]=preg_replace('/['.preg_quote(LF.CR).']+/',' ',$this->transformStyledATags($blockSplit[$k])).$lastBR;
}
break;
case 'h1':
@@ -904,17 +904,17 @@
}
} else {
// Eliminate true linebreaks inside Hx tags
- $blockSplit[$k]=preg_replace('/['.preg_quote(chr(10).chr(13)).']+/',' ',$this->transformStyledATags($blockSplit[$k])).$lastBR;
+ $blockSplit[$k]=preg_replace('/['.preg_quote(LF.CR).']+/',' ',$this->transformStyledATags($blockSplit[$k])).$lastBR;
}
break;
default:
// Eliminate true linebreaks inside other headlist tags and after hr tag
- $blockSplit[$k]=preg_replace('/['.preg_quote(chr(10).chr(13)).']+/',' ',$this->transformStyledATags($blockSplit[$k])).$lastBR;
+ $blockSplit[$k]=preg_replace('/['.preg_quote(LF.CR).']+/',' ',$this->transformStyledATags($blockSplit[$k])).$lastBR;
break;
}
} else { // NON-block:
if (strcmp(trim($blockSplit[$k]),'')) {
- $blockSplit[$k]=$this->divideIntoLines(preg_replace('/['.preg_quote(chr(10).chr(13)).']+/',' ',$blockSplit[$k])).$lastBR;
+ $blockSplit[$k]=$this->divideIntoLines(preg_replace('/['.preg_quote(LF.CR).']+/',' ',$blockSplit[$k])).$lastBR;
$blockSplit[$k]=$this->transformStyledATags($blockSplit[$k]);
} else unset($blockSplit[$k]);
}
@@ -982,12 +982,12 @@
case 'typolist': // Transform typolist blocks into OL/UL lists. Type 1 is expected to be numerical block
if (!isset($this->procOptions['typolist']) || $this->procOptions['typolist']) {
$tListContent = $this->removeFirstAndLastTag($blockSplit[$k]);
- $tListContent = preg_replace('/^[ ]*'.chr(10).'/','',$tListContent);
- $tListContent = preg_replace('/'.chr(10).'[ ]*$/','',$tListContent);
- $lines = explode(chr(10),$tListContent);
+ $tListContent = preg_replace('/^[ ]*'.LF.'/','',$tListContent);
+ $tListContent = preg_replace('/'.LF.'[ ]*$/','',$tListContent);
+ $lines = explode(LF,$tListContent);
$typ = $attribArray['type']==1 ? 'ol' : 'ul';
- $blockSplit[$k] = '<'.$typ.'>'.chr(10).
- '
'.implode('
'.chr(10).'
',$lines).'
'.
+ $blockSplit[$k] = '<'.$typ.'>'.LF.
+ '
'.implode('
'.LF.'
',$lines).'
'.
''.$typ.'>';
}
break;
@@ -1004,12 +1004,12 @@
}
break;
}
- $blockSplit[$k+1] = preg_replace('/^[ ]*'.chr(10).'/','',$blockSplit[$k+1]); // Removing linebreak if typohead
+ $blockSplit[$k+1] = preg_replace('/^[ ]*'.LF.'/','',$blockSplit[$k+1]); // Removing linebreak if typohead
} else { // NON-block:
$nextFTN = $this->getFirstTagName($blockSplit[$k+1]);
- $singleLineBreak = $blockSplit[$k]==chr(10);
+ $singleLineBreak = $blockSplit[$k]==LF;
if (t3lib_div::inList('TABLE,BLOCKQUOTE,TYPOLIST,TYPOHEAD,'.($this->procOptions['preserveDIVSections']?'DIV,':'').$this->blockElementList,$nextFTN)) { // Removing linebreak if typolist/typohead
- $blockSplit[$k] = preg_replace('/'.chr(10).'[ ]*$/','',$blockSplit[$k]);
+ $blockSplit[$k] = preg_replace('/'.LF.'[ ]*$/','',$blockSplit[$k]);
}
// If $blockSplit[$k] is blank then unset the line. UNLESS the line happend to be a single line break.
if (!strcmp($blockSplit[$k],'') && !$singleLineBreak) {
@@ -1019,7 +1019,7 @@
}
}
}
- return implode(chr(10),$blockSplit);
+ return implode(LF,$blockSplit);
}
/**
@@ -1205,7 +1205,7 @@
}
/**
- * This resolves the $value into parts based on -sections and
-sections and -tags. These are returned as lines separated by chr(10).
+ * This resolves the $value into parts based on
-sections and
-sections and -tags. These are returned as lines separated by LF.
* This point is to resolve the HTML-code returned from RTE into ordinary lines so it's 'human-readable'
* The function ->setDivTags does the opposite.
* This function processes content to go into the database.
@@ -1296,7 +1296,7 @@
}
// Remove any line break char (10 or 13)
- $subLines[$sk]=preg_replace('/'.chr(10).'|'.chr(13).'/','',$subLines[$sk]);
+ $subLines[$sk]=preg_replace('/'.LF.'|'.CR.'/','',$subLines[$sk]);
// If there are any attributes or if we are supposed to remap the tag, then do so:
if (count($newAttribs) && strcmp($remapParagraphTag,'1')) {
@@ -1307,7 +1307,7 @@
}
}
// Add the processed line(s)
- $divSplit[$k] = implode(chr(10),$subLines);
+ $divSplit[$k] = implode(LF,$subLines);
// If it turns out the line is just blank (containing a possibly) then just make it pure blank.
// But, prevent filtering of lines that are blank in sense above, but whose tags contain attributes.
@@ -1323,7 +1323,7 @@
}
// Return value:
- return $returnArray ? $divSplit : implode(chr(10),$divSplit);
+ return $returnArray ? $divSplit : implode(LF,$divSplit);
}
/**
@@ -1343,8 +1343,8 @@
$hSC = $this->procOptions['dontHSC_rte'] ? 0 : 1; // Default: re-convert literals to characters (that is < to <)
$convNBSP = !$this->procOptions['dontConvAmpInNBSP_rte']?1:0;
- // Divide the content into lines, based on chr(10):
- $parts = explode(chr(10),$value);
+ // Divide the content into lines, based on LF:
+ $parts = explode(LF,$value);
foreach($parts as $k => $v) {
// Processing of line content:
@@ -1366,7 +1366,7 @@
}
// Implode result:
- return implode(chr(10),$parts);
+ return implode(LF,$parts);
}
/**
Index: t3lib/class.t3lib_div.php
===================================================================
--- t3lib/class.t3lib_div.php (revision 6200)
+++ t3lib/class.t3lib_div.php (working copy)
@@ -646,12 +646,12 @@
public static function breakTextForEmail($str,$implChar="\n",$charWidth=76) {
self::logDeprecatedFunction();
- $lines = explode(chr(10),$str);
+ $lines = explode(LF,$str);
$outArr=array();
foreach ($lines as $lStr) {
$outArr[] = t3lib_div::breakLinesForEmail($lStr,$implChar,$charWidth);
}
- return implode(chr(10),$outArr);
+ return implode(LF,$outArr);
}
/**
@@ -1518,7 +1518,7 @@
* @return string Formatted for
','
'.chr(10).'
',$colParts[$kkk]);
+ if ($cfg['HTMLtableCells.']['addChr10BetweenParagraphs']) $colParts[$kkk]=str_replace('
','
'.LF.'
',$colParts[$kkk]);
$colParts[$kkk] = $this->parseFunc($colParts[$kkk], $conf);
}
@@ -4953,7 +4953,7 @@
$data = substr($theValue,$pointer,$len); // $data is the content until the next parameters['allParams']=trim($currentTag[1]);
if ($stripNL) { // Removes NL in the beginning and end of the tag-content AND at the end of the currentTagBuffer. $stripNL depends on the configuration of the current tag
- $contentAccum[$contentAccumP-1] = preg_replace('/'.chr(13).'?'.chr(10).'[ ]*$/', '', $contentAccum[$contentAccumP-1]);
- $contentAccum[$contentAccumP] = preg_replace('/^[ ]*'.chr(13).'?'.chr(10).'/', '', $contentAccum[$contentAccumP]);
- $contentAccum[$contentAccumP] = preg_replace('/'.chr(13).'?'.chr(10).'[ ]*$/', '', $contentAccum[$contentAccumP]);
+ $contentAccum[$contentAccumP-1] = preg_replace('/'.CR.'?'.LF.'[ ]*$/', '', $contentAccum[$contentAccumP-1]);
+ $contentAccum[$contentAccumP] = preg_replace('/^[ ]*'.CR.'?'.LF.'/', '', $contentAccum[$contentAccumP]);
+ $contentAccum[$contentAccumP] = preg_replace('/'.CR.'?'.LF.'[ ]*$/', '', $contentAccum[$contentAccumP]);
}
$this->data[$this->currentValKey] = $contentAccum[$contentAccumP];
$newInput=$this->cObjGetSingle($theName,$theConf,'/parseFunc/.tags.'.$tag[0]); // fetch the content object
@@ -5109,16 +5109,16 @@
}
/**
- * Lets you split the content by chr(10) and proces each line independently. Used to format content made with the RTE.
+ * Lets you split the content by LF and proces each line independently. Used to format content made with the RTE.
*
* @param string The input value
* @param array TypoScript options
- * @return string The processed input value being returned; Splitted lines imploded by chr(10) again.
+ * @return string The processed input value being returned; Splitted lines imploded by LF again.
* @access private
* @link http://typo3.org/doc.0.html?&tx_extrepmgm_pi1[extUid]=270&tx_extrepmgm_pi1[tocEl]=323&cHash=a19312be78
*/
function encaps_lineSplit($theValue, $conf) {
- $lParts = explode(chr(10),$theValue);
+ $lParts = explode(LF,$theValue);
$encapTags = t3lib_div::trimExplode(',',strtolower($conf['encapsTagList']),1);
$nonWrappedTag = $conf['nonWrappedTag'];
@@ -5186,7 +5186,7 @@
$lParts[$k] = $str_content;
}
- return implode(chr(10),$lParts);
+ return implode(LF,$lParts);
}
/**
@@ -5206,7 +5206,7 @@
$textstr = $textpieces[0];
$initP = '?id='.$GLOBALS['TSFE']->id.'&type='.$GLOBALS['TSFE']->type;
for($i=1; $i<$pieces; $i++) {
- $len=strcspn($textpieces[$i],chr(32).chr(9).chr(13).chr(10));
+ $len=strcspn($textpieces[$i],chr(32).TAB.CRLF);
if (trim(substr($textstr,-1))=='' && $len) {
$lastChar=substr($textpieces[$i],$len-1,1);
@@ -5276,7 +5276,7 @@
$textstr = $textpieces[0];
$initP = '?id='.$GLOBALS['TSFE']->id.'&type='.$GLOBALS['TSFE']->type;
for($i=1; $i<$pieces; $i++) {
- $len = strcspn($textpieces[$i],chr(32).chr(9).chr(13).chr(10));
+ $len = strcspn($textpieces[$i],chr(32).TAB.CRLF);
if (trim(substr($textstr,-1))=='' && $len) {
$lastChar = substr($textpieces[$i],$len-1,1);
if (!preg_match('/[A-Za-z0-9]/',$lastChar)) {$len--;}
@@ -6634,7 +6634,7 @@
*/
function processParams($params) {
$paramArr=array();
- $lines=t3lib_div::trimExplode(chr(10),$params,1);
+ $lines=t3lib_div::trimExplode(LF,$params,1);
foreach($lines as $val) {
$pair = explode('=',$val,2);
if (!t3lib_div::inList('#,/',substr(trim($pair[0]),0,1))) {
@@ -6651,7 +6651,7 @@
* @return string Cleaned up string, keywords will be separated by a comma only.
*/
function keywords($content) {
- $listArr = preg_split('/[,;' . chr(10) . ']/', $content);
+ $listArr = preg_split('/[,;' . LF . ']/', $content);
foreach ($listArr as $k => $v) {
$listArr[$k]=trim($v);
}
@@ -6775,12 +6775,12 @@
$emailContent = trim($msg);
if ($emailContent) {
- $parts = explode(chr(10), $emailContent, 2); // First line is subject
+ $parts = explode(LF, $emailContent, 2); // First line is subject
$subject=trim($parts[0]);
$plain_message=trim($parts[1]);
- if ($recipients) $GLOBALS['TSFE']->plainMailEncoded($recipients, $subject, $plain_message, implode(chr(10),$headers));
- if ($cc) $GLOBALS['TSFE']->plainMailEncoded($cc, $subject, $plain_message, implode(chr(10),$headers));
+ if ($recipients) $GLOBALS['TSFE']->plainMailEncoded($recipients, $subject, $plain_message, implode(LF,$headers));
+ if ($cc) $GLOBALS['TSFE']->plainMailEncoded($cc, $subject, $plain_message, implode(LF,$headers));
return true;
}
}
@@ -6942,7 +6942,7 @@
* @see gifBuilderTextBox()
*/
function linebreaks($string,$chars,$maxLines=0) {
- $lines = explode(chr(10),$string);
+ $lines = explode(LF,$string);
$lineArr=Array();
$c=0;
foreach ($lines as $paragraph) {
@@ -7995,16 +7995,16 @@
if (!$conf['src'] && !$typeNum) {
$typeNum = -1;
}
- $content.='frameParams($conf,$typeNum).' />'.chr(10);
+ $content.='frameParams($conf,$typeNum).' />'.LF;
break;
case 'FRAMESET':
$frameset = t3lib_div::makeInstance('tslib_frameset');
- $content.=$frameset->make($conf).chr(10);
+ $content.=$frameset->make($conf).LF;
break;
}
}
}
- return '';
+ return '';
}
}
@@ -8098,7 +8098,7 @@
// If width is defined AND there has been no change to the default table params, then extend them to a tablewidth of 1
if ($valPairs[4] && $this->default_tableParams==$this->tableParams) {$this->tableParams.=' width="1"';}
// Init:
- $this->begin = chr(10).'
tableParams.'>';
+ $this->begin = LF.'
tableParams.'>';
$this->end = '
';
$rows=array();
$widthImg = '';
@@ -8226,7 +8226,7 @@
if (!$rows && $cols) $rows=1; // If there are no rows in the middle but still som columns...
if ($rows&&$cols) {
- $res = chr(10).'
tableParams.'>';
+ $res = LF.'
tableParams.'>';
// top offset:
if ($offArr[1]) {
$xoff = $offArr[0] ? 1 : 0;
Index: typo3/sysext/cms/tslib/class.tslib_adminpanel.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_adminpanel.php (revision 6200)
+++ typo3/sysext/cms/tslib/class.tslib_adminpanel.php (working copy)
@@ -311,7 +311,7 @@
' . ($this->extNeedUpdate ? '' : '') . '
';
- $query = !t3lib_div::_GET('id') ? ('' . chr(10)) : '';
+ $query = !t3lib_div::_GET('id') ? ('' . LF) : '';
// the dummy field is needed for Firefox: to force a page reload on submit with must change the form value with JavaScript (see "onsubmit" attribute of the "form" element")
$query .= '';
foreach (t3lib_div::_GET() as $key => $value) {
@@ -319,7 +319,7 @@
if (is_array($value)) {
$query .= $this->getHiddenFields($key, $value);
} else {
- $query .= '' . chr(10);
+ $query .= '' . LF;
}
}
}
@@ -397,7 +397,7 @@
if (is_array($v)) {
$out .= $this->getHiddenFields($key . '[' . $k . ']', $v);
} else {
- $out .= '' . chr(10);
+ $out .= '' . LF;
}
}
return $out;
Index: typo3/sysext/cms/tslib/media/scripts/tmenu_layers.php
===================================================================
--- typo3/sysext/cms/tslib/media/scripts/tmenu_layers.php (revision 6200)
+++ typo3/sysext/cms/tslib/media/scripts/tmenu_layers.php (working copy)
@@ -375,7 +375,7 @@
GLV_timeout["'.$this->WMid.'"] = GLV_date.getTime();
GLV_timeoutRef["'.$this->WMid.'"] = '.t3lib_div::intInRange($this->mconf['hideMenuTimer'],0,20000).';
GLV_menuXY["'.$this->WMid.'"] = new Array();
-'.implode(chr(10),$this->WMxyArray).'
+'.implode(LF,$this->WMxyArray).'
'.$this->WMrestoreVars;
if ($this->mconf['freezeMouseover']) {
@@ -384,14 +384,14 @@
function GL'.$this->WMid.'_over(mitm_id) {
GL'.$this->WMid.'_out(""); // removes any old roll over state of an item. Needed for alwaysKeep and Opera browsers.
switch(mitm_id) {
-'.implode(chr(10),$this->VMmouseoverActions).'
+'.implode(LF,$this->VMmouseoverActions).'
}
GLV_currentROitem["'.$this->WMid.'"]=mitm_id;
}
function GL'.$this->WMid.'_out(mitm_id) {
if (!mitm_id) mitm_id=GLV_currentROitem["'.$this->WMid.'"];
switch(mitm_id) {
-'.implode(chr(10),$this->VMmouseoutActions).'
+'.implode(LF,$this->VMmouseoutActions).'
}
}
';
@@ -399,7 +399,7 @@
$GLOBALS["TSFE"]->JSCode.= '
function GL'.$this->WMid.'_getMouse(e) {
if (GLV_menuOn["'.$this->WMid.'"]!=null && !GLV_dontFollowMouse["'.$this->WMid.'"]){
-'.implode(chr(10),$GLV_menuOn).'
+'.implode(LF,$GLV_menuOn).'
}
GL_mouseMoveEvaluate("'.$this->WMid.'");
}
@@ -407,7 +407,7 @@
'.$this->WMhideCode.'
}
function GL'.$this->WMid.'_doTop(WMid,id) {
-'.trim(implode(chr(10),$DoTop)).'
+'.trim(implode(LF,$DoTop)).'
}
function GL'.$this->WMid.'_restoreMenu() {
'.$this->WMrestoreScript.'
@@ -428,7 +428,7 @@
$GLOBALS['TSFE']->JSeventFuncCalls['onmousemove'][$this->WMid]= 'GL'.$this->WMid.'_getMouse(e);';
$GLOBALS['TSFE']->JSeventFuncCalls['onmouseup'][$this->WMid]= 'GL_mouseUp(\''.$this->WMid.'\',e);';
- $GLOBALS['TSFE']->divSection.=implode($this->divLayers,chr(10)).chr(10);
+ $GLOBALS['TSFE']->divSection.=implode($this->divLayers,LF).LF;
return parent::extProc_finish();
}
Index: typo3/sysext/cms/tslib/media/scripts/freesite_dummy_page_menu.php
===================================================================
--- typo3/sysext/cms/tslib/media/scripts/freesite_dummy_page_menu.php (revision 6200)
+++ typo3/sysext/cms/tslib/media/scripts/freesite_dummy_page_menu.php (working copy)
@@ -55,7 +55,7 @@
$key = $row['uid'];
$val = $row['title'];
$content.= ''.$val.' ';
- $specialComment.= '[globalVar= based_on_uid='.$key.']'.chr(10);
+ $specialComment.= '[globalVar= based_on_uid='.$key.']'.LF;
}
// Select subcategories of template folder.
$page_res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'pages', 'pid='.intval($pid).' AND deleted=0 AND hidden=0 AND starttime=0 AND endtime=0 AND fe_group=0', '', 'sorting');
@@ -67,7 +67,7 @@
$key = $row['uid'];
$val = $page_row['title'].' / '.$row['title'];
$content.= ''.$val.' ';
- $specialComment.= '[globalVar= based_on_uid='.$key.']'.chr(10);
+ $specialComment.= '[globalVar= based_on_uid='.$key.']'.LF;
}
}
}
Index: typo3/sysext/cms/tslib/media/scripts/gmenu_layers.php
===================================================================
--- typo3/sysext/cms/tslib/media/scripts/gmenu_layers.php (revision 6200)
+++ typo3/sysext/cms/tslib/media/scripts/gmenu_layers.php (working copy)
@@ -375,7 +375,7 @@
GLV_timeout["'.$this->WMid.'"] = GLV_date.getTime();
GLV_timeoutRef["'.$this->WMid.'"] = '.t3lib_div::intInRange($this->mconf['hideMenuTimer'],0,20000).';
GLV_menuXY["'.$this->WMid.'"] = new Array();
-'.implode(chr(10),$this->WMxyArray).'
+'.implode(LF,$this->WMxyArray).'
'.$this->WMrestoreVars;
if ($this->mconf['freezeMouseover']) {
@@ -384,14 +384,14 @@
function GL'.$this->WMid.'_over(mitm_id) {
GL'.$this->WMid.'_out(""); // removes any old roll over state of an item. Needed for alwaysKeep and Opera browsers.
switch(mitm_id) {
-'.implode(chr(10),$this->VMmouseoverActions).'
+'.implode(LF,$this->VMmouseoverActions).'
}
GLV_currentROitem["'.$this->WMid.'"]=mitm_id;
}
function GL'.$this->WMid.'_out(mitm_id) {
if (!mitm_id) mitm_id=GLV_currentROitem["'.$this->WMid.'"];
switch(mitm_id) {
-'.implode(chr(10),$this->VMmouseoutActions).'
+'.implode(LF,$this->VMmouseoutActions).'
}
}
';
@@ -399,7 +399,7 @@
$GLOBALS["TSFE"]->JSCode.= '
function GL'.$this->WMid.'_getMouse(e) {
if (GLV_menuOn["'.$this->WMid.'"]!=null && !GLV_dontFollowMouse["'.$this->WMid.'"]){
-'.implode(chr(10),$GLV_menuOn).'
+'.implode(LF,$GLV_menuOn).'
}
GL_mouseMoveEvaluate("'.$this->WMid.'");
}
@@ -407,7 +407,7 @@
'.$this->WMhideCode.'
}
function GL'.$this->WMid.'_doTop(WMid,id) {
-'.trim(implode(chr(10),$DoTop)).'
+'.trim(implode(LF,$DoTop)).'
}
function GL'.$this->WMid.'_restoreMenu() {
'.$this->WMrestoreScript.'
@@ -428,7 +428,7 @@
$GLOBALS['TSFE']->JSeventFuncCalls['onmousemove'][$this->WMid]= 'GL'.$this->WMid.'_getMouse(e);';
$GLOBALS['TSFE']->JSeventFuncCalls['onmouseup'][$this->WMid]= 'GL_mouseUp(\''.$this->WMid.'\',e);';
- $GLOBALS['TSFE']->divSection.=implode($this->divLayers,chr(10)).chr(10);
+ $GLOBALS['TSFE']->divSection.=implode($this->divLayers,LF).LF;
return parent::extProc_finish();
}
Index: typo3/sysext/cms/tslib/class.tslib_pagegen.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_pagegen.php (revision 6200)
+++ typo3/sysext/cms/tslib/class.tslib_pagegen.php (working copy)
@@ -302,7 +302,7 @@
}
}
- return array(count($functions)? implode(chr(10), $functions) . chr(10) . implode(chr(10), $setEvents) : '', $setBody);
+ return array(count($functions)? implode(LF, $functions) . LF . implode(LF, $setEvents) : '', $setBody);
}
/**
@@ -452,7 +452,7 @@
// Adding doctype parts:
if (count($docTypeParts)) {
- $pageRenderer->setXmlPrologAndDocType(implode(chr(10), $docTypeParts));
+ $pageRenderer->setXmlPrologAndDocType(implode(LF, $docTypeParts));
}
// Begin header section:
@@ -500,14 +500,14 @@
$temp_styleLines = array ();
foreach ($GLOBALS['TSFE']->tmpl->setup['plugin.'] as $key => $iCSScode) {
if (is_array($iCSScode) && $iCSScode['_CSS_DEFAULT_STYLE']) {
- $temp_styleLines[] = '/* default styles for extension "' . substr($key, 0, - 1) . '" */' . chr(10) . $iCSScode['_CSS_DEFAULT_STYLE'];
+ $temp_styleLines[] = '/* default styles for extension "' . substr($key, 0, - 1) . '" */' . LF . $iCSScode['_CSS_DEFAULT_STYLE'];
}
}
if (count($temp_styleLines)) {
if ($GLOBALS['TSFE']->config['config']['inlineStyle2TempFile']) {
- $pageRenderer->addCssFile(TSpagegen::inline2TempFile(implode(chr(10), $temp_styleLines), 'css'));
+ $pageRenderer->addCssFile(TSpagegen::inline2TempFile(implode(LF, $temp_styleLines), 'css'));
} else {
- $pageRenderer->addCssInlineBlock('TSFEinlineStyle', implode(chr(10), $temp_styleLines));
+ $pageRenderer->addCssInlineBlock('TSFEinlineStyle', implode(LF, $temp_styleLines));
}
}
}
@@ -874,7 +874,7 @@
if (is_array($GLOBALS['TSFE']->inlineJS)) {
foreach ($GLOBALS['TSFE']->inlineJS as $key => $val) {
if (! is_array($val)) {
- $inlineJS .= chr(10) . $val . chr(10);
+ $inlineJS .= LF . $val . LF;
}
}
}
@@ -883,7 +883,7 @@
// Javascript inline code
$inline = $GLOBALS['TSFE']->cObj->cObjGet($GLOBALS['TSFE']->pSetup['jsInline.'], 'jsInline.');
if ($inline) {
- $inlineJS .= chr(10) . $inline . chr(10);
+ $inlineJS .= LF . $inline . LF;
}
// Javascript inline code for Footer
@@ -965,12 +965,12 @@
// add header data block
if ($GLOBALS['TSFE']->additionalHeaderData) {
- $pageRenderer->addHeaderData(implode(chr(10), $GLOBALS['TSFE']->additionalHeaderData));
+ $pageRenderer->addHeaderData(implode(LF, $GLOBALS['TSFE']->additionalHeaderData));
}
// add footer data block
if ($GLOBALS['TSFE']->additionalFooterData) {
- $pageRenderer->addFooterData(implode(chr(10), $GLOBALS['TSFE']->additionalFooterData));
+ $pageRenderer->addFooterData(implode(LF, $GLOBALS['TSFE']->additionalFooterData));
}
// Header complete, now add content
@@ -979,7 +979,7 @@
if ($GLOBALS['TSFE']->pSetup['frameSet.']) {
$fs = t3lib_div::makeInstance('tslib_frameset');
$pageRenderer->addBodyContent($fs->make($GLOBALS['TSFE']->pSetup['frameSet.']));
- $pageRenderer->addBodyContent(chr(10) . '' . chr(10));
+ $pageRenderer->addBodyContent(LF . '' . LF);
}
// Bodytag:
@@ -1007,22 +1007,22 @@
if (count($JSef[1])) { // Event functions:
$bodyTag = preg_replace('/>$/', '', trim($bodyTag)) . ' ' . trim(implode(' ', $JSef[1])) . '>';
}
- $pageRenderer->addBodyContent(chr(10) . $bodyTag);
+ $pageRenderer->addBodyContent(LF . $bodyTag);
// Div-sections
if ($GLOBALS['TSFE']->divSection) {
- $pageRenderer->addBodyContent(chr(10) . $GLOBALS['TSFE']->divSection);
+ $pageRenderer->addBodyContent(LF . $GLOBALS['TSFE']->divSection);
}
// Page content
- $pageRenderer->addBodyContent(chr(10) . $pageContent);
+ $pageRenderer->addBodyContent(LF . $pageContent);
// Render complete page
$GLOBALS['TSFE']->content = $pageRenderer->render();
// Ending page
if ($GLOBALS['TSFE']->pSetup['frameSet.']) {
- $GLOBALS['TSFE']->content .= chr(10) . '';
+ $GLOBALS['TSFE']->content .= LF . '';
}
}
Index: typo3/sysext/cms/tslib/class.tslib_fe.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_fe.php (revision 6200)
+++ typo3/sysext/cms/tslib/class.tslib_fe.php (working copy)
@@ -1506,7 +1506,7 @@
if ($reason == '') {
$reason = 'Page cannot be found.';
}
- $reason.= chr(10) . chr(10) . 'Additionally, ' . $code . ' was not found while trying to retrieve the error document.';
+ $reason.= LF . LF . 'Additionally, ' . $code . ' was not found while trying to retrieve the error document.';
$this->printError('Reason: '.nl2br(htmlspecialchars($reason)));
exit();
}
@@ -1559,7 +1559,7 @@
$base.= preg_replace('/(.*\/)[^\/]*/', '${1}', $url_parts['path']);
// Put it into content (generate also if necessary)
- $replacement = chr(10) . '' . chr(10);
+ $replacement = LF . '' . LF;
if (stristr($content, '')) {
$content = preg_replace('/()/i', '\1' . $replacement, $content);
} else {
@@ -1912,7 +1912,7 @@
$dateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'];
$timeFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'];
- $this->content.= chr(10).'';
+ $this->content.= LF.'';
}
}
$GLOBALS['TT']->pull();
@@ -3175,7 +3175,7 @@
$GLOBALS['TT']->push('Substitute header section');
$this->INTincScript_loadJSCode();
- $this->content = str_replace('', $this->convOutputCharset(implode(chr(10),$this->additionalHeaderData),'HD'), $this->content);
+ $this->content = str_replace('', $this->convOutputCharset(implode(LF,$this->additionalHeaderData),'HD'), $this->content);
$this->content = str_replace('', $this->convOutputCharset($this->divSection,'TDS'), $this->content);
$this->setAbsRefPrefix();
$GLOBALS['TT']->pull();
@@ -3268,7 +3268,7 @@
';
@@ -3259,7 +3259,7 @@
}
if (count($out)) {
$col = t3lib_div::intInRange(count($out),2,10);
- $outputStr = '
'.htmlspecialchars(implode($out,chr(10))).'
';
+ $outputStr = '
'.htmlspecialchars(implode($out,LF)).'
';
return '';
};
}
@@ -3458,7 +3458,7 @@
foreach ($GLOBALS['TYPO3_LOADED_EXT'] as $loadedExtConf) {
if (is_array($loadedExtConf) && $loadedExtConf['ext_tables.sql']) {
- $tblFileContent.= chr(10).chr(10).chr(10).chr(10).t3lib_div::getUrl($loadedExtConf['ext_tables.sql']);
+ $tblFileContent.= LF.LF.LF.LF.t3lib_div::getUrl($loadedExtConf['ext_tables.sql']);
}
}
} elseif (@is_file($actionParts[1])) {
@@ -3466,7 +3466,7 @@
}
if ($tblFileContent) {
$fileContent = implode(
- chr(10),
+ LF,
$this->getStatementArray($tblFileContent,1,'^CREATE TABLE ')
);
$FDfile = $this->getFieldDefinitions_fileContent($fileContent);
@@ -3622,7 +3622,7 @@
reset($GLOBALS['TYPO3_LOADED_EXT']);
while(list(,$loadedExtConf)=each($GLOBALS['TYPO3_LOADED_EXT'])) {
if (is_array($loadedExtConf) && $loadedExtConf['ext_tables.sql']) {
- $tblFileContent.= chr(10).chr(10).chr(10).chr(10).t3lib_div::getUrl($loadedExtConf['ext_tables.sql']);
+ $tblFileContent.= LF.LF.LF.LF.t3lib_div::getUrl($loadedExtConf['ext_tables.sql']);
}
}
}
@@ -3630,7 +3630,7 @@
reset($GLOBALS['TYPO3_LOADED_EXT']);
while(list(,$loadedExtConf)=each($GLOBALS['TYPO3_LOADED_EXT'])) {
if (is_array($loadedExtConf) && $loadedExtConf['ext_tables_static+adt.sql']) {
- $tblFileContent.= chr(10).chr(10).chr(10).chr(10).t3lib_div::getUrl($loadedExtConf['ext_tables_static+adt.sql']);
+ $tblFileContent.= LF.LF.LF.LF.t3lib_div::getUrl($loadedExtConf['ext_tables_static+adt.sql']);
}
}
}
@@ -3655,7 +3655,7 @@
// Make a database comparison because some tables that are defined twice have not been created at this point. This applies to the "pages.*" fields defined in sysext/cms/ext_tables.sql for example.
$fileContent = implode(
$this->getStatementArray($tblFileContent,1,'^CREATE TABLE '),
- chr(10)
+ LF
);
$FDfile = $this->getFieldDefinitions_fileContent($fileContent);
$FDdb = $this->getFieldDefinitions_database();
@@ -3780,7 +3780,7 @@
if (count($statements)) {
$out = '';
foreach ($statements as $statement) {
- $out.= nl2br(htmlspecialchars(t3lib_div::fixed_lgd_cs($statement,$maxlen)).chr(10).chr(10));
+ $out.= nl2br(htmlspecialchars(t3lib_div::fixed_lgd_cs($statement,$maxlen)).LF.LF);
}
}
$this->message($tLabel,'Content of '.basename($actionParts[1]),$out,1);
@@ -3995,7 +3995,7 @@
$updateWizardBoxes.= '