Index: t3lib/class.t3lib_arraybrowser.php
===================================================================
--- t3lib/class.t3lib_arraybrowser.php (revision 6617)
+++ t3lib/class.t3lib_arraybrowser.php (working copy)
@@ -161,7 +161,7 @@
function wrapValue($theValue,$depth) {
$wrappedValue = '';
if (strlen($theValue) > 0) {
- $wrappedValue = '' . htmlspecialchars($theValue) . '';
+ $wrappedValue = '' . htmlspecialchars($theValue) . '';
}
return $wrappedValue;
}
Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php (revision 6617)
+++ t3lib/class.t3lib_befunc.php (working copy)
@@ -4050,7 +4050,7 @@
';
- echo ''.$header.' '.$text;
+ echo ''.$header.' '.$text;
echo '
|
Index: t3lib/class.t3lib_div.php
===================================================================
--- t3lib/class.t3lib_div.php (revision 6617)
+++ t3lib/class.t3lib_div.php (working copy)
@@ -3420,13 +3420,13 @@
if (is_array($var)) {
t3lib_div::print_array($var);
} elseif (is_object($var)) {
- echo '|Object:';
+ echo '|Object:';
print_r($var);
- echo '
|
';
+ echo '|';
} elseif ((string)$var!='') {
- echo '|'.htmlspecialchars((string)$var).'|';
+ echo '|'.htmlspecialchars((string)$var).'|';
} else {
- echo '| debug |';
+ echo '| debug |';
}
if ($brOrHeader && !t3lib_div::testInt($brOrHeader)) {
@@ -5708,7 +5708,7 @@
*/
public static function flushOutputBuffers() {
$obContent = '';
-
+
while (ob_get_level()) {
$obContent .= ob_get_clean();
}
Index: t3lib/class.t3lib_formmail.php
===================================================================
--- t3lib/class.t3lib_formmail.php (revision 6617)
+++ t3lib/class.t3lib_formmail.php (working copy)
@@ -152,7 +152,7 @@
$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;
- $HTML_content.= ''.strtoupper($key).' | '.nl2br($HTML_val).' |
';
+ $HTML_content.= ''.strtoupper($key).' | '.nl2br($HTML_val).' |
';
}
}
}
Index: t3lib/class.t3lib_tceforms.php
===================================================================
--- t3lib/class.t3lib_tceforms.php (revision 6617)
+++ t3lib/class.t3lib_tceforms.php (working copy)
@@ -276,7 +276,7 @@
// INTERNAL, templates
var $totalWrap='
|
'; // Total wrapping for the table rows.
- var $fieldTemplate='###FIELD_NAME###
###FIELD_ITEM###
'; // Field template
+ var $fieldTemplate='###FIELD_NAME###
###FIELD_ITEM###
'; // Field template
var $sectionWrap=''; // Wrapping template code for a section
var $palFieldTemplateHeader=''; // Template for palette headers
var $palFieldTemplate=''; // Template for palettes
@@ -2490,7 +2490,7 @@
foreach ($rotateLang as $lKey) {
if (!$langChildren && !$langDisabled) {
- $item.= ''.$this->getLanguageIcon($table,$row,'v'.$lKey).$lKey.':';
+ $item.= ''.$this->getLanguageIcon($table,$row,'v'.$lKey).$lKey.':';
}
$tabParts = array();
@@ -2724,7 +2724,7 @@
'.implode('',$tRows).'
';
- $output.= $mayRestructureFlexforms ? '' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.addnew', 1) . ': '.implode(' | ',$newElementsLinks).'
' : '';
+ $output.= $mayRestructureFlexforms ? '' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.addnew', 1) . ': '.implode(' | ',$newElementsLinks).'
' : '';
} else {
// It is a container
@@ -4769,7 +4769,7 @@
$this->fieldTemplate='
###FIELD_HELP_ICON### |
- ###FIELD_NAME######FIELD_HELP_TEXT### |
+ ###FIELD_NAME######FIELD_HELP_TEXT### |
|
Index: t3lib/class.t3lib_tceforms_fe.php
===================================================================
--- t3lib/class.t3lib_tceforms_fe.php (revision 6617)
+++ t3lib/class.t3lib_tceforms_fe.php (working copy)
@@ -109,7 +109,7 @@
public function setFancyDesign() {
$this->fieldTemplate = '
- ###FIELD_HELP_ICON######FIELD_NAME######FIELD_HELP_TEXT### |
+ ###FIELD_HELP_ICON######FIELD_NAME######FIELD_HELP_TEXT### |
###FIELD_ITEM######FIELD_PAL_LINK_ICON### |
@@ -123,7 +123,7 @@
';
$this->palFieldTemplateHeader = '
- ###FIELD_HEADER### |
+ ###FIELD_HEADER### |
';
}
Index: t3lib/class.t3lib_tceforms_inline.php
===================================================================
--- t3lib/class.t3lib_tceforms_inline.php (revision 6617)
+++ t3lib/class.t3lib_tceforms_inline.php (working copy)
@@ -535,7 +535,7 @@
'fObj->borderStyle[2] ? ' background="'.htmlspecialchars($this->backPath.$this->fObj->borderStyle[2]).'"':'').
($this->fObj->borderStyle[3] ? ' class="'.htmlspecialchars($this->fObj->borderStyle[3]).'"':'').'>' .
- ''.$iconImg.' | '.$label.' | '.$ctrl.' |
';
+ ''.$iconImg.' | '.$label.' | '.$ctrl.' |
';
return $header;
}
Index: t3lib/class.t3lib_tsparser_ext.php
===================================================================
--- t3lib/class.t3lib_tsparser_ext.php (revision 6617)
+++ t3lib/class.t3lib_tsparser_ext.php (working copy)
@@ -261,12 +261,12 @@
function substituteCMarkers($all) {
switch($this->constantMode) {
case 'const':
- $all = str_replace('##'.$this->Cmarker.'_B##', '', $all);
- $all = str_replace('##'.$this->Cmarker.'_E##', '', $all);
+ $all = str_replace('##'.$this->Cmarker.'_B##', '', $all);
+ $all = str_replace('##'.$this->Cmarker.'_E##', '', $all);
break;
case 'subst':
- $all = str_replace('##'.$this->Cmarker.'_B##', '', $all);
- $all = str_replace('##'.$this->Cmarker.'_E##', '', $all);
+ $all = str_replace('##'.$this->Cmarker.'_B##', '', $all);
+ $all = str_replace('##'.$this->Cmarker.'_E##', '', $all);
break;
default:
$all = $all;
@@ -416,7 +416,7 @@
$ln = '';
}
- if ($this->tsbrowser_searchKeys[$depth] & 4) { $label = ''.$label.''; } // The key has matched the search string
+ if ($this->tsbrowser_searchKeys[$depth] & 4) { $label = ''.$label.''; } // The key has matched the search string
$label = ''.$label.'';
}
}
@@ -431,9 +431,9 @@
$theValue = $this->ext_fixed_lgd($theValue,$lgdChars);
}
if ($this->tsbrowser_searchKeys[$depth] & 2) { // The value has matched the search string
- $HTML.=' = '.$this->makeHtmlspecialchars($theValue).'';
+ $HTML.=' = '.$this->makeHtmlspecialchars($theValue).'';
} else {
- $HTML.=' = '.$this->makeHtmlspecialchars($theValue).'';
+ $HTML.=' = '.$this->makeHtmlspecialchars($theValue).'';
}
if ($this->ext_regComments && isset($arr[$key.'..'])) {
$comment = $arr[$key.'..'];
@@ -754,7 +754,7 @@
$firstChar = substr(trim($v),0,1);
if ($firstChar=='[') {
- $cArr[$k] = ''.$cArr[$k].'';
+ $cArr[$k] = ''.$cArr[$k].'';
} elseif ($firstChar=='/' || $firstChar=='#') {
if ($comments) {
$cArr[$k] = ''.$cArr[$k].'';
Index: typo3/alt_menu.php
===================================================================
--- typo3/alt_menu.php (revision 6617)
+++ typo3/alt_menu.php (working copy)
@@ -149,7 +149,7 @@
// Header: Admin functions
$this->content.='
- '.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.adminFunctions',1).' |
+ '.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.adminFunctions',1).' |
';
$rows=array();
Index: typo3/class.alt_menu_functions.inc
===================================================================
--- typo3/class.alt_menu_functions.inc (revision 6617)
+++ typo3/class.alt_menu_functions.inc (working copy)
@@ -207,7 +207,7 @@
}
$selectItems[] = '';
- $label=' '.$label.' ';
+ $label=' '.$label.' ';
// make menu collapsable
Index: typo3/class.file_list.inc
===================================================================
--- typo3/class.file_list.inc (revision 6617)
+++ typo3/class.file_list.inc (working copy)
@@ -180,7 +180,7 @@
if ($this->clickMenus) $otherMarkers['PAGE_ICON'] = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($otherMarkers['PAGE_ICON'],$path);
$buttons['level_up'] .= $this->linkWrapDir('backPath,'gfx/i/folder_up.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.upOneLevel',1).'" alt="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.upOneLevel',1).'" />',$theFile['path']);
- $otherMarkers['TITLE'] .= t3lib_div::fixed_lgd_cs($title,-($this->fixedL+20)); // No HTML specialchars here - HTML like is allowed
+ $otherMarkers['TITLE'] .= t3lib_div::fixed_lgd_cs($title,-($this->fixedL+20)); // No HTML specialchars here - HTML like is allowed
// this is the root page
} else {
Index: typo3/class.show_rechis.inc
===================================================================
--- typo3/class.show_rechis.inc (revision 6617)
+++ typo3/class.show_rechis.inc (working copy)
@@ -324,7 +324,7 @@
// get link to page history if the element history is shown
$elParts = explode(':',$this->element);
if ($elParts[0] != 'pages') {
- $content .= ''.$LANG->getLL('elementHistory',1).'
';
+ $content .= ''.$LANG->getLL('elementHistory',1).'
';
$pid = t3lib_BEfunc::getRecordRaw($elParts[0],'uid='.intval($elParts[1]));
$content .= $this->linkPage($LANG->getLL('elementHistory_link',1),array('element' => 'pages:'.$pid['pid']));
}
@@ -389,7 +389,7 @@
$lines[] = '
- '.$LANG->getLL('consistenceWarning',1).' |
+ '.$LANG->getLL('consistenceWarning',1).' |
';
}
@@ -493,10 +493,10 @@
$elParts = explode(':',$key);
// turn around diff because it should be a "rollback preview"
if ($diff['insertsDeletes'][$key] == 1) { // insert
- $record .= ''.$LANG->getLL('delete',1).'';
+ $record .= ''.$LANG->getLL('delete',1).'';
$record .= '
';
} elseif ($diff['insertsDeletes'][$key] == -1) {
- $record .= ''.$LANG->getLL('insert',1).'';
+ $record .= ''.$LANG->getLL('insert',1).'';
$record .= '
';
}
// build up temporary diff array
Index: typo3/mod/tools/em/class.em_index.php
===================================================================
--- typo3/mod/tools/em/class.em_index.php (revision 6617)
+++ typo3/mod/tools/em/class.em_index.php (working copy)
@@ -2344,7 +2344,7 @@
$oldMD5 = md5(str_replace(chr(13),'',$oldFileContent));
$info .= sprintf(
$GLOBALS['LANG']->getLL('ext_details_md5_previous'),
- '' . $oldMD5 . ''
+ '' . $oldMD5 . ''
) . '
';
t3lib_div::writeFile($editFile,$submittedContent['file']);
$saveFlag = 1;
@@ -2357,19 +2357,19 @@
$outCode.= sprintf(
$GLOBALS['LANG']->getLL('ext_details_file'),
- '' . substr($editFile, strlen($absPath)) . ' (' .
+ '' . substr($editFile, strlen($absPath)) . ' (' .
t3lib_div::formatSize(filesize($editFile)) . ')
'
);
$fileMD5 = md5(str_replace(chr(13),'',$fileContent));
$info .= sprintf(
$GLOBALS['LANG']->getLL('ext_details_md5_current'),
- '' . $fileMD5 . ''
+ '' . $fileMD5 . ''
) . '
';
if($saveFlag) {
$saveMD5 = md5(str_replace(chr(13),'',$submittedContent['file']));
$info .= sprintf(
$GLOBALS['LANG']->getLL('ext_details_md5_submitted'),
- '' . $saveMD5 . ''
+ '' . $saveMD5 . ''
) . '
';
if ($fileMD5!=$saveMD5) {
$info .= $GLOBALS['TBE_TEMPLATE']->rfw(
@@ -5597,7 +5597,7 @@
|
Index: typo3/mod/user/ws/class.wslib_gui.php
===================================================================
--- typo3/mod/user/ws/class.wslib_gui.php (revision 6617)
+++ typo3/mod/user/ws/class.wslib_gui.php (working copy)
@@ -177,7 +177,7 @@
$browse .= 'Showing ' . $browseStat['begin'] . ' to ' . ($browseStat['end'] ? $browseStat['end'] . ' out of ' . $browseStat['allItems'] : $browseStat['allItems']) . ' versions:
';
if (!($browseStat['begin']==1 && !$browseStat['end'])) {
for($a=0;$a':'').'['.($a+1).']'.($a==(int)$pointer?'':'').' ';
+ $browse.=($a==(int)$pointer?'':'').'['.($a+1).']'.($a==(int)$pointer?'':'').' ';
}
$browse.= '
';
}
@@ -483,8 +483,8 @@
// Create version element:
$versionsInOtherWS = $this->versionsInOtherWS($table, $rec_on['uid']);
$versionsInOtherWSWarning = $versionsInOtherWS && $GLOBALS['BE_USER']->workspace !== 0 ? '
' . $this->doc->icons(2) . $LANG->getLL('label_otherversions') . ' ' . $versionsInOtherWS : '';
- $multipleWarning = (!$mainCell && $GLOBALS['BE_USER']->workspace !==0 ? '
' . $this->doc->icons(3) . '' . $LANG->getLL('label_multipleversions') . '' : '');
- $verWarning = $warnAboutVersions || ($warnAboutVersions_nonPages && $GLOBALS['TCA'][$table]['ctrl']['versioning_followPages']) ? '
' . $this->doc->icons(3) . '' . $LANG->getLL('label_nestedversions') . '' : '';
+ $multipleWarning = (!$mainCell && $GLOBALS['BE_USER']->workspace !==0 ? '
' . $this->doc->icons(3) . '' . $LANG->getLL('label_multipleversions') . '' : '');
+ $verWarning = $warnAboutVersions || ($warnAboutVersions_nonPages && $GLOBALS['TCA'][$table]['ctrl']['versioning_followPages']) ? '
' . $this->doc->icons(3) . '' . $LANG->getLL('label_nestedversions') . '' : '';
$verElement = $icon.
''.
t3lib_BEfunc::getRecordTitle($table,$rec_off,TRUE).
Index: typo3/mod/user/ws/index.php
===================================================================
--- typo3/mod/user/ws/index.php (revision 6617)
+++ typo3/mod/user/ws/index.php (working copy)
@@ -471,19 +471,19 @@
$content = '
- ' . $LANG->getLL('label_workspace') . ' |
+ ' . $LANG->getLL('label_workspace') . ' |
'.$title.' |
- ' . $LANG->getLL('label_description') . ' |
+ ' . $LANG->getLL('label_description') . ' |
'.$description.' |
'.($GLOBALS['BE_USER']->workspace!=-99 && !$details ? '
- ' . $LANG->getLL('label_options') . ' |
+ strong>' . $LANG->getLL('label_options') . ' |
'.$menu.$actionLinks.' |
- ' . $LANG->getLL('label_status') . ' |
+ ' . $LANG->getLL('label_status') . ' |
'.$LANG->getLL('label_access_level').' ' . $GLOBALS['LANG']->getLL('workspace_list_access_' . $wsAccess['_ACCESS']) . ' |
' : '').'
@@ -686,27 +686,27 @@
global $LANG;
$content = '' .
- '' . $LANG->getLL('workspace_list_label_file_mountpoints') . ' | ' .
+ '
' . $LANG->getLL('workspace_list_label_file_mountpoints') . ' | ' .
'' . $this->workspaceList_getFileMountPoints($wksp) . ' |
' .
- '' . $LANG->getLL('workspace_list_label_db_mountpoints') . ' | ' .
+ '
' . $LANG->getLL('workspace_list_label_db_mountpoints') . ' | ' .
'' . $this->workspaceList_getWebMountPoints($wksp) . ' |
';
if ($wksp['uid'] > 0) {
// Displaying information below makes sence only for custom workspaces
$content .=
- '' . $LANG->getLL('workspace_list_label_frozen') . ' | ' .
+ '
' . $LANG->getLL('workspace_list_label_frozen') . ' | ' .
'' . $LANG->getLL($wksp['freeze'] ? 'workspace_list_label_frozen_yes' : 'workspace_list_label_frozen_no') . ' |
' .
- '' . $LANG->getLL('workspace_list_label_publish_date') . ' | ' .
+ '
' . $LANG->getLL('workspace_list_label_publish_date') . ' | ' .
'' . ($wksp['publish_time'] == 0 ? ' –' : t3lib_BEfunc::datetime($wksp['publish_time'])) . ' |
' .
- '' . $LANG->getLL('workspace_list_label_unpublish_date') . ' | ' .
+ '
' . $LANG->getLL('workspace_list_label_unpublish_date') . ' | ' .
'' . ($wksp['unpublish_time'] == 0 ? ' –' : t3lib_BEfunc::datetime($wksp['unpublish_time'])) . ' |
' .
- '' . $LANG->getLL('workspace_list_label_your_access') . ' | ' .
+ '
' . $LANG->getLL('workspace_list_label_your_access') . ' | ' .
'' . $LANG->getLL('workspace_list_access_' . $wksp['_ACCESS']) . ' |
' .
- '' . $LANG->getLL('workspace_list_label_workspace_users') . ' | ' .
+ '
' . $LANG->getLL('workspace_list_label_workspace_users') . ' | ' .
'' . $this->workspaceList_getUserList($wksp) . ' |
';
}
else if ($GLOBALS['BE_USER']->isAdmin()) {
// show users for draft/live workspace only to admin users
- $content .= '' . $LANG->getLL('workspace_list_label_workspace_users') . ' | ' .
+ $content .= '
' . $LANG->getLL('workspace_list_label_workspace_users') . ' | ' .
'' . $this->workspaceList_getUserList($wksp) . ' |
';
}
$content .= '
';
@@ -959,7 +959,7 @@
$content = '';
// TODO CSH lable explaining access here?
- $content .= '' . $access . ' | ';
+ $content .= '' . $access . '';
$content .= '' . implode(' ', $content_array) . ' |
';
return $content;
}
Index: typo3/mod/user/ws/wsol_preview.php
===================================================================
--- typo3/mod/user/ws/wsol_preview.php (revision 6617)
+++ typo3/mod/user/ws/wsol_preview.php (working copy)
@@ -89,17 +89,17 @@
Header
- '.$headerText.'
+ '.$headerText.'