- $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
- if ($compose_new_win) {
- // do not prefix $location here because $session_expired_location is set to PHP_SELF
- // of the last page
- $redirect_url = $session_expired_location;
- } elseif ( strpos($session_expired_location, 'webmail.php') === FALSE ) {
- $redirect_url = $location.'/webmail.php?right_frame='.urldecode($session_expired_location);
+ if ( strpos($session_expired_location, 'compose.php') !== FALSE ) {
+ $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
+ if ($compose_new_win) {
+ // do not prefix $location here because $session_expired_location is set to PHP_SELF
+ // of the last page
+ $redirect_url = $session_expired_location;
+ } else {
+ $redirect_url = $location.'/webmail.php?right_frame='.urldecode($session_expired_location);
+ }