Permalink
Browse files

This commit was manufactured by cvs2svn to create tag 'REL_4_6_5'.

  • Loading branch information...
2 parents a1cff99 + e79843e commit 2ed1fd2a24e94875004df07e920430db01e49031 cvs2svn committed Jul 2, 2001
@@ -61,7 +61,7 @@ orderline::status combo pending=Pending, shipped=Shipped, backorder=Back o
pricing::price_group combo pricing Discount group price_group nullselect
products text sku,description,category,price
products::artist text 30 Artist
-products::category combo products Category Enter in box for new category. category nullselect
+products::category combo products Category Enter in box for new category. category nullsellect
products::color textarea 50 5
products::comment textarea 70 8 Long Description
products::description text 60 Short Description
@@ -96,7 +96,7 @@ pricing::price_group combo pricing Discount group price_group nullselect
pricing::q3 text
pricing text 2
products::artist text 30 Artist
-products::category combo 20 1 products Category Enter in box for new category. category nullselect nullselect
+products::category combo 20 1 products Category Enter in box for new category. category nullselect nullsellect
products::color textarea 70 2
products::comment__MVC_FIELDMUNGE__ textarea 70 8 Long Description
products::description text 60 Short Description
@@ -80,7 +80,7 @@ code country state name
UK GLOUS Gloucestershire
UK GRAMP Grampian
UK GWYNED Gwynedd
- UK HANTS Hampshire
+ UK HANTS Hampshire
UK HERWOR Herefordshire & Worcestershire
UK HERTS Hertfordshire
UK HIGHL Highland
@@ -120,36 +120,36 @@ code country state name
EI CO FERMANAgh County Fermanagh
EI CO DERRY County Londonderry
EI CO TYRONE County Tyrone
- US AA Military Americas
+ US AA Military Americas
US AE Military Europe/ME/Canada
- US AP Military Pacific
- US AK Alaska
- US AL Alabama
- US AR Arkansas
- US AS American Samoa
- US AZ Arizona
- US CA California
- US CO Colorado
- US CT Connecticut
+ US AP Military Pacific
+ US AK Alaska
+ US AL Alabama
+ US AR Arkansas
+ US AS American Samoa
+ US AZ Arizona
+ US CA California
+ US CO Colorado
+ US CT Connecticut
US DC D.C.
- US DE Delaware
- US FL Florida
- US FM Micronesia
- US GA Georgia
- US GU Guam
- US HI Hawaii
- US IA Iowa
- US ID Idaho
- US IL Illinois
- US IN Indiana
- US KS Kansas
- US KY Kentucky
- US LA Louisiana
- US MA Massachusetts
- US MD Maryland
- US ME Maine
- US MH Marshall Islands
- US MI Michigan
+ US DE Delaware
+ US FL Florida
+ US FM Micronesia
+ US GA Georgia
+ US GU Guam
+ US HI Hawaii
+ US IA Iowa
+ US ID Idaho
+ US IL Illinois
+ US IN Indiana
+ US KS Kansas
+ US KY Kentucky
+ US LA Louisiana
+ US MA Massachusetts
+ US MD Maryland
+ US ME Maine
+ US MH Marshall Islands
+ US MI Michigan
US MN Minnesota
US MO Missouri
US MP Marianas
@@ -180,5 +180,4 @@ code country state name
US VT Vermont
US WA Washington
US WI Wisconsin
- US WV West Virginia
US WY Wyoming
View
@@ -23,7 +23,7 @@ my($order, $label, %terms) = @_;
package UI::Primitive;
-$VERSION = substr(q$Revision: 1.27 $, 10);
+$VERSION = substr(q$Revision: 1.26 $, 10);
$DEBUG = 0;
use vars qw!
@@ -163,9 +163,9 @@ sub ui_acl_enabled {
my $try = shift;
my $table;
$Global::SuperUserFunction = \&is_super;
- my $default = defined $Global::Variable->{UI_SECURITY_OVERRIDE}
- ? $Global::Variable->{UI_SECURITY_OVERRIDE}
- : 0;
+ my $default = defined $Global::Variable->{UI_ACL}
+ ? (! $Global::Variable->{UI_ACL})
+ : 1;
$table = $::Variable->{UI_ACCESS_TABLE} || 'access';
$Vend::WriteDatabase{$table} = 1;
my $db = Vend::Data::database_exists_ref($table);
@@ -62,7 +62,7 @@ pricing text 2
pricing::price_group combo pricing Discount group price_group nullselect
products text sku,description,category,price
products::artist text 30 Artist
-products::category combo products Category Enter in box for new category. category nullselect
+products::category combo products Category Enter in box for new category. category nullsellect
products::color textarea 50 5
products::comment textarea 70 8 Long Description
products::description text 60 Short Description
@@ -122,7 +122,7 @@ userdb::b_city text 40 Billing City
variable::Variable::CREDIT_CARDS_ACCEPTED checkbox visa=Visa, mc=Mastercard, discover=Discover, amex=American Express null_to_space
userdb::zip text 10 Postcode uc word
dbconfig::mv_metadata::height text 4 Select page rows Number of rows to display at selector page. digits
-products::category combo products Category Enter in box for new category. category nullselect
+products::category combo products Category Enter in box for new category. category nullsellect
custview::userdb::email_copy display =No, 1=Yes Payment method
userdb::state text 10 State
custview::userdb::dealer display =No,1=Yes Dealer
View
@@ -1,6 +1,6 @@
# Vend/Scan.pm: Prepare searches for Interchange
#
-# $Id: Scan.pm,v 1.9 2001-06-07 16:30:52 jason Exp $
+# $Id: Scan.pm,v 1.8 2000-12-02 19:49:10 heins Exp $
#
# Copyright (C) 1996-2000 Akopia, Inc. <info@akopia.com>
#
@@ -29,7 +29,7 @@ require Exporter;
perform_search
);
-$VERSION = substr(q$Revision: 1.9 $, 10);
+$VERSION = substr(q$Revision: 1.8 $, 10);
use strict;
use Vend::Util;
@@ -569,7 +569,7 @@ sub sql_statement {
}
die "SQL is not enabled for Interchange. Get the SQL::Statement module.\n"
- unless defined &SQL::Statement::new;
+ unless $INC{'SQL/Statement.pm'};
my $parser = SQL::Parser->new('Ansi');
View
@@ -1,6 +1,6 @@
# Table/Common.pm: Common access methods for Interchange Databases
#
-# $Id: Common.pm,v 1.17 2001-06-07 16:31:39 jason Exp $
+# $Id: Common.pm,v 1.16 2000-11-03 04:41:10 heins Exp $
#
# Copyright (C) 1996-2000 Akopia, Inc. <info@akopia.com>
#
@@ -25,7 +25,7 @@
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA.
-$VERSION = substr(q$Revision: 1.17 $, 10);
+$VERSION = substr(q$Revision: 1.16 $, 10);
use strict;
package Vend::Table::Common;
@@ -566,11 +566,7 @@ sub query {
($spec, $stmt) = Vend::Scan::sql_statement($query, $ref);
};
if(! CORE::ref $spec) {
- if($@) {
- ::logError("Bad SQL, error was: $@, query was: $query");
- } else {
- ::logError("Bad SQL, query was: $query");
- }
+ ::logError("Bad SQL, query was: $query");
return ($opt->{failure} || undef);
}
my @additions = grep length($_) == 2, keys %$opt;
View
@@ -1,14 +1,14 @@
#!/usr/bin/perl
#
-# $Id: UserDB.pm,v 1.18 2001-05-18 17:55:48 jon Exp $
+# $Id: UserDB.pm,v 1.17 2001-03-22 22:49:49 jon Exp $
#
# Copyright (C) 1996-2000 Akopia, Inc. <info@akopia.com>
#
# **** ALL RIGHTS RESERVED ****
package Vend::UserDB;
-$VERSION = substr(q$Revision: 1.18 $, 10);
+$VERSION = substr(q$Revision: 1.17 $, 10);
use vars qw! $VERSION @S_FIELDS @B_FIELDS @P_FIELDS @I_FIELDS %S_to_B %B_to_S!;
@@ -1116,7 +1116,7 @@ sub new_account {
if $self->{OPTIONS}{ignore_case};
}
die "Must have longer username.\n" unless length($self->{USERNAME}) > 1;
- die "Can't have '$self->{USERNAME}' as username, unsafe characters.\n"
+ die "Can't have '$1' as username, unsafe characters.\n"
if $self->{USERNAME} !~ m{^$GOOD_CHARS+$};
#::logDebug("new_account username: '$self->{USERNAME}'");
if ($self->{DB}->record_exists($self->{USERNAME})) {

0 comments on commit 2ed1fd2

Please sign in to comment.