diff -ur typo3_440/t3lib/class.t3lib_extmgm.php typo3_440_os2/t3lib/class.t3lib_extmgm.php --- typo3_440/t3lib/class.t3lib_extmgm.php 2010-06-13 16:42:34.000000000 +0200 +++ typo3_440_os2/t3lib/class.t3lib_extmgm.php 2010-05-04 13:16:16.000000000 +0200 @@ -867,7 +867,7 @@ if ($T3_SERVICES[$serviceType][$serviceKey]['available'] && $T3_SERVICES[$serviceType][$serviceKey]['os']!='') { // TYPO3_OS is not yet defined - $os_type = stristr(PHP_OS, 'win')&&!stristr(PHP_OS, 'darwin')?'WIN':'UNIX'; + $os_type = (stristr(PHP_OS, 'win')&&!stristr(PHP_OS, 'darwin'))||stristr(PHP_OS,'os/2')?'WIN':'UNIX'; $os = t3lib_div::trimExplode(',', strtoupper($T3_SERVICES[$serviceType][$serviceKey]['os'])); diff -ur typo3_440/t3lib/thumbs.php typo3_440_os2/t3lib/thumbs.php --- typo3_440/t3lib/thumbs.php 2010-06-13 16:42:34.000000000 +0200 +++ typo3_440_os2/t3lib/thumbs.php 2010-05-04 13:16:52.000000000 +0200 @@ -66,7 +66,7 @@ // ****************** // Constants defined // ****************** -define('TYPO3_OS', stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin')?'WIN':''); +define('TYPO3_OS', (stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin'))||stristr(PHP_OS,'os/2')?'WIN':''); define('TYPO3_MODE','BE'); if(!defined('PATH_thisScript')) define('PATH_thisScript',str_replace('//','/', str_replace('\\','/', (php_sapi_name()=='cgi'||php_sapi_name()=='isapi' ||php_sapi_name()=='cgi-fcgi')&&($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED'])? ($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED']):($_SERVER['ORIG_SCRIPT_FILENAME']?$_SERVER['ORIG_SCRIPT_FILENAME']:$_SERVER['SCRIPT_FILENAME'])))); if(!defined('PATH_site')) define('PATH_site', preg_replace('/[^\/]*.[^\/]*$/','',PATH_thisScript)); // the path to the website folder (see init.php) diff -ur typo3_440/typo3/init.php typo3_440_os2/typo3/init.php --- typo3_440/typo3/init.php 2010-06-13 16:42:34.000000000 +0200 +++ typo3_440_os2/typo3/init.php 2010-05-04 13:17:06.000000000 +0200 @@ -81,7 +81,7 @@ // ******************************* // Define constants // ******************************* -define('TYPO3_OS', stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin')?'WIN':''); +define('TYPO3_OS', (stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin'))||stristr(PHP_OS,'os/2')?'WIN':''); define('TYPO3_MODE','BE'); define('PATH_thisScript',str_replace('//','/', str_replace('\\','/', (PHP_SAPI=='cgi'||PHP_SAPI=='isapi' ||PHP_SAPI=='cgi-fcgi')&&($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED'])? ($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED']):($_SERVER['ORIG_SCRIPT_FILENAME']?$_SERVER['ORIG_SCRIPT_FILENAME']:$_SERVER['SCRIPT_FILENAME'])))); define('TYPO3_mainDir', 'typo3/'); // This is the directory of the backend administration for the sites of this TYPO3 installation. diff -ur typo3_440/typo3/sysext/adodb/adodb/adodb-csvlib.inc.php typo3_440_os2/typo3/sysext/adodb/adodb/adodb-csvlib.inc.php --- typo3_440/typo3/sysext/adodb/adodb/adodb-csvlib.inc.php 2009-11-25 16:02:14.000000000 +0100 +++ typo3_440_os2/typo3/sysext/adodb/adodb/adodb-csvlib.inc.php 2010-05-04 13:18:20.000000000 +0200 @@ -277,7 +277,7 @@ # 2. unlink($filename) fails -- ok, rename will fail # 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs # 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and cache updated - if (strncmp(PHP_OS,'WIN',3) === 0) { + if ((strncmp(PHP_OS,'WIN',3) === 0) || (strncmp(PHP_OS,'OS/2',4) === 0)) === 0) { // skip the decimal place $mtime = substr(str_replace(' ','_',microtime()),2); // getmypid() actually returns 0 on Win98 - never mind! diff -ur typo3_440/typo3/sysext/adodb/adodb/adodb-pear.inc.php typo3_440_os2/typo3/sysext/adodb/adodb/adodb-pear.inc.php --- typo3_440/typo3/sysext/adodb/adodb/adodb-pear.inc.php 2009-05-16 01:28:42.000000000 +0200 +++ typo3_440_os2/typo3/sysext/adodb/adodb/adodb-pear.inc.php 2010-05-04 13:18:28.000000000 +0200 @@ -361,7 +361,7 @@ function assertExtension($name) { if (!extension_loaded($name)) { - $dlext = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : '.so'; + $dlext = ((strncmp(PHP_OS,'WIN',3) === 0) || (strncmp(PHP_OS,'OS/2',4) === 0)) ? '.dll' : '.so'; @dl($name . $dlext); } if (!extension_loaded($name)) { diff -ur typo3_440/typo3/sysext/adodb/adodb/drivers/adodb-odbc_db2.inc.php typo3_440_os2/typo3/sysext/adodb/adodb/drivers/adodb-odbc_db2.inc.php --- typo3_440/typo3/sysext/adodb/adodb/drivers/adodb-odbc_db2.inc.php 2009-11-25 16:02:14.000000000 +0100 +++ typo3_440_os2/typo3/sysext/adodb/adodb/drivers/adodb-odbc_db2.inc.php 2010-05-04 13:18:38.000000000 +0200 @@ -112,7 +112,7 @@ function ADODB_DB2() { - if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC; + if ((strncmp(PHP_OS,'WIN',3) === 0) || (strncmp(PHP_OS,'OS/2',4) === 0)) $this->curmode = SQL_CUR_USE_ODBC; $this->ADODB_odbc(); } diff -ur typo3_440/typo3/sysext/adodb/adodb/drivers/adodb-sapdb.inc.php typo3_440_os2/typo3/sysext/adodb/adodb/drivers/adodb-sapdb.inc.php --- typo3_440/typo3/sysext/adodb/adodb/drivers/adodb-sapdb.inc.php 2009-11-25 16:02:14.000000000 +0100 +++ typo3_440_os2/typo3/sysext/adodb/adodb/drivers/adodb-sapdb.inc.php 2010-05-04 13:18:46.000000000 +0200 @@ -33,7 +33,7 @@ function ADODB_SAPDB() { - //if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC; + //if ((strncmp(PHP_OS,'WIN',3) === 0) || (strncmp(PHP_OS,'OS/2',4) === 0)) $this->curmode = SQL_CUR_USE_ODBC; $this->ADODB_odbc(); } diff -ur typo3_440/typo3/sysext/cms/tslib/index_ts.php typo3_440_os2/typo3/sysext/cms/tslib/index_ts.php --- typo3_440/typo3/sysext/cms/tslib/index_ts.php 2010-06-13 16:42:34.000000000 +0200 +++ typo3_440_os2/typo3/sysext/cms/tslib/index_ts.php 2010-05-04 13:17:24.000000000 +0200 @@ -57,7 +57,7 @@ // Constants defined // ****************** $TYPO3_MISC['microtime_start'] = microtime(true); -define('TYPO3_OS', stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin')?'WIN':''); +define('TYPO3_OS', (stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin'))||stristr(PHP_OS,'os/2')?'WIN':''); define('TYPO3_MODE','FE'); if (!defined('PATH_thisScript')) define('PATH_thisScript',str_replace('//','/', str_replace('\\','/', (PHP_SAPI=='cgi'||PHP_SAPI=='isapi' ||PHP_SAPI=='cgi-fcgi')&&($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED'])? ($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED']):($_SERVER['ORIG_SCRIPT_FILENAME']?$_SERVER['ORIG_SCRIPT_FILENAME']:$_SERVER['SCRIPT_FILENAME'])))); diff -ur typo3_440/typo3/sysext/cms/tslib/showpic.php typo3_440_os2/typo3/sysext/cms/tslib/showpic.php --- typo3_440/typo3/sysext/cms/tslib/showpic.php 2010-06-13 16:42:34.000000000 +0200 +++ typo3_440_os2/typo3/sysext/cms/tslib/showpic.php 2010-05-04 13:17:30.000000000 +0200 @@ -64,7 +64,7 @@ // *********************** // Paths are setup // *********************** -define('TYPO3_OS', stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin')?'WIN':''); +define('TYPO3_OS', (stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin'))||stristr(PHP_OS,'os/2')?'WIN':''); define('TYPO3_MODE','FE'); if (!defined('PATH_thisScript')) define('PATH_thisScript',str_replace('//','/', str_replace('\\','/', (PHP_SAPI=='cgi'||PHP_SAPI=='isapi' ||PHP_SAPI=='cgi-fcgi')&&($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED'])? ($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED']):($_SERVER['ORIG_SCRIPT_FILENAME']?$_SERVER['ORIG_SCRIPT_FILENAME']:$_SERVER['SCRIPT_FILENAME'])))); diff -ur typo3_440/typo3/sysext/install/mod/class.tx_install_ajax.php typo3_440_os2/typo3/sysext/install/mod/class.tx_install_ajax.php --- typo3_440/typo3/sysext/install/mod/class.tx_install_ajax.php 2010-06-13 16:42:34.000000000 +0200 +++ typo3_440_os2/typo3/sysext/install/mod/class.tx_install_ajax.php 2010-05-04 13:17:40.000000000 +0200 @@ -40,7 +40,7 @@ // *********************** // Paths are setup // *********************** -define('TYPO3_OS', stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin')?'WIN':''); +define('TYPO3_OS', (stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin'))||stristr(PHP_OS,'os/2')?'WIN':''); define('TYPO3_MODE','FE'); if (!defined('PATH_thisScript')) define('PATH_thisScript',str_replace('//','/', str_replace('\\','/', (PHP_SAPI=='cgi'||PHP_SAPI=='isapi' ||PHP_SAPI=='cgi-fcgi')&&($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED'])? ($_SERVER['ORIG_PATH_TRANSLATED']?$_SERVER['ORIG_PATH_TRANSLATED']:$_SERVER['PATH_TRANSLATED']):($_SERVER['ORIG_SCRIPT_FILENAME']?$_SERVER['ORIG_SCRIPT_FILENAME']:$_SERVER['SCRIPT_FILENAME']))));