X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUID.pm;h=50a9178951315c20fd44838a1ec4fefb9a3ab13a;hp=9c52f08834e995f8eef285f9dcdbf0b91ebd4e64;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=9d35792778885932c09102bd011b518eb47c5131

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 9c52f0883..50a917895 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -1,23 +1,21 @@
 package FS::UID;
+use base qw( Exporter );
 
 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
-  $AutoCommit %callback @callback $callback_hack $use_confcompat
+  $AutoCommit %callback @callback $callback_hack
 );
 use subs qw( getsecrets );
-use Exporter;
 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
-                 preuser_setup
+                 preuser_setup load_schema
                  getotaker dbh datasrc getsecrets driver_name myconnect
-                 use_confcompat
                );
 
 $DEBUG = 0;
@@ -29,7 +27,6 @@ $conf_dir  = "%%%FREESIDE_CONF%%%";
 $cache_dir = "%%%FREESIDE_CACHE%%%";
 
 $AutoCommit = 1; #ours, not DBI
-$use_confcompat = 1;
 $callback_hack = 0;
 
 =head1 NAME
@@ -74,7 +71,6 @@ sub adminsuidsetup {
 
 sub forksuidsetup {
   my $user = shift;
-  my $olduser = $user;
   warn "$me forksuidsetup starting for $user\n" if $DEBUG;
 
   if ( $FS::CurrentUser::upgrade_hack ) {
@@ -88,7 +84,7 @@ sub forksuidsetup {
 
   env_setup();
 
-  db_setup($olduser);
+  db_setup();
 
   callback_setup();
 
@@ -117,40 +113,33 @@ sub env_setup {
 
 }
 
-sub db_setup {
-  my $olduser = shift;
+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();
 
   warn "$me forksuidsetup connecting to database\n" if $DEBUG;
-  if ( $FS::CurrentUser::upgrade_hack && $olduser ) {
-    $dbh = &myconnect($olduser);
-  } else {
-    $dbh = &myconnect();
-  }
+  $dbh = &myconnect();
+
   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;
 
-  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 $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;
   }
 
 
@@ -182,6 +171,8 @@ sub myconnect {
                            )
     or die "DBI->connect error: $DBI::errstr\n";
 
+  $FS::Conf::conf_cache = undef;
+
   if ( $schema ) {
     use DBIx::DBSchema::_util qw(_load_driver ); #quelle hack
     my $driver = _load_driver($handle);
@@ -323,16 +314,6 @@ sub getsecrets {
   ($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