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_cs.php =================================================================== --- t3lib/class.t3lib_cs.php (revision 6617) +++ t3lib/class.t3lib_cs.php (working copy) @@ -660,7 +660,7 @@ foreach($array as $key => $value) { if (is_array($array[$key])) { $this->convArray($array[$key],$fromCS,$toCS,$useEntityForNoChar); - } else { + } elseif (is_string($array[$key])) { $array[$key] = $this->conv($array[$key],$fromCS,$toCS,$useEntityForNoChar); } } 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/backend.php =================================================================== --- typo3/backend.php (revision 6617) +++ typo3/backend.php (working copy) @@ -415,7 +415,7 @@ // Convert labels/settings back to UTF-8 since json_encode() only works with UTF-8: if ($GLOBALS['LANG']->charSet !== 'utf-8') { - $t3Configuration['username'] = $GLOBALS['LANG']->csConvObj->conv($t3Configuration['username'], $GLOBALS['LANG']->charSet, 'utf-8'); + $GLOBALS['LANG']->csConvObj->convArray($t3Configuration, $GLOBALS['LANG']->charSet, 'utf-8'); $GLOBALS['LANG']->csConvObj->convArray($t3LLLcore, $GLOBALS['LANG']->charSet, 'utf-8'); $GLOBALS['LANG']->csConvObj->convArray($t3LLLfileUpload, $GLOBALS['LANG']->charSet, 'utf-8'); } 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 @@
' . $addFields . - $flashMessage->render() . + $flashMessage->render() . '
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 = ' - + - + '.($GLOBALS['BE_USER']->workspace!=-99 && !$details ? ' - + - + ' : '').'
' . $LANG->getLL('label_workspace') . ' ' . $LANG->getLL('label_workspace') . '  '.$title.'
' . $LANG->getLL('label_description') . ' ' . $LANG->getLL('label_description') . '  '.$description.'
' . $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 = '' . - '' . + '' . '' . - '' . + '' . ''; if ($wksp['uid'] > 0) { // Displaying information below makes sence only for custom workspaces $content .= - '' . + '' . '' . - '' . + '' . '' . - '' . + '' . '' . - '' . + '' . '' . - '' . + '' . ''; } else if ($GLOBALS['BE_USER']->isAdmin()) { // show users for draft/live workspace only to admin users - $content .= '' . + $content .= '' . ''; } $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) . '
' . $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) . '
' . $LANG->getLL('workspace_list_label_workspace_users') . '
' . $LANG->getLL('workspace_list_label_workspace_users') . '' . $this->workspaceList_getUserList($wksp) . '
'; @@ -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.' + New page!

The previewed page is created in the workspace and has no counterpart in the live workspace.'; break; default: Index: typo3/mod/web/info/index.php =================================================================== --- typo3/mod/web/info/index.php (revision 6617) +++ typo3/mod/web/info/index.php (working copy) @@ -104,8 +104,8 @@ $this->doc->setModuleTemplate('templates/info.html'); $this->doc->tableLayout = Array ( '0' => Array ( - '0' => Array('',''), - "defCol" => Array('','') + '0' => Array('',''), + "defCol" => Array('','') ), "defRow" => Array ( "0" => Array('',''), Index: typo3/mod/web/perm/index.php =================================================================== --- typo3/mod/web/perm/index.php (revision 6617) +++ typo3/mod/web/perm/index.php (working copy) @@ -525,11 +525,11 @@ // Adding help text: if ($BE_USER->uc['helpText']) { $this->content.=$this->doc->divider(20); - $legendText = ''.$LANG->getLL('1',1).': '.$LANG->getLL('1_t',1); - $legendText.= '
'.$LANG->getLL('16',1).': '.$LANG->getLL('16_t',1); - $legendText.= '
'.$LANG->getLL('2',1).': '.$LANG->getLL('2_t',1); - $legendText.= '
'.$LANG->getLL('4',1).': '.$LANG->getLL('4_t',1); - $legendText.= '
'.$LANG->getLL('8',1).': '.$LANG->getLL('8_t',1); + $legendText = ''.$LANG->getLL('1',1).': '.$LANG->getLL('1_t',1); + $legendText.= '
'.$LANG->getLL('16',1).': '.$LANG->getLL('16_t',1); + $legendText.= '
'.$LANG->getLL('2',1).': '.$LANG->getLL('2_t',1); + $legendText.= '
'.$LANG->getLL('4',1).': '.$LANG->getLL('4_t',1); + $legendText.= '
'.$LANG->getLL('8',1).': '.$LANG->getLL('8_t',1); $code=$legendText.'

'.$LANG->getLL('def',1); $this->content.=$this->doc->section($LANG->getLL('Legend',1).':',$code); @@ -595,13 +595,13 @@   - '.$LANG->getLL('Owner',1).' + '.$LANG->getLL('Owner',1).' - '.$LANG->getLL('Group',1).' + '.$LANG->getLL('Group',1).' - '.$LANG->getLL('Everybody',1).' + '.$LANG->getLL('Everybody',1).' - '.$LANG->getLL('EditLock',1).' + '.$LANG->getLL('EditLock',1).' '; } else { @@ -609,9 +609,9 @@   - '.$LANG->getLL('User',1).': '.$BE_USER->user['username'].' + '.$LANG->getLL('User',1).': '.$BE_USER->user['username'].' '.(!$BE_USER->isAdmin()?' - '.$LANG->getLL('EditLock',1).'':'').' + '.$LANG->getLL('EditLock',1).'':'').' '; } @@ -707,11 +707,11 @@ $this->content.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'perm_module', $GLOBALS['BACK_PATH'], '
|'); // Creating legend table: - $legendText = ''.$LANG->getLL('1',1).': '.$LANG->getLL('1_t',1); - $legendText.= '
'.$LANG->getLL('16',1).': '.$LANG->getLL('16_t',1); - $legendText.= '
'.$LANG->getLL('2',1).': '.$LANG->getLL('2_t',1); - $legendText.= '
'.$LANG->getLL('4',1).': '.$LANG->getLL('4_t',1); - $legendText.= '
'.$LANG->getLL('8',1).': '.$LANG->getLL('8_t',1); + $legendText = ''.$LANG->getLL('1',1).': '.$LANG->getLL('1_t',1); + $legendText.= '
'.$LANG->getLL('16',1).': '.$LANG->getLL('16_t',1); + $legendText.= '
'.$LANG->getLL('2',1).': '.$LANG->getLL('2_t',1); + $legendText.= '
'.$LANG->getLL('4',1).': '.$LANG->getLL('4_t',1); + $legendText.= '
'.$LANG->getLL('8',1).': '.$LANG->getLL('8_t',1); $code=' Index: typo3/move_el.php =================================================================== --- typo3/move_el.php (revision 6617) +++ typo3/move_el.php (working copy) @@ -199,7 +199,7 @@ * @return string Wrapped title string. */ function wrapRecordTitle($str,$row) { - if ($GLOBALS['SOBE']->moveUid==$row['uid']) $str = ''.$str.''; + if ($GLOBALS['SOBE']->moveUid==$row['uid']) $str = ''.$str.''; return parent::wrapRecordTitle($str,$row); } } Index: typo3/sysext/belog/mod/index.php =================================================================== --- typo3/sysext/belog/mod/index.php (revision 6617) +++ typo3/sysext/belog/mod/index.php (working copy) @@ -94,7 +94,7 @@ $this->doc->tableLayout = Array ( '0' => Array ( - 'defCol' => Array('') + 'defCol' => Array('') ), 'defRow' => Array ( '0' => Array(''), @@ -239,7 +239,7 @@ array($GLOBALS['LANG']->getLL('action'), $menuA) ), array( - $GLOBALS['BE_USER']->workspace!==0 ? array('Workspace:',''.$GLOBALS['BE_USER']->workspace.'') : array('Workspace:',$menuW), + $GLOBALS['BE_USER']->workspace!==0 ? array('Workspace:',''.$GLOBALS['BE_USER']->workspace.'') : array('Workspace:',$menuW), array('Group by page:',$groupByPage) ) )); Index: typo3/sysext/beuser/mod/index.php =================================================================== --- typo3/sysext/beuser/mod/index.php (revision 6617) +++ typo3/sysext/beuser/mod/index.php (working copy) @@ -336,7 +336,7 @@ $str.= (($int&4)?'*':'x'); $str.= (($int&8)?'*':'x'); - return ''.$str.''; + return ''.$str.''; } /** @@ -738,7 +738,7 @@ // Traverse types: foreach ($theTypes as $tableFieldKey => $theTypeArrays) { if (is_array($theTypeArrays['items'])) { - $pout[] = ''.$theTypeArrays['tableFieldLabel'].''; + $pout[] = ''.$theTypeArrays['tableFieldLabel'].''; // Traverse options for this field: foreach ($theTypeArrays['items'] as $itemValue => $itemContent) { $v = $tableFieldKey.':'.$itemValue.':'.$itemContent[0]; @@ -881,7 +881,7 @@ $str.= (($int&4)?'*':'x'); $str.= (($int&8)?'*':'x'); - return ''.$str.''; + return ''.$str.''; } /** @@ -1379,11 +1379,11 @@ 'doc->backPath,'gfx/new_el.gif') . ' title="' . $GLOBALS['LANG']->getLL('newUser', true) . '" alt="" />'. ''; - $allCells['USERS'] = '
', '', '','
' . $GLOBALS['LANG']->getLL('usernames', true) . '' . $link_createNewUser . '
'; + $allCells['USERS'] = '
' . $GLOBALS['LANG']->getLL('usernames', true) . '' . $link_createNewUser . '
'; foreach ($options as $kk => $vv) { if ($compareFlags[$kk]) { - $allCells[$kk] = ''.$vv.':'; + $allCells[$kk] = ''.$vv.':'; } } $allGroups[]=$allCells; @@ -1591,9 +1591,9 @@ $outTable = ' - - - + + + '.$outTable.'
' . $GLOBALS['LANG']->getLL('timestamp', true) . '' . $GLOBALS['LANG']->getLL('host', true) . '' . $GLOBALS['LANG']->getLL('username', true) . '' . $GLOBALS['LANG']->getLL('timestamp', true) . '' . $GLOBALS['LANG']->getLL('host', true) . '' . $GLOBALS['LANG']->getLL('username', true) . '
'; Index: typo3/sysext/cms/ext_localconf.php =================================================================== --- typo3/sysext/cms/ext_localconf.php (revision 6617) +++ typo3/sysext/cms/ext_localconf.php (working copy) @@ -178,7 +178,7 @@ 'underscore (_) to hyphen (-) to make URLs more friendly for search engines' . 'URLs that are already existing (e.g. external links to your site) will still work like before.

' . '

You can set the separator character back to an underscore by putting the following line into the '. - 'Setup section of your Page TypoScript template:

' . + 'Setup section of your Page TypoScript template:

' . '

config.simulateStaticDocuments_replacementChar = _

'. '
  • CSS Stylesheets and JavaScript are put into an external file by default.

    '. '

    Technically, that means that the default value of "config.inlineStyle2TempFile" is now set to "1" and that of "config.removeDefaultJS" to "external"

  • '. Index: typo3/sysext/cms/layout/class.tx_cms_layout.php =================================================================== --- typo3/sysext/cms/layout/class.tx_cms_layout.php (revision 6617) +++ typo3/sysext/cms/layout/class.tx_cms_layout.php (working copy) @@ -325,10 +325,10 @@ } else $eI=''; switch($field) { case 'title': - $theData[$field] = ' '.$GLOBALS['LANG']->sL($TCA['pages']['columns'][$field]['label']).''.$eI; + $theData[$field] = ' '.$GLOBALS['LANG']->sL($TCA['pages']['columns'][$field]['label']).''.$eI; break; case 'uid': - $theData[$field] = ' ID:'; + $theData[$field] = ' ID:'; break; default: if (substr($field,0,6)=='table_') { @@ -348,7 +348,7 @@ break; } } else { - $theData[$field] = '  '.$GLOBALS['LANG']->sL($TCA['pages']['columns'][$field]['label'],1).''.$eI; + $theData[$field] = '  '.$GLOBALS['LANG']->sL($TCA['pages']['columns'][$field]['label'],1).''.$eI; } break; } @@ -802,8 +802,8 @@ // header line is drawn $theData = Array(); $theData['__cmds__'] =''; - $theData['info'] = 'Info
    '; - $theData['note'] = 'Note'; + $theData['info'] = 'Info
    '; + $theData['note'] = 'Note'; $out.=$this->addelement(1,'',$theData,' class="c-headLine"',20); // half line is drawn @@ -834,7 +834,7 @@ $theData = Array(); $this->getProcessedValue('sys_note','subject,category,author,email,personal',$row,$info); $cont=implode('
    ',$info); - $head = 'Page: '.t3lib_BEfunc::getRecordPath($row['pid'],$perms_clause,10).'
    '; + $head = 'Page: '.t3lib_BEfunc::getRecordPath($row['pid'],$perms_clause,10).'
    '; $theData['__cmds__']= $this->getIcon('sys_note',$row); $theData['info'] = $head.$cont; @@ -896,12 +896,12 @@ // Header line is drawn $theData = Array(); - $theData['subject'] = ''.$GLOBALS['LANG']->getLL('tt_board_subject',1).''; - $theData['author'] = ''.$GLOBALS['LANG']->getLL('tt_board_author',1).''; - $theData['date'] = ''.$GLOBALS['LANG']->getLL('tt_board_date',1).''; - $theData['age'] = ''.$GLOBALS['LANG']->getLL('tt_board_age',1).''; + $theData['subject'] = ''.$GLOBALS['LANG']->getLL('tt_board_subject',1).''; + $theData['author'] = ''.$GLOBALS['LANG']->getLL('tt_board_author',1).''; + $theData['date'] = ''.$GLOBALS['LANG']->getLL('tt_board_date',1).''; + $theData['age'] = ''.$GLOBALS['LANG']->getLL('tt_board_age',1).''; if ($GLOBALS['SOBE']->MOD_SETTINGS['tt_board']!='expand') { - $theData['replys'] = ''.$GLOBALS['LANG']->getLL('tt_board_RE',1).''; + $theData['replys'] = ''.$GLOBALS['LANG']->getLL('tt_board_RE',1).''; } $out.=$this->addelement(1,'',$theData,' class="c-headLine"',20); @@ -1252,7 +1252,7 @@ // Traverse fields, separated by ";" (displayed in a single cell). foreach($theFields as $fName2) { if ($TCA[$table]['columns'][$fName2]) { - $out[$fieldName].= ''.$GLOBALS['LANG']->sL($TCA[$table]['columns'][$fName2]['label'],1).''. + $out[$fieldName].= ''.$GLOBALS['LANG']->sL($TCA[$table]['columns'][$fName2]['label'],1).''. '  '. htmlspecialchars(t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getProcessedValue($table,$fName2,$row[$fName2],0,0,0,$row['uid']),25)). '
    '; @@ -1287,7 +1287,7 @@ foreach($fieldArr as $fieldName) { $ll = $GLOBALS['LANG']->sL($TCA[$table]['columns'][$fieldName]['label'],1); - $out[$fieldName] = ''.($ll?$ll:' ').''; + $out[$fieldName] = ''.($ll?$ll:' ').''; } return $out; } @@ -1367,7 +1367,7 @@ foreach($fieldArr as $field) { switch($field) { case 'title': - $red = $this->plusPages[$row['uid']] ? '' : ''; + $red = $this->plusPages[$row['uid']] ? '' : ''; $pTitle = htmlspecialchars(t3lib_BEfunc::getProcessedValue('pages',$field,$row[$field],20)); if ($red) { $pTitle = '
    '.$pTitle.''; @@ -1376,7 +1376,7 @@ break; case 'php_tree_stop': case 'TSconfig': - $theData[$field] = $row[$field]?' x':' '; + $theData[$field] = $row[$field]?' x':' '; break; case 'uid': if ($GLOBALS['BE_USER']->doesUserHaveAccess($row,2)) { @@ -1471,7 +1471,7 @@ // Create header row: $out = ' -
    ' . htmlspecialchars($GLOBALS['LANG']->csConvObj->conv_case($GLOBALS['LANG']->charSet, $colName, 'toUpper')) . '
    +
    ' . htmlspecialchars($GLOBALS['LANG']->csConvObj->conv_case($GLOBALS['LANG']->charSet, $colName, 'toUpper')) . '
    '; // Create command links: @@ -1545,7 +1545,7 @@ $lockIcon. $stat. ($langMode ? $this->languageFlag($row['sys_language_uid']) : ''). - ' '.htmlspecialchars($this->CType_labels[$row['CType']]).''; + ' '.htmlspecialchars($this->CType_labels[$row['CType']]).''; $out = ' '.$header.' @@ -1677,7 +1677,7 @@ } $outHeader= ($row['date'] ? htmlspecialchars($this->itemLabels['date'].' '.t3lib_BEfunc::date($row['date'])).'
    ':''). $this->infoGif($infoArr). - '' . $this->linkEditContent($this->renderText($row['header']), $row) . $hiddenHeaderNote . '
    '; + '' . $this->linkEditContent($this->renderText($row['header']), $row) . $hiddenHeaderNote . '
    '; } // Make content: Index: typo3/sysext/cms/tslib/class.tslib_content.php =================================================================== --- typo3/sysext/cms/tslib/class.tslib_content.php (revision 6617) +++ typo3/sysext/cms/tslib/class.tslib_content.php (working copy) @@ -3879,10 +3879,10 @@ if ($conf['debug']) {$content = '
    '.htmlspecialchars($content).'
    ';} if ($conf['debugFunc']) {debug($conf['debugFunc']==2?array($content):$content);} if ($conf['debugData']) { - echo '$cObj->data:'; + echo '$cObj->data:'; debug($this->data,'$cObj->data:'); if (is_array($this->alternativeData)) { - echo '$cObj->alternativeData:'; + echo '$cObj->alternativeData:'; debug($this->alternativeData,'$this->alternativeData'); } } @@ -4447,7 +4447,7 @@ // properties if (($properties&8)) {$theValue=$this->HTMLcaseshift($theValue, 'upper');} - if (($properties&1)) {$theValue=''.$theValue.'';} + if (($properties&1)) {$theValue=''.$theValue.'';} if (($properties&2)) {$theValue=''.$theValue.'';} if (($properties&4)) {$theValue=''.$theValue.'';} Index: typo3/sysext/cms/tslib/class.tslib_fe.php =================================================================== --- typo3/sysext/cms/tslib/class.tslib_fe.php (revision 6617) +++ typo3/sysext/cms/tslib/class.tslib_fe.php (working copy) @@ -1677,7 +1677,7 @@ if (@is_file(PATH_site.$this->TYPO3_CONF_VARS['FE']['workspacePreviewLogoutTemplate'])) { $message = t3lib_div::getUrl(PATH_site.$this->TYPO3_CONF_VARS['FE']['workspacePreviewLogoutTemplate']); } else { - $message = 'ERROR!
    Template File "'.$this->TYPO3_CONF_VARS['FE']['workspacePreviewLogoutTemplate'].'" configured with $TYPO3_CONF_VARS["FE"]["workspacePreviewLogoutTemplate"] not found. Please contact webmaster about this problem.'; + $message = 'ERROR!
    Template File "'.$this->TYPO3_CONF_VARS['FE']['workspacePreviewLogoutTemplate'].'" configured with $TYPO3_CONF_VARS["FE"]["workspacePreviewLogoutTemplate"] not found. Please contact webmaster about this problem.'; } } else { $message = 'You logged out from Workspace preview mode. Click this link to go back to the website'; Index: typo3/sysext/impexp/class.tx_impexp.php =================================================================== --- typo3/sysext/impexp/class.tx_impexp.php (revision 6617) +++ typo3/sysext/impexp/class.tx_impexp.php (working copy) @@ -2636,7 +2636,7 @@ if ($this->update) { $diffInverse = TRUE; // In case of update-PREVIEW we swap the diff-sources. $recInf = $this->doesRecordExist($table, $uid, $this->showDiff ? '*' : ''); - $pInfo['updatePath']= $recInf ? htmlspecialchars($this->getRecordPath($recInf['pid'])) : 'NEW!'; + $pInfo['updatePath']= $recInf ? htmlspecialchars($this->getRecordPath($recInf['pid'])) : 'NEW!'; // Mode selector: $optValues = array(); @@ -2705,15 +2705,15 @@ $pInfo['title'] = ''.$info['field'].', "'.$info['spKey'].'" : '.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['matchString'],60)).''; if ($info['subst']['type']) { if (strlen($info['subst']['title'])) { - $pInfo['title'].= '
    '.$preCode_B.''.$LANG->getLL('impexpcore_singlereco_title',1).' '.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['subst']['title'],60)); + $pInfo['title'].= '
    '.$preCode_B.''.$LANG->getLL('impexpcore_singlereco_title',1).' '.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['subst']['title'],60)); } if (strlen($info['subst']['description'])) { - $pInfo['title'].= '
    '.$preCode_B.''.$LANG->getLL('impexpcore_singlereco_descr',1).' '.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['subst']['description'],60)); + $pInfo['title'].= '
    '.$preCode_B.''.$LANG->getLL('impexpcore_singlereco_descr',1).' '.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['subst']['description'],60)); } $pInfo['title'].= '
    '.$preCode_B. - ($info['subst']['type'] == 'file' ? $LANG->getLL('impexpcore_singlereco_filename',1).' '.$info['subst']['relFileName'].'' : ''). - ($info['subst']['type'] == 'string' ? $LANG->getLL('impexpcore_singlereco_value',1).' '.$info['subst']['tokenValue'].'' : ''). - ($info['subst']['type'] == 'db' ? $LANG->getLL('impexpcore_softrefsel_record',1).' '.$info['subst']['recordRef'].'' : ''); + ($info['subst']['type'] == 'file' ? $LANG->getLL('impexpcore_singlereco_filename',1).' '.$info['subst']['relFileName'].'' : ''). + ($info['subst']['type'] == 'string' ? $LANG->getLL('impexpcore_singlereco_value',1).' '.$info['subst']['tokenValue'].'' : ''). + ($info['subst']['type'] == 'db' ? $LANG->getLL('impexpcore_softrefsel_record',1).' '.$info['subst']['recordRef'].'' : ''); } $pInfo['ref'] = 'SOFTREF'; $pInfo['size'] = ''; @@ -2966,7 +2966,7 @@ $cfg = $this->softrefCfg[$tokenID]; if ($cfg['mode'] === 'editable') { return - (strlen($cfg['title']) ? ''.htmlspecialchars($cfg['title']).'
    ' : ''). + (strlen($cfg['title']) ? ''.htmlspecialchars($cfg['title']).'
    ' : ''). htmlspecialchars($cfg['description']).'
    '; } @@ -3009,7 +3009,7 @@ if (strlen($cfg['subst']['title'])) { $descriptionField.= ' - '.htmlspecialchars($cfg['subst']['title']).'
    '; + '.htmlspecialchars($cfg['subst']['title']).'
    '; } // Description: @@ -3221,7 +3221,7 @@ // Traverse remaining in import record: foreach($importRecord as $fN => $value) { if (is_array($TCA[$table]['columns'][$fN]) && $TCA[$table]['columns'][$fN]['config']['type']!='passthrough') { - $output[$fN] = 'Field missing in database'; + $output[$fN] = 'Field missing in database'; } } Index: typo3/sysext/impexp/modfunc1/class.tx_impexp_modfunc1.php =================================================================== --- typo3/sysext/impexp/modfunc1/class.tx_impexp_modfunc1.php (revision 6617) +++ typo3/sysext/impexp/modfunc1/class.tx_impexp_modfunc1.php (working copy) @@ -145,9 +145,9 @@ '.($configuration['pagetree']['id'] ? $configuration['pagetree']['id'] : ' ').' '.htmlspecialchars($configuration['pagetree']['id'] ? t3lib_BEfunc::getRecordPath($configuration['pagetree']['id'],$clause,20) : '[Single Records]').' - ' . htmlspecialchars($configuration['meta']['title']) . '
    ' . + ' . htmlspecialchars($configuration['meta']['title']) . '
    ' . htmlspecialchars($configuration['meta']['description']). - ($configuration['meta']['notes'] ? '

    Notes: ' . htmlspecialchars($configuration['meta']['notes']) . '' : '') . + ($configuration['meta']['notes'] ? '

    Notes: ' . htmlspecialchars($configuration['meta']['notes']) . '' : '') . ' '; Index: typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php =================================================================== --- typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php (revision 6617) +++ typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php (working copy) @@ -361,7 +361,7 @@ while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) { $out.=' - Warning: phash-row "'.$row['phash'].'" didn\'t have a representation in the index_section table! + Warning: phash-row "'.$row['phash'].'" didn\'t have a representation in the index_section table! '; $this->allPhashListed[] = $row['phash']; } @@ -642,9 +642,9 @@ $this->utf8_to_currentCharset(t3lib_div::view_array($debugInfo)); $content.= '

    Debug information / lexer splitting:

    '. - '
    '. + '
    '. $this->utf8_to_currentCharset($lexer). - '

    '; + '
    '; } Index: typo3/sysext/install/mod/class.tx_install.php =================================================================== --- typo3/sysext/install/mod/class.tx_install.php (revision 6617) +++ typo3/sysext/install/mod/class.tx_install.php (working copy) @@ -1507,7 +1507,7 @@ // Memory and functions // ***************** $memory_limit_value = $this->convertByteSize(ini_get('memory_limit')); - + if ($memory_limit_value && $memory_limit_value < t3lib_div::getBytesFromSizeMeasurement(TYPO3_REQUIREMENTS_RECOMMENDED_PHP_MEMORY_LIMIT)) { $this->message($ext, 'Memory limit below ' . TYPO3_REQUIREMENTS_MINIMUM_PHP_MEMORY_LIMIT,' memory_limit=' . ini_get('memory_limit') . ' @@ -1553,7 +1553,7 @@ } else { if (($smtp_addr == '127.0.0.1' || $smtp_addr == '::1') && ($_SERVER['SERVER_ADDR'] == '127.0.0.1' || $_SERVER['SERVER_ADDR'] == '::1')) { $this->message($ext, 'Mail is configured (potential problem exists!)', - 'SMTP=' . $smtp . ' - Note: this server! Are you sure it runs SMTP server? + 'SMTP=' . $smtp . ' - Note: this server! Are you sure it runs SMTP server? smtp_port=' . ini_get('smtp_port') . ' '.$this->check_mail('get_form'), 1); } else { Index: typo3/sysext/install/updates/class.tx_coreupdates_compatversion.php =================================================================== --- typo3/sysext/install/updates/class.tx_coreupdates_compatversion.php (revision 6617) +++ typo3/sysext/install/updates/class.tx_coreupdates_compatversion.php (working copy) @@ -53,11 +53,11 @@ if ($this->compatVersionIsCurrent()) { $description = 'Up to date!
    If you do not use the wizard, your current TYPO3 installation is configured to use all the features included in the current release '.TYPO3_version.'.
    - There are two possibilities that you see this screen:
    1. You just updated from a previous version of TYPO3: + There are two possibilities that you see this screen:
      1. You just updated from a previous version of TYPO3: Because of some new features, the frontend output of your site might have changed. To emulate the "old" frontend behavior, change the compatibility version by continuing to step 2. - This is recommended after every update to make sure the frontend output is not altered. When re-running the wizard, you will see the changes needed for using the new features. + This is recommended after every update to make sure the frontend output is not altered. When re-running the wizard, you will see the changes needed for using the new features. Please continue to step two.
      2. -
      3. You just made a fresh install of TYPO3: +
      4. You just made a fresh install of TYPO3: Perfect! All new features will be used. You can stop here and do not need this wizard now.
      '; @@ -66,7 +66,7 @@ The compatibility version has been set to the current TYPO3 version. This is a stamp and has no impact for your installation.'; } } else { - $description = 'Your current TYPO3 installation is configured to behave like version '.$TYPO3_CONF_VARS['SYS']['compat_version'].' of TYPO3. If you just upgraded from this version, you most likely want to use new features as well.

      In the next step, you will see the things that need to be adjusted to make your installation compatible with the new features.'; + $description = 'Your current TYPO3 installation is configured to behave like version '.$TYPO3_CONF_VARS['SYS']['compat_version'].' of TYPO3. If you just upgraded from this version, you most likely want to use new features as well.

      In the next step, you will see the things that need to be adjusted to make your installation compatible with the new features.'; } return 1; // Return 1 in any case so user has possibility to switch back to a previous compat_version. Index: typo3/sysext/lowlevel/config/index.php =================================================================== --- typo3/sysext/lowlevel/config/index.php (revision 6617) +++ typo3/sysext/lowlevel/config/index.php (working copy) @@ -265,7 +265,7 @@ $this->content.= ' -
      '.$label.'
      +
      '.$label.'
      '; $this->content.=' Index: typo3/sysext/lowlevel/dbint/index.php =================================================================== --- typo3/sysext/lowlevel/dbint/index.php (revision 6617) +++ typo3/sysext/lowlevel/dbint/index.php (working copy) @@ -129,7 +129,7 @@ $this->doc->tableLayout = array ( '0' => array ( - 'defCol' => array('', '') + 'defCol' => array('', '') ), 'defRow' => array ( '0' => array('',''), @@ -545,7 +545,7 @@ reset($admin->lRecords[$t]); while(list(,$data)=each($admin->lRecords[$t])) { if (!t3lib_div::inList($admin->lostPagesList,$data[pid])) { - $lr.= 'uid:' . $data[uid] . ', pid:' . $data[pid] . ', ' . t3lib_div::fixed_lgd_cs(strip_tags($data[title]), 20) . '
      '; + $lr.= 'uid:' . $data[uid] . ', pid:' . $data[pid] . ', ' . t3lib_div::fixed_lgd_cs(strip_tags($data[title]), 20) . '
      '; } else { $lr.= 'uid:' . $data[uid] . ', pid:' . $data[pid] . ', ' . t3lib_div::fixed_lgd_cs(strip_tags($data[title]), 20) . '
      '; } @@ -581,7 +581,7 @@ $code=''; if (is_array($fileTest['noReferences'])) { while(list(,$val)=each($fileTest['noReferences'])) { - $code.='' . $val[0] . '/' . $val[1] . '
      '; + $code.='' . $val[0] . '/' . $val[1] . '
      '; } } $this->content.=$this->doc->section($GLOBALS['LANG']->getLL('files_no_ref'), $code, true, true); @@ -589,7 +589,7 @@ $code=''; if (is_array($fileTest['moreReferences'])) { while(list(,$val)=each($fileTest['moreReferences'])) { - $code.='' . $val[0] . '/' . $val[1] . ': ' . $val[2] . ' ' . $GLOBALS['LANG']->getLL('references') . '
      ' . $val[3] . '

      '; + $code.='' . $val[0] . '/' . $val[1] . ': ' . $val[2] . ' ' . $GLOBALS['LANG']->getLL('references') . '
      ' . $val[3] . '

      '; } } $this->content.=$this->doc->section($GLOBALS['LANG']->getLL('files_many_ref'),$code, true, true); @@ -599,7 +599,7 @@ ksort($fileTest['noFile']); reset($fileTest['noFile']); while(list(,$val)=each($fileTest['noFile'])) { - $code.='' . $val[0] . '/' . $val[1] . ' ' . $GLOBALS['LANG']->getLL('isMissing') . '
      ' . $GLOBALS['LANG']->getLL('referencedFrom') . $val[2] . '

      '; + $code.='' . $val[0] . '/' . $val[1] . ' ' . $GLOBALS['LANG']->getLL('isMissing') . '
      ' . $GLOBALS['LANG']->getLL('referencedFrom') . $val[2] . '

      '; } } $this->content.= $this->doc->section($GLOBALS['LANG']->getLL('files_no_file'), $code, true, true); @@ -629,13 +629,13 @@ $info = $this->findFile(PATH_site.$value.'/',$pattern,$matching_files,$depth); } if (is_array($info)) { - $lines[]='


      ' . $value . '/ ' . $GLOBALS['LANG']->getLL('beingChecked'); + $lines[]='
      ' . $value . '/ ' . $GLOBALS['LANG']->getLL('beingChecked'); $lines[]=$GLOBALS['LANG']->getLL('directories') . ' ' . $info[0]; if ($info[2]) $lines[]='' . $GLOBALS['LANG']->getLL('directoriesTooDeep') . ' ' . $depth . ''; $lines[]=$GLOBALS['LANG']->getLL('files') . ' ' . $info[1]; $lines[]=$GLOBALS['LANG']->getLL('matchingFiles') . '
      ' . implode('
      ', $matching_files) . '
      '; } else { - $lines[]=$GLOBALS['TBE_TEMPLATE']->dfw('
      ' . $value . '/ ' . $GLOBALS['LANG']->getLL('notChecked')); + $lines[]=$GLOBALS['TBE_TEMPLATE']->dfw('
      ' . $value . '/ ' . $GLOBALS['LANG']->getLL('notChecked')); } } Index: typo3/sysext/recycler/res/js/t3_recycler.js =================================================================== --- typo3/sysext/recycler/res/js/t3_recycler.js (revision 6617) +++ typo3/sysext/recycler/res/js/t3_recycler.js (working copy) @@ -59,11 +59,11 @@ var expander = new Ext.grid.RowExpander({ tpl : new Ext.Template( '
      ' + - '

      ' + Recycler.lang.table + ': {table}

      ' + - '

      ' + Recycler.lang.crdate + ': {crdate}

      ' + - '

      ' + Recycler.lang.tstamp + ': {tstamp}

      ' + - '

      ' + Recycler.lang.owner + ': {owner} (UID: {owner_uid})

      ' + - '

      ' + Recycler.lang.path + ': {path}

      ' + + '

      ' + Recycler.lang.table + ': {table}

      ' + + '

      ' + Recycler.lang.crdate + ': {crdate}

      ' + + '

      ' + Recycler.lang.tstamp + ': {tstamp}

      ' + + '

      ' + Recycler.lang.owner + ': {owner} (UID: {owner_uid})

      ' + + '

      ' + Recycler.lang.path + ': {path}

      ' + '
      ' ) }); Index: typo3/sysext/saltedpasswords/classes/class.tx_saltedpasswords_emconfhelper.php =================================================================== --- typo3/sysext/saltedpasswords/classes/class.tx_saltedpasswords_emconfhelper.php (revision 6617) +++ typo3/sysext/saltedpasswords/classes/class.tx_saltedpasswords_emconfhelper.php (working copy) @@ -204,7 +204,7 @@ the backend. Additionally, usage of salted passwords is enforced (forceSalted). The result is that there is no chance to login with users not having a salted password hash.
      -WARNING: This may lock you out of the backend! +WARNING: This may lock you out of the backend! EOT; } else { // inform the user that things like openid won't work anymore @@ -224,7 +224,7 @@
      This means that only passwords in the format of this extension will succeed for login.
      -IMPORTANT: This has the effect that passwords that are set from +IMPORTANT: This has the effect that passwords that are set from the Install Tool will not work! EOT; } @@ -300,7 +300,7 @@
      This means that only passwords in the format of this extension will succeed for login.
      -IMPORTANT: Because of this, it is not possible to login with +IMPORTANT: Because of this, it is not possible to login with users not having a salted password hash (e.g. existing frontend users). EOT; } else { @@ -321,7 +321,7 @@
      This means that only passwords in the format of this extension will succeed for login.
      -IMPORTANT: This has the effect that passwords that were set +IMPORTANT: This has the effect that passwords that were set before SaltedPasswords was used will not work (in fact, they need to be redefined). EOT; Index: typo3/sysext/sys_action/class.tx_sysaction.php =================================================================== --- typo3/sysext/sys_action/class.tx_sysaction.php (revision 6617) +++ typo3/sysext/sys_action/class.tx_sysaction.php (working copy) @@ -71,7 +71,7 @@ if($actionRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) { // Action header: - $header = t3lib_iconworks::getIconImage("sys_action",$actionRow,$this->backPath,'hspace="2" class="absmiddle"').''.$actionRow["title"].''; + $header = t3lib_iconworks::getIconImage("sys_action",$actionRow,$this->backPath,'hspace="2" class="absmiddle"').''.$actionRow["title"].''; $out.=' @@ -116,7 +116,7 @@ $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'be_users', 'pid=0 AND cruser_id='.intval($this->BE_USER->user['uid']).' AND createdByAction='.intval($actionRow['uid']).t3lib_BEfunc::deleteClause('be_users'), '', 'username'); $lines = array(); while($uRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) { - $lines[] = "".($uRow["uid"]==$userRecord["uid"]?"":"").$this->action_linkUserName(t3lib_iconworks::getIconImage("be_users",$uRow,$this->backPath,'title="uid='.$uRow["uid"].'" hspace="2" align="top"').$uRow["username"]." (".$uRow["realName"].")".($uRow["uid"]==$userRecord["uid"]?"":"")."",$actionRow["uid"],$uRow["uid"])."
      "; + $lines[] = "".($uRow["uid"]==$userRecord["uid"]?"":"").$this->action_linkUserName(t3lib_iconworks::getIconImage("be_users",$uRow,$this->backPath,'title="uid='.$uRow["uid"].'" hspace="2" align="top"').$uRow["username"]." (".$uRow["realName"].")".($uRow["uid"]==$userRecord["uid"]?"":"")."",$actionRow["uid"],$uRow["uid"])."
      "; } if (count($lines)) { $theCode.= $this->pObj->doc->section($LANG->getLL("action_t1_listOfUsers"),implode("",$lines),0,1); Index: typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php =================================================================== --- typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php (revision 6617) +++ typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php (working copy) @@ -92,8 +92,8 @@ if ($existTemplate) { $theOutput.=$this->pObj->doc->divider(5); $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('currentTemplate', true) , - '' . - $this->pObj->linkWrapTemplateTitle($tplRow["title"]) . '' . + '' . + $this->pObj->linkWrapTemplateTitle($tplRow["title"]) . '' . htmlspecialchars(trim($tplRow["sitetitle"]) ? ' - (' . $tplRow["sitetitle"] . ')' : '')); } if ($manyTemplatesMenu) { @@ -165,7 +165,7 @@ if ($cVal == t3lib_div::_GET('template') || t3lib_div::_GET('template') == "all") { $theOutput .= ' - +
      '.fw($header).'
      ' . $tmpl->templateTitles[$cVal] . '
      ' . $tmpl->templateTitles[$cVal] . '
      - + '; + $ret.= ''; return $ret; } @@ -339,7 +339,7 @@ } $theOutput.= $this->pObj->doc->spacer(5); - $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('templateInformation'), ''.htmlspecialchars($tplRow['title']).''.htmlspecialchars(trim($tplRow['sitetitle'])?' - ('.$tplRow['sitetitle'].')':''), 0, 1); + $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('templateInformation'), ''.htmlspecialchars($tplRow['title']).''.htmlspecialchars(trim($tplRow['sitetitle'])?' - ('.$tplRow['sitetitle'].')':''), 0, 1); if ($manyTemplatesMenu) { $theOutput.= $this->pObj->doc->section('', $manyTemplatesMenu); $theOutput.= $this->pObj->doc->divider(5); @@ -378,8 +378,8 @@ $outCode = 'pObj->doc->formWidth().' size="50">'; $outCode.= ''; $outCode.= ''; - $outCode.= '
      ' . $GLOBALS['LANG']->getLL('allowedExtensions') . ' ' . $TCA['sys_template']['columns']['resources']['config']['allowed'] . ''; - $outCode.= '
      ' . $GLOBALS['LANG']->getLL('maxFilesize') . ' ' . t3lib_div::formatSize($TCA['sys_template']['columns']['resources']['config']['max_size']*1024) . ''; + $outCode.= '
      ' . $GLOBALS['LANG']->getLL('allowedExtensions') . ' ' . $TCA['sys_template']['columns']['resources']['config']['allowed'] . ''; + $outCode.= '
      ' . $GLOBALS['LANG']->getLL('maxFilesize') . ' ' . t3lib_div::formatSize($TCA['sys_template']['columns']['resources']['config']['max_size']*1024) . ''; $theOutput.= $this->pObj->doc->spacer(15); $theOutput.= $this->pObj->doc->section($GLOBALS['LANG']->getLL('uploadResource'), $outCode); @@ -423,7 +423,7 @@ if (@is_file($path) && t3lib_div::inList($this->pObj->textExtensions, $fI['fileext'])) { if (filesize($path) < $TCA['sys_template']['columns']['resources']['config']['max_size']*1024) { $fileContent = t3lib_div::getUrl($path); - $outCode = $GLOBALS['LANG']->getLL('file'). ' ' . $e[file] . '
      '; + $outCode = $GLOBALS['LANG']->getLL('file'). ' ' . $e[file] . '
      '; $outCode.= ''; $outCode.= ''; $outCode.= ''; Index: typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php =================================================================== --- typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php (revision 6617) +++ typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php (working copy) @@ -221,8 +221,8 @@ $existTemplate = $this->initialize_editor($this->pObj->id,$template_uid); // initialize if ($existTemplate) { $theOutput .= '

      ' . $GLOBALS['LANG']->getLL('currentTemplate') . ' ' . - $this->pObj->linkWrapTemplateTitle($tplRow["title"], ($bType == "setup" ? "config" : "constants")) . '' . + t3lib_iconWorks::skinImg($BACK_PATH, t3lib_iconWorks::getIcon('sys_template', $tplRow)) . ' align="top" /> ' . + $this->pObj->linkWrapTemplateTitle($tplRow["title"], ($bType == "setup" ? "config" : "constants")) . '' . htmlspecialchars(trim($tplRow["sitetitle"]) ? ' - (' . $tplRow["sitetitle"] . ')' : '') . '

      '; if ($manyTemplatesMenu) { $theOutput.=$this->pObj->doc->section("",$manyTemplatesMenu); @@ -425,7 +425,7 @@ // back $out = $GLOBALS['LANG']->getLL('back'); - $out = ''.$out.''; + $out = ''.$out.''; $theOutput.=$this->pObj->doc->divider(5); $theOutput.=$this->pObj->doc->section("",$out); @@ -473,7 +473,7 @@ if (isset($this->pObj->MOD_SETTINGS["ts_browser_TLKeys_".$bType][$theKey])) { - $remove = ''; + $remove = ''; } else { $remove = ''; } @@ -488,7 +488,7 @@ Index: typo3/sysext/version/cm1/index.php =================================================================== --- typo3/sysext/version/cm1/index.php (revision 6617) +++ typo3/sysext/version/cm1/index.php (working copy) @@ -923,8 +923,8 @@ // Create version element: $versionsInOtherWS = $this->versionsInOtherWS($table, $rec_on['uid']); $versionsInOtherWSWarning = $versionsInOtherWS && $GLOBALS['BE_USER']->workspace !== 0 ? '
      ' . $this->doc->icons(2) . $GLOBALS['LANG']->getLL('otherVersions') . $versionsInOtherWS : ''; - $multipleWarning = (!$mainCell && $GLOBALS['BE_USER']->workspace !== 0 ? '
      ' . $this->doc->icons(3) . '' . $GLOBALS['LANG']->getLL('multipleVersions') . '' : ''); - $verWarning = $warnAboutVersions || ($warnAboutVersions_nonPages && $GLOBALS['TCA'][$table]['ctrl']['versioning_followPages']) ? '
      ' . $this->doc->icons(3) . '' . $GLOBALS['LANG']->getLL('versionInVersion') . '' : ''; + $multipleWarning = (!$mainCell && $GLOBALS['BE_USER']->workspace !== 0 ? '
      ' . $this->doc->icons(3) . '' . $GLOBALS['LANG']->getLL('multipleVersions') . '' : ''); + $verWarning = $warnAboutVersions || ($warnAboutVersions_nonPages && $GLOBALS['TCA'][$table]['ctrl']['versioning_followPages']) ? '
      ' . $this->doc->icons(3) . '' . $GLOBALS['LANG']->getLL('versionInVersion') . '' : ''; $verElement = $icon. (!$this->details ? '' : ''). t3lib_BEfunc::getRecordTitle($table,$rec_off,TRUE). @@ -939,13 +939,13 @@ $this->displayWorkspaceOverview_commandLinks($table,$rec_on,$rec_off,$vType). htmlspecialchars($swapLabel). '   - '.(!$this->diffOnly?''. // Lifecycle + '.(!$this->diffOnly?''. // Lifecycle ($this->showWorkspaceCol ? ' - ' : ''):''); + ' : ''):''); if ($diffCode) { $verElement = $verElement.' -
      ' . $GLOBALS['LANG']->getLL('diffToLiveElement') . ' +
      ' . $GLOBALS['LANG']->getLL('diffToLiveElement') . '
      ' . @@ -203,7 +203,7 @@ if (current($tmpl->clearList_setup) == t3lib_div::_GET('template') || t3lib_div::_GET('template') == "all") { $theOutput .= '
      ' . $tmpl->templateTitles[current($tmpl->clearList_setup)] . '
      ' . $tmpl->templateTitles[current($tmpl->clearList_setup)] . '
      '.$tmpl->ext_outputTS(array($val),$this->pObj->MOD_SETTINGS["ts_analyzer_checkLinenum"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkComments"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkCrop"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntax"],$this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntaxBlockmode"]).'
      Index: typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php =================================================================== --- typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php (revision 6617) +++ typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php (working copy) @@ -146,7 +146,7 @@ // Resetting the menu (stop) $theOutput.=$this->pObj->doc->spacer(5); - $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('editConstants', true),' '.$this->pObj->linkWrapTemplateTitle($tplRow["title"],"constants").''.htmlspecialchars(trim($tplRow["sitetitle"])?' - ('.$tplRow["sitetitle"].')':''),0,1); + $theOutput.=$this->pObj->doc->section($GLOBALS['LANG']->getLL('editConstants', true),' '.$this->pObj->linkWrapTemplateTitle($tplRow["title"],"constants").''.htmlspecialchars(trim($tplRow["sitetitle"])?' - ('.$tplRow["sitetitle"].')':''),0,1); if ($manyTemplatesMenu) { $theOutput.=$this->pObj->doc->section("",$manyTemplatesMenu); Index: typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php =================================================================== --- typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php (revision 6617) +++ typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php (working copy) @@ -65,7 +65,7 @@ function tableRow($label, $data, $field) { $ret = '
      '; $ret.= ''; - $ret.= ''.$label.'  '.$data.' 
      '.$label.'  '.$data.' 
      ' . $GLOBALS['LANG']->getLL('removeKey') . '' . $GLOBALS['LANG']->getLL('removeKey') . '
      - '.$remove.'
      '.$label.'
      + '.$remove.'
      '.$label.'
      ' . $GLOBALS['LANG']->getLL('lifecycle') . ': '.htmlspecialchars($this->formatCount($rec_off['t3ver_count'])).'' . $GLOBALS['LANG']->getLL('lifecycle') . ': '.htmlspecialchars($this->formatCount($rec_off['t3ver_count'])).'  ' . $GLOBALS['LANG']->getLL('workspace') . ': '.htmlspecialchars($this->formatWorkspace($rec_off['t3ver_wsid'])).'  ' . $GLOBALS['LANG']->getLL('workspace') . ': '.htmlspecialchars($this->formatWorkspace($rec_off['t3ver_wsid'])).'
      Index: typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php =================================================================== --- typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php (revision 6617) +++ typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php (working copy) @@ -144,7 +144,7 @@ htmlspecialchars(t3lib_div::fixed_lgd_cs($rec['title'],$GLOBALS['BE_USER']->uc['titleLen'])).''; } } - $theCode.= ''.$LANG->getLL('wiz_newPages_currentMenu').':

      '.implode('
      ',$lines); + $theCode.= ''.$LANG->getLL('wiz_newPages_currentMenu').':

      '.implode('
      ',$lines); } else { // Create loremIpsum code: if (t3lib_extMgm::isLoaded('lorem_ipsum')) { @@ -158,7 +158,7 @@ (is_object($loremIpsumObj) ? '
      '.$loremIpsumObj->getIcon('',$this->pObj->doc->backPath).'' : ''); } - $theCode.= ''.$LANG->getLL('wiz_newPages').':

      '.implode('
      ',$lines). + $theCode.= ''.$LANG->getLL('wiz_newPages').':

      '.implode('
      ',$lines). '




      Index: typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php =================================================================== --- typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php (revision 6617) +++ typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php (working copy) @@ -112,16 +112,16 @@ reset($menuItems); $lines=array(); $lines[]= ' - - '.(t3lib_extMgm::isLoaded('cms')?'':'').' - - + + '.(t3lib_extMgm::isLoaded('cms')?'':'').' + + '; while(list(,$rec)=each($menuItems)) { $m_perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(2); // edit permissions for that page! $pRec = t3lib_BEfunc::getRecord ('pages',$rec['uid'],'uid',' AND '.$m_perms_clause); $lines[]= ' '.(t3lib_extMgm::isLoaded('cms')?'':'').' @@ -129,7 +129,7 @@ '; } - $theCode.= ''.$LANG->getLL('wiz_currentPageOrder',1).':

      + $theCode.= ''.$LANG->getLL('wiz_currentPageOrder',1).':

      '.$diffCode.'
      '.$this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_title'),'title').''.$this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_subtitle'),'subtitle').''.$this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tChange'),'tstamp').''.$this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tCreate'),'crdate').''.$this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_title'),'title').''.$this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_subtitle'),'subtitle').''.$this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tChange'),'tstamp').''.$this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tCreate'),'crdate').'
      '.t3lib_iconWorks::getIconImage('pages',$rec,$GLOBALS['BACK_PATH'],'align="top" '.t3lib_BEfunc::titleAttribForPages($rec)). - (!is_array($pRec)?$GLOBALS['TBE_TEMPLATE']->rfw(''.$LANG->getLL('wiz_W',1).' '):''). + (!is_array($pRec)?$GLOBALS['TBE_TEMPLATE']->rfw(''.$LANG->getLL('wiz_W',1).' '):''). htmlspecialchars(t3lib_div::fixed_lgd_cs($rec['title'],$GLOBALS['BE_USER']->uc['titleLen'])).' '.htmlspecialchars(t3lib_div::fixed_lgd_cs($rec['subtitle'],$GLOBALS['BE_USER']->uc['titleLen'])).' '.t3lib_Befunc::datetime($rec['tstamp']).'  
      '.implode('',$lines).'

      '; if (count($menuItems)) { @@ -141,7 +141,7 @@ $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tCreate'),'crdate'); $lines[] = ''; $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_REVERSE'),'REV'); - $theCode.= ''.$LANG->getLL('wiz_changeOrder').':

      '.implode('
      ',$lines); + $theCode.= ''.$LANG->getLL('wiz_changeOrder').':

      '.implode('
      ',$lines); } // CSH: Index: typo3/template.php =================================================================== --- typo3/template.php (revision 6617) +++ typo3/template.php (working copy) @@ -446,7 +446,7 @@ */ function getFileheader($title,$path,$iconfile) { $fileInfo = t3lib_div::split_fileref($title); - $title = htmlspecialchars(t3lib_div::fixed_lgd_cs($fileInfo['path'],-35)).''.htmlspecialchars($fileInfo['file']).''; + $title = htmlspecialchars(t3lib_div::fixed_lgd_cs($fileInfo['path'],-35)).''.htmlspecialchars($fileInfo['file']).''; return 'backPath,$iconfile,'width="18" height="16"').' title="'.htmlspecialchars($path).'" alt="" />'.$title.''; } @@ -1709,11 +1709,11 @@ // Controls: if ($id==$onlineId) { - $controls = 'backPath,'gfx/blinkarrow_left.gif','width="5" height="9"').' class="absmiddle" alt="" /> '.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.online',1).''; + $controls = 'backPath,'gfx/blinkarrow_left.gif','width="5" height="9"').' class="absmiddle" alt="" /> '.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.online',1).''; } elseif (!$noAction) { $controls = ''. 'backPath,'gfx/insert1.gif','width="14" height="14"').' style="margin-right: 2px;" class="absmiddle" alt="" title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swapPage',1).'" />'. - ''.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swap',1).''; + ''.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swap',1).''; } // Write out HTML code: