';
foreach ($contentArray as $key=>$menucontent) {
- $this->content .= implode(chr(10), $menucontent);
+ $this->content .= implode(LF, $menucontent);
}
$this->content.='
Index: typo3/wizard_forms.php
===================================================================
--- typo3/wizard_forms.php (revision 7304)
+++ typo3/wizard_forms.php (working copy)
@@ -800,7 +800,7 @@
// Default:
if ($vv['type']=='select' || $vv['type']=='radio') {
- $thisLine[2]=str_replace(chr(10),', ',str_replace(',','',$vv['options']));
+ $thisLine[2]=str_replace(LF,', ',str_replace(',','',$vv['options']));
} elseif ($vv['type']=='check') {
if ($vv['default']) $thisLine[2]=1;
} elseif (strcmp(trim($vv['default']),'')) {
@@ -814,7 +814,7 @@
}
}
// Finally, implode the lines into a string, and return it:
- return implode(chr(10),$inLines);
+ return implode(LF,$inLines);
}
/**
@@ -827,7 +827,7 @@
function cfgString2CfgArray($cfgStr) {
// Traverse the number of form elements:
- $tLines=explode(chr(10),$cfgStr);
+ $tLines=explode(LF,$cfgStr);
foreach($tLines as $k => $v) {
// Initialize:
@@ -870,7 +870,7 @@
switch((string)$confData['type']) {
case 'select':
case 'radio':
- $confData['default'] = implode(chr(10),t3lib_div::trimExplode(',',$parts[2]));
+ $confData['default'] = implode(LF,t3lib_div::trimExplode(',',$parts[2]));
break;
default:
$confData['default'] = trim($parts[2]);
Index: typo3/wizard_tsconfig.php
===================================================================
--- typo3/wizard_tsconfig.php (revision 7304)
+++ typo3/wizard_tsconfig.php (working copy)
@@ -549,7 +549,7 @@
foreach($table['rows'] as $row) {
// Linking:
- $lP=t3lib_div::trimExplode(chr(10),$row['property'],1);
+ $lP=t3lib_div::trimExplode(LF,$row['property'],1);
$lP2=array();
while(list($k,$lStr)=each($lP)) {
$lP2[$k] = $this->linkProperty($lStr,$lStr,$objString,$row['datatype']);
Index: typo3/alt_doc.php
===================================================================
--- typo3/alt_doc.php (revision 7304)
+++ typo3/alt_doc.php (working copy)
@@ -938,7 +938,7 @@
if (is_array($this->tceforms->extraFormHeaders)) {
$extraTemplate = t3lib_parsehtml::getSubpart($this->doc->moduleTemplate, '###DOCHEADER_EXTRAHEADER###');
- $extraTemplate = t3lib_parsehtml::substituteMarker($extraTemplate, '###EXTRAHEADER###', implode(chr(10), $this->tceforms->extraFormHeaders));
+ $extraTemplate = t3lib_parsehtml::substituteMarker($extraTemplate, '###EXTRAHEADER###', implode(LF, $this->tceforms->extraFormHeaders));
}
return $extraTemplate;
}
@@ -1031,7 +1031,7 @@
if (count($this->tceforms->commentMessages)) {
$tceformMessages = '
';
}
Index: typo3/template.php
===================================================================
--- typo3/template.php (revision 7304)
+++ typo3/template.php (working copy)
@@ -731,19 +731,19 @@
if ($this->docType !== 'html_3') {
// Put the XML prologue before or after the doctype declaration according to browser
if ($browserInfo['browser'] === 'msie' && $browserInfo['version'] < 7) {
- $headerStart = $headerStart . chr(10) . $xmlPrologue;
+ $headerStart = $headerStart . LF . $xmlPrologue;
} else {
- $headerStart = $xmlPrologue . chr(10) . $headerStart;
+ $headerStart = $xmlPrologue . LF . $headerStart;
}
// Add the xml stylesheet according to doctype
if ($this->docType !== 'xhtml_frames') {
- $headerStart = $headerStart . chr(10) . $xmlStylesheet;
+ $headerStart = $headerStart . LF . $xmlStylesheet;
}
}
$this->pageRenderer->setXmlPrologAndDocType($headerStart);
- $this->pageRenderer->setHeadTag('' . chr(10). '');
+ $this->pageRenderer->setHeadTag('' . LF. '');
$this->pageRenderer->setCharSet($this->charset);
$this->pageRenderer->addMetaTag($this->generator());
$this->pageRenderer->addMetaTag($this->xUaCompatible());
@@ -1018,7 +1018,7 @@
$this->inDocStylesArray[] = $this->inDocStyles_TBEstyle;
// Implode it all:
- $inDocStyles = implode(chr(10), $this->inDocStylesArray);
+ $inDocStyles = implode(LF, $this->inDocStylesArray);
if ($this->styleSheetFile) {
$this->pageRenderer->addCssFile($this->backPath . $this->styleSheetFile);
@@ -1027,7 +1027,7 @@
$this->pageRenderer->addCssFile($this->backPath . $this->styleSheetFile2);
}
- $this->pageRenderer->addCssInlineBlock('inDocStyles', $inDocStyles . chr(10) . '/*###POSTCSSMARKER###*/');
+ $this->pageRenderer->addCssInlineBlock('inDocStyles', $inDocStyles . LF . '/*###POSTCSSMARKER###*/');
if ($this->styleSheetFile_post) {
$this->pageRenderer->addCssFile($this->backPath . $this->styleSheetFile_post);
}
@@ -1084,11 +1084,11 @@
function insertStylesAndJS($content) {
// insert accumulated CSS
$this->inDocStylesArray[] = $this->inDocStyles;
- $styles = "\n".implode("\n", $this->inDocStylesArray);
+ $styles = LF.implode(LF, $this->inDocStylesArray);
$content = str_replace('/*###POSTCSSMARKER###*/',$styles,$content);
// insert accumulated JS
- $jscode = $this->JScode."\n".$this->wrapScriptTags(implode("\n", $this->JScodeArray));
+ $jscode = $this->JScode.LF.$this->wrapScriptTags(implode(LF, $this->JScodeArray));
$content = str_replace('',$jscode,$content);
return $content;
@@ -1236,14 +1236,14 @@
function wrapScriptTags($string, $linebreak=TRUE) {
if(trim($string)) {
// ';
$GLOBALS['TSFE']->JSCode.=$JScode;
@@ -2948,7 +2948,7 @@
$url = $GLOBALS['TSFE']->baseUrlWrap($LD['totalURL']);
$target = $LD['target'];
}
- $codeLines.="\n".$var.$count."=".$menuName.".add(".$parent.",".$prev.",0,".t3lib_div::quoteJSvalue($title, true).",".t3lib_div::quoteJSvalue($url, true).",".t3lib_div::quoteJSvalue($target, true).");";
+ $codeLines.=LF.$var.$count."=".$menuName.".add(".$parent.",".$prev.",0,".t3lib_div::quoteJSvalue($title, true).",".t3lib_div::quoteJSvalue($url, true).",".t3lib_div::quoteJSvalue($target, true).");";
// If the active one should be chosen...
$active = ($levelConf['showActive'] && $this->isActive($data['uid'], $MP_var));
// If the first item should be shown
@@ -2956,9 +2956,9 @@
// do it...
if ($active || $first) {
if ($count==1) {
- $codeLines.="\n".$menuName.".openID = ".$var.$count.";";
+ $codeLines.=LF.$menuName.".openID = ".$var.$count.";";
} else {
- $codeLines.="\n".$menuName.".entry[".$parent."].openID = ".$var.$count.";";
+ $codeLines.=LF.$menuName.".entry[".$parent."].openID = ".$var.$count.";";
}
}
// Add submenu...
@@ -2973,7 +2973,7 @@
$levelConf['firstLabel'] = $this->mconf['firstLabelGeneral'];
}
if ($levelConf['firstLabel'] && $codeLines) {
- $codeLines.= chr(10).$menuName.'.defTopTitle['.$count.'] = '.t3lib_div::quoteJSvalue($levelConf['firstLabel'], true).';';
+ $codeLines.= LF.$menuName.'.defTopTitle['.$count.'] = '.t3lib_div::quoteJSvalue($levelConf['firstLabel'], true).';';
}
return $codeLines;
}
Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php (revision 7304)
+++ typo3/sysext/cms/tslib/class.tslib_content.php (working copy)
@@ -908,7 +908,7 @@
if ($conf['captionSplit'] && $conf['captionSplit.']['cObject']) {
$legacyCaptionSplit = 1;
$capSplit = $this->stdWrap($conf['captionSplit.']['token'], $conf['captionSplit.']['token.']);
- if (!$capSplit) {$capSplit=chr(10);}
+ if (!$capSplit) {$capSplit=LF;}
$captionArray = explode($capSplit, $this->cObjGetSingle($conf['captionSplit.']['cObject'], $conf['captionSplit.']['cObject.'], 'captionSplit.cObject'));
foreach ($captionArray as $ca_key => $ca_val) {
$captionArray[$ca_key] = $this->stdWrap(trim($captionArray[$ca_key]), $conf['captionSplit.']['stdWrap.']);
@@ -1730,7 +1730,7 @@
$dataArr = array();
// Getting the original config
if (trim($data)) {
- $data = str_replace(chr(10),'||',$data);
+ $data = str_replace(LF,'||',$data);
$dataArr = explode('||',$data);
}
// Adding the new dataArray config form:
@@ -1880,7 +1880,7 @@
} else {
$wrap = $wrap ? ' wrap="'.$wrap.'"' : ' wrap="virtual"';
}
- $default = $this->getFieldDefaultValue($conf['noValueInsert'], $confData['fieldname'], str_replace('\n',chr(10),trim($parts[2])));
+ $default = $this->getFieldDefaultValue($conf['noValueInsert'], $confData['fieldname'], str_replace('\n',LF,trim($parts[2])));
$fieldCode=sprintf('',
$confData['fieldname'], $elementIdAttribute, $cols, $rows, $wrap, $addParams, t3lib_div::formatForTextarea($default));
break;
@@ -2617,7 +2617,7 @@
}
// fetching params
- $lines = explode(chr(10), $this->stdWrap($conf['params'],$conf['params.']));
+ $lines = explode(LF, $this->stdWrap($conf['params'],$conf['params.']));
foreach ($lines as $l) {
$parts = explode('=', $l);
$parameter = strtolower(trim($parts[0]));
@@ -2716,7 +2716,7 @@
//custom parameter entry
$rawTS = $val['mmParamCustomEntry'];
//read and merge
- $tmp = t3lib_div::trimExplode(chr(10), $rawTS);
+ $tmp = t3lib_div::trimExplode(LF, $rawTS);
if (count($tmp)) {
foreach ($tmp as $tsLine) {
if (substr($tsLine, 0, 1) != '#' && $pos = strpos($tsLine, '.')) {
@@ -2783,7 +2783,7 @@
$paramsArray = array_merge((array) $typeConf['default.']['params.'], (array) $conf['params.'], $conf['predefined']);
$conf['params']= '';
foreach ($paramsArray as $key => $value) {
- $conf['params'] .= $key . '=' . $value . chr(10);
+ $conf['params'] .= $key . '=' . $value . LF;
}
$content = $this->MULTIMEDIA($conf);
break;
@@ -2942,10 +2942,10 @@
if (is_array($conf['params.'])) {
t3lib_div::remapArrayKeys($conf['params.'], $typeConf['mapping.']['params.']);
foreach ($conf['params.'] as $key => $value) {
- $params .= $qtObject . '.addParam("' .$key . '", "' . $value . '");' . chr(10);
+ $params .= $qtObject . '.addParam("' .$key . '", "' . $value . '");' . LF;
}
}
- $params = ($params ? substr($params, 0, -2) : '') . chr(10) . $qtObject . '.write("' . $replaceElementIdString . '");';
+ $params = ($params ? substr($params, 0, -2) : '') . LF . $qtObject . '.write("' . $replaceElementIdString . '");';
$alternativeContent = $this->stdWrap($conf['alternativeContent'], $conf['alternativeContent.']);
$layout = $this->stdWrap($conf['layout'], $conf['layout.']);
@@ -3791,7 +3791,7 @@
$content=preg_replace("/\r?\n[\t ]*\r?\n/",$conf['doubleBrTag'],$content);
}
if ($conf['br']) {$content=nl2br($content);}
- if ($conf['brTag']) {$content= str_replace(chr(10),$conf['brTag'],$content);}
+ if ($conf['brTag']) {$content= str_replace(LF,$conf['brTag'],$content);}
if ($conf['encapsLines.']) {$content=$this->encaps_lineSplit($content,$conf['encapsLines.']);}
if ($conf['keywords']) {$content= $this->keywords($content);}
if ($conf['innerWrap'] || $conf['innerWrap.']){$content=$this->wrap($content, $this->stdWrap($conf['innerWrap'], $conf['innerWrap.']));}
@@ -4170,13 +4170,13 @@
$parts = explode('|',$str);
$output =
- chr(10).str_pad('',$parts[0],chr(9)).
+ LF.str_pad('',$parts[0],TAB).
''.
- chr(10).str_pad('',$parts[0]+1,chr(9)).
+ LF.str_pad('',$parts[0]+1,TAB).
$content.
- chr(10).str_pad('',$parts[0],chr(9)).
+ LF.str_pad('',$parts[0],TAB).
''.
- chr(10).str_pad('',$parts[0]+1,chr(9));
+ LF.str_pad('',$parts[0]+1,TAB);
return $output;
}
@@ -4818,10 +4818,10 @@
$tagName=strtolower($htmlParser->getFirstTagName($v));
$cfg=$conf['externalBlocks.'][$tagName.'.'];
if ($cfg['stripNLprev'] || $cfg['stripNL']) {
- $parts[$k-1]=preg_replace('/'.chr(13).'?'.chr(10).'[ ]*$/', '', $parts[$k-1]);
+ $parts[$k-1]=preg_replace('/'.CR.'?'.LF.'[ ]*$/', '', $parts[$k-1]);
}
if ($cfg['stripNLnext'] || $cfg['stripNL']) {
- $parts[$k+1]=preg_replace('/^[ ]*'.chr(13).'?'.chr(10).'/', '', $parts[$k+1]);
+ $parts[$k+1]=preg_replace('/^[ ]*'.CR.'?'.LF.'/', '', $parts[$k+1]);
}
}
}
@@ -4857,7 +4857,7 @@
$colParts[$kkk] = $htmlParser->removeFirstAndLastTag($vvv);
if ($cfg['HTMLtableCells.'][$cc.'.']['callRecursive'] || (!isset($cfg['HTMLtableCells.'][$cc.'.']['callRecursive']) && $cfg['HTMLtableCells.']['default.']['callRecursive'])) {
- if ($cfg['HTMLtableCells.']['addChr10BetweenParagraphs']) $colParts[$kkk]=str_replace('','
'.chr(10).'',$colParts[$kkk]);
+ if ($cfg['HTMLtableCells.']['addChr10BetweenParagraphs']) $colParts[$kkk]=str_replace('
','
'.LF.'',$colParts[$kkk]);
$colParts[$kkk] = $this->parseFunc($colParts[$kkk], $conf);
}
@@ -4941,7 +4941,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
@@ -5097,16 +5097,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'];
@@ -5174,7 +5174,7 @@
$lParts[$k] = $str_content;
}
- return implode(chr(10),$lParts);
+ return implode(LF,$lParts);
}
/**
@@ -5194,7 +5194,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);
@@ -5264,7 +5264,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--;}
@@ -6630,7 +6630,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))) {
@@ -6647,7 +6647,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);
}
@@ -6771,12 +6771,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;
}
}
@@ -6938,7 +6938,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) {
@@ -7991,16 +7991,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 'framesetParams($setup).'>'.chr(10).$content.'';
+ return 'framesetParams($setup).'>'.LF.$content.'';
}
}
@@ -8094,7 +8094,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 = '';
@@ -8222,7 +8222,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/openid/sv1/class.tx_openid_sv1.php
===================================================================
--- typo3/sysext/openid/sv1/class.tx_openid_sv1.php (revision 7304)
+++ typo3/sysext/openid/sv1/class.tx_openid_sv1.php (working copy)
@@ -194,7 +194,7 @@
// we must change the password in the record to a long random string so
// that this user cannot be authenticated with other service.
if (is_array($userRecord)) {
- $userRecord[$this->authenticationInformation['db_user']['userident_column']] = uniqid($this->prefixId . chr(10), true);
+ $userRecord[$this->authenticationInformation['db_user']['userident_column']] = uniqid($this->prefixId . LF, true);
}
}
return $userRecord;
Index: typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php
===================================================================
--- typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php (revision 7304)
+++ typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php (working copy)
@@ -119,7 +119,7 @@
if ($tmpl->changed) {
// Set the data to be saved
$recData=array();
- $recData["sys_template"][$saveId]["constants"] = implode($tmpl->raw,chr(10));
+ $recData["sys_template"][$saveId]["constants"] = implode($tmpl->raw,LF);
// Create new tce-object
$tce = t3lib_div::makeInstance("t3lib_TCEmain");
$tce->stripslashes_values=0;
Index: typo3/sysext/statictemplates/media/scripts/freesite_dummy_page_menu.php
===================================================================
--- typo3/sysext/statictemplates/media/scripts/freesite_dummy_page_menu.php (revision 7304)
+++ typo3/sysext/statictemplates/media/scripts/freesite_dummy_page_menu.php (working copy)
@@ -55,7 +55,7 @@
$key = $row['uid'];
$val = $row['title'];
$content.= ''.$val.' '.$val.' '.$dictionaries.'
';
// Closing
@@ -366,7 +366,7 @@
$AspellCommand = 'cat ' . escapeshellarg($tmpFileName) . ' | ' . $this->AspellDirectory . ' -a check --mode=none --sug-mode=' . escapeshellarg($this->pspellMode) . $this->personalDictsArg . ' --lang=' . escapeshellarg($this->dictionary) . ' --encoding=' . escapeshellarg($this->aspellEncoding) . ' 2>&1';
$AspellAnswer = shell_exec($AspellCommand);
$AspellResultLines = array();
- $AspellResultLines = t3lib_div::trimExplode(chr(10), $AspellAnswer, 1);
+ $AspellResultLines = t3lib_div::trimExplode(LF, $AspellAnswer, 1);
if(substr($AspellResultLines[0],0,6) == 'Error:') echo("{$AspellAnswer}");
t3lib_div::unlink_tempfile($tmpFileName);
if(substr($AspellResultLines['1'],0,1) != '*') {
Index: typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
===================================================================
--- typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php (revision 7304)
+++ typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php (working copy)
@@ -931,25 +931,25 @@
$addElementCode = '';
foreach ($mainElements as $elListName => $elValue) {
- $addElementCode .= strToLower($elListName) . ' {' . $elValue . '}' . chr(10);
+ $addElementCode .= strToLower($elListName) . ' {' . $elValue . '}' . LF;
}
- $stylesheet = $this->thisConfig['mainStyleOverride'] ? $this->thisConfig['mainStyleOverride'] : chr(10) .
+ $stylesheet = $this->thisConfig['mainStyleOverride'] ? $this->thisConfig['mainStyleOverride'] : LF .
'body.htmlarea-content-body { font-family: ' . $mainStyle_font .
'; font-size: '.($this->thisConfig['mainStyle_size'] ? $this->thisConfig['mainStyle_size'] : '12px') .
'; color: '.($this->thisConfig['mainStyle_color']?$this->thisConfig['mainStyle_color'] : 'black') .
'; background-color: '.($this->thisConfig['mainStyle_bgcolor'] ? $this->thisConfig['mainStyle_bgcolor'] : 'white') .
- ';'.$this->thisConfig['mainStyleOverride_add.']['BODY'].'}' . chr(10) .
- 'td { ' . $this->thisConfig['mainStyleOverride_add.']['TD'].'}' . chr(10) .
- 'div { ' . $this->thisConfig['mainStyleOverride_add.']['DIV'].'}' . chr(10) .
- 'pre { ' . $this->thisConfig['mainStyleOverride_add.']['PRE'].'}' . chr(10) .
- 'ol { ' . $this->thisConfig['mainStyleOverride_add.']['OL'].'}' . chr(10) .
- 'ul { ' . $this->thisConfig['mainStyleOverride_add.']['UL'].'}' . chr(10) .
- 'blockquote { ' . $this->thisConfig['mainStyleOverride_add.']['BLOCKQUOTE'].'}' . chr(10) .
+ ';'.$this->thisConfig['mainStyleOverride_add.']['BODY'].'}' . LF .
+ 'td { ' . $this->thisConfig['mainStyleOverride_add.']['TD'].'}' . LF .
+ 'div { ' . $this->thisConfig['mainStyleOverride_add.']['DIV'].'}' . LF .
+ 'pre { ' . $this->thisConfig['mainStyleOverride_add.']['PRE'].'}' . LF .
+ 'ol { ' . $this->thisConfig['mainStyleOverride_add.']['OL'].'}' . LF .
+ 'ul { ' . $this->thisConfig['mainStyleOverride_add.']['UL'].'}' . LF .
+ 'blockquote { ' . $this->thisConfig['mainStyleOverride_add.']['BLOCKQUOTE'].'}' . LF .
$addElementCode;
if (is_array($this->thisConfig['inlineStyle.'])) {
- $stylesheet .= chr(10) . implode(chr(10), $this->thisConfig['inlineStyle.']) . chr(10);
+ $stylesheet .= LF . implode(LF, $this->thisConfig['inlineStyle.']) . LF;
}
} else {
$stylesheet = '/* mainStyleOverride and inlineStyle properties ignored. */';
@@ -1023,7 +1023,7 @@
}
}
foreach ($classesArray as $key => $subArray) {
- $JSClassesArray .= 'HTMLArea.classes' . ucfirst($key) . ' = ' . $this->buildNestedJSArray($subArray) . ';' . chr(10);
+ $JSClassesArray .= 'HTMLArea.classes' . ucfirst($key) . ' = ' . $this->buildNestedJSArray($subArray) . ';' . LF;
}
return $JSClassesArray;
}
@@ -1054,7 +1054,7 @@
* @return string Javascript localization array
*/
function buildJSMainLangArray() {
- $JSLanguageArray = 'var HTMLArea_langArray = new Object();' . chr(10);
+ $JSLanguageArray = 'var HTMLArea_langArray = new Object();' . LF;
$labelsArray = array('tooltips' => array(), 'msg' => array(), 'dialogs' => array());
foreach ($labelsArray as $labels => $subArray) {
$LOCAL_LANG = t3lib_div::readLLfile('EXT:' . $this->ID . '/htmlarea/locallang_' . $labels . '.xml', $this->language, 'utf-8');
@@ -1065,7 +1065,7 @@
}
$labelsArray[$labels] = $LOCAL_LANG[$this->language];
}
- $JSLanguageArray .= 'HTMLArea_langArray = ' . json_encode($labelsArray) . ';' . chr(10);
+ $JSLanguageArray .= 'HTMLArea_langArray = ' . json_encode($labelsArray) . ';' . LF;
return $JSLanguageArray;
}
@@ -1145,9 +1145,9 @@
* @return string filename
*/
function buildJSMainLangFile($RTEcounter) {
- $contents = $this->buildJSMainLangArray() . chr(10);
+ $contents = $this->buildJSMainLangArray() . LF;
foreach ($this->pluginEnabledCumulativeArray[$RTEcounter] as $pluginId) {
- $contents .= $this->buildJSLangArray($pluginId) . chr(10);
+ $contents .= $this->buildJSLangArray($pluginId) . LF;
}
return $this->writeTemporaryFile('', $this->language.'_'.$this->OutputCharset, 'js', $contents, TRUE);
}
@@ -1164,7 +1164,7 @@
$LOCAL_LANG = FALSE;
$extensionKey = is_object($this->registeredPlugins[$plugin]) ? $this->registeredPlugins[$plugin]->getExtensionKey() : $this->ID;
$LOCAL_LANG = t3lib_div::readLLfile('EXT:' . $extensionKey . '/htmlarea/plugins/' . $plugin . '/locallang.xml', $this->language, 'utf-8', 1);
- $linebreak = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->ID]['enableCompressedScripts'] ? '' : chr(10);
+ $linebreak = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->ID]['enableCompressedScripts'] ? '' : LF;
$JSLanguageArray = 'var ' . $plugin . '_langArray = new Object();' . $linebreak;
if (is_array($LOCAL_LANG)) {
if (!empty($LOCAL_LANG[$this->language])) {
@@ -1172,7 +1172,7 @@
} else {
$LOCAL_LANG[$this->language] = $LOCAL_LANG['default'];
}
- $JSLanguageArray .= $plugin . '_langArray = ' . json_encode($LOCAL_LANG[$this->language]) . ';'. chr(10);
+ $JSLanguageArray .= $plugin . '_langArray = ' . json_encode($LOCAL_LANG[$this->language]) . ';'. LF;
}
return $JSLanguageArray;
}
Index: typo3/sysext/rtehtmlarea/extensions/TYPO3Link/class.tx_rtehtmlarea_typo3link.php
===================================================================
--- typo3/sysext/rtehtmlarea/extensions/TYPO3Link/class.tx_rtehtmlarea_typo3link.php (revision 7304)
+++ typo3/sysext/rtehtmlarea/extensions/TYPO3Link/class.tx_rtehtmlarea_typo3link.php (working copy)
@@ -101,7 +101,7 @@
public function buildJSClassesAnchorArray() {
global $LANG, $TYPO3_CONF_VARS;
- $linebreak = $TYPO3_CONF_VARS['EXTCONF'][$this->htmlAreaRTE->ID]['enableCompressedScripts'] ? '' : chr(10);
+ $linebreak = $TYPO3_CONF_VARS['EXTCONF'][$this->htmlAreaRTE->ID]['enableCompressedScripts'] ? '' : LF;
$JSClassesAnchorArray .= 'HTMLArea.classesAnchorSetup = [ ' . $linebreak;
$classesAnchorIndex = 0;
foreach ($this->htmlAreaRTE->RTEsetup['properties']['classesAnchor.'] as $label => $conf) {
Index: typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php
===================================================================
--- typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php (revision 7304)
+++ typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php (working copy)
@@ -481,7 +481,7 @@
$onSubmit = implode('; ', $onSubmitAr).'; return true;';
}
if (count($extraHiddenAr)) {
- $extraHidden = implode(chr(10), $extraHiddenAr);
+ $extraHidden = implode(LF, $extraHiddenAr);
}
if (!$gpRedirectUrl && $this->redirectUrl) {
Index: typo3/sysext/lowlevel/clmods/class.missing_relations.php
===================================================================
--- typo3/sysext/lowlevel/clmods/class.missing_relations.php (revision 7304)
+++ typo3/sysext/lowlevel/clmods/class.missing_relations.php (working copy)
@@ -104,7 +104,7 @@
// Initialize result array:
$listExplain = ' Shows the missing record as header and underneath a list of record fields in which the references are found. '.$this->label_infoString;
$resultArray = array(
- 'message' => $this->cli_help['name'].chr(10).chr(10).$this->cli_help['description'],
+ 'message' => $this->cli_help['name'].LF.LF.$this->cli_help['description'],
'headers' => array(
'offlineVersionRecords_m' => array('Offline version records (managed)','These records are offline versions having a pid=-1 and references should never occur directly to their uids.'.$listExplain,3),
'deletedRecords_m' => array('Deleted-flagged records (managed)','These records are deleted with a flag but references are still pointing at them. Keeping the references is useful if you undelete the referenced records later, otherwise the references are lost completely when the deleted records are flushed at some point. Notice that if those records listed are themselves deleted (marked with "DELETED") it is not a problem.'.$listExplain,2),
@@ -184,7 +184,7 @@
$trav = array('offlineVersionRecords_m', 'nonExistingRecords_m');
foreach($trav as $tk) {
- echo 'Processing managed "'.$tk.'"...'.chr(10);
+ echo 'Processing managed "'.$tk.'"...'.LF;
foreach($resultArray[$tk] as $key => $value) {
foreach($value as $hash => $recReference) {
echo ' Removing reference to '.$key.' in record "'.$recReference.'": ';
@@ -194,10 +194,10 @@
$sysRefObj = t3lib_div::makeInstance('t3lib_refindex');
$error = $sysRefObj->setReferenceValue($hash,NULL);
if ($error) {
- echo ' t3lib_refindex::setReferenceValue(): '.$error.chr(10);
+ echo ' t3lib_refindex::setReferenceValue(): '.$error.LF;
} else echo 'DONE';
}
- echo chr(10);
+ echo LF;
}
}
}
Index: typo3/sysext/lowlevel/clmods/class.missing_files.php
===================================================================
--- typo3/sysext/lowlevel/clmods/class.missing_files.php (revision 7304)
+++ typo3/sysext/lowlevel/clmods/class.missing_files.php (working copy)
@@ -101,7 +101,7 @@
// Initialize result array:
$listExplain = ' Shows the relative filename of missing file as header and under a list of record fields in which the references are found. '.$this->label_infoString;
$resultArray = array(
- 'message' => $this->cli_help['name'].chr(10).chr(10).$this->cli_help['description'],
+ 'message' => $this->cli_help['name'].LF.LF.$this->cli_help['description'],
'headers' => array(
'managedFilesMissing' => array('List of missing files managed by TCEmain', $listExplain, 3),
'softrefFilesMissing' => array('List of missing files registered as a soft reference', $listExplain, 2),
@@ -157,7 +157,7 @@
*/
function main_autoFix($resultArray) {
foreach($resultArray['managedFilesMissing'] as $key => $value) {
- echo 'Processing file: '.$key.chr(10);
+ echo 'Processing file: '.$key.LF;
$c=0;
foreach($value as $hash => $recReference) {
echo ' Removing reference in record "'.$recReference.'": ';
@@ -167,12 +167,12 @@
$sysRefObj = t3lib_div::makeInstance('t3lib_refindex');
$error = $sysRefObj->setReferenceValue($hash,NULL);
if ($error) {
- echo ' t3lib_refindex::setReferenceValue(): '.$error.chr(10);
- echo 'missing_files: exit on error'.chr(10);
+ echo ' t3lib_refindex::setReferenceValue(): '.$error.LF;
+ echo 'missing_files: exit on error'.LF;
exit;
} else echo "DONE";
}
- echo chr(10);
+ echo LF;
}
}
}
Index: typo3/sysext/lowlevel/clmods/class.lost_files.php
===================================================================
--- typo3/sysext/lowlevel/clmods/class.lost_files.php (revision 7304)
+++ typo3/sysext/lowlevel/clmods/class.lost_files.php (working copy)
@@ -107,7 +107,7 @@
// Initialize result array:
$resultArray = array(
- 'message' => $this->cli_help['name'].chr(10).chr(10).$this->cli_help['description'],
+ 'message' => $this->cli_help['name'].LF.LF.$this->cli_help['description'],
'headers' => array(
'managedFiles' => array('Files related to TYPO3 records and managed by TCEmain','These files you definitely want to keep.',0),
'ignoredFiles' => array('Ignored files (index.html, .htaccess etc.)','These files are allowed in uploads/ folder',0),
@@ -213,7 +213,7 @@
echo ' ERROR: File "'.$absFileName.'" was not found!';
}
}
- echo chr(10);
+ echo LF;
}
}
}
Index: typo3/sysext/lowlevel/clmods/class.deleted.php
===================================================================
--- typo3/sysext/lowlevel/clmods/class.deleted.php (revision 7304)
+++ typo3/sysext/lowlevel/clmods/class.deleted.php (working copy)
@@ -90,7 +90,7 @@
// Initialize result array:
$resultArray = array(
- 'message' => $this->cli_help['name'].chr(10).chr(10).$this->cli_help['description'],
+ 'message' => $this->cli_help['name'].LF.LF.$this->cli_help['description'],
'headers' => array(
'deleted' => array('Index of deleted records','These are records from the page tree having the deleted-flag set. The --AUTOFIX option will flush them completely!',1),
),
@@ -131,7 +131,7 @@
// Traversing records:
foreach($resultArray['deleted'] as $table => $list) {
- echo 'Flushing deleted records from table "'.$table.'":'.chr(10);
+ echo 'Flushing deleted records from table "'.$table.'":'.LF;
foreach($list as $uid) {
echo ' Flushing record "'.$table.':'.$uid.'": ';
if ($bypass = $this->cli_noExecutionCheck($table.':'.$uid)) {
@@ -146,10 +146,10 @@
// Return errors if any:
if (count($tce->errorLog)) {
- echo ' ERROR from "TCEmain":'.chr(10).'TCEmain:'.implode(chr(10).'TCEmain:',$tce->errorLog);
+ echo ' ERROR from "TCEmain":'.LF.'TCEmain:'.implode(LF.'TCEmain:',$tce->errorLog);
} else echo "DONE";
}
- echo chr(10);
+ echo LF;
}
}
}
Index: typo3/sysext/lowlevel/clmods/class.orphan_records.php
===================================================================
--- typo3/sysext/lowlevel/clmods/class.orphan_records.php (revision 7304)
+++ typo3/sysext/lowlevel/clmods/class.orphan_records.php (working copy)
@@ -98,7 +98,7 @@
// Initialize result array:
$resultArray = array(
- 'message' => $this->cli_help['name'].chr(10).chr(10).$this->cli_help['description'],
+ 'message' => $this->cli_help['name'].LF.LF.$this->cli_help['description'],
'headers' => array(
'orphans' => array('Index of orphaned records','',3),
'misplaced_at_rootlevel' => array('Records that should not be at root level but are.','Fix manually by moving record into page tree',2),
@@ -162,7 +162,7 @@
// Traversing records:
foreach($resultArray['orphans'] as $table => $list) {
- echo 'Removing orphans from table "'.$table.'":'.chr(10);
+ echo 'Removing orphans from table "'.$table.'":'.LF;
foreach($list as $uid) {
echo ' Flushing orphan record "'.$table.':'.$uid.'": ';
if ($bypass = $this->cli_noExecutionCheck($table.':'.$uid)) {
@@ -177,10 +177,10 @@
// Return errors if any:
if (count($tce->errorLog)) {
- echo ' ERROR from "TCEmain":'.chr(10).'TCEmain:'.implode(chr(10).'TCEmain:',$tce->errorLog);
+ echo ' ERROR from "TCEmain":'.LF.'TCEmain:'.implode(LF.'TCEmain:',$tce->errorLog);
} else echo 'DONE';
}
- echo chr(10);
+ echo LF;
}
}
}
Index: typo3/sysext/lowlevel/clmods/class.double_files.php
===================================================================
--- typo3/sysext/lowlevel/clmods/class.double_files.php (revision 7304)
+++ typo3/sysext/lowlevel/clmods/class.double_files.php (working copy)
@@ -97,7 +97,7 @@
// Initialize result array:
$resultArray = array(
- 'message' => $this->cli_help['name'].chr(10).chr(10).$this->cli_help['description'],
+ 'message' => $this->cli_help['name'].LF.LF.$this->cli_help['description'],
'headers' => array(
'multipleReferencesList_count' => array('Number of multi-reference files','(See below)',0),
'singleReferencesList_count' => array('Number of files correctly referenced','The amount of correct 1-1 references',0),
@@ -185,11 +185,11 @@
foreach($resultArray['multipleReferencesList'] as $key => $value) {
$absFileName = t3lib_div::getFileAbsFileName($key);
if ($absFileName && @is_file($absFileName)) {
- echo 'Processing file: '.$key.chr(10);
+ echo 'Processing file: '.$key.LF;
$c=0;
foreach($value as $hash => $recReference) {
if ($c==0) {
- echo ' Keeping '.$key.' for record "'.$recReference.'"'.chr(10);
+ echo ' Keeping '.$key.' for record "'.$recReference.'"'.LF;
} else {
// Create unique name for file:
$fileFunc = t3lib_div::makeInstance('t3lib_basicFileFunctions');
@@ -206,14 +206,14 @@
$sysRefObj = t3lib_div::makeInstance('t3lib_refindex');
$error = $sysRefObj->setReferenceValue($hash,basename($newName));
if ($error) {
- echo ' ERROR: t3lib_refindex::setReferenceValue(): '.$error.chr(10);
+ echo ' ERROR: t3lib_refindex::setReferenceValue(): '.$error.LF;
exit;
} else echo "DONE";
} else {
echo ' ERROR: File "'.$newName.'" was not created!';
}
}
- echo chr(10);
+ echo LF;
}
$c++;
}
Index: typo3/sysext/lowlevel/clmods/class.syslog.php
===================================================================
--- typo3/sysext/lowlevel/clmods/class.syslog.php (revision 7304)
+++ typo3/sysext/lowlevel/clmods/class.syslog.php (working copy)
@@ -82,7 +82,7 @@
// Initialize result array:
$resultArray = array(
- 'message' => $this->cli_help['name'].chr(10).chr(10).$this->cli_help['description'],
+ 'message' => $this->cli_help['name'].LF.LF.$this->cli_help['description'],
'headers' => array(
'listing' => array('','',1),
'allDetails' => array('','',0),
Index: typo3/sysext/lowlevel/clmods/class.versions.php
===================================================================
--- typo3/sysext/lowlevel/clmods/class.versions.php (revision 7304)
+++ typo3/sysext/lowlevel/clmods/class.versions.php (working copy)
@@ -95,7 +95,7 @@
// Initialize result array:
$resultArray = array(
- 'message' => $this->cli_help['name'].chr(10).chr(10).$this->cli_help['description'],
+ 'message' => $this->cli_help['name'].LF.LF.$this->cli_help['description'],
'headers' => array(
'versions' => array('All versions','Showing all versions of records found',0),
'versions_published' => array('All published versions','This is all records that has been published and can therefore be removed permanently',1),
@@ -214,7 +214,7 @@
// Traversing records:
foreach($resultArray[$kk] as $table => $list) {
- echo 'Flushing published records from table "'.$table.'":'.chr(10);
+ echo 'Flushing published records from table "'.$table.'":'.LF;
foreach($list as $uid) {
echo ' Flushing record "'.$table.':'.$uid.'": ';
@@ -230,16 +230,16 @@
// Return errors if any:
if (count($tce->errorLog)) {
- echo ' ERROR from "TCEmain":'.chr(10).'TCEmain:'.implode(chr(10).'TCEmain:',$tce->errorLog);
+ echo ' ERROR from "TCEmain":'.LF.'TCEmain:'.implode(LF.'TCEmain:',$tce->errorLog);
} else echo 'DONE';
}
- echo chr(10);
+ echo LF;
}
}
// Traverse workspace:
foreach($resultArray['versions_lost_workspace'] as $table => $list) {
- echo 'Resetting workspace to zero for records from table "'.$table.'":'.chr(10);
+ echo 'Resetting workspace to zero for records from table "'.$table.'":'.LF;
foreach($list as $uid) {
echo ' Flushing record "'.$table.':'.$uid.'": ';
if ($bypass = $this->cli_noExecutionCheck($table.':'.$uid)) {
@@ -251,7 +251,7 @@
$GLOBALS['TYPO3_DB']->exec_UPDATEquery($table,'uid='.intval($uid),$fields_values);
echo 'DONE';
}
- echo chr(10);
+ echo LF;
}
}
@@ -271,10 +271,10 @@
// Return errors if any:
if (count($tce->errorLog)) {
- echo ' ERROR from "TCEmain":'.chr(10).'TCEmain:'.implode(chr(10).'TCEmain:',$tce->errorLog);
+ echo ' ERROR from "TCEmain":'.LF.'TCEmain:'.implode(LF.'TCEmain:',$tce->errorLog);
} else echo 'DONE';
}
- echo chr(10);
+ echo LF;
}
}
}
Index: typo3/sysext/lowlevel/clmods/class.cleanflexform.php
===================================================================
--- typo3/sysext/lowlevel/clmods/class.cleanflexform.php (revision 7304)
+++ typo3/sysext/lowlevel/clmods/class.cleanflexform.php (working copy)
@@ -91,7 +91,7 @@
// Initialize result array:
$resultArray = array(
- 'message' => $this->cli_help['name'].chr(10).chr(10).$this->cli_help['description'],
+ 'message' => $this->cli_help['name'].LF.LF.$this->cli_help['description'],
'headers' => array(
'dirty' => array('','',2),
),
@@ -125,7 +125,7 @@
t3lib_div::loadTCA($tableName);
foreach($GLOBALS['TCA'][$tableName]['columns'] as $colName => $config) {
if ($config['config']['type']=='flex') {
- if ($echoLevel>2) echo chr(10).' [cleanflexform:] Field "'.$colName.'" in '.$tableName.':'.$uid.' was a flexform and...';
+ if ($echoLevel>2) echo LF.' [cleanflexform:] Field "'.$colName.'" in '.$tableName.':'.$uid.' was a flexform and...';
$recRow = t3lib_BEfunc::getRecordRaw($tableName,'uid='.intval($uid));
$flexObj = t3lib_div::makeInstance('t3lib_flexformtools');
@@ -180,10 +180,10 @@
// Return errors if any:
if (count($tce->errorLog)) {
- echo ' ERROR from "TCEmain":'.chr(10).'TCEmain:'.implode(chr(10).'TCEmain:',$tce->errorLog);
+ echo ' ERROR from "TCEmain":'.LF.'TCEmain:'.implode(LF.'TCEmain:',$tce->errorLog);
} else echo 'DONE';
}
- echo chr(10);
+ echo LF;
}
}
}
Index: typo3/sysext/lowlevel/clmods/class.rte_images.php
===================================================================
--- typo3/sysext/lowlevel/clmods/class.rte_images.php (revision 7304)
+++ typo3/sysext/lowlevel/clmods/class.rte_images.php (working copy)
@@ -98,7 +98,7 @@
// Initialize result array:
$resultArray = array(
- 'message' => $this->cli_help['name'].chr(10).chr(10).$this->cli_help['description'],
+ 'message' => $this->cli_help['name'].LF.LF.$this->cli_help['description'],
'headers' => array(
'completeFileList' => array('Complete list of used RTEmagic files','Both parent and copy are listed here including usage count (which should in theory all be "1"). This list does not exclude files that might be missing.',1),
'RTEmagicFilePairs' => array('Statistical info about RTEmagic files','(copy used as index)',0),
@@ -197,7 +197,7 @@
if (is_array($resultArray['doubleFiles'])) {
if (!$limitTo || $limitTo==='doubleFiles') {
- echo 'FIXING double-usages of RTE files in uploads/: '.chr(10);
+ echo 'FIXING double-usages of RTE files in uploads/: '.LF;
foreach($resultArray['RTEmagicFilePairs'] as $fileName => $fileInfo) {
// Only fix something if there is a usage count of more than 1 plus if both original and copy exists:
@@ -207,7 +207,7 @@
$c=0;
foreach($fileInfo['usedIn'] as $hash => $recordID) {
if ($c==0) {
- echo ' Keeping file '.$fileName.' for record '.$recordID.chr(10);
+ echo ' Keeping file '.$fileName.' for record '.$recordID.LF;
} else {
// CODE below is adapted from "class.tx_impexp.php" where there is support for duplication of RTE images:
echo ' Copying file '.basename($fileName).' for record '.$recordID.' ';
@@ -243,7 +243,7 @@
$sysRefObj = t3lib_div::makeInstance('t3lib_refindex');
$error = $sysRefObj->setReferenceValue($hash,substr($copyDestName,strlen(PATH_site)));
if ($error) {
- echo ' - ERROR: t3lib_refindex::setReferenceValue(): '.$error.chr(10);
+ echo ' - ERROR: t3lib_refindex::setReferenceValue(): '.$error.LF;
exit;
} else echo " - DONE";
} else {
@@ -252,19 +252,19 @@
}
} else echo ' - ERROR: Could not construct new unique names for file!';
} else echo ' - ERROR: Maybe directory of file was not within "uploads/"?';
- echo chr(10);
+ echo LF;
}
$c++;
}
}
}
- } else echo 'Bypassing fixing of double-usages since --AUTOFIX was not "doubleFiles"'.chr(10);
+ } else echo 'Bypassing fixing of double-usages since --AUTOFIX was not "doubleFiles"'.LF;
}
if (is_array($resultArray['lostFiles'])) {
if ($limitTo==='lostFiles') {
- echo 'Removing lost RTEmagic files from folders inside uploads/: '.chr(10);
+ echo 'Removing lost RTEmagic files from folders inside uploads/: '.LF;
foreach($resultArray['lostFiles'] as $key => $value) {
$absFileName = t3lib_div::getFileAbsFileName($value);
@@ -279,10 +279,10 @@
echo ' ERROR: File "'.$absFileName.'" was not found!';
}
}
- echo chr(10);
+ echo LF;
}
}
- } else echo 'Bypassing fixing of double-usages since --AUTOFIX was not "lostFiles"'.chr(10);
+ } else echo 'Bypassing fixing of double-usages since --AUTOFIX was not "lostFiles"'.LF;
}
/**
Index: typo3/sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt
===================================================================
--- typo3/sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt (revision 7304)
+++ typo3/sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt (working copy)
@@ -149,7 +149,7 @@
// Initialize result array:
$resultArray = array(
'message' => $this->cli_help['name'].
- chr(10).chr(10).
+ LF.LF.
$this->cli_help['description'],
'headers' => array(
'SOME_ANALYSIS_1' => array('HEADER','DESCRIPTION',VERBOSITY_LEVEL 0-3),
Index: typo3/sysext/lowlevel/dbint/index.php
===================================================================
--- typo3/sysext/lowlevel/dbint/index.php (revision 7304)
+++ typo3/sysext/lowlevel/dbint/index.php (working copy)
@@ -366,7 +366,7 @@
list($headerContent,$bodyContent) = $refIndexObj->updateIndex($testOnly);
// Output content:
- $this->content.=$this->doc->section($headerContent,str_replace(chr(10),'/i',chr(10),$cellContent);
+ $cellContent=preg_replace('//i',LF,$cellContent);
$cells[]='';
}
@@ -588,7 +588,7 @@
while(list($a)=each($this->TABLECFG['c'])) {
reset($this->TABLECFG['c'][$a]);
while(list($b)=each($this->TABLECFG['c'][$a])) {
- $this->TABLECFG['c'][$a][$b] = str_replace(chr(10),''.htmlspecialchars($this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName)).' '.htmlspecialchars($this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName)).' '.implode(chr(10),$lines).'
';
+ ';
$content .= '' . $GLOBALS['LANG']->getLL('privacy_notice_header') .
@@ -2340,7 +2340,7 @@
if(isset($submittedContent['file']) && !$GLOBALS['TYPO3_CONF_VARS']['EXT']['noEdit']) { // Check referer here?
$oldFileContent = t3lib_div::getUrl($editFile);
if($oldFileContent != $submittedContent['file']) {
- $oldMD5 = md5(str_replace(chr(13),'',$oldFileContent));
+ $oldMD5 = md5(str_replace(CR,'',$oldFileContent));
$info .= sprintf(
$GLOBALS['LANG']->getLL('ext_details_md5_previous'),
'' . $oldMD5 . ' '
@@ -2359,13 +2359,13 @@
'' . substr($editFile, strlen($absPath)) . ' (' .
t3lib_div::formatSize(filesize($editFile)) . ')' . $fileMD5 . ' '
) . '' . $saveMD5 . ' '
@@ -3236,10 +3236,10 @@
return nl2br(trim((is_array($techInfo['tables']) ?
($tableHeader ?
"\n\n" . $GLOBALS['LANG']->getLL('extDumpTables_tables') . " \n" : '') .
- implode(chr(10), $techInfo['tables']) : '') .
+ implode(LF, $techInfo['tables']) : '') .
(is_array($techInfo['static']) ?
"\n\n" . $GLOBALS['LANG']->getLL('extBackup_static_tables') . " \n" .
- implode(chr(10), $techInfo['static']) : '').
+ implode(LF, $techInfo['static']) : '').
(is_array($techInfo['fields']) ?
"\n\n" . $GLOBALS['LANG']->getLL('extInfoArray_additional_fields') . " \n" .
implode(''.$GLOBALS['TBE_TEMPLATE']->rfw(''.$name.': '.$LANG->sL('LLL:EXT:lang/locallang_mod_tools_em.xml:msg_warn_diff').' ').' '.$GLOBALS['TBE_TEMPLATE']->rfw(''.$name.': '.$LANG->sL('LLL:EXT:lang/locallang_mod_tools_em.xml:msg_warn_diff').' ').' '.$LANG->sL('LLL:EXT:lang/locallang_mod_tools_em.xml:msg_modified').' '.$LANG->sL('LLL:EXT:lang/locallang_mod_tools_em.xml:msg_modified').' '.$data[EM_CONF][version].' '.
''.$lastversion.' '.
''.$this->typeLabels[$data['type']].(strlen($data['doubleInstall'])>1?' '.$GLOBALS['TBE_TEMPLATE']->rfw($extInfo['doubleInstall']).' ':'').' '.
-''.$comment.' '."\n".
+''.$comment.' '.LF.
$warn.
-'';
+ $this->genTree_HTML.=LF.'';
$PM = 'join';
$LN = ($a==$c)?'blank':'line';
$BTM = ($a==$c)?'bottom':'';
@@ -250,7 +250,7 @@
// Build HTML output:
if ($this->genTree_makeHTML) {
- $this->genTree_HTML.=chr(10).'';
+ $this->genTree_HTML.=LF.'';
$PM = 'join';
$LN = ($a==$c)?'blank':'line';
$BTM = ($a==$c)?'bottom':'';
Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php (revision 7304)
+++ t3lib/class.t3lib_befunc.php (working copy)
@@ -1336,7 +1336,7 @@
}
// Parsing the page TS-Config (or getting from cache)
- $pageTS = implode(chr(10) . '[GLOBAL]' . chr(10), $TSdataArray);
+ $pageTS = implode(LF . '[GLOBAL]' . LF, $TSdataArray);
if ($GLOBALS['TYPO3_CONF_VARS']['BE']['TSconfigConditions']) {
/* @var $parseObj t3lib_TSparser_TSconfig */
$parseObj = t3lib_div::makeInstance('t3lib_TSparser_TSconfig');
@@ -1401,7 +1401,7 @@
if (count($set)) {
// Get page record and TS config lines
$pRec = t3lib_befunc::getRecord('pages', $id);
- $TSlines = explode(chr(10), $pRec['TSconfig']);
+ $TSlines = explode(LF, $pRec['TSconfig']);
$TSlines = array_reverse($TSlines);
// Reset the set of changes.
reset($set);
@@ -1424,7 +1424,7 @@
$TSlines = array_reverse($TSlines);
// store those changes
- $TSconf = implode(chr(10), $TSlines);
+ $TSconf = implode(LF, $TSlines);
$GLOBALS['TYPO3_DB']->exec_UPDATEquery('pages', 'uid='.intval($id), array('TSconfig' => $TSconf));
}
@@ -2926,7 +2926,7 @@
}
}
- $content = implode(chr(10), $signals);
+ $content = implode(LF, $signals);
t3lib_BEfunc::setUpdateSignal(); // for backwards compatibility, should be replaced
return $content;
@@ -4366,7 +4366,7 @@
*/
public static function processParams($params) {
$paramArr = array();
- $lines = explode(chr(10), $params);
+ $lines = explode(LF, $params);
while(list(,$val) = each($lines)) {
$val = trim($val);
if ($val) {
Index: t3lib/class.t3lib_formmail.php
===================================================================
--- t3lib/class.t3lib_formmail.php (revision 7304)
+++ t3lib/class.t3lib_formmail.php (working copy)
@@ -144,14 +144,14 @@
reset($V);
while (list($key,$val)=each($V)) {
if (!t3lib_div::inList($this->reserved_names,$key)) {
- $space = (strlen($val)>60)?chr(10):'';
- $val = (is_array($val) ? implode($val,chr(10)) : $val);
+ $space = (strlen($val)>60)?LF:'';
+ $val = (is_array($val) ? implode($val,LF) : $val);
// convert form data from renderCharset to mail charset (HTML may use entities)
$Plain_val = ($convCharset && strlen($val)) ? $GLOBALS['TSFE']->csConvObj->conv($val,$GLOBALS['TSFE']->renderCharset,$this->charset,0) : $val;
$HTML_val = ($convCharset && strlen($val)) ? $GLOBALS['TSFE']->csConvObj->conv(htmlspecialchars($val),$GLOBALS['TSFE']->renderCharset,$this->charset,1) : htmlspecialchars($val);
- $Plain_content.= strtoupper($key).': '.$space.$Plain_val."\n".$space;
+ $Plain_content.= strtoupper($key).': '.$space.$Plain_val.LF.$space;
$HTML_content.= ''.strtoupper($key).' '.nl2br($HTML_val).' '.$this->resultRowTitles($lrow, $TCA[$table], $table).implode(chr(10), $rowArr).'
';
+ $out.=''.$this->resultRowTitles($lrow, $TCA[$table], $table).implode(LF, $rowArr).'
';
}
if (!$out) $out='No rows selected! ';
$cPR['header']='Result';
@@ -458,7 +458,7 @@
$rowArr[]=$this->csvValues($row, ',', '"', $TCA[$table], $table);
}
if (count($rowArr)) {
- $out.='';
+ $out.='';
if (!$this->noDownloadB) {
$out.=''.$this->resultRowTitles($lrow,$conf,$table).implode(chr(10),$rowArr).'
';
+ $out.=''.$this->resultRowTitles($lrow,$conf,$table).implode(LF,$rowArr).'
';
}
$out.='… ', $preparedArgument);
- $preparedArgument = str_replace(chr(10), '↵ ', $preparedArgument);
+ $preparedArgument = str_replace(LF, '↵ ', $preparedArgument);
$arguments .= '"' . $preparedArgument . ' "';
} elseif (is_numeric($argument)) {
$arguments .= '' . (string)$argument . ' ';
@@ -199,7 +199,7 @@
if ($endLine > $startLine) {
$codeSnippet = '' . $filePathAndName . ': ';
for ($line = $startLine; $line < $endLine; $line++) {
- $codeLine = str_replace("\t", ' ', $phpFile[$line-1]);
+ $codeLine = str_replace(TAB, ' ', $phpFile[$line-1]);
if ($line === $lineNumber) {
$codeSnippet .= ' ';
Index: t3lib/class.t3lib_xml.php
===================================================================
--- t3lib/class.t3lib_xml.php (revision 7304)
+++ 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;
}
@@ -245,7 +245,7 @@
/**
* Internal function for adding the actual content of the $row from $table to the internal structure.
* Notice that only fields from $table that are listed in $this->XML_recFields[$table] (set by setRecFields()) will be rendered (and in the order found in that array!)
- * Content from the row will be htmlspecialchar()'ed, UTF-8 encoded and have chr(10) (newlines) exchanged for '' . "\n";
+ ' class="c-divider">' . LF;
$optGroupOpen = true;
$c--;
$optGroupStart = array();
@@ -1645,7 +1645,7 @@
$opt[]= ''.t3lib_div::deHSCentities(htmlspecialchars($p[0])).' ' . "\n";
+ '>'.t3lib_div::deHSCentities(htmlspecialchars($p[0])).'' . LF;
}
}
@@ -2359,7 +2359,7 @@
$origRows = $rows = t3lib_div::intInRange($rows, 1, 20);
if (strlen($itemValue)>$this->charsPerRow*2) {
$cols = $this->maxTextareaWidth;
- $rows = t3lib_div::intInRange(round(strlen($itemValue)/$this->charsPerRow),count(explode(chr(10),$itemValue)),20);
+ $rows = t3lib_div::intInRange(round(strlen($itemValue)/$this->charsPerRow),count(explode(LF,$itemValue)),20);
if ($rows<$origRows) $rows=$origRows;
}
}
@@ -4613,7 +4613,7 @@
// Description texts:
if ($this->edit_showFieldHelp) {
$descr = $GLOBALS['LANG']->moduleLabels['labels'][$theMod.'_tablabel'].
- chr(10).
+ LF.
$GLOBALS['LANG']->moduleLabels['labels'][$theMod.'_tabdescr'];
}
@@ -5446,21 +5446,21 @@
// $this->additionalJS_submit:
if ($this->additionalJS_submit) {
$additionalJS_submit = implode('', $this->additionalJS_submit);
- $additionalJS_submit = str_replace("\r", '', $additionalJS_submit);
- $additionalJS_submit = str_replace("\n", '', $additionalJS_submit);
+ $additionalJS_submit = str_replace(CR, '', $additionalJS_submit);
+ $additionalJS_submit = str_replace(LF, '', $additionalJS_submit);
$out .= '
TBE_EDITOR.addActionChecks("submit", "'.addslashes($additionalJS_submit).'");
';
}
- $out .= chr(10).implode(chr(10),$this->additionalJS_post).chr(10).$this->extJSCODE;
+ $out .= LF.implode(LF,$this->additionalJS_post).LF.$this->extJSCODE;
$out .= '
TBE_EDITOR.loginRefreshed();
';
// Regular direct output:
if (!$update) {
- $spacer = chr(10) . chr(9);
+ $spacer = LF . TAB;
$out = $spacer . implode($spacer, $jsFile) . t3lib_div::wrapJS($out);
}
Index: t3lib/class.t3lib_querygenerator.php
===================================================================
--- t3lib/class.t3lib_querygenerator.php (revision 7304)
+++ 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_install.php
===================================================================
--- t3lib/class.t3lib_install.php (revision 7304)
+++ t3lib/class.t3lib_install.php (working copy)
@@ -216,7 +216,7 @@
}
// Splitting localconf.php file into lines:
- $lines = explode(chr(10),str_replace(chr(13),'',trim(t3lib_div::getUrl($writeToLocalconf_dat['file']))));
+ $lines = explode(LF,str_replace(CR,'',trim(t3lib_div::getUrl($writeToLocalconf_dat['file']))));
$writeToLocalconf_dat['endLine'] = array_pop($lines); // Getting "? >" ending.
// Checking if "updated" line was set by this tool - if so remove old line.
@@ -235,10 +235,10 @@
if ($this->setLocalconf) {
$success = FALSE;
- if (!t3lib_div::writeFile($writeToLocalconf_dat['tmpfile'],implode(chr(10),$inlines))) {
+ if (!t3lib_div::writeFile($writeToLocalconf_dat['tmpfile'],implode(LF,$inlines))) {
$msg = 'typo3conf/localconf.php'.$tmpExt.' could not be written - maybe a write access problem?';
}
- elseif (strcmp(t3lib_div::getUrl($writeToLocalconf_dat['tmpfile']), implode(chr(10),$inlines))) {
+ elseif (strcmp(t3lib_div::getUrl($writeToLocalconf_dat['tmpfile']), implode(LF,$inlines))) {
@unlink($writeToLocalconf_dat['tmpfile']);
$msg = 'typo3conf/localconf.php'.$tmpExt.' was NOT written properly (written content didn\'t match file content) - maybe a disk space problem?';
}
@@ -274,7 +274,7 @@
* @see setValueInLocalconfFile()
*/
function checkForBadString($string) {
- return preg_match('/['.chr(10).chr(13).']/',$string) ? FALSE : TRUE;
+ return preg_match('/['.LF.CR.']/',$string) ? FALSE : TRUE;
}
/**
@@ -285,9 +285,9 @@
* @see setValueInLocalconfFile()
*/
function slashValueForSingleDashes($value) {
- $value = str_replace("'.chr(10).'", '###INSTALL_TOOL_LINEBREAK###', $value);
+ $value = str_replace("'.LF.'", '###INSTALL_TOOL_LINEBREAK###', $value);
$value = str_replace("'","\'",str_replace('\\','\\\\',$value));
- $value = str_replace('###INSTALL_TOOL_LINEBREAK###', "'.chr(10).'", $value);
+ $value = str_replace('###INSTALL_TOOL_LINEBREAK###', "'.LF.'", $value);
return $value;
}
@@ -314,7 +314,7 @@
* @return array Array with information about table.
*/
function getFieldDefinitions_fileContent($fileContent) {
- $lines = t3lib_div::trimExplode(chr(10), $fileContent, 1);
+ $lines = t3lib_div::trimExplode(LF, $fileContent, 1);
$table = '';
$total = array();
@@ -812,7 +812,7 @@
* @return array Array of SQL statements
*/
function getStatementArray($sqlcode,$removeNonSQL=0,$query_regex='') {
- $sqlcodeArr = explode(chr(10), $sqlcode);
+ $sqlcodeArr = explode(LF, $sqlcode);
// Based on the assumption that the sql-dump has
$statementArray = array();
@@ -839,7 +839,7 @@
$statementArrayPointer++;
} elseif ($is_set) {
- $statementArray[$statementArrayPointer].= chr(10);
+ $statementArray[$statementArrayPointer].= LF;
}
}
@@ -865,13 +865,13 @@
if (TYPO3_OS == 'WIN') {
$table = strtolower($table);
}
- $sqlLines = explode(chr(10), $lineContent);
+ $sqlLines = explode(LF, $lineContent);
foreach ($sqlLines as $k=>$v) {
if (stristr($v,'auto_increment')) {
$sqlLines[$k] = preg_replace('/ default \'0\'/i', '', $v);
}
}
- $lineContent = implode(chr(10), $sqlLines);
+ $lineContent = implode(LF, $sqlLines);
$crTables[$table] = $lineContent;
}
} elseif ($insertCountFlag && preg_match('/^insert[[:space:]]*into[[:space:]]*[`]?([[:alnum:]_]*)[`]?/i',substr($lineContent,0,100),$reg)) {
Index: t3lib/class.t3lib_tsparser.php
===================================================================
--- t3lib/class.t3lib_tsparser.php (revision 7304)
+++ t3lib/class.t3lib_tsparser.php (working copy)
@@ -82,7 +82,7 @@
// Internal
var $setup = Array(); // TypoScript hierarchy being build during parsing.
- var $raw; // raw data, the input string exploded by chr(10)
+ var $raw; // raw data, the input string exploded by LF
var $rawP; // pointer to entry in raw data array
var $lastComment=''; // Holding the value of the last comment
var $commentSet=0; // Internally set, used as internal flag to create a multi-line comment (one of those like /*... */)
@@ -131,7 +131,7 @@
* @return void
*/
function parse($string,$matchObj='') {
- $this->raw = explode(chr(10),$string);
+ $this->raw = explode(LF,$string);
$this->rawP = 0;
$pre = '[GLOBAL]';
while($pre) {
@@ -206,7 +206,7 @@
if (substr($line,0,1)==')') { // Multiline ends...
if ($this->syntaxHighLight) $this->regHighLight("operator",$lineP,strlen($line)-1);
$this->multiLineEnabled=0; // Disable multiline
- $theValue = implode($this->multiLineValue,chr(10));
+ $theValue = implode($this->multiLineValue,LF);
if (strstr($this->multiLineObject,'.')) {
$this->setVal($this->multiLineObject,$setup,array($theValue)); // Set the value deeper.
} else {
@@ -258,7 +258,7 @@
$tsFuncArg = str_replace(
array('\\\\', '\n','\t'),
- array('\\', chr(10),chr(9)),
+ array('\\', LF,TAB),
$tsFuncArg
);
@@ -371,7 +371,7 @@
if ($this->syntaxHighLight) $this->regHighLight("comment", $lineP);
// Comment. The comments are concatenated in this temporary string:
- if ($this->regComments) $this->lastComment.= trim($line).chr(10);
+ if ($this->regComments) $this->lastComment.= trim($line).LF;
}
}
}
@@ -518,7 +518,7 @@
$splitStr=' $v) {
if (!$c) { // first goes through
$newString.=$v;
@@ -526,7 +526,7 @@
$subparts=explode('>',$v,2);
if (preg_match('/^\s*\r?\n/',$subparts[1])) { // There must be a line-break char after
// SO, the include was positively recognized:
- $newString.='### '.$splitStr.$subparts[0].'> BEGIN:'.chr(10);
+ $newString.='### '.$splitStr.$subparts[0].'> BEGIN:'.LF;
$params = t3lib_div::get_tag_attributes($subparts[0]);
if ($params['source']) {
$sourceParts = explode(':',$params['source'],2);
@@ -544,13 +544,13 @@
$includedFiles = array_merge($includedFiles, $included_text['files']);
$included_text = $included_text['typoscript'];
}
- $newString.= $included_text.chr(10);
+ $newString.= $included_text.LF;
}
}
break;
}
}
- $newString.='### '.$splitStr.$subparts[0].'> END:'.chr(10);
+ $newString.='### '.$splitStr.$subparts[0].'> END:'.LF;
$newString.=$subparts[1];
} else $newString.=$splitStr.$v;
} else $newString.=$splitStr.$v;
@@ -620,7 +620,7 @@
$this->syntaxHighLight=1;
$this->highLightData=array();
$this->error=array();
- $string = str_replace(chr(13),'',$string); // This is done in order to prevent empty .. sections around chr(13) content. Should not do anything but help lessen the amount of HTML code.
+ $string = str_replace(CR,'',$string); // This is done in order to prevent empty .. sections around CR content. Should not do anything but help lessen the amount of HTML code.
$this->parse($string);
@@ -699,7 +699,7 @@
$lines[] = $lineC;
}
- return ''.implode(chr(10),$lines).' ';
+ return ''.implode(LF,$lines).' ';
}
}
Index: t3lib/class.t3lib_sqlparser.php
===================================================================
--- t3lib/class.t3lib_sqlparser.php (revision 7304)
+++ t3lib/class.t3lib_sqlparser.php (working copy)
@@ -135,7 +135,7 @@
// Finding starting keyword of string:
$_parseString = $parseString; // Protecting original string...
$keyword = $this->nextPart($_parseString, '^(SELECT|UPDATE|INSERT[[:space:]]+INTO|DELETE[[:space:]]+FROM|EXPLAIN|DROP[[:space:]]+TABLE|CREATE[[:space:]]+TABLE|CREATE[[:space:]]+DATABASE|ALTER[[:space:]]+TABLE|TRUNCATE[[:space:]]+TABLE)[[:space:]]+');
- $keyword = strtoupper(str_replace(array(' ',"\t","\r","\n"),'',$keyword));
+ $keyword = strtoupper(str_replace(array(' ',TAB,CR,LF),'',$keyword));
switch($keyword) {
case 'SELECT':
@@ -481,7 +481,7 @@
// While the parseString is not yet empty:
while(strlen($parseString)>0) {
if ($key = $this->nextPart($parseString, '^(KEY|PRIMARY KEY|UNIQUE KEY|UNIQUE)([[:space:]]+|\()')) { // Getting key
- $key = strtoupper(str_replace(array(' ',"\t","\r","\n"),'',$key));
+ $key = strtoupper(str_replace(array(' ',TAB,CR,LF),'',$key));
switch($key) {
case 'PRIMARYKEY':
@@ -557,7 +557,7 @@
if ($result['TABLE']) {
if ($result['action'] = $this->nextPart($parseString, '^(CHANGE|DROP[[:space:]]+KEY|DROP[[:space:]]+PRIMARY[[:space:]]+KEY|ADD[[:space:]]+KEY|ADD[[:space:]]+PRIMARY[[:space:]]+KEY|DROP|ADD|RENAME)([[:space:]]+|\()')) {
- $actionKey = strtoupper(str_replace(array(' ',"\t","\r","\n"),'',$result['action']));
+ $actionKey = strtoupper(str_replace(array(' ',TAB,CR,LF),'',$result['action']));
// Getting field:
if (t3lib_div::inList('ADDPRIMARYKEY,DROPPRIMARYKEY',$actionKey) || $fieldKey = $this->nextPart($parseString, '^([[:alnum:]_]+)[[:space:]]+')) {
@@ -832,7 +832,7 @@
// Looking for stop-keywords:
if ($stopRegex && $this->lastStopKeyWord = $this->nextPart($parseString, $stopRegex)) {
- $this->lastStopKeyWord = strtoupper(str_replace(array(' ',"\t","\r","\n"),'',$this->lastStopKeyWord));
+ $this->lastStopKeyWord = strtoupper(str_replace(array(' ',TAB,CR,LF),'',$this->lastStopKeyWord));
return $stack;
}
@@ -917,7 +917,7 @@
if ($stack[$pnt]['table'] = $this->nextPart($parseString,'^([[:alnum:]_]+)(,|[[:space:]]+)')) {
// Looking for stop-keywords before fetching potential table alias:
if ($stopRegex && ($this->lastStopKeyWord = $this->nextPart($parseString, $stopRegex))) {
- $this->lastStopKeyWord = strtoupper(str_replace(array(' ',"\t","\r","\n"), '', $this->lastStopKeyWord));
+ $this->lastStopKeyWord = strtoupper(str_replace(array(' ',TAB,CR,LF), '', $this->lastStopKeyWord));
return $stack;
}
if (!preg_match('/^(LEFT|RIGHT|JOIN|INNER)[[:space:]]+/i', $parseString)) {
@@ -969,7 +969,7 @@
// Looking for stop-keywords:
if ($stopRegex && $this->lastStopKeyWord = $this->nextPart($parseString, $stopRegex)) {
- $this->lastStopKeyWord = strtoupper(str_replace(array(' ',"\t","\r","\n"), '', $this->lastStopKeyWord));
+ $this->lastStopKeyWord = strtoupper(str_replace(array(' ',TAB,CR,LF), '', $this->lastStopKeyWord));
return $stack;
}
@@ -1230,7 +1230,7 @@
// Looking for stop-keywords:
if ($stopRegex && $this->lastStopKeyWord = $this->nextPart($parseString, $stopRegex)) {
- $this->lastStopKeyWord = strtoupper(str_replace(array(' ',"\t","\r","\n"), '', $this->lastStopKeyWord));
+ $this->lastStopKeyWord = strtoupper(str_replace(array(' ',TAB,CR,LF), '', $this->lastStopKeyWord));
return $stack[0];
} else {
return $this->parseError('No operator, but parsing not finished in parseWhereClause().', $parseString);
@@ -1278,7 +1278,7 @@
// Looking for keywords
while($keyword = $this->nextPart($parseString,'^(DEFAULT|NOT[[:space:]]+NULL|AUTO_INCREMENT|UNSIGNED)([[:space:]]+|,|\))')) {
- $keywordCmp = strtoupper(str_replace(array(' ',"\t","\r","\n"),'',$keyword));
+ $keywordCmp = strtoupper(str_replace(array(' ',TAB,CR,LF),'',$keyword));
$result['featureIndex'][$keywordCmp]['keyword'] = $keyword;
@@ -1339,7 +1339,7 @@
protected function getValue(&$parseString, $comparator = '', $mode = '') {
$value = '';
- if (t3lib_div::inList('NOTIN,IN,_LIST',strtoupper(str_replace(array(' ',"\n","\r","\t"),'',$comparator)))) { // List of values:
+ if (t3lib_div::inList('NOTIN,IN,_LIST',strtoupper(str_replace(array(' ',LF,CR,TAB),'',$comparator)))) { // List of values:
if ($this->nextPart($parseString,'^([(])')) {
$listValues = array();
$comma=',';
@@ -1694,7 +1694,7 @@
$query = 'ALTER TABLE '.$components['TABLE'].' '.$components['action'].' '.($components['FIELD']?$components['FIELD']:$components['KEY']);
// Based on action, add the final part:
- switch(strtoupper(str_replace(array(' ',"\t","\r","\n"),'',$components['action']))) {
+ switch(strtoupper(str_replace(array(' ',TAB,CR,LF),'',$components['action']))) {
case 'ADD':
$query.=' '.$this->compileFieldCfg($components['definition']);
break;
@@ -1929,7 +1929,7 @@
$output .= ' ' . $v['comparator'];
// Detecting value type; list or plain:
- if (t3lib_div::inList('NOTIN,IN', strtoupper(str_replace(array(' ', "\t", "\r", "\n"), '', $v['comparator'])))) {
+ if (t3lib_div::inList('NOTIN,IN', strtoupper(str_replace(array(' ', TAB, CR, LF), '', $v['comparator'])))) {
if (isset($v['subquery'])) {
$output .= ' (' . $this->compileSELECT($v['subquery']) . ')';
} else {
@@ -2062,10 +2062,10 @@
# $str1 = stripslashes($str1);
# $str2 = stripslashes($str2);
- if (strcmp(str_replace(array(' ',"\t","\r","\n"),'',$this->trimSQL($str1)),str_replace(array(' ',"\t","\r","\n"),'',$this->trimSQL($str2)))) {
+ if (strcmp(str_replace(array(' ',TAB,CR,LF),'',$this->trimSQL($str1)),str_replace(array(' ',TAB,CR,LF),'',$this->trimSQL($str2)))) {
return array(
- str_replace(array(' ',"\t","\r","\n"),' ',$str),
- str_replace(array(' ',"\t","\r","\n"),' ',$newStr),
+ str_replace(array(' ',TAB,CR,LF),' ',$str),
+ str_replace(array(' ',TAB,CR,LF),' ',$newStr),
);
}
}
Index: t3lib/class.t3lib_db.php
===================================================================
--- t3lib/class.t3lib_db.php (revision 7304)
+++ t3lib/class.t3lib_db.php (working copy)
@@ -1114,7 +1114,7 @@
4
);
} else {
- $setDBinit = t3lib_div::trimExplode(chr(10), $GLOBALS['TYPO3_CONF_VARS']['SYS']['setDBinit'], TRUE);
+ $setDBinit = t3lib_div::trimExplode(LF, $GLOBALS['TYPO3_CONF_VARS']['SYS']['setDBinit'], TRUE);
foreach ($setDBinit as $v) {
if (mysql_query($v, $this->link) === FALSE) {
t3lib_div::sysLog('Could not initialize DB connection with query "' . $v .
Index: t3lib/class.t3lib_tsstyleconfig.php
===================================================================
--- t3lib/class.t3lib_tsstyleconfig.php (revision 7304)
+++ t3lib/class.t3lib_tsstyleconfig.php (working copy)
@@ -208,7 +208,7 @@
*/
function ext_mergeIncomingWithExisting($arr) {
$parseObj = t3lib_div::makeInstance("t3lib_TSparser");
- $parseObj->parse(implode(chr(10),$this->ext_incomingValues));
+ $parseObj->parse(implode(LF,$this->ext_incomingValues));
$arr2 = $parseObj->setup;
return t3lib_div::array_merge_recursive_overrule($arr,$arr2);
}
Index: t3lib/class.t3lib_tsparser_ext.php
===================================================================
--- t3lib/class.t3lib_tsparser_ext.php (revision 7304)
+++ t3lib/class.t3lib_tsparser_ext.php (working copy)
@@ -466,7 +466,7 @@
if (!is_array($this->lnToScript)) {
$this->lnToScript = array();
$c=1;
- $c+=substr_count($GLOBALS['TYPO3_CONF_VARS']['FE']['defaultTypoScript_setup'],chr(10))+2;
+ $c+=substr_count($GLOBALS['TYPO3_CONF_VARS']['FE']['defaultTypoScript_setup'],LF)+2;
$this->lnToScript[$c] = '[Default]';
foreach($this->hierarchyInfoToRoot as $info) {
@@ -681,11 +681,11 @@
$all='';
reset($config);
while (list(,$str)=each($config)) {
- $all .= chr(10) .'[GLOBAL]' . chr(10) . $str;
+ $all .= LF .'[GLOBAL]' . LF . $str;
}
if ($syntaxHL) {
- $all = preg_replace('/^[^'.chr(10).']*./','',$all);
+ $all = preg_replace('/^[^'.LF.']*./','',$all);
$all = chop($all);
$tsparser = t3lib_div::makeInstance('t3lib_TSparser');
$tsparser->lineNumberOffset=$this->ext_lineNumberOffset+1;
@@ -738,9 +738,9 @@
* @return [type] ...
*/
function ext_formatTS($input, $ln, $comments=1, $crop=0) {
- $input = preg_replace('/^[^'.chr(10).']*./','',$input);
+ $input = preg_replace('/^[^'.LF.']*./','',$input);
$input = chop($input);
- $cArr = explode(chr(10),$input);
+ $cArr = explode(LF,$input);
reset($cArr);
$n = ceil(log10(count($cArr)+$this->ext_lineNumberOffset));
@@ -823,7 +823,7 @@
while(list($const,$value)=each($this->flatSetup)) {
if (substr($const,-2)!='..' && isset($this->flatSetup[$const.'..'])) {
$comment = trim($this->flatSetup[$const.'..']);
- $c_arr = explode(chr(10),$comment);
+ $c_arr = explode(LF,$comment);
while(list($k,$v)=each($c_arr)) {
$line=trim(preg_replace('/^[#\/]*/','',$v));
if ($line) {
@@ -1428,7 +1428,7 @@
*/
function ext_regObjectPositions($constants) {
// This runs through the lines of the constants-field of the active template and registers the constants-names and linepositions in an array, $this->objReg
- $this->raw = explode(chr(10),$constants);
+ $this->raw = explode(LF,$constants);
$this->rawP=0;
$this->objReg=array(); // resetting the objReg if the divider is found!!
@@ -1575,7 +1575,7 @@
while(list($key,$var)=each($data)) {
if (isset($theConstants[$key])) {
if ($this->ext_dontCheckIssetValues || isset($check[$key])) { // If checkbox is set, update the value
- list($var) = explode(chr(10),$var); // exploding with linebreak, just to make sure that no multiline input is given!
+ list($var) = explode(LF,$var); // exploding with linebreak, just to make sure that no multiline input is given!
$typeDat=$this->ext_getTypeData($theConstants[$key]['type']);
switch($typeDat['type']) {
case 'int':
Index: t3lib/class.t3lib_beuserauth.php
===================================================================
--- t3lib/class.t3lib_beuserauth.php (revision 7304)
+++ t3lib/class.t3lib_beuserauth.php (working copy)
@@ -239,10 +239,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_tcemain.php
===================================================================
--- t3lib/class.t3lib_tcemain.php (revision 7304)
+++ t3lib/class.t3lib_tcemain.php (working copy)
@@ -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:
@@ -4330,7 +4330,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");
}
Index: t3lib/class.t3lib_parsehtml_proc.php
===================================================================
--- t3lib/class.t3lib_parsehtml_proc.php (revision 7304)
+++ 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:
@@ -826,7 +826,7 @@
// Traverse the blocks
foreach($blockSplit as $k => $v) {
$cc++;
- $lastBR = $cc==$aC ? '' : chr(10);
+ $lastBR = $cc==$aC ? '' : LF;
if ($k%2) { // Inside block:
@@ -847,23 +847,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':
@@ -898,17 +898,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]);
}
@@ -976,12 +976,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).' '.
'';
}
break;
@@ -998,12 +998,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) {
@@ -1013,7 +1013,7 @@
}
}
}
- return implode(chr(10),$blockSplit);
+ return implode(LF,$blockSplit);
}
/**
@@ -1199,7 +1199,7 @@
}
/**
- * This resolves the $value into parts based on
-sections and -sections and
-sections and -sections and
';
+ $out.='';
// USER extension (prefixed "user_")
$out.=''.implode(chr(10),$lines).' ';
+ return ''.implode(LF,$lines).' ';
}
/**