Commit 19ccacb7 authored by Michael Stucki's avatar Michael Stucki
Browse files

* Small fix in typo3/sysext/install/mod/class.tx_install.php: GraphicsMagick...

* Small fix in typo3/sysext/install/mod/class.tx_install.php: GraphicsMagick executed without any parameters caused a server error (used in the Install Tool for guessing the product version)
* Fixed bug #0001065: Labels of radio buttons in listview were not shown. (Thanks to Sebastian Kurfuerst)
* Changed innerWrap and outerWrap in editPanels to be stdWrap'able. (Thanks to Martin Kutschker)
* Fixed bug #0000098: Forms elements should not contain a wrap-attribute for textareas, so this is now optional. (Thanks to Martin Kutschker)
* Fixed bug #0001075: XHTML compliance of FORM elements. (Thanks to Martin Kutschker)
* Fixed bug #0001061: XHTML cleaning did not support the <param /> tag. (Thanks to Martin Kutschker)


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_3-8@738 709f56b5-9817-0410-a4d7-c38de5d9e867
parent 1a8155ab
2005-05-19 Michael Stucki <michael@typo3.org>
* Small fix in typo3/sysext/install/mod/class.tx_install.php: GraphicsMagick executed without any parameters caused a server error (used in the Install Tool for guessing the product version)
* Fixed bug #00001065: Labels of radio buttons in listview were not shown (Thanks to Sebastian Kurfuerst)
* Fixed bug #0001065: Labels of radio buttons in listview were not shown. (Thanks to Sebastian Kurfuerst)
* Changed innerWrap and outerWrap in editPanels to be stdWrap'able. (Thanks to Martin Kutschker)
* Fixed bug #0000098: Forms elements should not contain a wrap-attribute for textareas, so this is now optional. (Thanks to Martin Kutschker)
* Fixed bug #0001075: XHTML compliance of FORM elements. (Thanks to Martin Kutschker)
* Fixed bug #0001061: XHTML cleaning did not support the <param /> tag. (Thanks to Martin Kutschker)
2005-05-19 Karsten Dambekalns <karsten@typo3.org>
......
......@@ -1275,7 +1275,7 @@ class t3lib_parsehtml {
}
$newTag='<'.trim($tagName.' '.implode(' ',$outA));
// All tags that are standalone (not wrapping, not having endtags) should be ended with '/>'
if (t3lib_div::inList('img,br,hr,meta,link,base,area,input',$tagName) || substr($value,-2)=='/>') {
if (t3lib_div::inList('img,br,hr,meta,link,base,area,input,param,col',$tagName) || substr($value,-2)=='/>') {
$newTag.=' />';
} else {
$newTag.='>';
......
......@@ -567,20 +567,31 @@ class t3lib_tsfeBeUserAuth extends t3lib_beUserAuth {
$tmpTSc = $tmpTSc ['properties']['newContentWiz.']['overrideWithExtension'];
$newContentWizScriptPath = t3lib_extMgm::isLoaded($tmpTSc) ? (t3lib_extMgm::extRelPath($tmpTSc).'mod1/db_new_content_el.php') : (TYPO3_mainDir.'sysext/cms/layout/db_new_content_el.php');
$perms = $GLOBALS['BE_USER']->calcPerms($GLOBALS['TSFE']->page);
$toolBar='';
$id = $GLOBALS['TSFE']->id;
$toolBar.='<a href="'.htmlspecialchars(TYPO3_mainDir.'show_rechis.php?element='.rawurlencode('pages:'.$id).'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'#latest">'.
'<img src="t3lib/gfx/history2.gif" width="13" height="12" hspace="2" border="0" align="top" title="'.$this->extGetLL('edit_recordHistory').'" alt="" /></a>';
$toolBar.='<a href="'.htmlspecialchars($newContentWizScriptPath.'?id='.$id.'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
'<img src="t3lib/gfx/new_record.gif" width="16" height="12" hspace="1" border="0" align="top" title="'.$this->extGetLL('edit_newContentElement').'" alt="" /></a>';
$toolBar.='<a href="'.htmlspecialchars(TYPO3_mainDir.'move_el.php?table=pages&uid='.$id.'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
if ($perms&16) {
$toolBar.='<a href="'.htmlspecialchars($newContentWizScriptPath.'?id='.$id.'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
'<img src="t3lib/gfx/new_record.gif" width="16" height="12" hspace="1" border="0" align="top" title="'.$this->extGetLL('edit_newContentElement').'" alt="" /></a>';
}
if ($perms&2) {
$toolBar.='<a href="'.htmlspecialchars(TYPO3_mainDir.'move_el.php?table=pages&uid='.$id.'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
'<img src="t3lib/gfx/move_page.gif" width="11" height="12" hspace="2" border="0" align="top" title="'.$this->extGetLL('edit_move_page').'" alt="" /></a>';
$toolBar.='<a href="'.htmlspecialchars(TYPO3_mainDir.'db_new.php?id='.$id.'&pagesOnly=1&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
}
if ($perms&8) {
$toolBar.='<a href="'.htmlspecialchars(TYPO3_mainDir.'db_new.php?id='.$id.'&pagesOnly=1&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
'<img src="t3lib/gfx/new_page.gif" width="13" height="12" hspace="0" border="0" align="top" title="'.$this->extGetLL('edit_newPage').'" alt="" /></a>';
$params='&edit[pages]['.$id.']=edit';
$toolBar.='<a href="'.htmlspecialchars(TYPO3_mainDir.'alt_doc.php?'.$params.'&noView=1&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
}
if ($perms&2) {
$params='&edit[pages]['.$id.']=edit';
$toolBar.='<a href="'.htmlspecialchars(TYPO3_mainDir.'alt_doc.php?'.$params.'&noView=1&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
'<img src="t3lib/gfx/edit2.gif" width="11" height="12" hspace="2" border="0" align="top" title="'.$this->extGetLL('edit_editPageHeader').'" alt="" /></a>';
}
if ($this->check('modules','web_list')) {
$toolBar.='<a href="'.htmlspecialchars(TYPO3_mainDir.'db_list.php?id='.$id.'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))).'">'.
'<img src="t3lib/gfx/list.gif" width="11" height="11" hspace="2" border="0" align="top" title="'.$this->extGetLL('edit_db_list').'" alt="" /></a>';
......
......@@ -1572,6 +1572,12 @@ class tslib_cObj {
$fieldname_hashArray = Array();
$cc = 0;
// Formname;
$formname = $GLOBALS['TSFE']->uniqueHash();
if (ctype_digit($formname{0})) { // form name must start with a letter
$formname = 'a'.$formname;
}
foreach($dataArr as $val) {
$cc++;
......@@ -1631,7 +1637,7 @@ class tslib_cObj {
// Accessibility: Set id = fieldname attribute:
if ($conf['accessibility']) {
$elementIdAttribute = ' id="'.$confData['fieldname'].'"';
$elementIdAttribute = ' id="'.$formname.'_'.md5($confData['fieldname']).'"';
} else {
$elementIdAttribute = '';
}
......@@ -1645,7 +1651,12 @@ class tslib_cObj {
$cols = t3lib_div::intInRange($cols*$compWidth, 1, 120);
$rows=trim($fParts[2]) ? t3lib_div::intInRange($fParts[2],1,30) : 5;
$wrap=trim($fParts[3]) ? ' wrap="'.trim($fParts[3]).'"' : ' wrap="virtual"';
$wrap=trim($fParts[3]);
if ($conf['noWrapAttr'] || $wrap === 'disabled') {
$wrap='';
} else {
$wrap=$wrap ? ' wrap="'.trim($fParts[3]).'"' : ' wrap="virtual"';
}
$default = $this->getFieldDefaultValue($conf['noValueInsert'], $confData['fieldname'], str_replace('\n',chr(10),trim($parts[2])));
$fieldCode=sprintf('<textarea name="%s"'.$elementIdAttribute.' cols="%s" rows="%s"%s'.$addParams.'>%s</textarea>',
$confData['fieldname'], $cols, $rows, $wrap, t3lib_div::formatForTextarea($default));
......@@ -1826,7 +1837,7 @@ class tslib_cObj {
// Field:
$fieldLabel = $confData['label'];
if ($conf['accessibility']) {
$fieldLabel = '<label for="'.htmlspecialchars($confData['fieldname']).'">'.$fieldLabel.'</label>';
$fieldLabel = '<label for="'.$formname.'_'.md5($confData['fieldname']).'">'.$fieldLabel.'</label>';
}
// Getting template code:
......@@ -1929,9 +1940,8 @@ class tslib_cObj {
}
}
}
if($conf['accessibility']) { $hiddenfields = '<div style="display:none;">'.$hiddenfields.'</div>'; }
// Formname;
$formname = $GLOBALS['TSFE']->uniqueHash();
if ($conf['REQ']) {
$validateForm=' onsubmit="return validateForm(\''.$formname.'\',\''.implode(',',$fieldlist).'\',\''.rawurlencode($conf['goodMess']).'\',\''.rawurlencode($conf['badMess']).'\',\''.rawurlencode($conf['emailMess']).'\')"';
$GLOBALS['TSFE']->additionalHeaderData['JSFormValidate'] = '<script type="text/javascript" src="'.$GLOBALS['TSFE']->absRefPrefix.'t3lib/jsfunc.validateform.js"></script>';
......@@ -6628,10 +6638,12 @@ class tslib_cObj {
</form>';
// wrap the panel
if ($conf['innerWrap']) $panel = $this->wrap($panel,$conf['innerWrap']);
if ($conf['innerWrap.']) $panel = $this->stdWrap($panel,$conf['innerWrap.']);
// add black line:
$panel.=$blackLine;
// wrap the complete panel
if ($conf['outerWrap']) $panel = $this->wrap($panel,$conf['outerWrap']);
if ($conf['outerWrap.']) $panel = $this->stdWrap($panel,$conf['outerWrap.']);
$finalOut = $content.$panel;
break;
}
......@@ -6793,8 +6805,10 @@ class tslib_cObj {
$thick = t3lib_div::intInRange($thick,1,100);
$color = $conf['color'] ? $conf['color'] : '#cccccc';
if ($conf['innerWrap']) $content = $this->wrap($content,$conf['innerWrap']);
if ($conf['innerWrap.']) $content = $this->stdWrap($content,$conf['innerWrap.']);
$content='<table class="typo3-editPanel-previewBorder" border="'.$thick.'" cellpadding="0" cellspacing="0" bordercolor="'.$color.'" width="100%"><tr><td>'.$content.'</td></tr></table>';
if ($conf['outerWrap']) $content = $this->wrap($content,$conf['outerWrap']);
if ($conf['outerWrap.']) $content = $this->stdWrap($panel,$conf['outerWrap.']);
}
return $content;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment