holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup other cases of PHP_OS testing for WINNT

Browse Source
This commit is contained in:
Miles Lott 2004-01-28 13:34:47 +00:00
parent a295b5b852
commit 300badbfec
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.common.inc.php
View File

@ -1411,7 +1411,7 @@
$format .= 'H:i';
}
}
if((PHP_OS == 'Windows'||PHP_OS == 'WINNT') && (int)$t < 21600)
if((PHP_OS == 'Windows' || PHP_OS == 'WINNT') && (int)$t < 21600)
/*if(PHP_OS == 'Windows' && (int)$t < 21600)*/
{
$t = 21600;

10
phpgwapi/inc/class.sessions.inc.php
View File

@ -353,7 +353,9 @@
if (@$GLOBALS['phpgw_info']['server']['sessions_checkip'])
{
if (PHP_OS != 'Windows' && (! $GLOBALS['phpgw_info']['user']['session_ip'] || $GLOBALS['phpgw_info']['user']['session_ip'] != $this->getuser_ip()))
if((PHP_OS != 'Windows') && (PHP_OS != 'WINNT') &&
(!$GLOBALS['phpgw_info']['user']['session_ip'] || $GLOBALS['phpgw_info']['user']['session_ip'] != $this->getuser_ip())
)
{
if(is_object($GLOBALS['phpgw']->log))
{
@ -752,9 +754,11 @@
return False;
}
if (@$GLOBALS['phpgw_info']['server']['sessions_checkip'])
if(@$GLOBALS['phpgw_info']['server']['sessions_checkip'])
{
if (PHP_OS != 'Windows' && (! $GLOBALS['phpgw_info']['user']['session_ip'] || $GLOBALS['phpgw_info']['user']['session_ip'] != $this->getuser_ip()))
if((PHP_OS != 'Windows') && (PHP_OS != 'WINNT') &&
(!$GLOBALS['phpgw_info']['user']['session_ip'] || $GLOBALS['phpgw_info']['user']['session_ip'] != $this->getuser_ip())
)
{
if(is_object($GLOBALS['phpgw']->log))
{

2
phpgwapi/inc/common_functions.inc.php
View File

@ -935,7 +935,7 @@
*/
function filesystem_separator()
{
if (PHP_OS == 'Windows' || PHP_OS == 'OS/2')
if(PHP_OS == 'Windows' || PHP_OS == 'OS/2' || PHP_OS == 'WINNT')
{
return '\\';
}