diff --git a/web/includes/actions.php b/web/includes/actions.php index 54941ab9f..ed1e2f93c 100644 --- a/web/includes/actions.php +++ b/web/includes/actions.php @@ -126,7 +126,7 @@ if ( $action == 'login' && isset($_REQUEST['username']) && ( ZM_AUTH_TYPE == 're userLogin( $username, $password ); $refreshParent = true; $view = 'console'; - $redirect = true; + $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=console'; } else if ( $action == 'logout' ) { userLogout(); $refreshParent = true; @@ -726,7 +726,7 @@ if ( canEdit( 'System' ) ) { $_SESSION['zmMontageLayout'] = $Layout->Id(); setcookie('zmMontageLayout', $Layout->Id(), 1 ); session_write_close(); - $redirect = true; + $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=montagereview'; } // end if save } else if ( $_REQUEST['object'] == 'server' ) { @@ -893,6 +893,7 @@ if ( canEdit( 'System' ) ) { case 'lowband' : break; } + $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=options&tab='.$_REQUEST['tab']; } loadConfig( false ); } elseif ( $action == 'user' ) { diff --git a/web/index.php b/web/index.php index e44e3a83e..d7c3e40ba 100644 --- a/web/index.php +++ b/web/index.php @@ -214,7 +214,7 @@ if ( ZM_OPT_USE_AUTH and ! isset($user) ) { session_write_close(); if ( $redirect ) { - header('Location: '.ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view='.$view); + header('Location: '.$redirect; return; } diff --git a/web/skins/classic/views/postlogin.php b/web/skins/classic/views/postlogin.php index 8177dcd01..f57d5335c 100644 --- a/web/skins/classic/views/postlogin.php +++ b/web/skins/classic/views/postlogin.php @@ -23,7 +23,7 @@ xhtmlHeaders(__FILE__, translate('LoggingIn') );