import rt 3.4.6

8 files changed, 183 insertions, 325 deletions

diff --git a/rt/sbin/extract-message-catalog b/rt/sbin/extract-message-catalog
index 34d44ed..3552afb 100644
--- a/rt/sbin/extract-message-catalog
+++ b/rt/sbin/extract-message-catalog
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -23,9 +23,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/sbin/extract_pod_tests b/rt/sbin/extract_pod_tests
index 616560b..4d9d7bd 100644
--- a/rt/sbin/extract_pod_tests
+++ b/rt/sbin/extract_pod_tests
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -23,9 +23,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/sbin/factory b/rt/sbin/factory
index f72a296..743d8b9 100644
--- a/rt/sbin/factory
+++ b/rt/sbin/factory
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -23,9 +23,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/sbin/license_tag b/rt/sbin/license_tag
index ed1d4eb..906d349 100644
--- a/rt/sbin/license_tag
+++ b/rt/sbin/license_tag
@@ -5,7 +5,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -25,9 +25,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
@@ -52,7 +50,7 @@ my $LICENSE  = <<'EOL';
 
 COPYRIGHT:
  
-This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
                                          <jesse@bestpractical.com>
 
 (Except where explicitly superseded by other copyright notices)
@@ -72,9 +70,7 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 or visit their web page on the internet at
-http://www.gnu.org/copyleft/gpl.html.
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
 CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/sbin/regression_harness b/rt/sbin/regression_harness
index 1e97a29..d98e462 100644
--- a/rt/sbin/regression_harness
+++ b/rt/sbin/regression_harness
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -23,9 +23,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/sbin/rt-dump-database.in b/rt/sbin/rt-dump-database.in
index 734e00b..bcc7bb7 100755
--- a/rt/sbin/rt-dump-database.in
+++ b/rt/sbin/rt-dump-database.in
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -23,9 +23,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
@@ -47,10 +45,7 @@
 # 
 # END BPS TAGGED BLOCK }}}
 use strict;
-
-use lib "@LOCAL_LIB_PATH@";
 use lib "@RT_LIB_PATH@";
-
 use RT;
 use XML::Simple;
 
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index a20a73e..514ec89 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -23,9 +23,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
@@ -49,9 +47,8 @@
 use strict;
 use vars qw($PROMPT $VERSION $Handle $Nobody $SystemUser $item);
 use vars
-  qw(@Groups @Users @ACL @Queues @ScripActions @ScripConditions @Templates @CustomFields @Scrips @Attributes);
+  qw(@Groups @Users @ACL @Queues @ScripActions @ScripConditions @Templates @CustomFields @Scrips);
 
-use lib "@LOCAL_LIB_PATH@";
 use lib "@RT_LIB_PATH@";
 
 #This drags in  RT's config.pm
@@ -84,11 +81,6 @@ GetOptions(
     'datadir=s'
 );
 
-unless ( $args{'action'} ) {
-    help();
-    exit(-1);
-}
-
 $| = 1;    #unbuffer that output.
 
 require RT::Handle;
@@ -101,50 +93,56 @@ if ( $args{'prompt-for-dba-password'} ) {
     chomp( $args{'dba-password'} );
 }
 
+unless ( $args{'action'} ) {
+    help();
+    die;
+}
 if ( $args{'action'} eq 'init' ) {
     $dbh = DBI->connect( get_system_dsn(), $args{'dba'}, $args{'dba-password'} )
       || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
     print "Now creating a database for RT.\n";
-    if ( $RT::DatabaseType ne 'Oracle' || $args{'dba'} ne $RT::DatabaseUser ) {
-        create_db();
+    if ($RT::DatabaseType ne 'Oracle' ||
+        $args{'dba'} ne $RT::DatabaseUser) {
+    create_db();
     } else {
         print "...skipped as ".$args{'dba'} ." is not " . $RT::DatabaseUser . " or we're working with Oracle.\n";
     }
 
-    if ( $RT::DatabaseType eq "mysql" ) {
+    if ($RT::DatabaseType eq "mysql") {
         # Check which version we're running
         my ($version) = $dbh->selectrow_hashref("show variables like 'version'")->{Value} =~ /^(\d\.\d+)/;
         print "*** Warning: RT is unsupported on MySQL versions before 4.0.x\n" if $version < 4;
 
         # MySQL must have InnoDB support
         my $innodb = $dbh->selectrow_hashref("show variables like 'have_innodb'")->{Value};
-        if ( $innodb eq "NO" ) {
+        if ($innodb eq "NO") {
             die "RT requires that MySQL be compiled with InnoDB table support.\n".
               "See http://dev.mysql.com/doc/mysql/en/InnoDB.html\n";
-        } elsif ( $innodb eq "DISABLED" ) {
+        } elsif ($innodb eq "DISABLED") {
             die "RT requires that MySQL InnoDB table support be enabled.\n".
               ($version < 4
                ? "Add 'innodb_data_file_path=ibdata1:10M:autoextend' to the [mysqld] section of my.cnf\n"
                : "Remove the 'skip-innodb' line from your my.cnf file, restart MySQL, and try again.\n");
         }
     }
-
+    
     # SQLite can't deal with the disconnect/reconnect
-    unless ( $RT::DatabaseType eq 'SQLite' ) {
+    unless ($RT::DatabaseType eq 'SQLite') {
 
         $dbh->disconnect;
 
-        if ( $RT::DatabaseType eq "Oracle" ) {
-            $RT::DatabasePassword = $RT::DatabasePassword; #Warning avidance
-            $dbh = DBI->connect( $Handle->DSN, ${RT::DatabaseUser}, ${RT::DatabasePassword} ) || die $DBI::errstr;
-        } else {	
-            $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} ) || die $DBI::errstr;
-        }
+	if ($RT::DatabaseType eq "Oracle") {
+        $RT::DatabasePassword = $RT::DatabasePassword; #Warning avidance
+        $dbh = DBI->connect( $Handle->DSN, ${RT::DatabaseUser}, ${RT::DatabasePassword} ) || die $DBI::errstr;
+	} else {
+	
+        $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} ) || die $DBI::errstr;
+	}
     }
     print "Now populating database schema.\n";
     insert_schema();
     print "Now inserting database ACLs\n";
-    insert_acl() unless $RT::DatabaseType eq 'Oracle';
+    insert_acl() unless ($RT::DatabaseType eq 'Oracle');
     print "Now inserting RT core system objects\n";
     insert_initial_data();
     print "Now inserting RT data\n";
@@ -152,52 +150,47 @@ if ( $args{'action'} eq 'init' ) {
 }
 elsif ( $args{'action'} eq 'drop' ) {
     unless ( $dbh =
-        DBI->connect( get_system_dsn(), $args{'dba'}, $args{'dba-password'} ) )
+         DBI->connect( get_system_dsn(), $args{'dba'}, $args{'dba-password'} ) )
     {
         warn $DBI::errstr;
         warn "Database doesn't appear to exist. Aborting database drop.";
-        exit;
+        exit(0);
     }
     drop_db();
 }
 elsif ( $args{'action'} eq 'insert' ) {
-    insert_data( $args{'datafile'} || ($args{'datadir'}."/content") );
+    insert_data( $args{'datafile'} || ($args{'datadir'}."/content"));
 }
-elsif ( $args{'action'} eq 'acl' ) {
+elsif ($args{'action'} eq 'acl') {
     $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} )
       || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
-    insert_acl($args{'datadir'});
+     insert_acl($args{'datadir'});
 }
-elsif ( $args{'action'} eq 'schema' ) {
+elsif ($args{'action'} eq 'schema') {
     $dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} )
       || die "Failed to connect to " . get_system_dsn() . " as $args{'dba'}: $DBI::errstr";
-    insert_schema($args{'datadir'});
+        insert_schema($args{'datadir'});
 }
+
 else {
-    print STDERR "$0 called with an invalid --action parameter\n";
+    print STDERR '$0 called with an invalid --action parameter';
     exit(-1);
 }
 
 # {{{ sub insert_schema
 sub insert_schema {
-    my $base_path = (shift || $RT::EtcPath);
+        my $base_path = (shift || $RT::EtcPath);
     my (@schema);
     print "Creating database schema.\n";
 
-    my $schema_file = $base_path . "/schema." . $RT::DatabaseType;
-    if ( -f $schema_file ) {
-        open( SCHEMA, "<$schema_file"  ) or die "Can't open $schema_file: $!";
-	my @lines = <SCHEMA>;
+    if ( -f $base_path . "/schema." . $RT::DatabaseType ) {
+	no warnings 'unopened';
 
-	my $local_schema_file = $RT::LocalEtcPath . "/schema." . $RT::DatabaseType;
-	if (-f $local_schema_file) {
-	    open( SCHEMA_LOCAL, "<$local_schema_file" )
-		or die "Can't open $local_schema_file: $!";
-	    push @lines, ';;', <SCHEMA_LOCAL>;
-	}
+        open( SCHEMA, "<" . $base_path . "/schema." . $RT::DatabaseType );
+        open( SCHEMA_LOCAL, "<" . $RT::LocalEtcPath . "/schema." . $RT::DatabaseType );
 
         my $statement = "";
-        foreach my $line (@lines) {
+        foreach my $line (<SCHEMA>, ($_ = ';;'), <SCHEMA_LOCAL>) {
             $line =~ s/\#.*//g;
             $line =~ s/--.*//g;
             $statement .= $line;
@@ -208,12 +201,11 @@ sub insert_schema {
             }
         }
 
-        local $SIG{__WARN__} = sub {};
-        my $is_local = 0; # local/etc/schema needs to be nonfatal.
+	local $SIG{__WARN__} = sub {};
+	my $is_local = 0; # local/etc/schema needs to be nonfatal. 
         $dbh->begin_work or die $dbh->errstr;
         foreach my $statement (@schema) {
-            if ( $statement =~ /^\s*;$/ ) { $is_local = 1; next; }
-
+	    if ($statement =~ /^\s*;$/) { $is_local = 1; next; }
             print STDERR "SQL: $statement\n" if defined $args{'debug'};
             my $sth = $dbh->prepare($statement) or die $dbh->errstr;
             unless ( $sth->execute or $is_local ) {
@@ -221,11 +213,13 @@ sub insert_schema {
             }
         }
         $dbh->commit or die $dbh->errstr;
+
     }
     else {
         die "Couldn't find schema file for " . $RT::DatabaseType . "\n";
     }
     print "Done setting up database schema.\n";
+
 }
 
 # }}}
@@ -235,13 +229,13 @@ sub drop_db {
     if ( $RT::DatabaseType eq 'Oracle' ) {
         print <<END;
 
-To delete the tables and sequences of the RT Oracle database by running
-    \@etc/drop.Oracle
+To delete the tables and sequences of the RT Oracle database by running 
+    \@etc/drop.Oracle 
 through SQLPlus.
 
 END
         return;
-    }
+    }	
     unless ( $args{'force'} ) {
         print <<END;
 
@@ -256,8 +250,8 @@ END
     print "Dropping $RT::DatabaseType database $RT::DatabaseName.\n";
 
     if ( $RT::DatabaseType eq 'SQLite' ) {
-        unlink $RT::DatabaseName or warn $!;
-        return;
+	unlink $RT::DatabaseName or warn $!;
+	return;
     }
     $dbh->do("Drop DATABASE $RT::DatabaseName") or warn $DBI::errstr;
 }
@@ -272,15 +266,15 @@ sub create_db {
     }
     elsif ( $RT::DatabaseType eq 'Pg' ) {
         $dbh->do("CREATE DATABASE $RT::DatabaseName WITH ENCODING='UNICODE'");
-        if ( $DBI::errstr ) {
+        if ($DBI::errstr) {
             $dbh->do("CREATE DATABASE $RT::DatabaseName") || die $DBI::errstr;
         }
     }
-    elsif ( $RT::DatabaseType eq 'Oracle' ) {
+    elsif ($RT::DatabaseType eq 'Oracle') {
         insert_acl();
     }
     elsif ( $RT::DatabaseType eq 'Informix' ) {
-        $ENV{DB_LOCALE} = 'en_us.utf8';
+	$ENV{DB_LOCALE} = 'en_us.utf8';
         $dbh->do("CREATE DATABASE $RT::DatabaseName WITH BUFFERED LOG");
     }
     else {
@@ -318,7 +312,8 @@ sub _yesno {
 
 # {{{ insert_acls
 sub insert_acl {
-    my $base_path = (shift || $RT::EtcPath);
+
+        my $base_path = (shift || $RT::EtcPath);
 
     if ( $RT::DatabaseType =~ /^oracle$/i ) {
         do $base_path . "/acl.Oracle"
@@ -380,8 +375,8 @@ sub get_system_dsn {
         $dsn =~ s/dbname=$RT::DatabaseName/dbname=template1/;
     }
     elsif ( $RT::DatabaseType eq 'Informix' ) {
-        # with Informix, you want to connect sans database:
-        $dsn =~ s/Informix:$RT::DatabaseName/Informix:/;
+	# with Informix, you want to connect sans database:
+	$dsn =~ s/Informix:$RT::DatabaseName/Informix:/;
     }
     return $dsn;
 }
@@ -420,15 +415,14 @@ sub insert_initial_data {
         Comments =>
 'Do not delete or modify this user. It is integral to RT\'s internal database structures',
         Creator => '1',
-        LastUpdatedBy => '1',
-    );
+        LastUpdatedBy => '1' );
 
-    unless ( $val ) {
+    unless ($val) {
         print "$msg\n";
-        exit(-1);
+        exit(1);
     }
     print "done.\n";
-    $RT::Handle->Disconnect() unless $RT::DatabaseType eq 'SQLite';
+    $RT::Handle->Disconnect() unless ($RT::DatabaseType eq 'SQLite');
 
 }
 
@@ -464,78 +458,77 @@ sub insert_data {
     require $datafile
       || die "Couldn't find initial data for import\n" . $@;
 
-    if ( @Groups ) {
+    if (@Groups) {
         print "Creating groups...";
         foreach $item (@Groups) {
             my $new_entry = RT::Group->new($CurrentUser);
             my ( $return, $msg ) = $new_entry->_Create(%$item);
-            print "(Error: $msg)" unless $return;
+            print "(Error: $msg)" unless ($return);
             print $return. ".";
         }
         print "done.\n";
     }
-    if ( @Users ) {
+    if (@Users) {
         print "Creating users...";
         foreach $item (@Users) {
             my $new_entry = new RT::User($CurrentUser);
             my ( $return, $msg ) = $new_entry->Create(%$item);
-            print "(Error: $msg)" unless $return;
+            print "(Error: $msg)" unless ($return);
             print $return. ".";
         }
         print "done.\n";
     }
-    if ( @Queues ) {
+    if (@Queues) {
         print "Creating queues...";
         for $item (@Queues) {
             my $new_entry = new RT::Queue($CurrentUser);
             my ( $return, $msg ) = $new_entry->Create(%$item);
-            print "(Error: $msg)" unless $return;
+            print "(Error: $msg)" unless ($return);
             print $return. ".";
         }
         print "done.\n";
     }
-    if ( @ACL ) {
+    if (@ACL) {
         print "Creating ACL...";
         for my $item (@ACL) {
 
-            my ($princ, $object);
+	    my ($princ, $object);
 
-            # Global rights or Queue rights?
-            if ( $item->{'Queue'} ) {
+	    # Global rights or Queue rights?
+	    if ($item->{'Queue'}) {
                 $object = RT::Queue->new($CurrentUser);
                 $object->Load( $item->{'Queue'} );
-            } else {
-                $object = $RT::System;
-            }
+	    } else {
+		$object = $RT::System;
+	    }
 
-            # Group rights or user rights?
-            if ( $item->{'GroupDomain'} ) {
+	    # Group rights or user rights?
+	    if ($item->{'GroupDomain'}) {
                 $princ = RT::Group->new($CurrentUser);
-                if ( $item->{'GroupDomain'} eq 'UserDefined' ) {
+	        if ($item->{'GroupDomain'} eq 'UserDefined') {
                   $princ->LoadUserDefinedGroup( $item->{'GroupId'} );
-                } elsif ( $item->{'GroupDomain'} eq 'SystemInternal' ) {
+	        } elsif ($item->{'GroupDomain'} eq 'SystemInternal') {
                   $princ->LoadSystemInternalGroup( $item->{'GroupType'} );
-                } elsif ( $item->{'GroupDomain'} eq 'RT::System-Role' ) {
+	        } elsif ($item->{'GroupDomain'} eq 'RT::System-Role') {
                   $princ->LoadSystemRoleGroup( $item->{'GroupType'} );
-                } elsif ( $item->{'GroupDomain'} eq 'RT::Queue-Role' &&
-                          $item->{'Queue'} )
-                {
+	        } elsif ($item->{'GroupDomain'} eq 'RT::Queue-Role' &&
+			 $item->{'Queue'}) {
                   $princ->LoadQueueRoleGroup( Type => $item->{'GroupType'},
-                                              Queue => $object->id);
-                } else {
+					      Queue => $object->id);
+	        } else {
                   $princ->Load( $item->{'GroupId'} );
-                }
-            } else {
-                $princ = RT::User->new($CurrentUser);
-                $princ->Load( $item->{'UserId'} );
-            }
-
-            # Grant it
-            my ( $return, $msg ) = $princ->PrincipalObj->GrantRight(
+	        }
+	    } else {
+		$princ = RT::User->new($CurrentUser);
+		$princ->Load( $item->{'UserId'} );
+	    }
+
+	    # Grant it
+	    my ( $return, $msg ) = $princ->PrincipalObj->GrantRight(
                                                      Right => $item->{'Right'},
                                                      Object => $object );
 
-            if ( $return ) {
+            if ($return) {
                 print $return. ".";
             }
             else {
@@ -546,12 +539,26 @@ sub insert_data {
         }
         print "done.\n";
     }
-    if ( @CustomFields ) {
+    if (@CustomFields) {
         print "Creating custom fields...";
         for $item (@CustomFields) {
             my $new_entry = new RT::CustomField($CurrentUser);
             my $values    = $item->{'Values'};
             delete $item->{'Values'};
+            my $q     = $item->{'Queue'};
+            my $q_obj = RT::Queue->new($CurrentUser);
+            $q_obj->Load($q);
+            if ( $q_obj->Id ) {
+                $item->{'Queue'} = $q_obj->Id;
+            }
+            elsif ( $q == 0 ) {
+                $item->{'Queue'} = 0;
+            }
+            else {
+                print "(Error: Could not find queue " . $q . ")\n"
+                  unless ( $q_obj->Id );
+                next;
+            }
             my ( $return, $msg ) = $new_entry->Create(%$item);
             unless( $return ) {
                 print "(Error: $msg)\n";
@@ -560,54 +567,41 @@ sub insert_data {
 
             foreach my $value ( @{$values} ) {
                 my ( $eval, $emsg ) = $new_entry->AddValue(%$value);
-                print "(Error: $emsg)\n" unless $eval;
-            }
-
-            if ( $item->{LookupType} && !exists $item->{'Queue'} ) { # enable by default
-                my $ocf = RT::ObjectCustomField->new($CurrentUser);
-                $ocf->Create( CustomField => $new_entry->Id );
+                print "(Error: $emsg)\n" unless ($eval);
             }
 
-            print "(Error: $msg)\n" unless $return;
+            print "(Error: $msg)\n" unless ($return);
             print $return. ".";
         }
 
         print "done.\n";
     }
 
-    if ( @ScripActions ) {
+    if (@ScripActions) {
         print "Creating ScripActions...";
 
         for $item (@ScripActions) {
             my $new_entry = RT::ScripAction->new($CurrentUser);
-            my ($return,$msg) = $new_entry->Create(%$item);
-            unless ($return) {
-                print "(Error: $msg)\n";
-                exit;
-            }
+            my $return    = $new_entry->Create(%$item);
             print $return. ".";
         }
 
         print "done.\n";
     }
 
-    if ( @ScripConditions ) {
+    if (@ScripConditions) {
         print "Creating ScripConditions...";
 
         for $item (@ScripConditions) {
             my $new_entry = RT::ScripCondition->new($CurrentUser);
-            my ($return,$msg) = $new_entry->Create(%$item);
-            unless ($return) {
-                print "(Error: $msg)\n";
-                exit;
-            }
+            my $return    = $new_entry->Create(%$item);
             print $return. ".";
         }
 
         print "done.\n";
     }
 
-    if ( @Templates ) {
+    if (@Templates) {
         print "Creating templates...";
 
         for $item (@Templates) {
@@ -617,13 +611,13 @@ sub insert_data {
         }
         print "done.\n";
     }
-    if ( @Scrips ) {
+    if (@Scrips) {
         print "Creating scrips...";
 
         for $item (@Scrips) {
             my $new_entry = new RT::Scrip($CurrentUser);
             my ( $return, $msg ) = $new_entry->Create(%$item);
-            if ( $return ) {
+            if ($return) {
                 print $return. ".";
             }
             else {
@@ -632,24 +626,7 @@ sub insert_data {
         }
         print "done.\n";
     }
-    if ( @Attributes ) {
-        print "Creating predefined searches...";
-        my $sys = RT::System->new($CurrentUser);
-
-        for $item (@Attributes) {
-            my $obj = delete $item->{Object}; # XXX: make this something loadable
-            $obj ||= $sys;
-            my ( $return, $msg ) = $obj->AddAttribute (%$item);
-            if ( $return ) {
-                print $return. ".";
-            }
-            else {
-                print "(Error: $msg)\n";
-            }
-        }
-        print "done.\n";
-    }
-    $RT::Handle->Disconnect() unless $RT::DatabaseType eq 'SQLite';
+    $RT::Handle->Disconnect() unless ($RT::DatabaseType eq 'SQLite');
     print "Done setting up database content.\n";
 }
 
@@ -675,17 +652,17 @@ sub help {
 $0: Set up RT's database
 
 --action        init    Initialize the database
-                drop    Drop the database.
+                drop    Drop the database. 
                         This will ERASE ALL YOUR DATA
-                insert  Insert data into RT's database.
+                insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it
                         using the '--datafile' option below.
-
+                        
                 acl     Initialize only the database ACLs
                         To use a local or supplementary datafile, specify it
                         using the '--datadir' option below.
-
+                        
                 schema  Initialize only the database schema
                         To use a local or supplementary datafile, specify it
                         using the '--datadir' option below.
diff --git a/rt/sbin/rt-test-dependencies.in b/rt/sbin/rt-test-dependencies.in
index 35d1db3..d867fc2 100644
--- a/rt/sbin/rt-test-dependencies.in
+++ b/rt/sbin/rt-test-dependencies.in
@@ -3,7 +3,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -23,9 +23,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
@@ -63,7 +61,6 @@ GetOptions(
     'with-ORACLE',                        'with-FASTCGI',
     'with-SPEEDYCGI',                     'with-MODPERL1',
     'with-MODPERL2',                      'with-DEV',
-    'with-STANDALONE',
     'download=s',
     'repository=s'
 );
@@ -72,20 +69,13 @@ unless (keys %args) {
     help();
     exit(0);
 }
-# Set up defaults
-my %default = (
-    'with-MASON' => 1,
-    'with-CORE' => 1,
-    'with-CLI' => 1,
-    'with-MAILGATE' => 1, 
-    'with-DEV' => @RT_DEVEL_MODE@, 
-    'with-STANDALONE' => @RT_STANDALONE@,
-);
-$args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;
-
-use Data::Dumper;
-print Dumper( \%args );
 
+# Set up defaults
+$args{'with-MASON'} = 1;
+$args{'with-CORE'} = 1;
+$args{'with-DEV'} =1; 
+$args{'with-CLI'} =1; 
+$args{'with-MAILGATE'} =1; 
 {
   my $section;
   my %always_show_sections = (
@@ -140,7 +130,6 @@ The following switches will tell the tool to check for specific dependencies
 	--with-sqlite		Database interface and driver for SQLite (unsupported)
 	--with-oracle		Database interface for oracle (unsupported)
 
-	--with-standalone	Libraries needed to support the standalone simple pure perl server
 	--with-fastcgi		Libraries needed to support the fastcgi handler
 	--with-speedycgi	Libraries needed to support the speedycgi handler
 	--with-modperl1		Libraries needed to support the modperl 1 handler
@@ -150,38 +139,26 @@ The following switches will tell the tool to check for specific dependencies
 
 You can also specify -v or --verbose to list the status of all dependencies,
 rather than just the missing ones.
-
-The "RT_FIX_DEPS_CMD" environment variable, if set, will be used
-instead of the standard CPAN shell by --install to install any
-required modules.  It will be called with the module name, or, if
-"RT_FIX_DEPS_CMD" contains a "%s", will replace the "%s" with the
-module name before calling the program.
 .
 }
 
 
-sub text_to_hash {
-    my %hash;
-    for my $line ( split /\n/, $_[0] ) {
-        my($key, $value) = $line =~ /(\S+)\s*(\S*)/;
-        $value ||= '';
-        $hash{$key} = $value;
-    }
-
-    return %hash;
+sub _ {
+    map { /(\S+)\s*(\S*)/; $1 => ($2 ? $2 :'') } split ( /\n/, $_[0] );
 }
 
-$deps{'CORE'} = [ text_to_hash( << '.') ];
+$deps{'CORE'} = [ _( << '.') ];
 Digest::base
 Digest::MD5 2.27
 DBI 1.37
+Test::Inline
 Class::ReturnValue 0.40
-Date::Format
-DBIx::SearchBuilder 1.48
+DBIx::SearchBuilder 1.35
 Text::Template
 File::Spec 0.8
 HTML::Entities 
 HTML::Scrubber 0.08
+Net::Domain
 Log::Dispatch 2.0
 Locale::Maketext 1.06
 Locale::Maketext::Lexicon 0.32
@@ -193,101 +170,91 @@ Text::Wrapper
 Time::ParseDate
 Time::HiRes 
 File::Temp
+Term::ReadKey
 Text::Autoformat
-Text::Quoted 2.02
+Text::Quoted 1.3
 Tree::Simple 1.04
-Regexp::Common
 Scalar::Util
-Module::Versions::Report 1.03
+Module::Versions::Report
 Cache::Simple::TimedExpiry
-UNIVERSAL::require
-Calendar::Simple
+XML::Simple
 .
 
-$deps{'MASON'} = [ text_to_hash( << '.') ];
+$deps{'MASON'} = [ _( << '.') ];
+Params::Validate 0.02
+Cache::Cache
+Exception::Class 1.14
 HTML::Mason 1.23
+MLDBM
 Errno
+FreezeThaw
 Digest::MD5 2.27
 CGI::Cookie 1.20
 Storable 2.08
 Apache::Session 1.53
 XML::RSS 1.05
-GD
-GD::Graph
-GD::Text
-Text::WikiFormat 0.76
-.
-
-$deps{'STANDALONE'} = [ text_to_hash( << '.') ];
 HTTP::Server::Simple 0.07
 HTTP::Server::Simple::Mason 0.09
+Text::WikiFormat
 .
 
-$deps{'MAILGATE'} = [ text_to_hash( << '.') ];
+$deps{'MAILGATE'} = [ _( << '.') ];
 HTML::TreeBuilder
 HTML::FormatText
 Getopt::Long
 LWP::UserAgent
-Pod::Usage
 .
 
-$deps{'CLI'} = [ text_to_hash( << '.') ];
+$deps{'CLI'} = [ _( << '.') ];
 Getopt::Long 2.24
-LWP
-HTTP::Request::Common
-Text::ParseWords
-Term::ReadLine
-Term::ReadKey
 .
 
-$deps{'DEV'} = [ text_to_hash( << '.') ];
+$deps{'DEV'} = [ _( << '.') ];
+Regexp::Common
 Test::Inline 
 Apache::Test
 HTML::Form
 HTML::TokeParser
 WWW::Mechanize
-Test::WWW::Mechanize 1.04
+Test::WWW::Mechanize
 Module::Refresh 0.03
-Test::Expect 0.30
-XML::Simple
-File::Find
 .
 
-$deps{'FASTCGI'} = [ text_to_hash( << '.') ];
+$deps{'FASTCGI'} = [ _( << '.') ];
 CGI 2.92
 FCGI
 CGI::Fast 
 .
 
-$deps{'SPEEDYCGI'} = [ text_to_hash( << '.') ];
+$deps{'SPEEDYCGI'} = [ _( << '.') ];
 CGI 2.92
 CGI::SpeedyCGI
 .
 
 
-$deps{'MODPERL1'} = [ text_to_hash( << '.') ];
+$deps{'MODPERL1'} = [ _( << '.') ];
 CGI 2.92
 Apache::Request
 Apache::DBI 0.92
 .
 
-$deps{'MODPERL2'} = [ text_to_hash( << '.') ];
+$deps{'MODPERL2'} = [ _( << '.') ];
 CGI 2.92
 Apache::DBI
 HTML::Mason 1.31
 .
 
-$deps{'MYSQL'} = [ text_to_hash( << '.') ];
+$deps{'MYSQL'} = [ _( << '.') ];
 DBD::mysql 2.1018
 .
-$deps{'ORACLE'} = [ text_to_hash( << '.') ];
+$deps{'ORACLE'} = [ _( << '.') ];
 DBD::Oracle
 .
-$deps{'POSTGRESQL'} = [ text_to_hash( << '.') ];
-DBD::Pg 1.43
+$deps{'POSTGRESQL'} = [ _( << '.') ];
+DBD::Pg 1.41
 .
 
-$deps{'SQLITE'} = [ text_to_hash( << '.') ];
+$deps{'SQLITE'} = [ _( << '.') ];
 DBD::SQLite 1.00
 .
 
@@ -302,24 +269,18 @@ check_perl_version();
 check_users();
 
 
-foreach my $type (sort grep $args{$_}, keys %args) {
+foreach my $type (keys %args) {
     next unless ($type =~ /^with-(.*?)$/);
-
-    $type = $1;
+    my $type = $1;
     section("$type dependencies");
-
-    my @missing;
-    my @deps = @{ $deps{$type} };
+    my @deps = (@{$deps{$type}});
     while (@deps) {
         my $module = shift @deps;
         my $version = shift @deps;
-        my $ret = test_dep($module, $version);
+        my $ret = test_dep($module, $version);	
 
-        push @missing, $module, $version unless $ret;
-    }
-    if ( $args{'install'} ) {
-        while( @missing ) {
-            resolve_dep(shift @missing, shift @missing);
+        if ($args{'install'} && !$ret) {
+            resolve_dep($module);		
         }
     }
 }
@@ -339,77 +300,14 @@ sub test_dep {
 
         return undef;
     } else {
-        my $msg = "$module";
-        $msg .= " >=$version" if $version;
-        found($msg, 1);
+        found("$module $version", 1);
         return 1;
     }
 }
 
 sub resolve_dep {
     my $module = shift;
-    my $version = shift;
-
-    print "\nInstall module $module\n";
-
-    my $ext = $ENV{'RT_FIX_DEPS_CMD'};
-    unless( $ext ) {
-        my $configured = 1;
-        {
-            local @INC = @INC;
-            if ( $ENV{'HOME'} ) {
-                unshift @INC, "$ENV{'HOME'}/.cpan";
-            }
-            $configured = eval { require CPAN::MyConfig } || eval { require CPAN::Config };
-        }
-        unless ( $configured ) {
-            print <<END;
-You didn't configure CPAN shell yet.
-Please run `@PERL@ -MCPAN -e shell` tool and configure it.
-END
-            exit(1);
-        }
-        my $rv = eval { require CPAN; CPAN::Shell->install($module) };
-        return $rv unless $@;
-
-        print <<END;
-Failed to load module CPAN.
-
--------- Error ---------
-$@
-------------------------
-
-When we tried to start installing RT's perl dependencies, 
-we were unable to load the CPAN client. This module is usually distributed
-with Perl. This usually indicates that your vendor has shipped an unconfigured
-or incorrectly configured CPAN client.
-The error above may (or may not) give you a hint about what went wrong
-
-You have several choices about how to install dependencies in 
-this situatation:
-
-1) use a different tool to install dependencies by running setting the following
-   shell environment variable and rerunning this tool:
-    RT_FIX_DEPS_CMD='@PERL@ -MCPAN -e"install %s"'
-2) Attempt to configure CPAN by running:
-   `@PERL@ -MCPAN -e shell` program from shell.
-   If this fails, you may have to manually upgrade CPAN (see below)
-3) Try to update the CPAN client. Download it from:
-   http://search.cpan.org/dist/CPAN and try again
-4) Install each dependency manually by downloading them one by one from
-   http://search.cpan.org
-
-END
-        exit(1);
-    }
-
-    if( $ext =~ /\%s/) {
-        $ext =~ s/\%s/$module/g; # sprintf( $ext, $module );
-    } else {
-        $ext .= " $module";
-    }
-    print "\t\tcommand: '$ext'\n";
-    return scalar `$ext 1>&2`;
+    system( qq[@PERL@ -MCPAN -e'install("$module")'] );
 }
 
 sub download_mods {
@@ -457,10 +355,10 @@ sub check_perl_version {
   section("perl");
   eval {require 5.008003};
   if ($@) {
-    found("5.8.3", 0,"RT is known to be non-functional on versions of perl older than 5.8.3. Please upgrade to 5.8.3 or newer.");
-    exit(1);
+    found("5.8.3", 0, "RT is known to be non-functional on versions of perl older than 5.8.3. Please upgrade to 5.8.3 or newer.");
+    die;
   } else {
-    found( ">=5.8.3($])", 1);
+    found("5.8.3", 1);
   }
 }