[rt-commit] [svn] r585 - in rt/branches: . rt-3.3/bin rt-3.3/etc rt-3.3/lib

[autrijus at fsck.com]

Author: autrijus
Date: Tue Mar 16 14:22:32 2004
New Revision: 585

Modified:
   rt/branches/   (props changed)
   rt/branches/rt-3.3/bin/webmux.pl.in
   rt/branches/rt-3.3/etc/acl.mysql
   rt/branches/rt-3.3/lib/RT.pm.in
Log:
* move class loading to RT::InitClasses.
* do not do acl if mysql is in skip-grant-tables mode.


Modified: rt/branches/rt-3.3/bin/webmux.pl.in
==============================================================================
--- rt/branches/rt-3.3/bin/webmux.pl.in	(original)
+++ rt/branches/rt-3.3/bin/webmux.pl.in	Tue Mar 16 14:22:32 2004
@@ -78,22 +78,6 @@
     package HTML::Mason::Commands;
     use vars qw(%session);
 
-    use RT::Tickets;
-    use RT::Transactions;
-    use RT::Users;
-    use RT::CurrentUser;
-    use RT::Templates;
-    use RT::Queues;
-    use RT::ScripActions;
-    use RT::ScripConditions;
-    use RT::Scrips;
-    use RT::Groups;
-    use RT::GroupMembers;
-    use RT::CustomFields;
-    use RT::CustomFieldValues;
-    use RT::ObjectCustomFields;
-    use RT::ObjectCustomFieldValues;
-
     use RT::Interface::Web;
     use MIME::Entity;
     use Text::Wrapper;

Modified: rt/branches/rt-3.3/etc/acl.mysql
==============================================================================
--- rt/branches/rt-3.3/etc/acl.mysql	(original)
+++ rt/branches/rt-3.3/etc/acl.mysql	Tue Mar 16 14:22:32 2004
@@ -1,5 +1,5 @@
 sub acl {
-return () if $RT::DatabaseUser eq 'root';
+return () if !$RT::DatabaseUser or $RT::DatabaseUser eq 'root';
 return  (
 "USE mysql;",
 "DELETE FROM user WHERE user = '${RT::DatabaseUser}';",

Modified: rt/branches/rt-3.3/lib/RT.pm.in
==============================================================================
--- rt/branches/rt-3.3/lib/RT.pm.in	(original)
+++ rt/branches/rt-3.3/lib/RT.pm.in	Tue Mar 16 14:22:32 2004
@@ -131,7 +131,8 @@
   
     $System = RT::System->new();
 
-   InitLogging(); 
+    InitClasses();
+    InitLogging(); 
 }
 
   
@@ -262,6 +263,29 @@
 
 # }}}
 
+}
+
+=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;
 }
 
 # }}}