Index: interchange/lib/Vend/Page.pm
===================================================================
RCS file: /home/rsicdev/CVSRepository/interchange/lib/Vend/Page.pm,v
retrieving revision 1.1
retrieving revision 1.3
diff -c -r1.1 -r1.3
*** interchange/lib/Vend/Page.pm	24 Aug 2013 23:46:49 -0000	1.1
--- interchange/lib/Vend/Page.pm	14 Nov 2013 17:18:17 -0000	1.3
***************
*** 1,6 ****
  # Vend::Page - Handle Interchange page routing
  # 
! # $Id: Page.pm,v 1.1 2013/08/24 23:46:49 rsicdev Exp $
  #
  # Copyright (C) 2002-2008 Interchange Development Group
  # Copyright (C) 1996-2002 Red Hat, Inc.
--- 1,6 ----
  # Vend::Page - Handle Interchange page routing
  # 
! # $Id: Page.pm,v 1.3 2013/11/14 17:18:17 rsicdev Exp $
  #
  # Copyright (C) 2002-2008 Interchange Development Group
  # Copyright (C) 1996-2002 Red Hat, Inc.
***************
*** 46,52 ****
  
  use vars qw/$VERSION/;
  
! $VERSION = substr(q$Revision: 1.1 $, 10);
  
  my $wantref = 1;
  
--- 46,52 ----
  
  use vars qw/$VERSION/;
  
! $VERSION = substr(q$Revision: 1.3 $, 10);
  
  my $wantref = 1;
  
***************
*** 105,111 ****
  	if($Vend::Cfg->{ExtraSecure} and
  		$Vend::Cfg->{AlwaysSecure}->{$name}
  		and !$CGI::secure) {
! 		$name = find_special_page('violation');
  	}
  
  	$page = $Vend::VirtualPage || readin($name);
--- 105,148 ----
  	if($Vend::Cfg->{ExtraSecure} and
  		$Vend::Cfg->{AlwaysSecure}->{$name}
  		and !$CGI::secure) {
! 		# 2013-10-25 AxR - When ExtraSecure page is requested
! 		# using non-secure mode, send 301 redirect to use
! 		# the secure mode. Code taken from BounceReferrals code
! 		# in Vend::Dispatch as suggested by Tom Burton and
! 		# Jon Jensen interchange-users December 2009 051506
! 		::logGlobal(
! 		    "ExtraSecure page '%s' called by '%s'",
! 		    $name,
! 		    $CGI::referer,
! 		);
! 		my $path = $CGI::path_info;
! 		$path =~ s:^/::;
! 		my $form =
! 		    join '',
! 			map { "$_=$CGI::values{$_}\n" }
! 			    grep { !$Vend::Cfg->{BounceReferrals_hide}->{$_} }
! 				sort keys %CGI::values;
! 		my $url = secure_vendUrl(
! 		    $path eq '' ? $Vend::Cfg->{DirectoryIndex} : $path,
! 		    undef,
! 		    undef,
! 		    { form => $form, match_security => 1 }
! 		);
! 		$url = header_data_scrub($url);
! 		my $msg = ::get_locale_message(
! 		    301,
! 		    "Redirected to %s.",
! 		    $url,
! 		);
! 		$Vend::StatusLine = <<EOF;
! Status: 301 Moved
! Location: $url
! Content-Type: text/plain
! 
! Redirecting to $url
! EOF
! 		::response($msg);
! 		return;
  	}
  
  	$page = $Vend::VirtualPage || readin($name);