1 files changed, 24 insertions, 60 deletions

diff --git a/rt/lib/RT.pm.in b/rt/lib/RT.pm.in
index f7c882b61..db3725037 100644
--- a/rt/lib/RT.pm.in
+++ b/rt/lib/RT.pm.in
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT;
 use strict;
 use RT::I18N;
@@ -59,7 +59,6 @@ use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger
         $LocalEtcPath
         $LocalLexiconPath
         $LogDir
-        $BinPath
         $MasonComponentRoot
         $MasonLocalComponentRoot
         $MasonDataDir
@@ -75,7 +74,6 @@ $SITE_CONFIG_FILE = "@CONFIG_FILE_PATH@/RT_SiteConfig.pm";
 $BasePath = '@RT_PATH@';
 
 $EtcPath = '@RT_ETC_PATH@';
-$BinPath = '@RT_BIN_PATH@';
 $VarPath = '@RT_VAR_PATH@';
 $LocalPath = '@RT_LOCAL_PATH@';
 $LocalEtcPath = '@LOCAL_ETC_PATH@';
@@ -102,26 +100,21 @@ $MasonSessionDir = '@MASON_SESSION_PATH@';
 
 =head1 NAME
 
-RT - Request Tracker
+	RT - Request Tracker
 
 =head1 SYNOPSIS
 
-A fully featured request tracker package
+	A fully featured request tracker package
 
 =head1 DESCRIPTION
 
-=head2 LoadConfig
 
-Load RT's config file.  First, the site configuration file
-(C<RT_SiteConfig.pm>) is loaded, in order to establish overall site
-settings like hostname and name of RT instance.  Then, the core
-configuration file (C<RT_Config.pm>) is loaded to set fallback values
-for all settings; it bases some values on settings from the site
-configuration file.
+=cut
+
+=item LoadConfig
 
-In order for the core configuration to not override the site's
-settings, the function C<Set> is used; it only sets values if they
-have not been set already.
+Load RT's config file. First, go after the core config file. 
+After that, go after the site config.
 
 =cut
 
@@ -136,10 +129,10 @@ sub LoadConfig {
     RT::I18N->Init;
 }
 
-=head2 Init
-
-Conenct to the database, set up logging.
+=item Init
 
+    Conenct to the database, set up logging.
+    
 =cut
 
 sub Init {
@@ -157,8 +150,7 @@ sub Init {
   
     $System = RT::System->new();
 
-    InitClasses();
-    InitLogging(); 
+   InitLogging(); 
 }
 
   
@@ -167,7 +159,7 @@ sub Init {
 Get a database connection
 
 =cut
-
+ 
 sub ConnectToDatabase {
     require RT::Handle;
     unless ($Handle && $Handle->dbh && $Handle->dbh->ping) {
@@ -181,10 +173,9 @@ sub ConnectToDatabase {
 Create the RT::Logger object. 
 
 =cut
-
 sub InitLogging {
 
-    # We have to set the record separator ($, man perlvar)
+    # We have to set the record seperator ($, man perlvar)
     # or Log::Dispatch starts getting
     # really pissy, as some other module we use unsets it.
 
@@ -213,7 +204,6 @@ sub InitLogging {
         die ("Log file $filename couldn't be written or created.\n RT can't run.");
     }
 
-    package Log::Dispatch::File;
     require Log::Dispatch::File;
 
 
@@ -231,7 +221,6 @@ sub InitLogging {
 		       ));
     }
     if ($RT::LogToScreen) {
-	package Log::Dispatch::Screen;
 	require Log::Dispatch::Screen;
 	$RT::Logger->add(Log::Dispatch::Screen->new
 		     ( name => 'screen',
@@ -245,7 +234,6 @@ sub InitLogging {
 		     ));
     }
     if ($RT::LogToSyslog) {
-	package Log::Dispatch::Syslog;
 	require Log::Dispatch::Syslog;
 	$RT::Logger->add(Log::Dispatch::Syslog->new
 		     ( name => 'syslog',
@@ -278,14 +266,7 @@ sub InitLogging {
 ## Mason).  It will log all problems through the standard logging
 ## mechanism (see above).
 
-$SIG{__WARN__} = sub {
-    my $w = shift;
-    $w =~ s/(?:\r*\n)+$//;
-    # The 'wide character' warnings has to be silenced for now, at least
-    # until HTML::Mason offers a sane way to process both raw output and
-    # unicode strings.
-    $RT::Logger->warning($w) if index($w, 'Wide character in ') != 0;
-};
+$SIG{__WARN__} = sub {$RT::Logger->warning($_[0])};
 
 #When we call die, trap it and log->crit with the value of the die.
 
@@ -305,30 +286,6 @@ $SIG{__DIE__}  = sub {
 
 }
 
-=head2 InitClasses
-
-Load all modules that define base classes
-
-=cut
-
-sub InitClasses {
-    require RT::Tickets;
-    require RT::Transactions;
-    require RT::Users;
-    require RT::CurrentUser;
-    require RT::Templates;
-    require RT::Queues;
-    require RT::ScripActions;
-    require RT::ScripConditions;
-    require RT::Scrips;
-    require RT::Groups;
-    require RT::GroupMembers;
-    require RT::CustomFields;
-    require RT::CustomFieldValues;
-    require RT::ObjectCustomFields;
-    require RT::ObjectCustomFieldValues;
-}
-
 # }}}
 
 
@@ -340,6 +297,9 @@ sub Nobody {
     return ($Nobody);
 }
 
+
+=head1 SYNOPSIS
+
 =head1 BUGS
 
 Please report them to rt-bugs@fsck.com, if you know what's broken and have at least 
@@ -352,13 +312,17 @@ If you're not sure what's going on, report them rt-devel@lists.bestpractical.com
 L<RT::StyleGuide>
 L<DBIx::SearchBuilder>
 
+
+
 =begin testing
 
+
 ok ($RT::Nobody->Name() eq 'Nobody', "Nobody is nobody");
 ok ($RT::Nobody->Name() ne 'root', "Nobody isn't named root");
 ok ($RT::SystemUser->Name() eq 'RT_System', "The system user is RT_System");
 ok ($RT::SystemUser->Name() ne 'noname', "The system user isn't noname");
 
+
 =end testing
 
 =cut