Index: C:/workspace/TYPO3_4-2/typo3/mod/tools/em/class.em_index.php =================================================================== --- C:/workspace/TYPO3_4-2/typo3/mod/tools/em/class.em_index.php (revision 3327) +++ C:/workspace/TYPO3_4-2/typo3/mod/tools/em/class.em_index.php (working copy) @@ -404,7 +404,7 @@ // Initialize Document Template object: $this->doc = t3lib_div::makeInstance('template'); $this->doc->backPath = $BACK_PATH; - $this->doc->setModuleTemplate('templates/em_index.html'); + $this->doc->setModuleTemplate('templates/em_index.html'); $this->doc->docType='xhtml_trans'; // JavaScript @@ -622,14 +622,14 @@ break; } } - + // Setting up the buttons and markers for docheader $docHeaderButtons = $this->getButtons(); $markers = array( 'CSH' => $docHeaderButtons['csh'], 'FUNC_MENU' => $this->getFuncMenu(), 'CONTENT' => $this->content - ); + ); // Build the for the module $this->content = $this->doc->startPage('Extension Manager'); @@ -648,7 +648,7 @@ echo $this->content; } } - + /** * Create the function menu * @@ -661,7 +661,7 @@ } elseif($this->CMD['showExt'] && (!$this->CMD['standAlone'] && !t3lib_div::_GP('standAlone'))) { $funcMenu = t3lib_BEfunc::getFuncMenu(0, 'SET[singleDetails]', $this->MOD_SETTINGS['singleDetails'], $this->MOD_MENU['singleDetails'], '', '&CMD[showExt]=' . $this->CMD['showExt']); } - return $funcMenu; + return $funcMenu; } /** @@ -670,7 +670,7 @@ * @return array all available buttons as an assoc. array */ private function getButtons() { - + $buttons = array( 'csh' => '', 'back' => '', @@ -678,7 +678,7 @@ ); // CSH //$buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH']); - + // Shortcut if ($GLOBALS['BE_USER']->mayMakeShortcut()) { $buttons['shortcut'] = $this->doc->makeShortcutIcon('CMD','function',$this->MCONF['name']); @@ -687,7 +687,7 @@ if(($this->CMD['showExt'] && (!$this->CMD['standAlone'] && !t3lib_div::_GP('standAlone'))) || ($this->CMD['importExt'] || $this->CMD['uploadExt'] && (!$this->CMD['standAlone'])) || $this->CMD['importExtInfo']) { $buttons['back'] = 'doc->backPath, 'gfx/goback.gif') . ' title="Go back" class="absmiddle" alt="" />'; } - + return $buttons; } @@ -1509,7 +1509,7 @@ switch($metaType) { case 'mirrors': $mfile = t3lib_div::tempnam('mirrors'); - $mirrorsFile = t3lib_div::getURL($this->MOD_SETTINGS['mirrorListURL']); + $mirrorsFile = t3lib_div::getURL($this->MOD_SETTINGS['mirrorListURL'], 0, array('User-Agent: TYPO3/'.TYPO3_version)); if($mirrorsFile===false) { t3lib_div::unlink_tempfile($mfile); $content = '

The mirror list was not updated, it could not be fetched from '.$this->MOD_SETTINGS['mirrorListURL'].'. Possible reasons: network problems, allow_url_fopen is off, curl is not enabled in Install tool.

'; @@ -1534,7 +1534,7 @@ $mirror = $this->getMirrorURL(); $extfile = $mirror.'extensions.xml.gz'; - $extmd5 = t3lib_div::getURL($mirror.'extensions.md5'); + $extmd5 = t3lib_div::getURL($mirror.'extensions.md5', 0, array('User-Agent: TYPO3/'.TYPO3_version)); if (is_file(PATH_site.'typo3temp/extensions.xml.gz')) { $localmd5 = md5_file(PATH_site.'typo3temp/extensions.xml.gz'); } @@ -1544,7 +1544,7 @@ } elseif($extmd5 == $localmd5) { $content .= '

The extension list has not changed remotely, it has thus not been fetched.

'; } else { - $extXML = t3lib_div::getURL($extfile); + $extXML = t3lib_div::getURL($extfile, 0, array('User-Agent: TYPO3/'.TYPO3_version)); if($extXML === false) { $content .= '

Error: The extension list could not be fetched from '.$extfile.'. Possible reasons: network problems, allow_url_fopen is off, curl is not enabled in Install tool.

'; } else { Index: C:/workspace/TYPO3_4-2/typo3/mod/tools/em/class.em_terconnection.php =================================================================== --- C:/workspace/TYPO3_4-2/typo3/mod/tools/em/class.em_terconnection.php (revision 3327) +++ C:/workspace/TYPO3_4-2/typo3/mod/tools/em/class.em_terconnection.php (working copy) @@ -64,7 +64,7 @@ */ function fetchExtension($extKey, $version, $expectedMD5, $mirrorURL) { $mirrorURL .= $extKey{0}.'/'.$extKey{1}.'/'.$extKey.'_'.$version.'.t3x'; - $t3x = t3lib_div::getURL($mirrorURL); + $t3x = t3lib_div::getURL($mirrorURL, 0, array('User-Agent: TYPO3/'.TYPO3_version)); $MD5 = md5($t3x); if($t3x===false) return 'The T3X file could not be fetched. Possible reasons: network problems, allow_url_fopen is off, curl is not enabled in Install tool.'; @@ -87,7 +87,7 @@ */ function fetchTranslation($extKey, $lang, $mirrorURL) { $mirrorURL .= $extKey{0}.'/'.$extKey{1}.'/'.$extKey.'-l10n/'.$extKey.'-l10n-'.$lang.'.zip'; - $l10n = t3lib_div::getURL($mirrorURL); + $l10n = t3lib_div::getURL($mirrorURL, 0, array('User-Agent: TYPO3/'.TYPO3_version)); if($l10n !== false) { return array($l10n); @@ -106,7 +106,7 @@ function fetchTranslationStatus($extKey, $mirrorURL) { $url = $mirrorURL . $extKey{0}.'/'.$extKey{1}.'/'.$extKey.'-l10n/'.$extKey.'-l10n.xml'; - $remote = t3lib_div::getURL($url); + $remote = t3lib_div::getURL($url, 0, array('User-Agent: TYPO3/'.TYPO3_version)); if($remote !== false) { $parsed = $this->emObj->xmlhandler->parseL10nXML($remote); @@ -254,7 +254,7 @@ ); } // END for Bug #5919 - + // Compile data for SOAP call: $accountData = array( 'username' => $em['user']['fe_u'],