diff options
author | the_systech <the_systech@users.sourceforge.net> | 2002-03-28 19:52:21 +0000 |
---|---|---|
committer | the_systech <the_systech@users.sourceforge.net> | 2002-03-28 19:52:21 +0000 |
commit | 0e2eb0daee6af72a6b7fbbf3959244d6539c02c1 (patch) | |
tree | fd0f23310fd124dd7c2a5b58531774be87749996 /phpBB | |
parent | 30af46fcd9ec50f6bd9605d8bb16d8e87fbbf9e6 (diff) | |
download | forums-0e2eb0daee6af72a6b7fbbf3959244d6539c02c1.tar forums-0e2eb0daee6af72a6b7fbbf3959244d6539c02c1.tar.gz forums-0e2eb0daee6af72a6b7fbbf3959244d6539c02c1.tar.bz2 forums-0e2eb0daee6af72a6b7fbbf3959244d6539c02c1.tar.xz forums-0e2eb0daee6af72a6b7fbbf3959244d6539c02c1.zip |
Ok all of these damned httpd server that are different are about annoying
git-svn-id: file:///svn/phpbb/trunk@2444 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r-- | phpBB/login.php | 2 | ||||
-rw-r--r-- | phpBB/posting.php | 4 | ||||
-rw-r--r-- | phpBB/privmsg.php | 16 | ||||
-rw-r--r-- | phpBB/profile.php | 6 | ||||
-rw-r--r-- | phpBB/viewforum.php | 4 | ||||
-rw-r--r-- | phpBB/viewtopic.php | 6 |
6 files changed, 19 insertions, 19 deletions
diff --git a/phpBB/login.php b/phpBB/login.php index 743c53c14f..240f965603 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -47,7 +47,7 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($ // since this doesn't exist for ISAPI mode and therefore the // normal Location redirector is used in preference // - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] ) { diff --git a/phpBB/posting.php b/phpBB/posting.php index 35a8fd0fc1..83f51c26a8 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -334,7 +334,7 @@ if ( !$is_auth[$is_auth_type] ) break; } - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true)); exit; } @@ -1093,4 +1093,4 @@ $template->pparse('body'); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?>
\ No newline at end of file +?> diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 5dfd2a9ad5..c8bea4ff60 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -183,7 +183,7 @@ else if ( $mode == "read" ) if ( !$userdata['session_logged_in'] ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id", true)); } @@ -257,7 +257,7 @@ else if ( $mode == "read" ) // if ( !( $privmsg = $db->sql_fetchrow($pm_status) ) ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true)); } @@ -590,7 +590,7 @@ else if ( ( $delete && $mark_list ) || $delete_all ) { if (!$userdata['session_logged_in']) { - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true)); } if ( isset($mark_list) && !is_array($mark_list) ) @@ -787,7 +787,7 @@ else if ( $save && $mark_list && $folder != "savebox" && $folder != "outbox") { if ( !$userdata['session_logged_in'] ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true)); } @@ -880,7 +880,7 @@ else if ( $submit || $refresh || $mode != "" ) if (!$userdata['session_logged_in']) { $user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? "&" . POST_USERS_URL . "=" . $HTTP_GET_VARS[POST_USERS_URL] : ""; - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true)); } @@ -1265,7 +1265,7 @@ else if ( $submit || $refresh || $mode != "" ) } if ( !($privmsg = $db->sql_fetchrow($pm_edit_status)) ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true)); } @@ -1304,7 +1304,7 @@ else if ( $submit || $refresh || $mode != "" ) if ( !($privmsg = $db->sql_fetchrow($pm_reply_status)) ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true)); } @@ -1658,7 +1658,7 @@ else if ( $submit || $refresh || $mode != "" ) // if ( !$userdata['session_logged_in'] ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true)); } diff --git a/phpBB/profile.php b/phpBB/profile.php index 213807a49f..d544bbd570 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -83,7 +83,7 @@ if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { if ( !$userdata['session_logged_in'] && $mode == 'editprofile' ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=editprofile", true)); exit; } @@ -109,9 +109,9 @@ if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) } else { - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("index.$phpEx", true)); exit; } -?>
\ No newline at end of file +?> diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index d3716e2401..3db981753d 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -103,7 +103,7 @@ if ( !$is_auth['auth_read'] || !$is_auth['auth_view'] ) if ( !$userdata['session_logged_in'] ) { $redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : "" ); - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("login.$phpEx?redirect=viewforum.$phpEx&$redirect", true)); } // @@ -672,4 +672,4 @@ $template->pparse('body'); // include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?>
\ No newline at end of file +?> diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index db1e751a3d..e45c53d134 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -191,7 +191,7 @@ if( !$is_auth['auth_view'] || !$is_auth['auth_read'] ) { $redirect = ( isset($post_id) ) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id"; $redirect .= ( isset($start) ) ? "&start=$start" : ''; - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&$redirect", true)); } @@ -308,7 +308,7 @@ else { if ( $HTTP_GET_VARS['unwatch'] == 'topic' ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; header($header_location . append_sid("login.$phpEx?redirect=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic", true)); } } @@ -1171,4 +1171,4 @@ $template->pparse('body'); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?>
\ No newline at end of file +?> |