* Changed version numbers in t3lib/config_default.php
authorMichael Stucki <michael.stucki@typo3.org>
Fri, 7 Jul 2006 19:11:55 +0000 (19:11 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Fri, 7 Jul 2006 19:11:55 +0000 (19:11 +0000)
        * Minor corrections to CVSreadme.txt
        * Install Tool displayed TYPO3_version instead of TYPO3_branch
        * Fixed bug #2462: typo3temp/ subdirectories were not created automatically
        * Fixed bug #3362: Windows systems print phpinfo under some circumstances
        * Fixed bug #1153 again: Adding parameters to showpic.php is not always expected: Add a new property to skip adding these parameters (JSwindow.altUrl_noDefaultParams)

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@1609 709f56b5-9817-0410-a4d7-c38de5d9e867

16 files changed:
CVSreadme.txt
ChangeLog
t3lib/class.t3lib_div.php
t3lib/class.t3lib_extfilefunc.php
t3lib/class.t3lib_flexformtools.php
t3lib/class.t3lib_htmlmail.php
t3lib/class.t3lib_tceforms.php
t3lib/class.t3lib_tcemain.php
t3lib/class.t3lib_tsfebeuserauth.php
t3lib/class.t3lib_tstemplate.php
t3lib/config_default.php
typo3/init.php
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/css_styled_content/static/setup.txt
typo3/sysext/install/mod/class.tx_install.php

index 4c631b7..a880fc9 100644 (file)
@@ -1,37 +1,6 @@
-Post-CVS checkout instructions:
-
-If you check out the module "TYPO3core" from SourceForce CVS you will have to make a few symlinks in the
-checked out source before it will work for you. Follow these guidelines:
-
-
-- Go to the module directory (default is "TYPO3core")
-- Create symlink for tslib:
-       ln -s typo3/sysext/cms/tslib
-- Go to typo3/ folder:
-       cd typo3/
-- Create symlinks for t3lib/ and other things:
-       ln -s ../t3lib
-       ln -s ../t3lib/thumbs.php
-       ln -s ../t3lib/gfx
-- Finally, go to the t3lib/fonts/ dir:
-       cd t3lib/fonts/
-- Create two symlinks to fonts:
-       ln -s vera.ttf verdana.ttf
-       ln -s nimbus.ttf arial.ttf
-
-OR
-
-- Go to the module directory (default is "TYPO3core")
-- Run the create-symlinks.sh shell script.
-
-
-Thats all. This procedure is only needed when you check out the source for the first time ever.
-
-
 ABOUT GLOBAL EXTENSIONS:
-Notice that the "typo3/ext/" folder is NOT a part of the TYPO3 core CVS.
-From version 3.7.0 of TYPO3 this directory is considered locally composed and maintained.
-This means you can put a custom collection of extensions here which you will have to maintain independantly of TYPO3 core.
+Starting with version 4.0 of TYPO3 the directory typo3/ext/ is considered locally composed and maintained.
+This means you can put a custom collection of extensions here which you will have to maintain independently of TYPO3core.
 Some of the old global extensions have been moved to be system extensions for your convenience.
 Notice that individual extensions might infact have their own CVS project somewhere, like on
 SourceForge.net, project "TYPO3 Extension Development Platform" (typo3xdev).
@@ -47,8 +16,7 @@ Follow this list IMMEDIATELY after updating sources from CVS (both core and exte
 
 
 COMMITING CHANGES TO THE CORE:
-This is only allowed for members of the core team (http://typo3.org/projects/teams-and-projects/#team_10) who is also having "developer" status on SourceForge (http://sourceforge.net/project/memberlist.php?group_id=20391)
-There is defined a set of rules and conditions under which to commit to the core CVS.
-These are found in "misc/core_cvs_rules.txt
+This is only allowed for members of the core team (http://typo3.org/teams/core/) who is also having "developer" status on SourceForge (http://sourceforge.net/project/memberlist.php?group_id=20391).
+There is defined a set of rules and conditions under which to commit to the core CVS. These are found in "misc/core_cvs_rules.txt
 
-- kasper
\ No newline at end of file
+- kasper
index 6cdae94..5a4198a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-07  Michael Stucki  <michael@typo3.org>
+
+       * Changed version numbers in t3lib/config_default.php
+       * Minor corrections to CVSreadme.txt
+       * Install Tool displayed TYPO3_version instead of TYPO3_branch
+       * Fixed bug #2462: typo3temp/ subdirectories were not created automatically
+       * Fixed bug #3362: Windows systems print phpinfo under some circumstances
+       * Fixed bug #1153 again: Adding parameters to showpic.php is not always expected: Add a new property to skip adding these parameters (JSwindow.altUrl_noDefaultParams)
+
 2006-07-06  Martin Kutschker  <martin.t.kutschker@blackbox.net>
 
        * Fix bug #3779: edit form on page broken
@@ -7,7 +16,7 @@
 
        * Fix bug #3427: config.spamProtectEmailAddresses may garble mail link
 
-2006-07-01  Karsten Dambekalns <karsten@typo3.org>
+2006-07-01  Karsten Dambekalns  <karsten@typo3.org>
 
        * DBAL update (sysext):
                - this update closes bugs #3638, #2106, #2866, #3754 (for Firefox, broken in MSIE) and maybe a few more
@@ -85,7 +94,7 @@
 
 2006-06-11  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
-       * Fix bugtracker issue 3505: BE multi-language flexforms do not work (t3lib_tceforms)
+       * Fix bug #3505: BE multi-language flexforms do not work (t3lib_tceforms)
 
 2006-06-08  Martin Kutschker  <martin.t.kutschker@blackbox.net>
 
 
 2006-04-29  Martin Kutschker  <martin.t.kutschker@blackbox.net>
 
-       * Fixed wrong use of implode in typo3/mod/tools/em/class.em_index.php (lines 1392, 1424)
+       * Fixed wrong use of implode in typo3/mod/tools/em/class.em_index.php (lines 1392, 1424; see bug #3302)
 
 2006-04-23  Dmitry Dulepov <typo3@accio.lv>
 
index f54de13..a09b884 100755 (executable)
@@ -2300,17 +2300,17 @@ class t3lib_div {
         *
         * @param       string          Filepath/URL to read
         * @param       integer         Whether the HTTP header should be fetched or not. 0=disable, 1=fetch header+content, 2=fetch header only
-        * @param  array                HTTP headers to be used in the request
+        * @param       array           HTTP headers to be used in the request
         * @return      string          The content from the resource given as input.
         */
        function getURL($url, $includeHeader = 0, $requestHeaders = false)      {
                $content = false;
 
                        // (Proxy support implemented by Arco <arco@appeltaart.mine.nu>)
-               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlUse'] == '1' && preg_match('/^https?:\/\//', $url)) {
-                       // External URL without error checking.
+               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlUse'] == '1' && preg_match('/^https?:\/\//', $url)) {
+                               // External URL without error checking.
                        $ch = curl_init();
-                       if (!$ch) {
+                       if (!$ch)       {
                                return false;
                        }
 
@@ -2319,73 +2319,76 @@ class t3lib_div {
                        curl_setopt($ch, CURLOPT_NOBODY, $includeHeader == 2 ? 1 : 0);
                        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
                        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                       if (is_array($requestHeaders)) {
+                       if (is_array($requestHeaders))  {
                                curl_setopt($ch, CURLOPT_HTTPHEADER, $requestHeaders);
                        }
 
-                       if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {
-                               curl_setopt ($ch, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
+                       if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer'])      {
+                               curl_setopt($ch, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
 
-                               // I don't know if it will be needed
-                               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']) {
-                                       curl_setopt ($ch, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel'] );
+                                       // Not sure if this is needed
+                               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel'])      {
+                                       curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']);
                                }
-                               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']) {
-                                       curl_setopt ($ch, CURLOPT_PROXYUSERPWD, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass'] );
+                               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass'])    {
+                                       curl_setopt($ch, CURLOPT_PROXYUSERPWD, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']);
                                }
                        }
                        $content = curl_exec($ch);
                        curl_close($ch);
-               } elseif ($includeHeader) {
+
+               } elseif ($includeHeader)       {
                        $parsedURL = parse_url($url);
-                       if (!t3lib_div::inList('ftp,ftps,http,https,gopher,telnet', $parsedURL['scheme'])) {
+                       if (!t3lib_div::inList('ftp,ftps,http,https,gopher,telnet', $parsedURL['scheme']))      {
                                return false;
                        }
 
                        $fp = @fsockopen($parsedURL['host'], ($parsedURL['port'] > 0 ? $parsedURL['port'] : 80), $errno, $errstr, 2.0);
-                       if (!$fp) {
+                       if (!$fp)       {
                                return false;
                        }
 
                        $msg = 'GET ' . $parsedURL['path'] .
                                        ($parsedURL['query'] ? '?' . $parsedURL['query'] : '') .
-                                       ' HTTP/1.0' . chr(13) . chr(10) . 'Host: ' .
-                                       $parsedURL['host']  . chr(13) . chr(10) . chr(13) . chr(10);
+                                       ' HTTP/1.0' . "\r\n" . 'Host: ' .
+                                       $parsedURL['host'] . "\r\n\r\n";
                        fputs($fp, $msg);
                        while (!feof($fp))      {
                                $line = fgets($fp, 2048);
-                               $content .= $line;
-                               if ($includeHeader == 2 && !strlen(trim($line))) {
-                                       // Stop at the first empty line (= end of header)
-                                       break;
+                               $content.= $line;
+                               if ($includeHeader == 2 && !strlen(trim($line)))        {
+                                       break;  // Stop at the first empty line (= end of header)
                                }
                        }
                        fclose($fp);
-               } elseif (is_array($requestHeaders) && function_exists('stream_context_create')) {
+
+               } elseif (is_array($requestHeaders) && function_exists('stream_context_create'))        {
+
                        $ctx = stream_context_create(array(
-                                                       'http' => array(
-                                                               'header' => implode(chr(13) . chr(10), $requestHeaders)
-                                                       )
+                                               'http' => array(
+                                                       'header' => implode("\r\n", $requestHeaders)
                                                )
-                                  );
-                       if (function_exists('file_get_contents')) {
+                                       )
+                               );
+
+                       if (function_exists('file_get_contents'))       {
                                $content = @file_get_contents($url, $ctx);
                        }
-                       elseif (false !== ($fd = @fopen($url, 'rb', false, $ctx))) {
+                       elseif (false !== ($fd = @fopen($url, 'rb', false, $ctx)))      {
                                $content = '';
                                while (!feof($fd))      {
-                                       $content .= fread($fd, 4096);
+                                       $content.= fread($fd, 4096);
                                }
                                fclose($fd);
                        }
                }
-               elseif (function_exists('file_get_contents')) {
+               elseif (function_exists('file_get_contents'))   {
                        $content = @file_get_contents($url);
                }
-               elseif (false !== ($fd = @fopen($url, 'rb'))) {
+               elseif (false !== ($fd = @fopen($url, 'rb')))   {
                        $content = '';
-                       while (!feof($fd))  {
-                               $content .= fread($fd, 4096);
+                       while (!feof($fd))      {
+                               $content.= fread($fd, 4096);
                        }
                        fclose($fd);
                }
@@ -2487,7 +2490,7 @@ class t3lib_div {
         * @return      boolean         TRUE if @mkdir went well!
         */
        function mkdir($theNewFolder)   {
-               $theNewFolder = ereg_replace('\/$','',$theNewFolder);
+               $theNewFolder = preg_replace('|/$|','',$theNewFolder);
                if (mkdir($theNewFolder, octdec($GLOBALS['TYPO3_CONF_VARS']['BE']['folderCreateMask']))){
                        chmod($theNewFolder, octdec($GLOBALS['TYPO3_CONF_VARS']['BE']['folderCreateMask'])); //added this line, because the mode at 'mkdir' has a strange behaviour sometimes
 
@@ -4365,7 +4368,7 @@ class t3lib_div {
                                $params['backTrace'] = debug_backtrace();
                        }
                        $fakeThis = FALSE;
-                       foreach($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_div.php']['systemLog'] as $hookMethod)        {
+                       foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_div.php']['systemLog'] as $hookMethod)       {
                                t3lib_div::callUserFunction($hookMethod,$params,$fakeThis);
                        }
                }
@@ -4451,12 +4454,12 @@ class t3lib_div {
         */
        function arrayToLogString($arr, $valueList=array(), $valueLength=20) {
                $str = '';
-               if(is_array($arr)) {
-                       if (!is_array($valueList)) {
+               if (is_array($arr))     {
+                       if (!is_array($valueList))      {
                                $valueList = $valueList = t3lib_div::trimExplode(',', $valueList, 1);
                        }
                        $valListCnt = count($valueList);
-                       foreach($arr as $key => $value) {
+                       foreach ($arr as $key => $value)        {
                                if (!$valListCnt || in_array($key, $valueList)) {
                                        $str .= (string)$key.trim(': '.t3lib_div::fixed_lgd(str_replace("\n",'|',(string)$value), $valueLength)).'; ';
                                }
index dc3fce5..66c8081 100755 (executable)
@@ -142,6 +142,8 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
        var $lastError = '';
 
 
+
+
        /**
         * Initialization of the class
         *
index 9266b0e..28bd93e 100644 (file)
@@ -138,14 +138,14 @@ class t3lib_flexformtools {
                        $langChildren = $dataStructArray['meta']['langChildren'] ? 1 : 0;
                        $langDisabled = $dataStructArray['meta']['langDisable'] ? 1 : 0;
 
-                          // empty or invalid <meta>
+                               // empty or invalid <meta>
                        if (!is_array($editData['meta']))       {
-                          $editData['meta'] = array();
+                               $editData['meta'] = array();
                        }
                        $editData['meta']['currentLangId'] = array();
                        $languages = $this->getAvailableLanguages();
 
-                       foreach($languages as $lInfo)   {
+                       foreach ($languages as $lInfo)  {
                                $editData['meta']['currentLangId'][] = $lInfo['ISOcode'];
                        }
                        if (!count($editData['meta']['currentLangId'])) {
index 8a9f687..dc89398 100755 (executable)
@@ -274,14 +274,14 @@ class t3lib_htmlmail {
                        $host = ($TYPO3_CONF_VARS['SYS']['sitename'] ? preg_replace('/[^A-Za-z0-9_\-]/', '_', $TYPO3_CONF_VARS['SYS']['sitename']) : 'localhost') . '.TYPO3';
                }
                $this->messageid = md5(microtime()) . '@' . $host;
-               
+
                        // Default line break for Unix systems.
                $this->linebreak = chr(10);
                        // Line break for Windows. This is needed because PHP on Windows systems send mails via SMTP instead of using sendmail, and thus the linebreak needs to be \r\n.
                if (TYPO3_OS=='WIN')    {
                        $this->linebreak = chr(13).chr(10);
                }
-               
+
                if (!$this->charset) {
                        if (is_object($GLOBALS['TSFE']) && $GLOBALS['TSFE']->renderCharset) {
                                $this->charset = $GLOBALS['TSFE']->renderCharset;
@@ -293,11 +293,11 @@ class t3lib_htmlmail {
                                $this->charset = $this->defaultCharset;
                        }
                }
-               
+
                        // Use quoted-printable headers by default
                $this->useQuotedPrintable();
        }
-       
+
        /**
         * [Describe function...]
         *
@@ -1432,4 +1432,4 @@ class t3lib_htmlmail {
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_htmlmail.php']) {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_htmlmail.php']);
 }
-?>
+?>
\ No newline at end of file
index 5237b34..b63d03b 100755 (executable)
@@ -5429,4 +5429,4 @@ class t3lib_TCEforms_FE extends t3lib_TCEforms {
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms.php']) {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tceforms.php']);
 }
-?>
+?>
\ No newline at end of file
index 03fa28b..159ff50 100755 (executable)
@@ -199,7 +199,7 @@ require_once (PATH_t3lib.'class.t3lib_loaddbgroup.php');
 require_once (PATH_t3lib.'class.t3lib_parsehtml_proc.php');
 require_once (PATH_t3lib.'class.t3lib_stdgraphic.php');
 require_once (PATH_t3lib.'class.t3lib_basicfilefunc.php');
-require_once (PATH_t3lib."class.t3lib_refindex.php");
+require_once (PATH_t3lib.'class.t3lib_refindex.php');
 require_once (PATH_t3lib.'class.t3lib_flexformtools.php');
 
 
index a332cc8..d401df2 100755 (executable)
@@ -1112,4 +1112,4 @@ $query.
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tsfebeuserauth.php'])   {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tsfebeuserauth.php']);
 }
-?>
+?>
\ No newline at end of file
index 6b00efa..864460e 100755 (executable)
@@ -1567,4 +1567,4 @@ class t3lib_TStemplate    {
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tstemplate.php'])       {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_tstemplate.php']);
 }
-?>
+?>
\ No newline at end of file
index 3a5d5e1..facddc2 100755 (executable)
@@ -247,9 +247,9 @@ $TYPO3_CONF_VARS = Array(
 $T3_VAR = array();     // Initialize.
 
        // TYPO3 version
-$TYPO_VERSION = '4.0-CVS';     // deprecated: use the constants defined below
+$TYPO_VERSION = '4.1-dev';     // deprecated: use the constants defined below
 define('TYPO3_version', $TYPO_VERSION);
-define('TYPO3_branch', '4.0');
+define('TYPO3_branch', '4.1');
 define('TYPO3_copyright_year', '1998-2006');
 
 // Database-variables are cleared!
index 4ed60b0..5cc7fc9 100755 (executable)
@@ -96,6 +96,15 @@ if (substr($temp_path,-strlen(TYPO3_mainDir))!=TYPO3_mainDir)        {
 
 // OUTPUT error message and exit if there are problems with the path. Otherwise define constants and continue.
 if (!$temp_path || substr($temp_path,-strlen(TYPO3_mainDir))!=TYPO3_mainDir)   {       // This must be the case in order to proceed
+       if (TYPO3_OS=='WIN')    {
+               $thisPath_base = basename(substr($temp_path,-strlen(TYPO3_mainDir)));
+               $mainPath_base = basename(TYPO3_mainDir);
+               if (strtolower($thisPath) == strtolower($mainPath))     {       // Seems like the requested URL is not case-specific. This may happen on Windows only. -case. Otherwise, redirect to the correct URL. TYPO3_mainDir must be lower-case!!
+                       header('Location: '.str_replace($thisPath_base, $mainPath_base, t3lib_div::getIndpEnv('SCRIPT_NAME')));
+                       exit;
+               }
+       }
+
        echo ('Error in init.php: Path to TYPO3 main dir could not be resolved correctly. <br /><br />
                This happens if the last '.strlen(TYPO3_mainDir).' characters of this path, '.$temp_path.', (\$temp_path) is NOT "'.TYPO3_mainDir.'" for some reason. <br />
                You may have a strange server configuration.
index 8a37a44..535f766 100755 (executable)
@@ -1878,8 +1878,8 @@ class tslib_cObj {
                                                        $this->data[$this->currentValKey] = $value;
                                                        $image = $this->IMG_RESOURCE($conf['image.']);
                                                        $params = $conf['image.']['params'] ? ' '.$conf['image.']['params'] : '';
-                                                       $params .= $this->getAltParam($conf['image.'], false);
-                                                       $params .= $addParams;
+                                                       $params.= $this->getAltParam($conf['image.'], false);
+                                                       $params.= $addParams;
                                                } else {
                                                        $image = '';
                                                }
@@ -2698,7 +2698,7 @@ class tslib_cObj {
                                if ($conf['JSwindow.']['altUrl'] || $conf['JSwindow.']['altUrl.'])      {
                                        $altUrl = $this->stdWrap($conf['JSwindow.']['altUrl'], $conf['JSwindow.']['altUrl.']);
                                        if ($altUrl)    {
-                                               $url=$altUrl.'?file='.rawurlencode($imageFile).$params;
+                                               $url = $altUrl . ($conf['JSwindow.']['altUrl_noDefaultParams'] ? '' : '?file='.rawurlencode($imageFile).$params);
                                        }
                                }
 
index b47335b..7e6a8ac 100755 (executable)
                                $this->printError('Configuration Error: 404 page "'.$readFile.'" could not be found.');
                        }
                        exit;
-               } elseif (strlen($code)) {
-                       // Check if URL is relative
+               } elseif (strlen($code))        {
+                               // Check if URL is relative
                        $url_parts = parse_url($code);
-                       if ($url_parts['host'] == '') {
+                       if ($url_parts['host'] == '')   {
                                $url_parts['host'] = t3lib_div::getIndpEnv('HTTP_HOST');
                                $code = t3lib_div::getIndpEnv('TYPO3_REQUEST_HOST') . $code;
                                $checkBaseTag = false;
-                       }
-                       else {
+                       } else {
                                $checkBaseTag = true;
                        }
-                       // Prepare headers
+                               // Prepare headers
                        $headers = array(
                                'User-agent: ' . t3lib_div::getIndpEnv('HTTP_USER_AGENT'),
                                'Referer: ' . t3lib_div::getIndpEnv('TYPO3_REQUEST_URL')
                        );
                        $content = t3lib_div::getURL($code, 0, $headers);
                        if (false === $content) {
-                               // Last chance -- redirect
+                                       // Last chance -- redirect
                                header('Location: '.t3lib_div::locationHeaderUrl($code));
-                       }
-                       else {
-                               // Put <base> if necesary
-                               if ($checkBaseTag) {
-                                          // If content already has <base> tag, we do not need to do anything
-                                       if (false === stristr($content, '<base ')) {
-                                               // Generate href for base tag
+                       } else {
+                                       // Put <base> if necesary
+                               if ($checkBaseTag)      {
+
+                                               // If content already has <base> tag, we do not need to do anything
+                                       if (false === stristr($content, '<base '))      {
+
+                                                       // Generate href for base tag
                                                $base = $url_parts['scheme'] . '://';
-                                               if ($url_parts['user'] != '') {
-                                                       $base .= $url_parts['user'];
-                                                       if ($url_parts['pass'] != '') {
-                                                               $base .= ':' . $url_parts['pass'];      
+                                               if ($url_parts['user'] != '')   {
+                                                       $base.= $url_parts['user'];
+                                                       if ($url_parts['pass'] != '')   {
+                                                               $base.= ':' . $url_parts['pass'];
                                                        }
-                                                       $base .= '@';
+                                                       $base.= '@';
                                                }
-                                               $base .= $url_parts['host'];
+                                               $base.= $url_parts['host'];
 
-                                               // Add path portion skipping possible file name
-                                               $base .= preg_replace('/(.*\/)[^\/]*/', '\1', $url_parts['path']);
+                                                       // Add path portion skipping possible file name
+                                               $base.= preg_replace('/(.*\/)[^\/]*/', '\1', $url_parts['path']);
 
-                                               // Put it into content (generate also <head> if necessary)
+                                                       // Put it into content (generate also <head> if necessary)
                                                $replacement = chr(10) . '<base href="' . htmlentities($base) . '" />' . chr(10);
-                                               if (stristr($content, '<head>')) {
+                                               if (stristr($content, '<head>'))        {
                                                        $content = preg_replace('/(<head>)/i', '\1' . $replacement, $content);
-                                               }
-                                               else {
+                                               } else {
                                                        $content = preg_replace('/(<html[^>]*>)/i', '\1<head>' . $replacement . '</head>', $content);
                                                }
-                                  }
+                                       }
                                }
-                               // Output it
-                               echo $content;
+                               echo $content;  // Output the content
                        }
                        exit;
                } else {
index 665a685..7875f9d 100755 (executable)
@@ -1486,7 +1486,4 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
 [END]
 
 
-<<<<<<< setup.txt
 # TYPO3 CVS ID: $Id$
-=======
-# TYPO3 CVS ID: $Id$>>>>>>> 1.7
index bac68af..0ac581b 100755 (executable)
@@ -981,7 +981,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                $sVar['CONST: TYPO3_OS']=TYPO3_OS;
                $sVar['CONST: PATH_thisScript']=PATH_thisScript;
                $sVar['CONST: php_sapi_name()']=php_sapi_name();
-               $sVar['OTHER: TYPO3_VERSION']=$GLOBALS['TYPO_VERSION'];
+               $sVar['OTHER: TYPO3_VERSION']=TYPO3_version;
                $sVar['OTHER: PHP_VERSION']=phpversion();
                $sVar['imagecreatefromgif()']=function_exists('imagecreatefromgif');
                $sVar['imagecreatefrompng()']=function_exists('imagecreatefrompng');
@@ -1712,11 +1712,17 @@ From sub-directory:
                );
 
                foreach ($checkWrite as $relpath => $descr)     {
+
                                // Check typo3temp/
                        $general_message = $descr[0];
+
+                       if (!@is_dir(PATH_site.$relpath))       {       // If the directory is missing, try to create it
+                               t3lib_div::mkdir(PATH_site.$relpath);
+                       }
+
                        if (!@is_dir(PATH_site.$relpath))       {
                                if ($descr[1])  {       // required...
-                                       $this->message($ext, $relpath.' directory does not exist','
+                                       $this->message($ext, $relpath.' directory does not exist and could not be created','
                                        <em>Full path: '.PATH_site.$relpath.'</em>
                                        '.$general_message.'
 
@@ -4803,7 +4809,7 @@ a:hover {color: #006; text-decoration:underline:}
                                <table width="100%" border="0" cellspacing="1" cellpadding="10">
                                        <tr>
                                                <td bgcolor="#F4F0E8">
-                                               <div align="center"><span class="size4text"><strong>TYPO3 '.$GLOBALS['TYPO_VERSION'].' Install Tool</strong></span></div>
+                                               <div align="center"><span class="size4text"><strong>TYPO3 '.TYPO3_branch.' Install Tool</strong></span></div>
                                                <div align="center"><span style="color:navy;"><strong>Site: '.$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'].'</strong></span></div><br />
 
 '.($this->step?$this->stepHeader():$this->menu()).$content.'<hr />'.$this->note123().$this->endNotes().'
@@ -5055,4 +5061,4 @@ a:hover {color: #006; text-decoration:underline:}
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/install/mod/class.tx_install.php'])   {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/install/mod/class.tx_install.php']);
 }
-?>
+?>
\ No newline at end of file