diff --git a/typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php b/typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php index b78c443..53bd906 100644 --- a/typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php +++ b/typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php @@ -349,7 +349,7 @@ class tx_em_Connection_ExtDirectServer { $path = PATH_site . $path; if (@file_exists($path)) { //TODO: charset conversion - return t3lib_div::getURL($path); + return t3lib_div::getUrl($path); } return ''; } diff --git a/typo3/sysext/em/classes/connection/class.tx_em_connection_ter.php b/typo3/sysext/em/classes/connection/class.tx_em_connection_ter.php index c39ee0f..3d273c0 100644 --- a/typo3/sysext/em/classes/connection/class.tx_em_connection_ter.php +++ b/typo3/sysext/em/classes/connection/class.tx_em_connection_ter.php @@ -63,7 +63,7 @@ class tx_em_Connection_Ter { function fetchExtension($extKey, $version, $expectedMD5, $mirrorURL) { $extPath = t3lib_div::strtolower($extKey); $mirrorURL .= $extPath{0} . '/' . $extPath{1} . '/' . $extPath . '_' . $version . '.t3x'; - $t3x = t3lib_div::getURL($mirrorURL, 0, array(TYPO3_user_agent)); + $t3x = t3lib_div::getUrl($mirrorURL, 0, array(TYPO3_user_agent)); $MD5 = md5($t3x); if ($t3x === FALSE) { @@ -89,7 +89,7 @@ class tx_em_Connection_Ter { function fetchTranslation($extKey, $lang, $mirrorURL) { $extPath = t3lib_div::strtolower($extKey); $mirrorURL .= $extPath{0} . '/' . $extPath{1} . '/' . $extPath . '-l10n/' . $extPath . '-l10n-' . $lang . '.zip'; - $l10n = t3lib_div::getURL($mirrorURL, 0, array(TYPO3_user_agent)); + $l10n = t3lib_div::getUrl($mirrorURL, 0, array(TYPO3_user_agent)); if ($l10n !== false) { return array($l10n); @@ -132,7 +132,7 @@ class tx_em_Connection_Ter { function fetchTranslationStatus($extKey, $mirrorURL) { $extPath = t3lib_div::strtolower($extKey); $mirrorURL .= $extPath{0} . '/' . $extPath{1} . '/' . $extPath . '-l10n/' . $extPath . '-l10n.xml'; - $remote = t3lib_div::getURL($mirrorURL, 0, array(TYPO3_user_agent)); + $remote = t3lib_div::getUrl($mirrorURL, 0, array(TYPO3_user_agent)); if ($remote !== false) { $parsed = $this->emObj->xmlHandler->parseL10nXML($remote); diff --git a/typo3/sysext/em/classes/index.php b/typo3/sysext/em/classes/index.php index f82d1ab..2473345 100644 --- a/typo3/sysext/em/classes/index.php +++ b/typo3/sysext/em/classes/index.php @@ -1114,7 +1114,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase { switch ($metaType) { case 'mirrors': $mfile = t3lib_div::tempnam('mirrors'); - $mirrorsFile = t3lib_div::getURL($this->MOD_SETTINGS['mirrorListURL'], 0, array(TYPO3_user_agent)); + $mirrorsFile = t3lib_div::getUrl($this->MOD_SETTINGS['mirrorListURL'], 0, array(TYPO3_user_agent)); if ($mirrorsFile===false) { t3lib_div::unlink_tempfile($mfile); $content = '

' . @@ -1146,7 +1146,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase { $mirror = $this->getMirrorURL(); $extfile = $mirror . 'extensions.xml.gz'; - $extmd5 = t3lib_div::getURL($mirror . 'extensions.md5', 0, array(TYPO3_user_agent)); + $extmd5 = t3lib_div::getUrl($mirror . 'extensions.md5', 0, array(TYPO3_user_agent)); if (is_file(PATH_site . 'typo3temp/extensions.xml.gz')) { $localmd5 = md5_file(PATH_site . 'typo3temp/extensions.xml.gz'); } @@ -1169,7 +1169,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase { ); $content .= $flashMessage->render(); } else { - $extXML = t3lib_div::getURL($extfile, 0, array(TYPO3_user_agent)); + $extXML = t3lib_div::getUrl($extfile, 0, array(TYPO3_user_agent)); if ($extXML === false) { $content .= '

' . sprintf($GLOBALS['LANG']->getLL('ext_import_list_unchanged'), diff --git a/typo3/sysext/em/classes/repository/class.tx_em_repository_utility.php b/typo3/sysext/em/classes/repository/class.tx_em_repository_utility.php index 7060944..d03e075 100644 --- a/typo3/sysext/em/classes/repository/class.tx_em_repository_utility.php +++ b/typo3/sysext/em/classes/repository/class.tx_em_repository_utility.php @@ -157,13 +157,13 @@ class tx_em_Repository_Utility implements t3lib_Singleton { * @param string $remoteRessource remote ressource to read contents from * @param string $localRessource local ressource (absolute file path) to store retrieved contents to * @return void - * @see t3lib_div::getURL(), t3lib_div::writeFile() + * @see t3lib_div::getUrl(), t3lib_div::writeFile() * @throws tx_em_ConnectionException */ protected function fetchFile($remoteRessource, $localRessource) { if (is_string($remoteRessource) && is_string($localRessource) && !empty($remoteRessource) && !empty($localRessource)) { - $fileContent = t3lib_div::getURL($remoteRessource, 0, array(TYPO3_user_agent)); + $fileContent = t3lib_div::getUrl($remoteRessource, 0, array(TYPO3_user_agent)); if ($fileContent !== false) { t3lib_div::writeFile($localRessource, $fileContent) || $this->throwConnectionException(sprintf('Could not write to file %s.', htmlspecialchars($localRessource))); } else { @@ -284,7 +284,7 @@ class tx_em_Repository_Utility implements t3lib_Singleton { if (!is_file($this->getLocalExtListFile())) { $updateNecessity |= self::PROBLEM_EXTENSION_FILE_NOT_EXISTING; } else { - $remotemd5 = t3lib_div::getURL($this->getRemoteExtHashFile(), 0, array(TYPO3_user_agent)); + $remotemd5 = t3lib_div::getUrl($this->getRemoteExtHashFile(), 0, array(TYPO3_user_agent)); if ($remotemd5 !== false) { $localmd5 = md5_file($this->getLocalExtListFile()); diff --git a/typo3/sysext/em/classes/tools/class.tx_em_tools.php b/typo3/sysext/em/classes/tools/class.tx_em_tools.php index 0feed8e..81d22f7 100644 --- a/typo3/sysext/em/classes/tools/class.tx_em_tools.php +++ b/typo3/sysext/em/classes/tools/class.tx_em_tools.php @@ -624,7 +624,7 @@ final class tx_em_Tools { * @param $file */ public static function getArrayFromLocallang($file, $key = 'default') { - $content = t3lib_div::getURL($file); + $content = t3lib_div::getUrl($file); $array = t3lib_div::xml2array($content); return $array['data'][$key];