External.pm (interchange-5.8.2) | : | External.pm (interchange-5.10.0) | ||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
use strict; | use strict; | |||
BEGIN { | BEGIN { | |||
if($ENV{EXT_INTERCHANGE_DIR}) { | if($ENV{EXT_INTERCHANGE_DIR}) { | |||
$Global::VendRoot = $ENV{EXT_INTERCHANGE_DIR}; | $Global::VendRoot = $ENV{EXT_INTERCHANGE_DIR}; | |||
if(-f "$Global::VendRoot/_session_storable") { | if(-f "$Global::VendRoot/_session_storable") { | |||
$ENV{MINIVEND_STORABLE} = 1; | $ENV{MINIVEND_STORABLE} = 1; | |||
} | } | |||
} | } | |||
else { | ||||
die "Cannot proceed: EXT_INTERCHANGE_DIR environment variable is | ||||
not defined.\n"; | ||||
} | ||||
} | } | |||
use Vend::Util; | use Vend::Util; | |||
use Vend::Session; | use Vend::Session; | |||
use Vend::Cart; | use Vend::Cart; | |||
use Cwd; | use Cwd; | |||
require Data::Dumper; | require Data::Dumper; | |||
BEGIN { | BEGIN { | |||
if($ENV{EXT_INTERCHANGE_DIR}) { | if($ENV{EXT_INTERCHANGE_DIR}) { | |||
skipping to change at line 82 | skipping to change at line 85 | |||
1; | 1; | |||
package main; | package main; | |||
BEGIN { | BEGIN { | |||
if($ENV{EXT_INTERCHANGE_DIR}) { | if($ENV{EXT_INTERCHANGE_DIR}) { | |||
sub logDebug { | sub logDebug { | |||
warn caller() . ':external_debug: ', Vend::Util::errmsg(@ _), "\n"; | warn caller() . ':external_debug: ', Vend::Util::errmsg(@ _), "\n"; | |||
} | } | |||
sub logError { | ||||
die caller() . ':external_error: ', Vend::Util::errmsg(@_ | ||||
), "\n"; | ||||
} | ||||
sub catalog { | sub catalog { | |||
my $cat = shift or return $Vend::Cat; | my $cat = shift or return $Vend::Cat; | |||
$Vend::Cat = $cat; | $Vend::Cat = $cat; | |||
} | } | |||
sub session { | sub session { | |||
my $id = shift; | my $id = shift; | |||
$Vend::Cat ||= $ENV{EXT_INTERCHANGE_CATALOG} | $Vend::Cat ||= $ENV{EXT_INTERCHANGE_CATALOG} | |||
or die "No Interchange catalog specified\n"; | or die "No Interchange catalog specified\n"; | |||
$Vend::Cfg = $Vend::Global->{Catalogs}{$Vend::Cat}{extern al_config} | $Vend::Cfg = $Vend::Global->{Catalogs}{$Vend::Cat}{extern al_config} | |||
or die "Catalog $Vend::Cat not found.\n"; | or die "Catalog $Vend::Cat not found.\n"; | |||
$CGI::remote_addr = $ENV{REMOTE_ADDR}; | $CGI::remote_addr = $ENV{REMOTE_ADDR} || '127.0.0.1'; | |||
if($id =~ /^(\w+):/) { | if($id =~ /^(\w+):/) { | |||
$Vend::SessionID = $1; | $Vend::SessionID = $1; | |||
$Vend::SessionName = $id; | $Vend::SessionName = $id; | |||
} | } | |||
else { | else { | |||
$Vend::SessionID = $id; | $Vend::SessionID = $id; | |||
$Vend::SessionName = "${id}:$CGI::remote_addr"; | $Vend::SessionName = "${id}:$CGI::remote_addr"; | |||
} | } | |||
Vend::Session::get_session(); | Vend::Session::get_session(); | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 10 lines changed or added |