'.implode(chr(10),$lines).''; + return '
'.implode(LF,$lines).''; } } Index: t3lib/class.t3lib_pagerenderer.php =================================================================== --- t3lib/class.t3lib_pagerenderer.php (revision 6295) +++ t3lib/class.t3lib_pagerenderer.php (working copy) @@ -135,12 +135,12 @@ $this->backPath = isset($backPath) ? $backPath : $GLOBALS['BACK_PATH']; $this->inlineJavascriptWrap = array( - '' . chr(10) + '' . LF ); $this->inlineCssWrap = array( - '' . chr(10) + '' . LF ); } @@ -636,7 +636,7 @@ public function addJsInlineCode($name, $block, $compress = TRUE, $forceOnTop = FALSE) { if (!isset($this->jsInline[$name])) { $this->jsInline[$name] = array ( - 'code' => $block . chr(10), + 'code' => $block . LF, 'section' => self::PART_HEADER, 'compress' => $compress, 'forceOnTop' => $forceOnTop @@ -656,7 +656,7 @@ public function addJsFooterInlineCode($name, $block, $compress = TRUE, $forceOnTop = FALSE) { if (!isset($this->jsInline[$name])) { $this->jsInline[$name] = array ( - 'code' => $block . chr(10), + 'code' => $block . LF, 'section' => self::PART_FOOTER, 'compress' => $compress, 'forceOnTop' => $forceOnTop @@ -952,7 +952,7 @@ $this->doConcatenate(); } - $metaTags = implode(chr(10), $this->metaTags); + $metaTags = implode(LF, $this->metaTags); if (count($this->cssFiles)) { foreach ($this->cssFiles as $file => $properties) { @@ -962,9 +962,9 @@ $tag = str_replace('|', $tag, $properties['allWrap']); } if ($properties['forceOnTop']) { - $cssFiles = $tag . chr(10) . $cssFiles; + $cssFiles = $tag . LF . $cssFiles; } else { - $cssFiles .= chr(10) . $tag; + $cssFiles .= LF . $tag; } } } @@ -973,9 +973,9 @@ foreach ($this->cssInline as $name => $properties) { if ($properties['forceOnTop']) { - $cssInline = '/*' . htmlspecialchars($name) . '*/' . chr(10) . $properties['code'] . chr(10) . $cssInline; + $cssInline = '/*' . htmlspecialchars($name) . '*/' . LF . $properties['code'] . LF . $cssInline; } else { - $cssInline .= '/*' . htmlspecialchars($name) . '*/' . chr(10) . $properties['code'] . chr(10); + $cssInline .= '/*' . htmlspecialchars($name) . '*/' . LF . $properties['code'] . LF; } } $cssInline = $this->inlineCssWrap[0] . $cssInline . $this->inlineCssWrap[1]; @@ -991,15 +991,15 @@ } if ($properties['forceOnTop']) { if ($properties['section'] === self::PART_HEADER) { - $jsLibs = $tag . chr(10) . $jsLibs; + $jsLibs = $tag . LF . $jsLibs; } else { - $jsFooterLibs = $tag . chr(10) . $jsFooterLibs; + $jsFooterLibs = $tag . LF . $jsFooterLibs; } } else { if ($properties['section'] === self::PART_HEADER) { - $jsLibs .= chr(10) . $tag; + $jsLibs .= LF . $tag; } else { - $jsFooterLibs .= chr(10) . $tag; + $jsFooterLibs .= LF . $tag; } } @@ -1015,15 +1015,15 @@ } if ($properties['forceOnTop']) { if ($properties['section'] === self::PART_HEADER) { - $jsFiles = $tag . chr(10) . $jsFiles; + $jsFiles = $tag . LF . $jsFiles; } else { - $jsFooterFiles = $tag . chr(10) . $jsFooterFiles; + $jsFooterFiles = $tag . LF . $jsFooterFiles; } } else { if ($properties['section'] === self::PART_HEADER) { - $jsFiles .= chr(10) . $tag; + $jsFiles .= LF . $tag; } else { - $jsFooterFiles .= chr(10) . $tag; + $jsFooterFiles .= LF . $tag; } } } @@ -1033,15 +1033,15 @@ foreach ($this->jsInline as $name => $properties) { if ($properties['forceOnTop']) { if ($properties['section'] === self::PART_HEADER) { - $jsInline = '/*' . htmlspecialchars($name) . '*/' . chr(10) . $properties['code'] . chr(10) . $jsInline; + $jsInline = '/*' . htmlspecialchars($name) . '*/' . LF . $properties['code'] . LF . $jsInline; } else { - $jsFooterInline = '/*' . htmlspecialchars($name) . '*/' . chr(10) . $properties['code'] . chr(10) . $jsFooterInline; + $jsFooterInline = '/*' . htmlspecialchars($name) . '*/' . LF . $properties['code'] . LF . $jsFooterInline; } } else { if ($properties['section'] === self::PART_HEADER) { - $jsInline .= '/*' . htmlspecialchars($name) . '*/' . chr(10) . $properties['code'] . chr(10); + $jsInline .= '/*' . htmlspecialchars($name) . '*/' . LF . $properties['code'] . LF; } else { - $jsFooterInline .= '/*' . htmlspecialchars($name) . '*/' . chr(10) . $properties['code'] . chr(10); + $jsFooterInline .= '/*' . htmlspecialchars($name) . '*/' . LF . $properties['code'] . LF; } } } @@ -1062,7 +1062,7 @@ $template = t3lib_div::getURL($templateFile); if ($this->removeEmptyLinesFromTemplate) { - $template = strtr($template, array(chr(10) => '', chr(13) => '')); + $template = strtr($template, array(LF => '', CR => '')); } if ($part != self::PART_COMPLETE) { $templatePart = explode('###BODY###', $template); @@ -1070,11 +1070,11 @@ } if ($this->moveJsFromHeaderToFooter) { - $jsFooterLibs = $jsLibs . chr(10) . $jsFooterLibs; + $jsFooterLibs = $jsLibs . LF . $jsFooterLibs; $jsLibs = ''; - $jsFooterFiles = $jsFiles . chr(10) . $jsFooterFiles; + $jsFooterFiles = $jsFiles . LF . $jsFooterFiles; $jsFiles = ''; - $jsFooterInline = $jsInline . chr(10) . $jsFooterInline; + $jsFooterInline = $jsInline . LF . $jsFooterInline; $jsInline = ''; } @@ -1083,7 +1083,7 @@ 'HTMLTAG' => $this->htmlTag, 'HEADTAG' => $this->headTag, 'METACHARSET' => $this->charSet ? str_replace('|', htmlspecialchars($this->charSet), $this->metaCharsetTag) : '', - 'INLINECOMMENT' => $this->inlineComments ? chr(10) . chr(10) . '' . chr(10) . chr(10) : '', + 'INLINECOMMENT' => $this->inlineComments ? LF . LF . '' . LF . LF : '', 'BASEURL' => $this->baseUrl ? str_replace('|', $this->baseUrl, $this->baseUrlTag) : '', 'SHORTCUT' => $this->favIcon ? sprintf($this->shortcutTag, htmlspecialchars($this->favIcon), $this->iconMimeType) : '', 'CSS_INCLUDE' => $cssFiles, @@ -1093,8 +1093,8 @@ 'JS_LIBS' => $jsLibs, 'TITLE' => $this->title ? str_replace('|', htmlspecialchars($this->title), $this->titleTag) : '', 'META' => $metaTags, - 'HEADERDATA' => $this->headerData ? implode(chr(10), $this->headerData) : '', - 'FOOTERDATA' => $this->footerData ? implode(chr(10), $this->footerData) : '', + 'HEADERDATA' => $this->headerData ? implode(LF, $this->headerData) : '', + 'FOOTERDATA' => $this->footerData ? implode(LF, $this->footerData) : '', 'JS_LIBS_FOOTER' => $jsFooterLibs, 'JS_INCLUDE_FOOTER' => $jsFooterFiles, 'JS_INLINE_FOOTER' => $jsFooterInline, @@ -1116,7 +1116,7 @@ $out = ''; if ($this->addPrototype) { - $out .= '' . chr(10); + $out .= '' . LF; unset($this->jsFiles[$this->backPath . 'contrib/prototype/prototype.js']); } @@ -1136,21 +1136,21 @@ $moduleLoadString = '?load=' . implode(',', $mods); } - $out .= '' . chr(10); + $out .= '' . LF; unset($this->jsFiles[$this->backPath . 'contrib/scriptaculous/scriptaculous.js' . $moduleLoadString]); } // include extCore if ($this->addExtCore) { - $out .= '' . chr(10); + $out .= '' . LF; unset($this->jsFiles[$this->backPath . 'contrib/extjs/ext-core' . ($this->enableExtCoreDebug ? '-debug' : '') . '.js']); } // include extJS if ($this->addExtJS) { // use the base adapter all the time - $out .= '' . chr(10); - $out .= '' . chr(10); + $out .= '' . LF; + $out .= '' . LF; // add extJS localization $localeMap = $this->csConvObj->isoArray; // load standard ISO mapping and modify for use with ExtJS @@ -1165,7 +1165,7 @@ // TODO autoconvert file from UTF8 to current BE charset if necessary!!!! $extJsLocaleFile = 'contrib/extjs/locale/ext-lang-' . $extJsLang . '-min.js'; if (file_exists(PATH_typo3 . $extJsLocaleFile)) { - $out .= '' . chr(10); + $out .= '' . LF; } @@ -1189,10 +1189,10 @@ $out .= $this->inlineJavascriptWrap[0] . ' Ext.ns("TYPO3"); - Ext.BLANK_IMAGE_URL = "' . htmlspecialchars(t3lib_div::locationHeaderUrl($this->backPath . 'gfx/clear.gif')) . '";' . chr(10) . + Ext.BLANK_IMAGE_URL = "' . htmlspecialchars(t3lib_div::locationHeaderUrl($this->backPath . 'gfx/clear.gif')) . '";' . LF . $inlineSettings . 'Ext.onReady(function() {' . - ($this->enableExtJSQuickTips ? 'Ext.QuickTips.init();' . chr(10) : '') . $code . + ($this->enableExtJSQuickTips ? 'Ext.QuickTips.init();' . LF : '') . $code . ' });' . $this->inlineJavascriptWrap[1]; unset ($this->extOnReadyCode); @@ -1282,7 +1282,7 @@ $error = ''; $this->jsInline[$name]['code'] = t3lib_div::minifyJavaScript($properties['code'], $error); if ($error) { - $this->compressError .= 'Error with minify JS Inline Block "' . $name . '": ' . $error . chr(10); + $this->compressError .= 'Error with minify JS Inline Block "' . $name . '": ' . $error . LF; } } } Index: t3lib/class.t3lib_tcemain.php =================================================================== --- t3lib/class.t3lib_tcemain.php (revision 6295) +++ t3lib/class.t3lib_tcemain.php (working copy) @@ -146,7 +146,7 @@ * 4846: function insertDB($table,$id,$fieldArray,$newVersion=FALSE,$suggestedUid=0,$dontSetNewIdIndex=FALSE) * 4919: function checkStoredRecord($table,$id,$fieldArray,$action) * 4956: function setHistory($table,$id,$logId) - * 4989: function clearHistory($maxAgeSeconds=604800,$table) + * 4989: function clearHistory($maxAgeSeconds=ONE_WEEK,$table) * 5003: function updateRefIndex($table,$id) * * SECTION: Misc functions @@ -1187,7 +1187,7 @@ $eFileMarker = $eFile['markerField']&&trim($mixedRec[$eFile['markerField']]) ? trim($mixedRec[$eFile['markerField']]) : '###TYPO3_STATICFILE_EDIT###'; $insertContent = str_replace($eFileMarker,'',$mixedRec[$eFile['contentField']]); // must replace the marker if present in content! - $SW_fileNewContent = $parseHTML->substituteSubpart($SW_fileContent, $eFileMarker, chr(10).$insertContent.chr(10), 1, 1); + $SW_fileNewContent = $parseHTML->substituteSubpart($SW_fileContent, $eFileMarker, LF.$insertContent.LF, 1, 1); t3lib_div::writeFile($eFile['editFile'],$SW_fileNewContent); // Write status: @@ -4284,7 +4284,7 @@ foreach($files as $dat) { if (@is_file($dat['ID_absFile'])) { unlink ($dat['ID_absFile']); -#echo 'DELETE FlexFormFile:'.$dat['ID_absFile'].chr(10); +#echo 'DELETE FlexFormFile:'.$dat['ID_absFile'].LF; } else { $this->log($table,0,3,0,100,"Delete: Referenced file '".$dat['ID_absFile']."' that was supposed to be deleted together with it's record didn't exist"); } @@ -6156,7 +6156,7 @@ * @param string table where the history should be cleared * @return void */ - function clearHistory($maxAgeSeconds=604800,$table) { + function clearHistory($maxAgeSeconds=ONE_WEEK,$table) { $tstampLimit = $maxAgeSeconds ? $GLOBALS['EXEC_TIME'] - $maxAgeSeconds : 0; $GLOBALS['TYPO3_DB']->exec_DELETEquery('sys_history', 'tstamp<'.intval($tstampLimit).' AND tablename='.$GLOBALS['TYPO3_DB']->fullQuoteStr($table, 'sys_history')); Index: t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php =================================================================== --- t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php (revision 6295) +++ t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php (working copy) @@ -49,7 +49,7 @@ * * @var integer */ - protected $defaultLifetime = 3600; + protected $defaultLifetime = ONE_HOUR; /** * Constructs this backend Index: t3lib/class.t3lib_beuserauth.php =================================================================== --- t3lib/class.t3lib_beuserauth.php (revision 6295) +++ t3lib/class.t3lib_beuserauth.php (working copy) @@ -237,10 +237,10 @@ if ($this->user['uid']) { if (!$this->isAdmin()) { return TRUE; - } else die('ERROR: CLI backend user "'.$userName.'" was ADMIN which is not allowed!'.chr(10).chr(10)); - } else die('ERROR: No backend user named "'.$userName.'" was found! [Database: '.TYPO3_db.']'.chr(10).chr(10)); - } else die('ERROR: Module name, "'.$GLOBALS['MCONF']['name'].'", was not prefixed with "_CLI_"'.chr(10).chr(10)); - } else die('ERROR: Another user was already loaded which is impossible in CLI mode!'.chr(10).chr(10)); + } else die('ERROR: CLI backend user "'.$userName.'" was ADMIN which is not allowed!'.LF.LF); + } else die('ERROR: No backend user named "'.$userName.'" was found! [Database: '.TYPO3_db.']'.LF.LF); + } else die('ERROR: Module name, "'.$GLOBALS['MCONF']['name'].'", was not prefixed with "_CLI_"'.LF.LF); + } else die('ERROR: Another user was already loaded which is impossible in CLI mode!'.LF.LF); } } Index: t3lib/class.t3lib_querygenerator.php =================================================================== --- t3lib/class.t3lib_querygenerator.php (revision 6295) +++ t3lib/class.t3lib_querygenerator.php (working copy) @@ -1183,13 +1183,13 @@ while(list($key,$conf) = each($queryConfig)) { switch($conf['type']) { case 'newlevel': - $qs.=chr(10).$pad.trim($conf['operator']).' ('.$this->getQuery($queryConfig[$key]['nl'],$pad.' ').chr(10).$pad.')'; + $qs.=LF.$pad.trim($conf['operator']).' ('.$this->getQuery($queryConfig[$key]['nl'],$pad.' ').LF.$pad.')'; break; case 'userdef': - $qs.=chr(10).$pad.getUserDefQuery($conf,$first); + $qs.=LF.$pad.getUserDefQuery($conf,$first); break; default: - $qs.=chr(10).$pad.$this->getQuerySingle($conf,$first); + $qs.=LF.$pad.$this->getQuerySingle($conf,$first); break; } $first=0; Index: t3lib/class.t3lib_xml.php =================================================================== --- t3lib/class.t3lib_xml.php (revision 6295) +++ t3lib/class.t3lib_xml.php (working copy) @@ -120,7 +120,7 @@ * @return string */ function getResult() { - $content = implode(chr(10),$this->lines); + $content = implode(LF,$this->lines); return $this->output($content); } @@ -209,7 +209,7 @@ if ($b) $this->XMLIndent++; else $this->XMLIndent--; $this->Icode=''; for ($a=0;$a<$this->XMLIndent;$a++) { - $this->Icode.=chr(9); + $this->Icode.=TAB; } return $this->Icode; } @@ -273,13 +273,13 @@ } /** - * Substitutes chr(10) characters with a '
-sections and
-tags. These are returned as lines separated by chr(10).
+ * This resolves the $value into parts based on
-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 6295)
+++ 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);
}
@@ -4945,7 +4945,7 @@
$data = substr($theValue,$pointer,$len); // $data is the content until the next tableParams.'>';
+ $this->begin = LF.'
tableParams.'>';
$this->end = '
';
$rows=array();
$widthImg = '';
@@ -8221,7 +8221,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 6295)
+++ 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 6295)
+++ 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 6295)
+++ 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 6295)
+++ 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 6295)
+++ 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:
@@ -499,14 +499,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));
}
}
}
@@ -873,7 +873,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;
}
}
}
@@ -882,7 +882,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
@@ -964,12 +964,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
@@ -978,7 +978,7 @@
if ($GLOBALS['TSFE']->pSetup['frameSet.']) {
$fs = t3lib_div::makeInstance('tslib_frameset');
$pageRenderer->addBodyContent($fs->make($GLOBALS['TSFE']->pSetup['frameSet.']));
- $pageRenderer->addBodyContent(chr(10) . '