* Fixed bug #11125: Validation issue: End tag for "br" omitted, but OMITTAG NO was...
authorPatrick Broens <patrick@netcreators.com>
Wed, 27 May 2009 07:24:09 +0000 (07:24 +0000)
committerPatrick Broens <patrick@netcreators.com>
Wed, 27 May 2009 07:24:09 +0000 (07:24 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5500 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/mod/user/ws/class.wslib_gui.php
typo3/mod/user/ws/index.php
typo3/mod/user/ws/publish.php
typo3/mod/user/ws/wsol_preview.php

index 0f32a16..a2a398d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-05-27  Patrick Broens  <patrick@patrickbroens.nl>
 
        * Fixed bug #11124: Validation issue: End tag for "br" omitted, but OMITTAG NO was specified in typo3/mod/tools/em/class.em_index.php
+       * Fixed bug #11125: Validation issue: End tag for "br" omitted, but OMITTAG NO was specified in various files of typo3/mod/user/ws/
 
 2009-05-26  Patrick Broens  <patrick@patrickbroens.nl>
 
index 769400f..ac7ddb0 100644 (file)
@@ -174,14 +174,14 @@ class wslib_gui {
                $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:<br/>';
+               $browse .= 'Showing ' . $browseStat['begin'] . ' to ' . ($browseStat['end'] ? $browseStat['end'] . ' out of ' . $browseStat['allItems'] : $browseStat['allItems']) . ' versions:<br />';
                if (!($browseStat['begin']==1 && !$browseStat['end']))  {
                        for($a=0;$a<ceil($browseStat['allItems']/$resultsPerPage);$a++) {
                                $browse.=($a==(int)$pointer?'<b>':'').'<a href="'.htmlspecialchars('index.php?browsePointer='.rawurlencode($a)).'">['.($a+1).']</a>'.($a==(int)$pointer?'</b>':'').' ';
                        }
-                       $browse.='<br/>';
+                       $browse.= '<br />';
                }
-               $browse.='<br/>';
+               $browse.= '<br />';
 
                $workspaceOverviewList = $this->displayWorkspaceOverview_list($pArray);
                if ($workspaceOverviewList || $this->alwaysDisplayHeader) {
@@ -429,15 +429,15 @@ class wslib_gui {
                                                                                $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').'<br/>';
+                                                                                       $diffCode.= $this->doc->icons(1) . $LANG->getLL('label_newrecord') . '<br />';
                                                                                        $diffCode.= $diffHTML;
                                                                                } elseif ($rec_off['t3ver_state']==2)   {
-                                                                                       $diffCode.= $this->doc->icons(2).'Deleted element<br/>';
-                                                                                       $diffCode.= $this->doc->icons(2).$LANG->getLL('label_deletedrecord').'<br/>';
+                                                                                       $diffCode.= $this->doc->icons(2) . 'Deleted element<br />';
+                                                                                       $diffCode.= $this->doc->icons(2) . $LANG->getLL('label_deletedrecord') . '<br />';
                                                                                } elseif ($rec_on['t3ver_state']==3)    {
-                                                                                       $diffCode.= $this->doc->icons(1).'Move-to placeholder (destination)<br/>';
+                                                                                       $diffCode.= $this->doc->icons(1) . 'Move-to placeholder (destination)<br />';
                                                                                } elseif ($rec_off['t3ver_state']==4)   {
-                                                                                       $diffCode.= $this->doc->icons(1).'Move-to pointer (source)<br/>';
+                                                                                       $diffCode.= $this->doc->icons(1) . 'Move-to pointer (source)<br />';
                                                                                } 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 @@ class wslib_gui {
 
                                                                        // Create version element:
                                                                        $versionsInOtherWS = $this->versionsInOtherWS($table, $rec_on['uid']);
-                                                                       $versionsInOtherWSWarning = $versionsInOtherWS && $GLOBALS['BE_USER']->workspace!==0 ? '<br/>'.$this->doc->icons(2).$LANG->getLL('label_otherversions').' '.$versionsInOtherWS : '';
-                                                                       $multipleWarning = (!$mainCell && $GLOBALS['BE_USER']->workspace!==0? '<br/>'.$this->doc->icons(3).'<b>'.$LANG->getLL('label_multipleversions').'</b>' : '');
-                                                                       $verWarning = $warnAboutVersions || ($warnAboutVersions_nonPages && $GLOBALS['TCA'][$table]['ctrl']['versioning_followPages'])? '<br/>'.$this->doc->icons(3).'<b>'.$LANG->getLL('label_nestedversions').'</b>' : '';
+                                                                       $versionsInOtherWSWarning = $versionsInOtherWS && $GLOBALS['BE_USER']->workspace !== 0 ? '<br />' . $this->doc->icons(2) . $LANG->getLL('label_otherversions') . ' ' . $versionsInOtherWS : '';
+                                                                       $multipleWarning = (!$mainCell && $GLOBALS['BE_USER']->workspace !==0 ? '<br />' . $this->doc->icons(3) . '<b>' . $LANG->getLL('label_multipleversions') . '</b>' : '');
+                                                                       $verWarning = $warnAboutVersions || ($warnAboutVersions_nonPages && $GLOBALS['TCA'][$table]['ctrl']['versioning_followPages']) ? '<br />' . $this->doc->icons(3) . '<b>' . $LANG->getLL('label_nestedversions') . '</b>' : '';
                                                                        $verElement = $icon.
                                                                                '<a href="'.htmlspecialchars($this->doc->backPath.t3lib_extMgm::extRelPath('version').'cm1/index.php?id='.($table==='pages'?$rec_on['uid']:$rec_on['pid']).'&details='.rawurlencode($table.':'.$rec_off['uid']).'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
                                                                                t3lib_BEfunc::getRecordTitle($table,$rec_off,TRUE).
@@ -839,7 +839,7 @@ class wslib_gui {
                                        break;
                        }
                        $text = t3lib_BEfunc::datetime($dat['tstamp']).': ' . sprintf($text, $username);
-                       $text.= ($data['comment']?'<br/>' . $LANG->getLL('stage_label_user_comment'). ' <em>'.htmlspecialchars($data['comment']).'</em>':'');
+                       $text.= ($data['comment'] ? '<br />' . $LANG->getLL('stage_label_user_comment') . ' <em>' . htmlspecialchars($data['comment']) . '</em>' : '');
 
                        $entry[] = $text;
                }
@@ -964,7 +964,7 @@ class wslib_gui {
                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 '<br/>
+                       return '<br />
                                        <img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/ol/joinbottom.gif','width="18" height="16"').' align="top" alt="" title="" />'.
                        ($origId ?
                        '<a href="'.htmlspecialchars($this->doc->backPath.t3lib_extMgm::extRelPath('version').'cm1/index.php?id='.$uid.'&details='.rawurlencode('pages:'.$uid).'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
index 72e5ebe..434a78a 100755 (executable)
@@ -463,7 +463,7 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
                                $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.=  '<br/>Any user can browse the workspace frontend using this link for the next '.$ttlHours.' hours (does not require backend login):<br/><br/><a target="_blank" href="'.htmlspecialchars($previewUrl).'">'.$previewUrl.'</a>';
+                               $actionLinks.= '<br />Any user can browse the workspace frontend using this link for the next ' . $ttlHours . ' hours (does not require backend login):<br /><br /><a target="_blank" href="' . htmlspecialchars($previewUrl) . '">' . $previewUrl . '</a>';
                        } else {
                                $actionLinks.= '<input type="submit" name="_previewLink" value="Generate Workspace Preview Link" />';
                        }
@@ -491,7 +491,7 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
                                <td class="bgColor4">'.$LANG->getLL('label_access_level').' ' . $GLOBALS['LANG']->getLL('workspace_list_access_' . $wsAccess['_ACCESS']) . '</td>
                        </tr>' : '').'
                </table>
-               <br/>
+               <br />
                ';
 
                        // Add publishing and review overview:
@@ -501,7 +501,7 @@ class SC_mod_user_ws_index extends t3lib_SCbase {
                        } else {
                                $content.= $this->displayWorkspaceOverview();
                        }
-                       $content.='<br/>';
+                       $content .= '<br />';
                }
 
                        // Return content:
index 7179509..00993df 100644 (file)
@@ -187,7 +187,7 @@ class SC_mod_user_ws_publish extends t3lib_SCbase {
 
                                $errors = $tce->errorLog;
                                if (count($errors) > 0) {
-                                       $content .= '<h3>' . $GLOBALS['LANG']->getLL('label_errors') . '</h3><br/>' . implode('<br/>',$errors);
+                                       $content .= '<h3>' . $GLOBALS['LANG']->getLL('label_errors') . '</h3><br />' . implode('<br />', $errors);
                                        $content .= '<br /><br /><a href="index.php">' . $GLOBALS['LANG']->getLL('return_to_index') . '</a>';
                                }
                                else {
index e80fcdb..0712ee8 100755 (executable)
@@ -95,11 +95,11 @@ class wsol_preview {
                } elseif ($msg = t3lib_div::_GP('msg')) {
                        switch($msg)    {
                                case 'branchpoint':
-                                       $message = '<b>No live page available!</b><br/><br/>
+                                       $message = '<b>No live page available!</b><br /><br />
                                        The previewed page was inside a "Branch" type version and has no traceable counterpart in the live workspace.';
                                break;
                                case 'newpage':
-                                       $message = '<b>New page!</b><br/><br/>
+                                       $message = '<b>New page!</b><br /><br />
                                        The previewed page is created in the workspace and has no counterpart in the live workspace.';
                                break;
                                default:
@@ -113,7 +113,7 @@ class wsol_preview {
                                                <title>Message</title>
                                        </head>
                                        <body bgcolor="#eeeeee">
-                                               <div width="100%" height="100%" style="text-align: center; align: center;"><br/><br/><br/><br/><font face="verdana,arial" size="2" color="#666666">'.$message.'</font></div>
+                                               <div width="100%" height="100%" style="text-align: center; align: center;"><br /><br /><br /><br /><font face="verdana,arial" size="2" color="#666666">' . $message . '</font></div>
                                        </body>
                                </html>';