Bug #22940 » patch_433_os2.diff
| typo3_433_os2/misc/phpcheck/incfile.php 2010-05-04 13:20:28.000000000 +0200 | ||
|---|---|---|
|
error_reporting(E_ALL ^ E_NOTICE);
|
||
|
}
|
||
|
|
||
|
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("PATH_thisScript",
|
||
|
TYPO3_OS=="WIN" ?
|
||
| typo3_433_os2/t3lib/class.t3lib_extmgm.php 2010-05-04 13:21:32.000000000 +0200 | ||
|---|---|---|
|
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']));
|
||
|
|
||
| typo3_433_os2/t3lib/thumbs.php 2010-05-04 13:20:40.000000000 +0200 | ||
|---|---|---|
|
// ******************
|
||
|
// 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)
|
||
| typo3_433_os2/typo3/cli_dispatch.phpsh 2010-05-04 13:21:48.000000000 +0200 | ||
|---|---|---|
|
|
||
|
// Figure out if the path is relative
|
||
|
$relativePath = FALSE;
|
||
|
if (stristr(PHP_OS,'win') && !stristr(PHP_OS,'darwin')) {
|
||
|
if ((stristr(PHP_OS,'win') && !stristr(PHP_OS,'darwin')))||stristr(PHP_OS,'os/2') {
|
||
|
|
||
|
// Windows
|
||
|
if (!preg_match('/^([A-Z]:)?\\\/', $temp_PATH_thisScript)) {
|
||
|
$relativePath = TRUE;
|
||
| typo3_433_os2/typo3/init.php 2010-05-04 13:20:48.000000000 +0200 | ||
|---|---|---|
|
// *******************************
|
||
|
// 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.
|
||
| typo3_433_os2/typo3/sysext/adodb/adodb/adodb-csvlib.inc.php 2010-05-04 13:22:06.000000000 +0200 | ||
|---|---|---|
|
# 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)) {
|
||
|
// skip the decimal place
|
||
|
$mtime = substr(str_replace(' ','_',microtime()),2);
|
||
|
// getmypid() actually returns 0 on Win98 - never mind!
|
||
| typo3_433_os2/typo3/sysext/adodb/adodb/adodb-pear.inc.php 2010-05-04 13:22:12.000000000 +0200 | ||
|---|---|---|
|
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)) {
|
||
| typo3_433_os2/typo3/sysext/adodb/adodb/drivers/adodb-odbc_db2.inc.php 2010-05-04 13:22:26.000000000 +0200 | ||
|---|---|---|
|
|
||
|
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();
|
||
|
}
|
||
|
|
||
| typo3_433_os2/typo3/sysext/cms/tslib/index_ts.php 2010-05-04 13:21:00.000000000 +0200 | ||
|---|---|---|
|
// 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']))));
|
||
| typo3_433_os2/typo3/sysext/cms/tslib/showpic.php 2010-05-04 13:21:06.000000000 +0200 | ||
|---|---|---|
|
// ***********************
|
||
|
// 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']))));
|
||
|
|
||
| typo3_433_os2/typo3/sysext/install/mod/class.tx_install_ajax.php 2010-05-04 13:21:16.000000000 +0200 | ||
|---|---|---|
|
// ***********************
|
||
|
// 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']))));
|
||
|
|
||