Config.pm (interchange-5.8.2) | : | Config.pm (interchange-5.10.0) | ||
---|---|---|---|---|
skipping to change at line 47 | skipping to change at line 47 | |||
@Locale_directives_ary @Locale_directives_scalar | @Locale_directives_ary @Locale_directives_scalar | |||
@Locale_directives_code %tagCanon | @Locale_directives_code %tagCanon | |||
%ContainerSave %ContainerTrigger %ContainerSpecial %Conta inerType | %ContainerSave %ContainerTrigger %ContainerSpecial %Conta inerType | |||
%Default | %Default | |||
%Dispatch_code %Dispatch_priority | %Dispatch_code %Dispatch_priority | |||
%Cleanup_code %Cleanup_priority | %Cleanup_code %Cleanup_priority | |||
@Locale_directives_currency @Locale_keys_currency | @Locale_directives_currency @Locale_keys_currency | |||
$GlobalRead $SystemCodeDone $SystemGroupsDone $CodeDest | $GlobalRead $SystemCodeDone $SystemGroupsDone $CodeDest | |||
$SystemReposDone $ReposDest @include | $SystemReposDone $ReposDest @include | |||
); | ); | |||
use Config; | ||||
use Vend::Safe; | use Vend::Safe; | |||
use Fcntl; | use Fcntl; | |||
use Vend::Parse; | use Vend::Parse; | |||
use Vend::Util; | use Vend::Util; | |||
use Vend::File; | use Vend::File; | |||
use Vend::Data; | use Vend::Data; | |||
use Vend::Cron; | use Vend::Cron; | |||
use Vend::CharSet (); | use Vend::CharSet (); | |||
$VERSION = '2.248'; | $VERSION = '2.248'; | |||
skipping to change at line 173 | skipping to change at line 174 | |||
# | # | |||
@Locale_directives_code = ( | @Locale_directives_code = ( | |||
[ 'ProductFiles', \&Vend::Data::update_productbase ], | [ 'ProductFiles', \&Vend::Data::update_productbase ], | |||
); | ); | |||
my %HashDefaultBlank = (qw( | my %HashDefaultBlank = (qw( | |||
SOAP 1 | SOAP 1 | |||
Mail 1 | Mail 1 | |||
Accounting 1 | Accounting 1 | |||
Levy 1 | Levy 1 | |||
QueryCache 1 | ||||
)); | )); | |||
my %DumpSource = (qw( | my %DumpSource = (qw( | |||
SpecialPage 1 | SpecialPage 1 | |||
GlobalSub 1 | GlobalSub 1 | |||
)); | )); | |||
my %DontDump = (qw( | my %DontDump = (qw( | |||
GlobalSub 1 | GlobalSub 1 | |||
SpecialPage 1 | SpecialPage 1 | |||
skipping to change at line 515 | skipping to change at line 517 | |||
['ErrorFile', 'root_dir', undef], | ['ErrorFile', 'root_dir', undef], | |||
['SysLog', 'hash', undef], | ['SysLog', 'hash', undef], | |||
['Logging', 'integer', 0], | ['Logging', 'integer', 0], | |||
['CheckHTML', undef, ''], | ['CheckHTML', undef, ''], | |||
['UrlSepChar', 'url_sep_char', '&'], | ['UrlSepChar', 'url_sep_char', '&'], | |||
['Variable', 'variable', ''], | ['Variable', 'variable', ''], | |||
['Profiles', 'profile', ''], | ['Profiles', 'profile', ''], | |||
['Catalog', 'catalog', ''], | ['Catalog', 'catalog', ''], | |||
['SubCatalog', 'catalog', ''], | ['SubCatalog', 'catalog', ''], | |||
['AutoVariable', 'autovar', 'UrlJoiner'], | ['AutoVariable', 'autovar', 'UrlJoiner'], | |||
['EnableJSONPost', 'yesno', 'No'], | ||||
['UnpackJSON', 'yesno', 'Yes'], | ||||
['XHTML', 'yesno', 'No'], | ['XHTML', 'yesno', 'No'], | |||
['UTF8', 'yesno', $ENV{MINIVEND_DI SABLE_UTF8} ? 'No' : 'Yes'], | ['UTF8', 'yesno', $ENV{MINIVEND_DI SABLE_UTF8} ? 'No' : 'Yes'], | |||
['External', 'yesno', 'No'], | ['External', 'yesno', 'No'], | |||
['ExternalFile', 'root_dir', "$Global::RunDir/external.st ructure"], | ['ExternalFile', 'root_dir', "$Global::RunDir/external.st ructure"], | |||
['ExternalExport', undef, 'Global::Catalog =Catalog'], | ['ExternalExport', undef, 'Global::Catalog =Catalog'], | |||
['DowncaseVarname', undef, ''], | ['DowncaseVarname', undef, ''], | |||
]; | ]; | |||
return $directives; | return $directives; | |||
} | } | |||
skipping to change at line 720 | skipping to change at line 724 | |||
['External', 'yesno', 'No'], | ['External', 'yesno', 'No'], | |||
['ExternalExport', undef, join " ", @External_dire ctives], | ['ExternalExport', undef, join " ", @External_dire ctives], | |||
['CartTrigger', 'routine_array', ''], | ['CartTrigger', 'routine_array', ''], | |||
['CartTriggerQuantity', 'yesno', 'no'], | ['CartTriggerQuantity', 'yesno', 'no'], | |||
['UserTrack', 'yesno', 'no'], | ['UserTrack', 'yesno', 'no'], | |||
['DebugHost', 'ip_address_regexp', ''], | ['DebugHost', 'ip_address_regexp', ''], | |||
['BounceReferrals', 'yesno', 'no'], | ['BounceReferrals', 'yesno', 'no'], | |||
['BounceReferralsRobot', 'yesno', 'no'], | ['BounceReferralsRobot', 'yesno', 'no'], | |||
['BounceRobotSessionURL', 'yesno', 'no'], | ['BounceRobotSessionURL', 'yesno', 'no'], | |||
['OrderCleanup', 'routine_array', ''], | ['OrderCleanup', 'routine_array', ''], | |||
['QueryCache', 'hash', ''], | ||||
['SessionCookieSecure', 'yesno', 'no'], | ['SessionCookieSecure', 'yesno', 'no'], | |||
['SessionHashLength', 'integer', 1], | ['SessionHashLength', 'integer', 1], | |||
['SessionHashLevels', 'integer', 2], | ['SessionHashLevels', 'integer', 2], | |||
['SourcePriority', 'array_complete', 'mv_pc mv_source'], | ['SourcePriority', 'array_complete', 'mv_pc mv_source'], | |||
['SourceCookie', sub { &parse_ordered_attributes(@_, [qw(name expire doma in path secure)]) }, '' ], | ['SourceCookie', sub { &parse_ordered_attributes(@_, [qw(name expire doma in path secure)]) }, '' ], | |||
['SuppressCachedCookies', 'yesno', 'no'], | ['SuppressCachedCookies', 'yesno', 'no'], | |||
['OutputCookieHook', undef, ''], | ['OutputCookieHook', undef, ''], | |||
]; | ]; | |||
skipping to change at line 2774 | skipping to change at line 2779 | |||
$testsub = sub { | $testsub = sub { | |||
my $module = shift; | my $module = shift; | |||
my $oldtype = ''; | my $oldtype = ''; | |||
if($module =~ s/\.pl$//) { | if($module =~ s/\.pl$//) { | |||
$oldtype = '.pl'; | $oldtype = '.pl'; | |||
} | } | |||
$module =~ /[^\w:]/ and return undef; | $module =~ /[^\w:]/ and return undef; | |||
if($perlglobal) { | if($perlglobal) { | |||
if ($pathinfo) { | if ($pathinfo) { | |||
unshift(@INC, $pathinfo); | unshift(@INC, $pathinfo); | |||
unshift(@INC, "$pathinfo/$Config{archname }"); | ||||
} | } | |||
eval "require $module$oldtype;"; | eval "require $module$oldtype;"; | |||
my $error = $@; | my $error = $@; | |||
if ($pathinfo) { | if ($pathinfo) { | |||
shift(@INC); | shift(@INC); | |||
shift(@INC); | ||||
} | } | |||
::logGlobal("while eval'ing module %s got [%s]\n" , $module, $error) if $error; | ::logGlobal("while eval'ing module %s got [%s]\n" , $module, $error) if $error; | |||
return ! $error; | return ! $error; | |||
} | } | |||
else { | else { | |||
# Since we aren't safe to actually require, we wi ll | # Since we aren't safe to actually require, we wi ll | |||
# just look for a readable module file | # just look for a readable module file | |||
$module =~ s!::!/!g; | $module =~ s!::!/!g; | |||
$oldtype = '.pm' if ! $oldtype; | $oldtype = '.pm' if ! $oldtype; | |||
my $found; | my $found; | |||
skipping to change at line 3585 | skipping to change at line 3592 | |||
push @Dispatches, 'Locale'; | push @Dispatches, 'Locale'; | |||
return 1; | return 1; | |||
}, | }, | |||
DiscountSpacesOn => sub { | DiscountSpacesOn => sub { | |||
return 1 unless $C->{DiscountSpacesOn}; | return 1 unless $C->{DiscountSpacesOn}; | |||
push @Dispatches, 'DiscountSpaces'; | push @Dispatches, 'DiscountSpaces'; | |||
return 1; | return 1; | |||
}, | }, | |||
QueryCache => sub { | ||||
my $qc; | ||||
return 1 unless $qc = $C->{QueryCache}; | ||||
$qc->{table} ||= 'qc'; | ||||
$qc->{intro} ||= 'qc'; | ||||
$qc->{default_expire} ||= '30min'; | ||||
$qc->{default_public_expire} ||= '48hours | ||||
'; | ||||
$qc->{default_return} ||= '{}'; | ||||
return 1; | ||||
}, | ||||
CookieLogin => sub { | CookieLogin => sub { | |||
return 1 unless $C->{CookieLogin}; | return 1 unless $C->{CookieLogin}; | |||
push @Dispatches, 'CookieLogin'; | push @Dispatches, 'CookieLogin'; | |||
return 1; | return 1; | |||
}, | }, | |||
ProductFiles => \&set_default_search, | ProductFiles => \&set_default_search, | |||
VendRoot => sub { | VendRoot => sub { | |||
my $cat_template_dirs = $C->{TemplateDir} || []; | my $cat_template_dirs = $C->{TemplateDir} || []; | |||
if ($Global::NoAbsolute) { | if ($Global::NoAbsolute) { | |||
for (@$cat_template_dirs) { | for (@$cat_template_dirs) { | |||
End of changes. 7 change blocks. | ||||
0 lines changed or deleted | 18 lines changed or added |