Index: typo3/mod/user/ws/class.wslib_gui.php =================================================================== --- typo3/mod/user/ws/class.wslib_gui.php (revision 5437) +++ typo3/mod/user/ws/class.wslib_gui.php (working copy) @@ -174,14 +174,14 @@ $pointer = t3lib_div::_GP('browsePointer'); $browseStat = $this->cropWorkspaceOverview_list($pArray,$pointer,$resultsPerPage); $browse = ''; - $browse.='Showing '.$browseStat['begin'].' to '.($browseStat['end'] ? $browseStat['end'].' out of '.$browseStat['allItems'] : $browseStat['allItems']).' versions:
'; + $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.='
'; + $browse.= '
'; } - $browse.='
'; + $browse.= '
'; $workspaceOverviewList = $this->displayWorkspaceOverview_list($pArray); if ($workspaceOverviewList || $this->alwaysDisplayHeader) { @@ -429,15 +429,15 @@ $diffCode = ''; list($diffHTML,$diffPct) = $this->createDiffView($table, $rec_off, $rec_on); if ($rec_on['t3ver_state']==1) { // New record: - $diffCode.= $this->doc->icons(1).$LANG->getLL('label_newrecord').'
'; + $diffCode.= $this->doc->icons(1) . $LANG->getLL('label_newrecord') . '
'; $diffCode.= $diffHTML; } elseif ($rec_off['t3ver_state']==2) { - $diffCode.= $this->doc->icons(2).'Deleted element
'; - $diffCode.= $this->doc->icons(2).$LANG->getLL('label_deletedrecord').'
'; + $diffCode.= $this->doc->icons(2) . 'Deleted element
'; + $diffCode.= $this->doc->icons(2) . $LANG->getLL('label_deletedrecord') . '
'; } elseif ($rec_on['t3ver_state']==3) { - $diffCode.= $this->doc->icons(1).'Move-to placeholder (destination)
'; + $diffCode.= $this->doc->icons(1) . 'Move-to placeholder (destination)
'; } elseif ($rec_off['t3ver_state']==4) { - $diffCode.= $this->doc->icons(1).'Move-to pointer (source)
'; + $diffCode.= $this->doc->icons(1) . 'Move-to pointer (source)
'; } else { $diffCode.= ($diffPct<0 ? 'N/A' : ($diffPct ? $diffPct.'% change:' : '')); $diffCode.= ($diffPct<0 ? $LANG->getLL('label_notapplicable') : ($diffPct ? sprintf($LANG->getLL('label_percentchange'), $diffPct) : '')); @@ -474,9 +474,9 @@ // 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').'' : ''; + $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') . '' : ''; $verElement = $icon. ''. t3lib_BEfunc::getRecordTitle($table,$rec_off,TRUE). @@ -839,7 +839,7 @@ break; } $text = t3lib_BEfunc::datetime($dat['tstamp']).': ' . sprintf($text, $username); - $text.= ($data['comment']?'
' . $LANG->getLL('stage_label_user_comment'). ' '.htmlspecialchars($data['comment']).'':''); + $text.= ($data['comment'] ? '
' . $LANG->getLL('stage_label_user_comment') . ' ' . htmlspecialchars($data['comment']) . '' : ''); $entry[] = $text; } @@ -964,7 +964,7 @@ global $TCA, $LANG; if ($GLOBALS['BE_USER']->workspace===0 || !$this->expandSubElements) { // In online workspace we have a reduced view because otherwise it will bloat the listing: - return '
+ return '
doc->backPath,'gfx/ol/joinbottom.gif','width="18" height="16"').' align="top" alt="" title="" />'. ($origId ? ''. Index: typo3/mod/user/ws/index.php =================================================================== --- typo3/mod/user/ws/index.php (revision 5437) +++ typo3/mod/user/ws/index.php (working copy) @@ -463,7 +463,7 @@ $ttlHours = intval($GLOBALS['BE_USER']->getTSConfigVal('options.workspaces.previewLinkTTLHours')); $ttlHours = ($ttlHours ? $ttlHours : 24*2); $previewUrl = t3lib_div::getIndpEnv('TYPO3_SITE_URL').'index.php?ADMCMD_prev='.t3lib_BEfunc::compilePreviewKeyword('', $GLOBALS['BE_USER']->user['uid'],60*60*$ttlHours,$GLOBALS['BE_USER']->workspace).'&id='.intval($GLOBALS['BE_USER']->workspaceRec['db_mountpoints']); - $actionLinks.= '
Any user can browse the workspace frontend using this link for the next '.$ttlHours.' hours (does not require backend login):

'.$previewUrl.''; + $actionLinks.= '
Any user can browse the workspace frontend using this link for the next ' . $ttlHours . ' hours (does not require backend login):

' . $previewUrl . ''; } else { $actionLinks.= ''; } @@ -491,7 +491,7 @@ '.$LANG->getLL('label_access_level').' ' . $GLOBALS['LANG']->getLL('workspace_list_access_' . $wsAccess['_ACCESS']) . ' ' : '').' -
+
'; // Add publishing and review overview: @@ -501,7 +501,7 @@ } else { $content.= $this->displayWorkspaceOverview(); } - $content.='
'; + $content .= '
'; } // Return content: Index: typo3/mod/user/ws/publish.php =================================================================== --- typo3/mod/user/ws/publish.php (revision 5437) +++ typo3/mod/user/ws/publish.php (working copy) @@ -187,7 +187,7 @@ $errors = $tce->errorLog; if (count($errors) > 0) { - $content .= '

' . $GLOBALS['LANG']->getLL('label_errors') . '


' . implode('
',$errors); + $content .= '

' . $GLOBALS['LANG']->getLL('label_errors') . '


' . implode('
', $errors); $content .= '

' . $GLOBALS['LANG']->getLL('return_to_index') . ''; } else { Index: typo3/mod/user/ws/wsol_preview.php =================================================================== --- typo3/mod/user/ws/wsol_preview.php (revision 5437) +++ typo3/mod/user/ws/wsol_preview.php (working copy) @@ -95,11 +95,11 @@ } elseif ($msg = t3lib_div::_GP('msg')) { switch($msg) { case 'branchpoint': - $message = 'No live page available!

+ $message = 'No live page available!

The previewed page was inside a "Branch" type version and has no traceable counterpart in the live workspace.'; break; case 'newpage': - $message = 'New page!

+ $message = 'New page!

The previewed page is created in the workspace and has no counterpart in the live workspace.'; break; default: @@ -113,7 +113,7 @@ Message -




'.$message.'
+




' . $message . '
';