Cleanup other cases of PHP_OS testing for WINNT

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

View File

@ -353,7 +353,9 @@
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)) if(is_object($GLOBALS['phpgw']->log))
{ {
@ -754,7 +756,9 @@
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)) if(is_object($GLOBALS['phpgw']->log))
{ {

View File

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