projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix cust_main-require_address2 vs cust_location, RT#41184
[freeside.git]
/
FS
/
FS
/
UID.pm
diff --git
a/FS/FS/UID.pm
b/FS/FS/UID.pm
index
4ea2ecd
..
50a9178
100644
(file)
--- a/
FS/FS/UID.pm
+++ b/
FS/FS/UID.pm
@@
-1,23
+1,21
@@
package FS::UID;
package FS::UID;
+use base qw( Exporter );
use strict;
use vars qw(
use strict;
use vars qw(
- @
ISA @
EXPORT_OK $DEBUG $me $cgi $freeside_uid $conf_dir $cache_dir
+ @EXPORT_OK $DEBUG $me $cgi $freeside_uid $conf_dir $cache_dir
$secrets $datasrc $db_user $db_pass $schema $dbh $driver_name
$secrets $datasrc $db_user $db_pass $schema $dbh $driver_name
- $AutoCommit %callback @callback $callback_hack
$use_confcompat
+ $AutoCommit %callback @callback $callback_hack
);
use subs qw( getsecrets );
);
use subs qw( getsecrets );
-use Exporter;
use Carp qw( carp croak cluck confess );
use DBI;
use IO::File;
use FS::CurrentUser;
use Carp qw( carp croak cluck confess );
use DBI;
use IO::File;
use FS::CurrentUser;
-@ISA = qw(Exporter);
@EXPORT_OK = qw( checkeuid checkruid cgi setcgi adminsuidsetup forksuidsetup
@EXPORT_OK = qw( checkeuid checkruid cgi setcgi adminsuidsetup forksuidsetup
- preuser_setup
+ preuser_setup
load_schema
getotaker dbh datasrc getsecrets driver_name myconnect
getotaker dbh datasrc getsecrets driver_name myconnect
- use_confcompat
);
$DEBUG = 0;
);
$DEBUG = 0;
@@
-29,7
+27,6
@@
$conf_dir = "%%%FREESIDE_CONF%%%";
$cache_dir = "%%%FREESIDE_CACHE%%%";
$AutoCommit = 1; #ours, not DBI
$cache_dir = "%%%FREESIDE_CACHE%%%";
$AutoCommit = 1; #ours, not DBI
-$use_confcompat = 1;
$callback_hack = 0;
=head1 NAME
$callback_hack = 0;
=head1 NAME
@@
-116,6
+113,14
@@
sub env_setup {
}
}
+sub load_schema {
+ warn "$me loading schema\n" if $DEBUG;
+ getsecrets() unless $datasrc;
+ use FS::Schema qw(reload_dbdef dbdef);
+ reload_dbdef("$conf_dir/dbdef.$datasrc")
+ unless $FS::Schema::setup_hack;
+}
+
sub db_setup {
croak "Not running uid freeside (\$>=$>, \$<=$<)\n" unless checkeuid();
sub db_setup {
croak "Not running uid freeside (\$>=$>, \$<=$<)\n" unless checkeuid();
@@
-124,27
+129,17
@@
sub db_setup {
warn "$me forksuidsetup connected to database with handle $dbh\n" if $DEBUG;
warn "$me forksuidsetup connected to database with handle $dbh\n" if $DEBUG;
- warn "$me forksuidsetup loading schema\n" if $DEBUG;
- use FS::Schema qw(reload_dbdef dbdef);
- reload_dbdef("$conf_dir/dbdef.$datasrc")
- unless $FS::Schema::setup_hack;
+ load_schema();
warn "$me forksuidsetup deciding upon config system to use\n" if $DEBUG;
warn "$me forksuidsetup deciding upon config system to use\n" if $DEBUG;
-
if ( ! $FS::Schema::setup_hack && dbdef->table('conf')
) {
+
unless ( $FS::Schema::setup_hack
) {
+ #how necessary is this now that we're no longer possibly a pre-1.9 db?
my $sth = $dbh->prepare("SELECT COUNT(*) FROM conf") or die $dbh->errstr;
$sth->execute or die $sth->errstr;
my $sth = $dbh->prepare("SELECT COUNT(*) FROM conf") or die $dbh->errstr;
$sth->execute or die $sth->errstr;
- my $confcount = $sth->fetchrow_arrayref->[0];
-
- if ($confcount) {
- $use_confcompat = 0;
- }else{
- die "NO CONFIGURATION RECORDS FOUND";
- }
+ $sth->fetchrow_arrayref->[0] or die "NO CONFIGURATION RECORDS FOUND";
- } else {
- die "NO CONFIGURATION TABLE FOUND" unless $FS::Schema::setup_hack;
}
}
@@
-319,16
+314,6
@@
sub getsecrets {
($datasrc, $db_user, $db_pass);
}
($datasrc, $db_user, $db_pass);
}
-=item use_confcompat
-
-Returns true whenever we should use 1.7 configuration compatibility.
-
-=cut
-
-sub use_confcompat {
- $use_confcompat;
-}
-
=back
=head1 CALLBACKS
=back
=head1 CALLBACKS