Project

General

Profile

Bug #18314 » 7682_em_wrong_markup4.diff

Administrator Admin, 2008-03-06 23:12

View differences:

typo3/mod/tools/em/class.em_index.php (working copy)
');
}
$this->doc->form = '<form action="index.php" method="post" name="pageform">';
// Descriptions:
$this->descrTable = '_MOD_'.$this->MCONF['name'];
......
$menu.='&nbsp;&nbsp;<label for="checkDisplayObsolete">Show obsolete:</label>&nbsp;&nbsp;'.t3lib_BEfunc::getFuncCheck(0,'SET[display_obsolete]',$this->MOD_SETTINGS['display_obsolete'],'','','id="checkDisplayObsolete"');
}
$this->content.=$this->doc->section('','<span class="nobr">'.$menu.'</span>');
$this->content.=$this->doc->section('','<form action="index.php" method="post" name="pageform"><span class="nobr">'.$menu.'</span></form>');
$this->content.=$this->doc->spacer(10);
switch((string)$this->MOD_SETTINGS['function']) {
......
}
$content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'loaded', $GLOBALS['BACK_PATH'],'');
$content.= '<form action="index.php" method="post" name="lookupform">';
$content.= '<label for="_lookUp">Look up:</label> <input type="text" id="_lookUp" name="_lookUp" value="'.htmlspecialchars($this->lookUpStr).'" /><input type="submit" value="Search"/><br/><br/>';
$content.= '
$content.= '</form>
<!-- Loaded Extensions List -->
<table border="0" cellpadding="2" cellspacing="1">'.implode('',$lines).'</table>';
......
$content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'avail', $GLOBALS['BACK_PATH'],'|<br/>');
$content.= 'If you want to use an extension in TYPO3, you should simply click the "plus" button '.$this->installButton().' . <br />
Installed extensions can also be removed again - just click the remove button '.$this->removeButton().' .<br /><br />';
$content.= '<label for="_lookUp">Look up:</label> <input type="text" id="_lookUp" name="_lookUp" value="'.htmlspecialchars($this->lookUpStr).'" /><input type="submit" value="Search"/><br/><br/>';
$content .= '<form action="index.php" method="post" name="lookupform">';
$content.= '<label for="_lookUp">Look up:</label> <input type="text" id="_lookUp" name="_lookUp" value="'.htmlspecialchars($this->lookUpStr).'" /><input type="submit" value="Search"/></form><br/><br/>';
$content.= $this->securityHint.'<br /><br />';
$content.= '<table border="0" cellpadding="2" cellspacing="1">'.implode('',$lines).'</table>';
......
// CSH:
$content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import_ter', $GLOBALS['BACK_PATH'],'|<br/>');
$onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;";
$content.= '</form><form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'"><label for="_lookUp">List or look up <strong'.($this->MOD_SETTINGS['display_unchecked']?' style="color:#900;">all':' style="color:#090;">reviewed').'</strong> extensions</label><br />
<input type="text" id="_lookUp" name="_lookUp" value="'.htmlspecialchars($this->listRemote_search).'" /> <input type="submit" value="Look up" /><br /><br />';
$content.= '<form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'"><label for="_lookUp">List or look up <strong'.($this->MOD_SETTINGS['display_unchecked']?' style="color:#900;">all':' style="color:#090;">reviewed').'</strong> extensions</label><br />
<input type="text" id="_lookUp" name="_lookUp" value="'.htmlspecialchars($this->listRemote_search).'" /> <input type="submit" value="Look up" /></form><br /><br />';
$content .= $this->browseLinks();
......
} else {
$content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import_ter', $GLOBALS['BACK_PATH'],'|<br/>');
$onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;";
$content.= '</form><form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'"><label for="_lookUp">List or look up <strong'.($this->MOD_SETTINGS['display_unchecked']?' style="color:#900;">all':' style="color:#090;">reviewed').'</strong> extensions</label><br />
<input type="text" id="_lookUp" name="_lookUp" value="'.htmlspecialchars($this->listRemote_search).'" /> <input type="submit" value="Look up" /><br /><br />';
$content.= '<form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'"><label for="_lookUp">List or look up <strong'.($this->MOD_SETTINGS['display_unchecked']?' style="color:#900;">all':' style="color:#090;">reviewed').'</strong> extensions</label><br />
<input type="text" id="_lookUp" name="_lookUp" value="'.htmlspecialchars($this->listRemote_search).'" /> <input type="submit" value="Look up" /></form><br /><br />';
$content.= '<p><strong>No matching extensions found.</strong></p>';
......
$content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import', $GLOBALS['BACK_PATH'],'|<br/>');
$onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;";
$content.= '</form><form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'"><label for="_lookUp">List or look up <strong'.($this->MOD_SETTINGS['display_unchecked']?' style="color:#900;">all':' style="color:#090;">reviewed').'</strong> extensions</label><br />
$content.= '<form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'"><label for="_lookUp">List or look up <strong'.($this->MOD_SETTINGS['display_unchecked']?' style="color:#900;">all':' style="color:#090;">reviewed').'</strong> extensions</label><br />
<input type="text" id="_lookUp" name="_lookUp" value="" /> <input type="submit" value="Look up" /><br /><br />';
if ($this->CMD['fetchMetaData']) { // fetches mirror/extension data from online rep.
......
$content.= ' (last update: '.date($dateFormat.' '.$timeFormat,filemtime(PATH_site.'typo3temp/extensions.xml.gz')).')';
}
}
$content.= '<br /><br />'.$this->securityHint;
$content.= '</form><br /><br />'.$this->securityHint;
$content.= '<br /><br /><strong>PRIVACY NOTICE:</strong><br />'.$this->privacyNotice;
$this->content.=$this->doc->section('Extensions in TYPO3 Extension Repository',$content,0,1);
......
// Upload:
if ($this->importAtAll()) {
$content= '</form><form action="index.php" enctype="'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['form_enctype'].'" method="post">
$content= '<form action="index.php" enctype="'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['form_enctype'].'" method="post">
<label for="upload_ext_file">Upload extension file (.t3x):</label><br />
<input type="file" size="60" id="upload_ext_file" name="upload_ext_file" /><br />
... to location:<br />
......
if ($this->importAsType('S')) $content.='<option value="S">System (typo3/sysext/)</option>';
$content.='</select><br />
<input type="checkbox" value="1" name="CMD[uploadOverwrite]" id="checkUploadOverwrite" /> <label for="checkUploadOverwrite">Overwrite any existing extension!</label><br />
<input type="submit" name="CMD[uploadExt]" value="Upload extension file" /><br />
<input type="submit" name="CMD[uploadExt]" value="Upload extension file" /></form><br />
';
} else $content=$this->noImportMsg();
......
// Prepare the HTML output:
$content.= '
'.t3lib_BEfunc::cshItem('_MOD_tools_em', 'settings', $GLOBALS['BACK_PATH'],'|<br/>').'
<form action="index.php" method="post" name="altersettings">
<fieldset><legend>Security Settings</legend>
<table border="0" cellpadding="2" cellspacing="2">
<tr class="bgColor4">
......
</fieldset>
<br />
<input type="submit" value="Update" />
</form>
';
$this->content.=$this->doc->section('Repository settings',$content,0,1);
......
// Prepare the HTML output:
$content.= '
'.t3lib_BEfunc::cshItem('_MOD_tools_em', 'translation', $GLOBALS['BACK_PATH'],'|<br/>').'
<form action="index.php" method="post" name="translationform">
<fieldset><legend>Translation Settings</legend>
<table border="0" cellpadding="2" cellspacing="2">
<tr class="bgColor4">
......
<br />
<input type="submit" value="Save selection" />
<br />
</fieldset>';
</fieldset>
</form>';
$this->content.=$this->doc->section('Translation settings',$content,0,1);
......
*/
function importExtInfo($extKey, $version='') {
$content = '';
$content = '<form action="index.php" method="post" name="pageform">';
// Fetch remote data:
$this->xmlhandler->searchExtensionsXML($extKey, '', '', true, true);
......
($this->importAsType('G',$fetchData['emconf_lockType'])?'<option value="G">Global: '.$this->typePaths['G'].$extKey.'/'.(@is_dir(PATH_site.$this->typePaths['G'].$extKey)?' (OVERWRITE)':' (empty)').'</option>':'').
($this->importAsType('L',$fetchData['emconf_lockType'])?'<option value="L">Local: '.$this->typePaths['L'].$extKey.'/'.(@is_dir(PATH_site.$this->typePaths['L'].$extKey)?' (OVERWRITE)':' (empty)').'</option>':'').
($this->importAsType('S',$fetchData['emconf_lockType'])?'<option value="S">System: '.$this->typePaths['S'].$extKey.'/'.(@is_dir(PATH_site.$this->typePaths['S'].$extKey)?' (OVERWRITE)':' (empty)').'</option>':'').
'</select>';
'</select>
</form>';
} else $select.= $this->noImportMsg();
$content.= $select;
$this->content.= $this->doc->section('Select command',$content,0,1);
......
$updates.= $this->checkClearCache($list[$extKey]);
if ($updates) {
$updates = '
</form><form action="'.t3lib_div::linkThisScript().'" method="post">'.$updates.'
<form action="'.t3lib_div::linkThisScript().'" method="post">'.$updates.'
<br /><input type="submit" name="write" value="Remove extension" />
<input type="hidden" name="_do_install" value="1" />
<input type="hidden" name="_clrCmd" value="'.$this->CMD['clrCmd'].'" />
<input type="hidden" name="standAlone" value="'.$this->CMD['standAlone'].'" />
';
</form>';
$this->content.=$this->doc->section('Removing '.$this->extensionTitleIconHeader($extKey,$list[$extKey]).strtoupper(': Database needs to be updated'),$updates,1,1,1,1);
}
}
......
$fI = t3lib_div::split_fileref($editFile);
if (@is_file($editFile) && t3lib_div::inList($this->editTextExtensions,($fI['fileext']?$fI['fileext']:$fI['filebody']))) {
if (filesize($editFile)<($this->kbMax*1024)) {
$outCode = '';
$outCode = '<form action="index.php" method="post" name="editfileform">';
$info = '';
$submittedContent = t3lib_div::_POST('edit');
$saveFlag = 0;
......
} else $outCode.=$GLOBALS['TBE_TEMPLATE']->rfw('<br />[SAVING IS DISABLED - can be enabled by the $TYPO3_CONF_VARS[\'EXT\'][\'noEdit\']-flag] ');
$onClick = 'window.location.href=\'index.php?CMD[showExt]='.$extKey.'\';return false;';
$outCode.='<input type="submit" name="cancel" value="Cancel" onclick="'.htmlspecialchars($onClick).'" />';
$outCode.='<input type="submit" name="cancel" value="Cancel" onclick="'.htmlspecialchars($onClick).'" /></form>';
$theOutput.=$this->doc->spacer(15);
$theOutput.=$this->doc->section('Edit file:','',0,1);
......
if (count($outputRow)>1 || !$returnUrl) {
$content = '
</form> <!-- ending page form ... -->
<!-- ending page form ... -->
<form action="'.htmlspecialchars(t3lib_div::getIndpEnv('REQUEST_URI')).'" method="post">
<table border="0" cellpadding="1" cellspacing="1">'.implode('',$outputRow).'</table>
<input type="submit" name="_" value="Import and Install selected" />
</form>
<form> <!-- continuing page form... -->';
</form>';
if ($returnUrl) {
$content.= '
......
$updates.= $this->checkUploadFolder($extKey,$extInfo);
if ($updates) {
$updates = '</form><form action="'.htmlspecialchars($script).'" method="post">'.$updates.$addFields.'
<br /><input type="submit" name="write" value="Make updates" />
$updates = '<form action="'.htmlspecialchars($script).'" method="post">'.$updates.$addFields.'
<br /><input type="submit" name="write" value="Make updates" /></form>
';
}
......
* @return string HTML content.
*/
function getRepositoryUploadForm($extKey,$extInfo) {
$content.='
$content = '<form action="index.php" method="post" name="repuploadform">
<input type="hidden" name="CMD[showExt]" value="'.$extKey.'" />
<input type="hidden" name="em[action]" value="doUpload" />
<table border="0" cellpadding="2" cellspacing="1">
......
</td>
</tr>
</table>
';
</form>';
return $content;
}
......
}
$content .= '<br /><br /><input type="submit" value="Try again" />';
return array('returnCode' => false, 'html' => $content);
return array('returnCode' => false, 'html' => '<form action="index.php" method="post" name="depform">'.$content.'</form>');
}
return array('returnCode' => true);
......
<br />
<h3>Clear cache</h3>
<p>This extension requests the cache to be cleared when it is installed/removed.<br />
<form action="index.php" method="post">
<label for="check_clear_all_cache">Clear all cache:</label> <input type="checkbox" name="_clear_all_cache" id="check_clear_all_cache" checked="checked" value="1" /><br />
</p>
</form></p>
';
}
}
......
$content.= '
<br />
<h3>Import static data</h3>
<table border="0" cellpadding="0" cellspacing="0">'.$out.'</table>';
<form action="index.php" method="post" name="lookupform">
<table border="0" cellpadding="0" cellspacing="0">'.$out.'</table>
</form>';
}
}
}
......
$form = '
<table border="0" cellpadding="0" cellspacing="0" width="600">
<tr>
<td>'.$tsStyleConfig->ext_getForm($MOD_SETTINGS['constant_editor_cat'],$theConstants,$script,$addFields).'</td>
<td>'.$tsStyleConfig->ext_getForm($MOD_SETTINGS['constant_editor_cat'],$theConstants,$script,$addFields).'</form></td>
</tr>
</table>';
if ($output) {
return $form;
} else {
$this->content.=$this->doc->section('','</form>'.$form.'<form>');
$this->content.=$this->doc->section('',$form);
}
}
}
(7-7/9)