[Rt-commit] r10134 - in rt/branches/3.999-DANGEROUS: . docs/design_docs etc html/Admin/Queues html/Approvals html/Elements/RT__Model__Queue html/Elements/RT__Model__Ticket html/REST/1.0/Forms/queue html/REST/1.0/Forms/ticket html/REST/1.0/NoAuth html/Search html/Ticket html/Ticket/Elements lib/RT lib/RT/Condition lib/RT/Interface lib/RT/Interface/Web/QueryBuilder lib/RT/Model lib/RT/Report lib/RT/ScripAction lib/t share/po t/api t/delegation t/mail t/web

jesse at bestpractical.com jesse at bestpractical.com
Thu Dec 27 01:15:13 EST 2007


Author: jesse
Date: Thu Dec 27 01:15:12 2007
New Revision: 10134

Removed:
   rt/branches/3.999-DANGEROUS/t/api/currentuser.t
Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/docs/design_docs/TransactionTypes.txt
   rt/branches/3.999-DANGEROUS/etc/RT_Config.pm
   rt/branches/3.999-DANGEROUS/etc/config.yml
   rt/branches/3.999-DANGEROUS/etc/initialdata
   rt/branches/3.999-DANGEROUS/etc/schema.Informix
   rt/branches/3.999-DANGEROUS/etc/schema.Oracle
   rt/branches/3.999-DANGEROUS/etc/schema.Pg
   rt/branches/3.999-DANGEROUS/etc/schema.SQLite
   rt/branches/3.999-DANGEROUS/etc/schema.Sybase
   rt/branches/3.999-DANGEROUS/etc/schema.mysql
   rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html
   rt/branches/3.999-DANGEROUS/html/Approvals/index.html
   rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Queue/ColumnMap
   rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Ticket/ColumnMap
   rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default
   rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/default
   rt/branches/3.999-DANGEROUS/html/REST/1.0/NoAuth/mail-gateway
   rt/branches/3.999-DANGEROUS/html/Search/Build.html
   rt/branches/3.999-DANGEROUS/html/Search/Results.tsv
   rt/branches/3.999-DANGEROUS/html/Ticket/Create.html
   rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips
   rt/branches/3.999-DANGEROUS/html/Ticket/Update.html
   rt/branches/3.999-DANGEROUS/lib/RT/Condition/Generic.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Dispatcher.pm
   rt/branches/3.999-DANGEROUS/lib/RT/EmailParser.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web/QueryBuilder/Tree.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Report/Tickets.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Generic.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/RecordCorrespondence.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Test.pm
   rt/branches/3.999-DANGEROUS/lib/t/setup_regression.t
   rt/branches/3.999-DANGEROUS/share/po/cs.po
   rt/branches/3.999-DANGEROUS/share/po/da.po
   rt/branches/3.999-DANGEROUS/share/po/de.po
   rt/branches/3.999-DANGEROUS/share/po/es.po
   rt/branches/3.999-DANGEROUS/share/po/fi.po
   rt/branches/3.999-DANGEROUS/share/po/fr.po
   rt/branches/3.999-DANGEROUS/share/po/he.po
   rt/branches/3.999-DANGEROUS/share/po/hu.po
   rt/branches/3.999-DANGEROUS/share/po/id.po
   rt/branches/3.999-DANGEROUS/share/po/it.po
   rt/branches/3.999-DANGEROUS/share/po/ja.po
   rt/branches/3.999-DANGEROUS/share/po/nl.po
   rt/branches/3.999-DANGEROUS/share/po/no.po
   rt/branches/3.999-DANGEROUS/share/po/pl.po
   rt/branches/3.999-DANGEROUS/share/po/pt_br.po
   rt/branches/3.999-DANGEROUS/share/po/ru.po
   rt/branches/3.999-DANGEROUS/share/po/sv.po
   rt/branches/3.999-DANGEROUS/share/po/tr.po
   rt/branches/3.999-DANGEROUS/share/po/zh_cn.po
   rt/branches/3.999-DANGEROUS/share/po/zh_tw.po
   rt/branches/3.999-DANGEROUS/t/api/i18n.t
   rt/branches/3.999-DANGEROUS/t/delegation/cleanup_stalled.t
   rt/branches/3.999-DANGEROUS/t/mail/gnupg-bad.t
   rt/branches/3.999-DANGEROUS/t/mail/gnupg-incoming.t
   rt/branches/3.999-DANGEROUS/t/mail/gnupg-realmail.t
   rt/branches/3.999-DANGEROUS/t/mail/sendmail.t
   rt/branches/3.999-DANGEROUS/t/ticket/batch-upload-csv.t
   rt/branches/3.999-DANGEROUS/t/web/basic.t
   rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t
   rt/branches/3.999-DANGEROUS/t/web/gnupg-outgoing.t
   rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-create.t
   rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-update.t
   rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t

Log:
 r74244 at pinglin:  jesse | 2007-12-27 01:13:52 -0500
  * passing 3817 tests


Modified: rt/branches/3.999-DANGEROUS/docs/design_docs/TransactionTypes.txt
==============================================================================
--- rt/branches/3.999-DANGEROUS/docs/design_docs/TransactionTypes.txt	(original)
+++ rt/branches/3.999-DANGEROUS/docs/design_docs/TransactionTypes.txt	Thu Dec 27 01:15:12 2007
@@ -35,7 +35,7 @@
 
 The UIs should call sth like
 $Ticket->AddTransaction($Transactionname), which should be equivalent
-with i.e.  $Ticket->Correspond when $Transactionname is 'Correspond'
+with i.e.  $Ticket->correspond when $Transactionname is 'Correspond'
 (AUTOLOAD should call the do-sub if exists
 RT->Config->Get('TransactionTypes')->{$Transactionname})
 

Modified: rt/branches/3.999-DANGEROUS/etc/RT_Config.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/RT_Config.pm	(original)
+++ rt/branches/3.999-DANGEROUS/etc/RT_Config.pm	Thu Dec 27 01:15:12 2007
@@ -240,12 +240,12 @@
 # RT is designed such that any mail which already has a ticket-id associated
 # with it will get to the right place automatically.
 
-# $CorrespondAddress and $commentAddress are the default addresses
+# $correspond_address and $commentAddress are the default addresses
 # that will be listed in From: and Reply-To: headers of correspondence
 # and comment mail tracked by RT, unless overridden by a queue-specific
 # address.
 
-set($CorrespondAddress , 'RT_CorrespondAddressNotset');
+set($correspond_address , 'RT_correspond_addressNotset');
 
 set($commentAddress , 'RT_commentAddressNotset');
 

Modified: rt/branches/3.999-DANGEROUS/etc/config.yml
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/config.yml	(original)
+++ rt/branches/3.999-DANGEROUS/etc/config.yml	Thu Dec 27 01:15:12 2007
@@ -1,6 +1,6 @@
 --- 
 framework: 
-  AdminMode: 1
+  AdminMode: 0
   ApplicationClass: RT
   Applicationname: RT
   ApplicationUUID: EAFC6FF2-5E8D-11DC-9FAD-91A9684ED971

Modified: rt/branches/3.999-DANGEROUS/etc/initialdata
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/initialdata	(original)
+++ rt/branches/3.999-DANGEROUS/etc/initialdata	Thu Dec 27 01:15:12 2007
@@ -62,7 +62,7 @@
 
 @Queues = ({ name              => 'General',
              Description       => 'The default queue',
-             CorrespondAddress => "",
+             correspond_address => "",
              commentAddress    => "", },
            { name        => '___Approvals',
              Description => 'A system-internal queue for the approvals system',
@@ -253,7 +253,7 @@
 you may reply to this message.
 
                         Thank you,
-                        {$Ticket->QueueObj->CorrespondAddress()}
+                        {$Ticket->QueueObj->correspond_address()}
 
 -------------------------------------------------------------------------
 {$Transaction->Content()}

Modified: rt/branches/3.999-DANGEROUS/etc/schema.Informix
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Informix	(original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Informix	Thu Dec 27 01:15:12 2007
@@ -27,7 +27,7 @@
 	id 			SERIAL,
 	name 			VARCHAR(200) DEFAULT '' NOT NULL,
 	Description 		VARCHAR(255) DEFAULT NULL,
-	CorrespondAddress 	VARCHAR(120) DEFAULT NULL,
+	correspond_address 	VARCHAR(120) DEFAULT NULL,
 	commentAddress 		VARCHAR(120) DEFAULT NULL,
 	InitialPriority 	INTEGER DEFAULT 0 NOT NULL,
 	FinalPriority 		INTEGER DEFAULT 0 NOT NULL,

Modified: rt/branches/3.999-DANGEROUS/etc/schema.Oracle
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Oracle	(original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Oracle	Thu Dec 27 01:15:12 2007
@@ -25,7 +25,7 @@
 		CONSTRAINT Queues_Key PRIMARY KEY,
 	name 			VARCHAR2(200) CONSTRAINT Queues_name_Unique UNIQUE NOT NULL,
 	Description 		VARCHAR2(255),
-	CorrespondAddress 	VARCHAR2(120),
+	correspond_address 	VARCHAR2(120),
 	commentAddress 		VARCHAR2(120),
 	InitialPriority 	NUMBER(11,0) DEFAULT 0 NOT NULL,
 	FinalPriority 		NUMBER(11,0) DEFAULT 0 NOT NULL,

Modified: rt/branches/3.999-DANGEROUS/etc/schema.Pg
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Pg	(original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Pg	Thu Dec 27 01:15:12 2007
@@ -48,7 +48,7 @@
   id INTEGER DEFAULT nextval('queues_id_seq'),
   name varchar(200) NOT NULL  ,
   Description varchar(255) NULL  ,
-  CorrespondAddress varchar(120) NULL  ,
+  correspond_address varchar(120) NULL  ,
   commentAddress varchar(120) NULL  ,
   InitialPriority integer NOT NULL DEFAULT 0  ,
   FinalPriority integer NOT NULL DEFAULT 0  ,

Modified: rt/branches/3.999-DANGEROUS/etc/schema.SQLite
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.SQLite	(original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.SQLite	Thu Dec 27 01:15:12 2007
@@ -26,7 +26,7 @@
   id INTEGER PRIMARY KEY  ,
   name varchar(200) NOT NULL  ,
   Description varchar(255) NULL  ,
-  CorrespondAddress varchar(120) NULL  ,
+  correspond_address varchar(120) NULL  ,
   commentAddress varchar(120) NULL  ,
   InitialPriority integer NULL  ,
   FinalPriority integer NULL  ,

Modified: rt/branches/3.999-DANGEROUS/etc/schema.Sybase
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Sybase	(original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Sybase	Thu Dec 27 01:15:12 2007
@@ -26,7 +26,7 @@
   id numeric(38,0) identity,
   name varchar(200) NOT NULL  ,
   Description varchar(255) NULL  ,
-  CorrespondAddress varchar(120) NULL  ,
+  correspond_address varchar(120) NULL  ,
   commentAddress varchar(120) NULL  ,
   InitialPriority integer NOT NULL   ,
   FinalPriority integer NOT NULL   ,

Modified: rt/branches/3.999-DANGEROUS/etc/schema.mysql
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.mysql	(original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.mysql	Thu Dec 27 01:15:12 2007
@@ -25,7 +25,7 @@
   id INTEGER NOT NULL  AUTO_INCREMENT,
   name varchar(200) NOT NULL  ,
   Description varchar(255) NULL  ,
-  CorrespondAddress varchar(120) NULL  ,
+  correspond_address varchar(120) NULL  ,
   commentAddress varchar(120) NULL  ,
   InitialPriority integer NOT NULL DEFAULT 0  ,
   FinalPriority integer NOT NULL DEFAULT 0  ,

Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html	Thu Dec 27 01:15:12 2007
@@ -68,8 +68,8 @@
 </tr>
 
 <tr><td align="right"><&|/l&>Reply Address</&>:</td>
-<td><input name="CorrespondAddress" value="<% ($Create) ? "" : $QueueObj->CorrespondAddress %>" />
-<br /><span><em><&|/l , RT->Config->Get('CorrespondAddress')&>(If left blank, will default to %1)</&></em></span></td>
+<td><input name="correspond_address" value="<% ($Create) ? "" : $QueueObj->correspond_address %>" />
+<br /><span><em><&|/l , RT->Config->Get('correspond_address')&>(If left blank, will default to %1)</&></em></span></td>
 <td align="right"><&|/l&>comment Address</&>:</td>
 <td><input name="commentAddress" value="<% ($Create) ? "" : $QueueObj->commentAddress %>" />
 <br /><span><em><&|/l , RT->Config->Get('commentAddress')&>(If left blank, will default to %1)</&></em></span></td>
@@ -99,7 +99,7 @@
 </td></tr>
 
 % if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
-% if ( my $email = $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress') ) {
+% if ( my $email = $QueueObj->correspond_address || RT->Config->Get('correspond_address') ) {
 <tr><td colspan="4"><& /Admin/Elements/ShowKeyInfo, Type => 'private', email => $email &></td></tr>
 % }
 % if ( my $email = $QueueObj->commentAddress || RT->Config->Get('commentAddress') ) {
@@ -139,7 +139,7 @@
 }
 if ( $QueueObj->id ) {
     delete $session{'create_in_queues'};
-    my @attribs= qw(Description CorrespondAddress commentAddress name
+    my @attribs= qw(Description correspond_address commentAddress name
         InitialPriority FinalPriority DefaultDueIn Sign Encrypt disabled);
 
     # we're asking about enabled on the web page but really care about disabled
@@ -177,7 +177,7 @@
 $name => undef
 $Create => undef
 $Description => undef
-$CorrespondAddress => undef
+$correspond_address => undef
 $commentAddress => undef
 $InitialPriority => undef
 $FinalPriority => undef

Modified: rt/branches/3.999-DANGEROUS/html/Approvals/index.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Approvals/index.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Approvals/index.html	Thu Dec 27 01:15:12 2007
@@ -70,7 +70,7 @@
 	);
 	RT::I18N::set_mime_entity_to_utf8($notes); # convert text parts into utf-8
 
-        my ( $notesval, $notesmsg ) = $ticket->Correspond( MIMEObj => $notes );
+        my ( $notesval, $notesmsg ) = $ticket->correspond( MIMEObj => $notes );
         if ($notesval) {
                 push ( @actions, _("Approval #%1: Notes recorded",$ticket->id ));
         } else {

Modified: rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Queue/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Queue/ColumnMap	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Queue/ColumnMap	Thu Dec 27 01:15:12 2007
@@ -66,7 +66,7 @@
         value     => sub { return $_[0]->InitialPriority .'-'. $_[0]->FinalPriority },
     },
     Address  => {
-        value     => sub { return ($_[0]->CorrespondAddress||'-') .'/'. ($_[0]->commentAddress||'-') },
+        value     => sub { return ($_[0]->correspond_address||'-') .'/'. ($_[0]->commentAddress||'-') },
     },
 
     (map {
@@ -76,7 +76,7 @@
     } qw(WebPath WebBaseURL WebURL)),
 
 };
-foreach my $col(qw(name Description CorrespondAddress commentAddress InitialPriority FinalPriority DefaultDueIn)) {
+foreach my $col(qw(name Description correspond_address commentAddress InitialPriority FinalPriority DefaultDueIn)) {
     $QUEUE_COLUMN_MAP->{$col} = { attribute => $col, value => sub { return $_[0]->$col() } };
 }
 

Modified: rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Ticket/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Ticket/ColumnMap	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Ticket/ColumnMap	Thu Dec 27 01:15:12 2007
@@ -154,15 +154,15 @@
     },
     Requestors => {
         attribute => 'Requestor.email',
-        value => sub { return $_[0]->Requestors->MemberemailesAsString }
+        value => sub { return $_[0]->Requestors->member_emailsAsString }
     },
     Cc => {
         attribute => 'Cc.email',
-        value => sub { return $_[0]->Cc->MemberemailesAsString }
+        value => sub { return $_[0]->Cc->member_emailsAsString }
     },
     AdminCc => {
         attribute => 'AdminCc.email',
-        value => sub { return $_[0]->AdminCc->MemberemailesAsString }
+        value => sub { return $_[0]->AdminCc->member_emailsAsString }
     },
     startsRelative => {
         title     => 'starts',
@@ -230,7 +230,7 @@
         attribute => 'Requestor.email',
         value => sub {
             my $t = shift;
-            my @requestors = $t->Requestors->Memberemailes;
+            my @requestors = $t->Requestors->member_emails;
             for my $email (@requestors)
             {
                 my %key = RT::Crypt::GnuPG::GetKeyInfo($email);

Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default	(original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default	Thu Dec 27 01:15:12 2007
@@ -57,7 +57,7 @@
 my ($c, $o, $k, $e) = ("", [], {}, 0);
 my %data = %$changes;
 my $queue = RT::Model::Queue->new() ;
-my @fields = qw(name Description CorrespondAddress commentAddress
+my @fields = qw(name Description correspond_address commentAddress
                 InitialPriority FinalPriority DefaultDueIn);
 my %fields = map { lc $_ => $_ } @fields;
 
@@ -77,7 +77,7 @@
                 name => '<queue name>',
                 Description => "",
                 commentAddress => "",
-                CorrespondAddress => "",
+                correspond_address => "",
                 InitialPriority => "",
                 FinalPriority => "",
                 DefaultDueIn => "",

Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/default
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/default	(original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/default	Thu Dec 27 01:15:12 2007
@@ -193,7 +193,7 @@
 
     foreach $key (@people) {
         next unless (!%$fields || (exists $fields->{lc $key}));
-        push @data, [ $key => [ $ticket->$key->Memberemailes ] ];
+        push @data, [ $key => [ $ticket->$key->member_emails ] ];
     }
 
     $time = RT::Date->new();
@@ -273,7 +273,7 @@
             my ($p, @msgs);
 
             my %new  = map {$_=>1} @{ vsplit($val) };
-            my %old  = map {$_=>1} $ticket->$key->Memberemailes;
+            my %old  = map {$_=>1} $ticket->$key->member_emails;
             my $type = $key eq 'Requestors' ? 'Requestor' : $key;
 
             foreach $p (keys %old) {

Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/NoAuth/mail-gateway
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/NoAuth/mail-gateway	(original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/NoAuth/mail-gateway	Thu Dec 27 01:15:12 2007
@@ -70,7 +70,7 @@
     $m->out( 'Status: '  . ($Ticket->Status         || '') );
     $m->out( 'Subject: ' . ($Ticket->Subject        || '') );
     $m->out(
-      'Requestor: ' . ($Ticket->Requestors->MemberemailesAsString || '') );
+      'Requestor: ' . ($Ticket->Requestors->member_emailsAsString || '') );
   }
 }
 else {

Modified: rt/branches/3.999-DANGEROUS/html/Search/Build.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Build.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Build.html	Thu Dec 27 01:15:12 2007
@@ -167,7 +167,7 @@
     my ($string, $results) = @_;
 
     my $tree = RT::Interface::Web::QueryBuilder::Tree->new('AND');
-    @$results = $tree->ParseSQL( Query => $string, CurrentUser => Jifty->web->current_user );
+    @$results = $tree->ParseSQL( Query => $string );
 
     return $tree;
 };

Modified: rt/branches/3.999-DANGEROUS/html/Search/Results.tsv
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Results.tsv	(original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Results.tsv	Thu Dec 27 01:15:12 2007
@@ -70,7 +70,7 @@
 my %known_cfs;
 
 my @attrs = qw( id QueueObj->name Subject Status TimeEstimated time_worked time_left Priority FinalPriority OwnerObj->name 
-                Requestors->MemberemailesAsString Cc->MemberemailesAsString AdminCc->MemberemailesAsString
+                Requestors->member_emailsAsString Cc->member_emailsAsString AdminCc->member_emailsAsString
                 DueObj->ISO ToldObj->ISO CreatedObj->ISO ResolvedObj->ISO LastUpdatedObj->ISO);
 
 $r->content_type('application/vnd.ms-excel');
@@ -104,7 +104,7 @@
     foreach my $attr (@attrs) {
         my $label = $attr;
         $label =~ s'Obj-.(?:AsString|name|ISO)''g;
-        $label =~ s'-\>MemberemailesAsString''g;
+        $label =~ s'-\>member_emailsAsString''g;
 	push @header, $label;
     }
     foreach my $id (sort keys %known_cfs) {

Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Create.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Create.html	Thu Dec 27 01:15:12 2007
@@ -326,8 +326,8 @@
 
     # check to see if we have a good passphrase
     if ( $ARGS{'Sign'} ) {
-        my $address = $QueueObj->CorrespondAddress
-            || RT->Config->Get('CorrespondAddress');
+        my $address = $QueueObj->correspond_address
+            || RT->Config->Get('correspond_address');
         unless ( RT::Crypt::GnuPG::DrySign($address, "x") ) {
             push @cannot_sign_as, $address;
             $checks_failure = 1;

Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips	(original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips	Thu Dec 27 01:15:12 2007
@@ -117,7 +117,7 @@
 my $action;
 
 if (($ARGS{'UpdateType'} &&  $ARGS{'UpdateType'} eq 'response' ) || ($ARGS{'Action'} && $ARGS{'Action'} eq 'Respond' )) {
-    $action = 'Correspond';
+    $action = 'correspond';
 }
 else {
     $action = 'comment';

Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Update.html	(original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Update.html	Thu Dec 27 01:15:12 2007
@@ -259,8 +259,8 @@
         my $address = $ARGS{'UpdateType'} eq "private"
             ? ( $TicketObj->QueueObj->commentAddress
                 || RT->Config->Get('commentAddress') )
-            : ( $TicketObj->QueueObj->CorrespondAddress
-                || RT->Config->Get('CorrespondAddress') );
+            : ( $TicketObj->QueueObj->correspond_address
+                || RT->Config->Get('correspond_address') );
         unless ( RT::Crypt::GnuPG::DrySign($address, "x") ) {
             push @cannot_sign_as, $address;
             $checks_failure = 1;

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Condition/Generic.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Condition/Generic.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Condition/Generic.pm	Thu Dec 27 01:15:12 2007
@@ -87,6 +87,7 @@
   my $class = ref($proto) || $proto;
   my $self  = {};
   bless ($self, $class);
+  $self->_get_current_user(@_);
   $self->_init(@_);
   return $self;
 }
@@ -101,7 +102,6 @@
 	       TemplateObj => undef,
 	       Argument => undef,
 	       ApplicableTransTypes => undef,
-           CurrentUser => undef,
 	       @_ );
   
   $self->{'Argument'} = $args{'Argument'};
@@ -109,7 +109,6 @@
   $self->{'TicketObj'} = $args{'TicketObj'};
   $self->{'TransactionObj'} = $args{'TransactionObj'};
   $self->{'ApplicableTransTypes'} = $args{'ApplicableTransTypes'};
-  $self->current_user($args{'CurrentUser'});
 }
 # }}}
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Dispatcher.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Dispatcher.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Dispatcher.pm	Thu Dec 27 01:15:12 2007
@@ -31,13 +31,12 @@
 };
 
 # XXX TODO XXX SECURITY RISK - this regex is WRONG AND UNSAFE
-before qr'/(?!login)$' => run {
-    my $path = $1 ||'';
-    tangent '/login' unless (Jifty->web->current_user->id || $path =~ /NoAuth/);
+before qr'^/(?!login)' => run {
+    tangent '/login' unless (Jifty->web->current_user->id  || Jifty->web->request->path =~ /NoAuth/i);
 };
 
 before qr/(.*)/ => run {
-    my $path = $1;
+    my $path =  Jifty->web->request->path;
 # This code canonicalize_s time inputs in hours into minutes
 # If it's a noauth file, don't ask for auth.
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/EmailParser.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/EmailParser.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/EmailParser.pm	Thu Dec 27 01:15:12 2007
@@ -307,7 +307,7 @@
         my $user = RT::Model::User->new(current_user => RT->system_user);
         $Address = $user->canonicalize_email($Address);
         next if ( lc $args{'CurrentUser'}->email   eq lc $Address );
-        next if ( lc $args{'QueueObj'}->CorrespondAddress eq lc $Address );
+        next if ( lc $args{'QueueObj'}->correspond_address eq lc $Address );
         next if ( lc $args{'QueueObj'}->commentAddress    eq lc $Address );
         next if ( $self->IsRTAddress($Address) );
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm	Thu Dec 27 01:15:12 2007
@@ -230,7 +230,7 @@
 
 =over 4
 
-=item From - sender's address, by default is 'CorrespondAddress';
+=item From - sender's address, by default is 'correspond_address';
 
 =item To - reciepient, by default is 'OwnerEmail';
 
@@ -257,7 +257,7 @@
     my %args = (
         To          => RT->Config->Get('OwnerEmail'),
         Bcc         => undef,
-        From        => RT->Config->Get('CorrespondAddress'),
+        From        => RT->Config->Get('correspond_address'),
         Subject     => 'There has been an error',
         Explanation => 'Unexplained error',
         MIMEObj     => undef,
@@ -498,7 +498,7 @@
     return $template;
 }
 
-=head2 SendEmailUsingTemplate Template => '', Arguments => {}, From => CorrespondAddress, To => '', Cc => '', Bcc => ''
+=head2 SendEmailUsingTemplate Template => '', Arguments => {}, From => correspond_address, To => '', Cc => '', Bcc => ''
 
 Sends email using a template, takes name of template, arguments for it and recipients.
 
@@ -511,7 +511,7 @@
           To => undef,
           Cc => undef,
           Bcc => undef,
-          From => RT->Config->Get('CorrespondAddress'),
+          From => RT->Config->Get('correspond_address'),
          InReplyTo => undef,
           @_
       );
@@ -642,8 +642,8 @@
     } else {
         # XXX: what if want to forward txn of other object than ticket?
         $subject = AddSubjectTag( $subject, $txn->object_id );
-        $from = $txn->Object->QueueObj->CorrespondAddress
-            || RT->Config->Get('CorrespondAddress');
+        $from = $txn->Object->QueueObj->correspond_address
+            || RT->Config->Get('correspond_address');
     }
     $mail->head->set( Subject => "Fwd: $subject" );
     $mail->head->set( From    => $from );
@@ -846,7 +846,7 @@
     foreach my $address ( @recipients ) {
         $address = $args{'CurrentUser'}->user_object->canonicalize_email( $address );
         next if lc $args{'CurrentUser'}->email   eq $address;
-        next if lc $args{'QueueObj'}->CorrespondAddress eq $address;
+        next if lc $args{'QueueObj'}->correspond_address eq $address;
         next if lc $args{'QueueObj'}->commentAddress    eq $address;
         next if IsRTAddress( $address );
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm	Thu Dec 27 01:15:12 2007
@@ -599,7 +599,7 @@
     }
     elsif ( $args{ARGSRef}->{'UpdateType'} eq 'response' ) {
         my ( $Transaction, $Description, $Object ) =
-        $args{TicketObj}->Correspond(%message_args);
+        $args{TicketObj}->correspond(%message_args);
         push( @results, $Description );
         $Object->UpdateCustomFields( ARGSRef => $args{ARGSRef} ) if $Object;
     }

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web/QueryBuilder/Tree.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web/QueryBuilder/Tree.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web/QueryBuilder/Tree.pm	Thu Dec 27 01:15:12 2007
@@ -233,14 +233,13 @@
     my $self = shift;
     my %args = (
         Query => '',
-        CurrentUser => '', #XXX: Hack
         @_
     );
     my $string = $args{'Query'};
 
     my @results;
 
-    my %field = %{ RT::Model::TicketCollection->new( $args{'CurrentUser'} )->columns };
+    my %field = %{ RT::Model::TicketCollection->new()->columns };
     my %lcfield = map { ( lc($_) => $_ ) } keys %field;
 
     my $node =  $self;
@@ -262,7 +261,7 @@
             $key =~ s/^[^.]+/ $lcfield{ lc $main_key } /e;
         }
         unless( $class ) {
-            push @results, [ $args{'CurrentUser'}->_("Unknown field: $key"), -1 ]
+            push @results, [ _("Unknown field: $key"), -1 ]
         }
 
         $value = "'$value'" if $value =~ /[^0-9]/;

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm	Thu Dec 27 01:15:12 2007
@@ -398,7 +398,7 @@
 
     my %data = ();
     my $current_user_address = lc $self->current_user->user_object->email;
-    my $correspond = lc $self->TransactionObj->TicketObj->QueueObj->CorrespondAddress;
+    my $correspond = lc $self->TransactionObj->TicketObj->QueueObj->correspond_address;
     my $comment = lc $self->TransactionObj->TicketObj->QueueObj->commentAddress;
     foreach my $hdr (qw(From To Cc Bcc RT-Send-Cc RT-Send-Bcc)) {
         my @Addresses;

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm	Thu Dec 27 01:15:12 2007
@@ -799,16 +799,16 @@
 
 # }}}
 
-# {{{ Memberemailes
+# {{{ member_emails
 
-=head2 Memberemailes
+=head2 member_emails
 
 Returns an array of the email addresses of all of this group's members
 
 
 =cut
 
-sub Memberemailes {
+sub member_emails {
     my $self = shift;
 
     my %addresses;
@@ -821,9 +821,9 @@
 
 # }}}
 
-# {{{ MemberemailesAsString
+# {{{ member_emailsAsString
 
-=head2 MemberemailesAsString
+=head2 member_emailsAsString
 
 Returns a comma delimited string of the email addresses of all users 
 who are members of this group.
@@ -831,9 +831,9 @@
 =cut
 
 
-sub MemberemailesAsString {
+sub member_emailsAsString {
     my $self = shift;
-    return (join(', ', $self->Memberemailes));
+    return (join(', ', $self->member_emails));
 }
 
 # }}}

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm	Thu Dec 27 01:15:12 2007
@@ -86,7 +86,7 @@
 
 column        name => max_length is 200,  type is 'varchar(200)',  default is '';
 column        Description => max_length is 255,  type is 'varchar(255)',  default is '';
-column        CorrespondAddress => max_length is 120,  type is 'varchar(120)',  default is '';
+column        correspond_address => max_length is 120,  type is 'varchar(120)',  default is '';
 column        commentAddress => max_length is 120,  type is 'varchar(120)',  default is '';
 column        InitialPriority => max_length is 11,  type is 'int(11)',  default is '0';
 column        FinalPriority => max_length is 11,  type is 'int(11)',  default is '0';
@@ -322,7 +322,7 @@
 
   name (required)
   Description
-  CorrespondAddress
+  correspond_address
   commentAddress
   InitialPriority
   FinalPriority
@@ -337,7 +337,7 @@
     my $self = shift;
     my %args = (
         name              => undef,
-        CorrespondAddress => '',
+        correspond_address => '',
         Description       => '',
         commentAddress    => '',
         InitialPriority   => 0,
@@ -917,7 +917,7 @@
         return undef;
     }   
     
-    return ( $self->AdminCc->MemberemailesAsString )
+    return ( $self->AdminCc->member_emailsAsString )
     
 }   
 
@@ -938,7 +938,7 @@
         return undef;
     }
 
-    return ( $self->Cc->MemberemailesAsString);
+    return ( $self->Cc->member_emailsAsString);
 
 }
 # }}}

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm	Thu Dec 27 01:15:12 2007
@@ -1379,7 +1379,7 @@
         return undef;
     }
 
-    return ( $self->Requestors->MemberemailesAsString );
+    return ( $self->Requestors->member_emailsAsString );
 }
 
 
@@ -1396,7 +1396,7 @@
         return undef;
     }
 
-    return ( $self->AdminCc->MemberemailesAsString )
+    return ( $self->AdminCc->member_emailsAsString )
 
 }
 
@@ -1412,7 +1412,7 @@
     unless ( $self->current_user_has_right('ShowTicket') ) {
         return undef;
     }
-    return ( $self->Cc->MemberemailesAsString);
+    return ( $self->Cc->member_emailsAsString);
 
 }
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm	Thu Dec 27 01:15:12 2007
@@ -96,7 +96,9 @@
 
 # XXX TODO, merging params should 'just work' but does not 
  __PACKAGE__->column('email')->writable(1);
-
+sub set_email { my $self = shift; my $addr = shift;
+    $self->__set(column => 'email', value => $addr);
+}
 
 
 # {{{ sub create 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Report/Tickets.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Report/Tickets.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Report/Tickets.pm	Thu Dec 27 01:15:12 2007
@@ -86,7 +86,7 @@
     if ( !$queues && $args{'Query'} ) {
         require RT::Interface::Web::QueryBuilder::Tree;
         my $tree = RT::Interface::Web::QueryBuilder::Tree->new('AND');
-        $tree->ParseSQL( Query => $args{'Query'}, CurrentUser => $self->current_user );
+        $tree->ParseSQL( Query => $args{'Query'} );
         $queues = $tree->GetReferencedQueues;
     }
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm	Thu Dec 27 01:15:12 2007
@@ -45,11 +45,11 @@
 # those contributions and any derivatives thereof.
 # 
 # END BPS TAGGED BLOCK }}}
-package RT::ScripAction::Autoreply;
 
 use strict;
 use warnings;
 
+package RT::ScripAction::Autoreply;
 use base qw(RT::ScripAction::SendEmail);
 
 =head2 Prepare
@@ -77,7 +77,7 @@
 sub set_Recipients {
     my $self=shift;
 
-    push(@{$self->{'To'}}, $self->TicketObj->Requestors->Memberemailes);
+    push(@{$self->{'To'}}, $self->TicketObj->Requestors->member_emails);
     
     return(1);
 }
@@ -105,8 +105,8 @@
 		     RT->Config->Get('commentAddress');
     }
     else {
-	$replyto = $self->TicketObj->QueueObj->CorrespondAddress ||
-		     RT->Config->Get('CorrespondAddress');
+	$replyto = $self->TicketObj->QueueObj->correspond_address ||
+		     RT->Config->Get('correspond_address');
     }
     
     unless ($self->TemplateObj->MIMEObj->head->get('From')) {

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm	Thu Dec 27 01:15:12 2007
@@ -504,7 +504,7 @@
                     . $Description );
         } elsif ( $ticketargs->{'UpdateType'} =~ /^(public|response|correspond)$/i ) {
             my ( $Transaction, $Description, $Object )
-                = $T::Tickets{$template_id}->Correspond(
+                = $T::Tickets{$template_id}->correspond(
                 BccMessageTo => $ticketargs->{'Bcc'},
                 MIMEObj      => $ticketargs->{'MIMEObj'},
                 TimeTaken    => $ticketargs->{'time_worked'}
@@ -739,7 +739,7 @@
         $args{$date} = $dateobj->ISO;
     }
 
-    $args{'requestor'} ||= $self->TicketObj->Requestors->Memberemailes
+    $args{'requestor'} ||= $self->TicketObj->Requestors->member_emails
         if $self->TicketObj;
 
     $args{'type'} ||= 'ticket';

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Generic.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Generic.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Generic.pm	Thu Dec 27 01:15:12 2007
@@ -73,6 +73,7 @@
   my $class = ref($proto) || $proto;
   my $self  = {};
   bless ($self, $class);
+  $self->_get_current_user(@_);
   $self->_init(@_);
   return $self;
 }
@@ -82,7 +83,6 @@
 sub _init  {
   my $self = shift;
   my %args = ( Argument => undef,
-               CurrentUser => undef,
                ScripActionObj => undef,
                ScripObj => undef,
                TemplateObj => undef,
@@ -93,7 +93,6 @@
                @_ );
 
   $self->{'Argument'} = $args{'Argument'};
-  $self->current_user( $args{'CurrentUser'});
   $self->{'ScripActionObj'} = $args{'ScripActionObj'};
   $self->{'ScripObj'} = $args{'ScripObj'};
   $self->{'TemplateObj'} = $args{'TemplateObj'};
@@ -203,19 +202,5 @@
 }
 # }}}
 
-# {{{ sub DESTROY
-sub DESTROY {
-    my $self = shift;
-
-    # We need to clean up all the references that might maybe get
-    # oddly circular
-    $self->{'ScripActionObj'} = undef;
-    $self->{'ScripObj'} = undef;
-    $self->{'TemplateObj'} =undef
-    $self->{'TicketObj'} = undef;
-    $self->{'TransactionObj'} = undef;
-}
-
-# }}}
 
 1;

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm	Thu Dec 27 01:15:12 2007
@@ -98,19 +98,19 @@
     }
 
     if ( $arg =~ /\bRequestor\b/ ) {
-        push @To, $ticket->Requestors->Memberemailes;
+        push @To, $ticket->Requestors->member_emails;
     }
 
     if ( $arg =~ /\bCc\b/ ) {
 
         #If we have a To, make the Ccs, Ccs, otherwise, promote them to To
         if (@To) {
-            push ( @Cc, $ticket->Cc->Memberemailes );
-            push ( @Cc, $ticket->QueueObj->Cc->Memberemailes  );
+            push ( @Cc, $ticket->Cc->member_emails );
+            push ( @Cc, $ticket->QueueObj->Cc->member_emails  );
         }
         else {
-            push ( @Cc, $ticket->Cc->Memberemailes  );
-            push ( @To, $ticket->QueueObj->Cc->Memberemailes  );
+            push ( @Cc, $ticket->Cc->member_emails  );
+            push ( @To, $ticket->QueueObj->Cc->member_emails  );
         }
     }
 
@@ -126,8 +126,8 @@
 
     }
     if ( $arg =~ /\bAdminCc\b/ ) {
-        push ( @Bcc, $ticket->AdminCc->Memberemailes  );
-        push ( @Bcc, $ticket->QueueObj->AdminCc->Memberemailes  );
+        push ( @Bcc, $ticket->AdminCc->member_emails  );
+        push ( @Bcc, $ticket->QueueObj->AdminCc->member_emails  );
     }
 
     if ( RT->Config->Get('UseFriendlyToLine') ) {

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/RecordCorrespondence.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/RecordCorrespondence.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/RecordCorrespondence.pm	Thu Dec 27 01:15:12 2007
@@ -107,7 +107,7 @@
 	TicketObj => $self->{'TicketObj'});
     return undef unless $result;
     
-    my ($trans, $desc, $transaction) = $self->{'TicketObj'}->Correspond(
+    my ($trans, $desc, $transaction) = $self->{'TicketObj'}->correspond(
 	MIMEObj => $self->TemplateObj->MIMEObj);
     $self->{'TransactionObj'} = $transaction;
 }

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm	Thu Dec 27 01:15:12 2007
@@ -692,8 +692,8 @@
           || RT->Config->Get('commentAddress');
     }
     else {
-        $replyto = $self->TicketObj->QueueObj->CorrespondAddress
-          || RT->Config->Get('CorrespondAddress');
+        $replyto = $self->TicketObj->QueueObj->correspond_address
+          || RT->Config->Get('correspond_address');
     }
 
     unless ( $self->TemplateObj->MIMEObj->head->get('From') ) {

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Test.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Test.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Test.pm	Thu Dec 27 01:15:12 2007
@@ -161,7 +161,7 @@
         my ($val, $msg) = $obj->create( %args );
         die "$msg" unless $val;
     } else {
-        my @fields = qw(CorrespondAddress commentAddress);
+        my @fields = qw(correspond_address commentAddress);
         foreach my $field ( @fields ) {
             next unless exists $args{ $field };
             next if $args{ $field } eq $obj->$field;

Modified: rt/branches/3.999-DANGEROUS/lib/t/setup_regression.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/t/setup_regression.t	(original)
+++ rt/branches/3.999-DANGEROUS/lib/t/setup_regression.t	Thu Dec 27 01:15:12 2007
@@ -17,7 +17,7 @@
 
 my ($id, $msg) = $q->create( name => 'Regression',
             Description => 'A regression test queue',
-            CorrespondAddress => 'correspond at a',
+            correspond_address => 'correspond at a',
             commentAddress => 'comment at a');
 
 isnt($id, 0, "Queue was Created sucessfully - $msg");
@@ -28,7 +28,7 @@
 is($q2->id, $id, "Sucessfully loaded the queue again");
 is($q2->name, 'Regression');
 is($q2->Description, 'A regression test queue');
-is($q2->CorrespondAddress, 'correspond at a');
+is($q2->correspond_address, 'correspond at a');
 is($q2->commentAddress, 'comment at a');
 
 

Modified: rt/branches/3.999-DANGEROUS/share/po/cs.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/cs.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/cs.po	Thu Dec 27 01:15:12 2007
@@ -369,7 +369,7 @@
 msgstr "(Zadejte identifikátory či URL požadavku, oddělené mezerami)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Pro prázdné pole se použije %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/da.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/da.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/da.po	Thu Dec 27 01:15:12 2007
@@ -402,7 +402,7 @@
 msgid "(Enter ticket ids or URLs, separated with spaces)"
 msgstr "(Indtast sagsnummer eller URL'er, adskilt af mellemrum)"
 
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 #: html/Admin/Queues/Modify.html:75
 #: html/Admin/Queues/Modify.html:81

Modified: rt/branches/3.999-DANGEROUS/share/po/de.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/de.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/de.po	Thu Dec 27 01:15:12 2007
@@ -333,7 +333,7 @@
 msgstr "(Geben Sie die Anfrage IDs oder URLs getrennt durch Leerzeichen ein)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Standardwert: %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/es.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/es.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/es.po	Thu Dec 27 01:15:12 2007
@@ -393,7 +393,7 @@
 msgstr "(Entrar ids o URLs de casos, separados por espacios)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Si se deja vacio, pasara por defecto a %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/fi.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/fi.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/fi.po	Thu Dec 27 01:15:12 2007
@@ -374,7 +374,7 @@
 msgstr "(Syötä tapausten numerot tai www-osoitteet, välilyönneillä erotettuina)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Jos jätetään tyhjäksi, palaa arvoon %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/fr.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/fr.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/fr.po	Thu Dec 27 01:15:12 2007
@@ -308,7 +308,7 @@
 msgstr "(Entrer le numéro du ticket ou son URL, séparés par des espaces)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Si à laissé blanc, le défaut sera %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/he.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/he.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/he.po	Thu Dec 27 01:15:12 2007
@@ -316,7 +316,7 @@
 msgstr ""
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr ""

Modified: rt/branches/3.999-DANGEROUS/share/po/hu.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/hu.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/hu.po	Thu Dec 27 01:15:12 2007
@@ -300,7 +300,7 @@
 msgstr "(Szóközökkel elválasztva adható meg a problémák sorszáma vagy URL-je.)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Ha üresen marad: %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/id.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/id.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/id.po	Thu Dec 27 01:15:12 2007
@@ -314,7 +314,7 @@
 msgstr "(Jika ditinggalkan kosong, default akan diatur menjadi %1"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Jika ditinggalkan kosong, default akan menjadi %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/it.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/it.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/it.po	Thu Dec 27 01:15:12 2007
@@ -393,7 +393,7 @@
 msgstr "(inserire i numeri o gli URL dei ticket, separati da spazi)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Se non specificato usa: %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/ja.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/ja.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/ja.po	Thu Dec 27 01:15:12 2007
@@ -360,7 +360,7 @@
 msgstr ""
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr ""

Modified: rt/branches/3.999-DANGEROUS/share/po/nl.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/nl.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/nl.po	Thu Dec 27 01:15:12 2007
@@ -364,7 +364,7 @@
 msgstr ""
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Indien leeggelaten, wordt voorzien van %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/no.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/no.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/no.po	Thu Dec 27 01:15:12 2007
@@ -393,7 +393,7 @@
 msgstr "(Skriv inn referansenummer eller URler, separert med mellomrom)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Settes til standard %1 hvis blank)"

Modified: rt/branches/3.999-DANGEROUS/share/po/pl.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/pl.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/pl.po	Thu Dec 27 01:15:12 2007
@@ -403,7 +403,7 @@
 msgstr "(Wprowadź numery lub adresy URL zgłoszeń, oddzielone spacjami)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Jeśli pozostawisz puste, domyślnie zostanie ustawione na %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/pt_br.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/pt_br.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/pt_br.po	Thu Dec 27 01:15:12 2007
@@ -389,7 +389,7 @@
 msgstr ""
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Se deixado em branco, será entendido como %)"

Modified: rt/branches/3.999-DANGEROUS/share/po/ru.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/ru.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/ru.po	Thu Dec 27 01:15:12 2007
@@ -402,7 +402,7 @@
 msgstr "(Если не заполнено, то по умолчанию равно %1"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Если не заполнено, то по умолчанию равно %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/sv.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/sv.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/sv.po	Thu Dec 27 01:15:12 2007
@@ -322,7 +322,7 @@
 msgid "(Enter ticket ids or URLs, separated with spaces)"
 msgstr "(Mata in ärende-ID:n eller URL, separerade med mellanrum)"
 
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 #: html/Admin/Queues/Modify.html:75
 #: html/Admin/Queues/Modify.html:81

Modified: rt/branches/3.999-DANGEROUS/share/po/tr.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/tr.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/tr.po	Thu Dec 27 01:15:12 2007
@@ -295,7 +295,7 @@
 msgstr "(Boşluklarla ayrılmış olarak, bilet numaralarını veya URL' lerini girin)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(Boş bırakılırsa, varsayılan olarak %1 değerini alacaktır)"

Modified: rt/branches/3.999-DANGEROUS/share/po/zh_cn.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/zh_cn.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/zh_cn.po	Thu Dec 27 01:15:12 2007
@@ -428,7 +428,7 @@
 msgstr "(键入申请单编号或网址,以空白分隔)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(如果留白, 则预设为 %1)"

Modified: rt/branches/3.999-DANGEROUS/share/po/zh_tw.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/zh_tw.po	(original)
+++ rt/branches/3.999-DANGEROUS/share/po/zh_tw.po	Thu Dec 27 01:15:12 2007
@@ -428,7 +428,7 @@
 msgstr "(鍵入申請單編號或網址,以空白分隔)"
 
 #: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
+#. ($RT::correspond_address)
 #. ($RT::commentAddress)
 msgid "(If left blank, will default to %1)"
 msgstr "(如果留白, 則預設為 %1)"

Modified: rt/branches/3.999-DANGEROUS/t/api/i18n.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/i18n.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/api/i18n.t	Thu Dec 27 01:15:12 2007
@@ -2,10 +2,17 @@
 use strict;
 use warnings;
 use RT::Test; use Test::More; 
-plan tests => 9;
+plan tests => 12;
 use RT;
 
 
+ok( require RT::CurrentUser );
+
+ok( my $cu = RT::CurrentUser->new('root') );
+is( _('TEST_STRING'), "Concrete Mixer", "Localized TEST_STRING into English" );
+Jifty::I18N->get_handle('FR-fr');
+is( _('Before'), "Avant", "Localized TEST_STRING into French" );
+
 
 
 use_ok ('Jifty::I18N');
@@ -19,4 +26,5 @@
 
 
 
+
 1;

Modified: rt/branches/3.999-DANGEROUS/t/delegation/cleanup_stalled.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/delegation/cleanup_stalled.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/delegation/cleanup_stalled.t	Thu Dec 27 01:15:12 2007
@@ -414,7 +414,7 @@
 ok( $ret, "Look up ACE to be delegated: $msg" );
 ( $ret, $msg ) = $ace->Delegate( principal_id => $pg1->principal_id );
 ok( $ret, "Delegate DelegateRights to pg1: $msg" );
-$ace = RT::Model::ACE->new($u2);
+$ace = RT::Model::ACE->new(current_user => RT::CurrentUser->new( id => $u2));
 ( $ret, $msg ) = $ace->load_by_values(
     right_name     => 'ShowConfigTab',
     Object        => RT->system,

Modified: rt/branches/3.999-DANGEROUS/t/mail/gnupg-bad.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/gnupg-bad.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/mail/gnupg-bad.t	Thu Dec 27 01:15:12 2007
@@ -26,7 +26,7 @@
 $m->get( $baseurl.'/Admin/Queues/');
 $m->follow_link_ok( {text => 'General'} );
 $m->submit_form( form_number => 3,
-         fields      => { CorrespondAddress => 'rt at example.com' } );
+         fields      => { correspond_address => 'rt at example.com' } );
 $m->content_like(qr/rt\@example.com.* - never/, 'has key info.');
 
 ok(my $user = RT::Model::User->new(current_user => RT->system_user));

Modified: rt/branches/3.999-DANGEROUS/t/mail/gnupg-incoming.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/gnupg-incoming.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/mail/gnupg-incoming.t	Thu Dec 27 01:15:12 2007
@@ -44,7 +44,7 @@
 $m->get( $baseurl.'/Admin/Queues/');
 $m->follow_link_ok( {text => 'General'} );
 $m->submit_form( form_number => 3,
-		 fields      => { CorrespondAddress => 'general at example.com' } );
+		 fields      => { correspond_address => 'general at example.com' } );
 $m->content_like(qr/general\@example.com.* - never/, 'has key info.');
 
 ok(my $user = RT::Model::User->new(current_user => RT->system_user));

Modified: rt/branches/3.999-DANGEROUS/t/mail/gnupg-realmail.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/gnupg-realmail.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/mail/gnupg-realmail.t	Thu Dec 27 01:15:12 2007
@@ -30,7 +30,7 @@
 $m->get_ok( '/Admin/Queues/');
 $m->follow_link_ok( {text => 'General'} );
 $m->submit_form( form_number => 3,
-         fields      => { CorrespondAddress => 'rt-recipient at example.com' } );
+         fields      => { correspond_address => 'rt-recipient at example.com' } );
 $m->content_like(qr/rt-recipient\@example.com.* - never/, 'has key info.');
 
 diag "load Everyone group" if $ENV{'TEST_VERBOSE'};

Modified: rt/branches/3.999-DANGEROUS/t/mail/sendmail.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/sendmail.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/mail/sendmail.t	Thu Dec 27 01:15:12 2007
@@ -136,7 +136,7 @@
 ok ($id, $msg);
 
 $parser->ParseMIMEEntityFromScalar($content);
-($id, $msg) = $tick->Correspond(MIMEObj => $parser->Entity);
+($id, $msg) = $tick->correspond(MIMEObj => $parser->Entity);
 ok ($id, $msg);
 
 
@@ -179,7 +179,7 @@
 ok ($id, $msg);
 
 $parser->ParseMIMEEntityFromScalar($content);
-($id, $msg) = $tick->Correspond(MIMEObj => $parser->Entity);
+($id, $msg) = $tick->correspond(MIMEObj => $parser->Entity);
 ok ($id, $msg);
 
 

Modified: rt/branches/3.999-DANGEROUS/t/ticket/batch-upload-csv.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/batch-upload-csv.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/batch-upload-csv.t	Thu Dec 27 01:15:12 2007
@@ -28,7 +28,7 @@
 EOF
 
 my $action = RT::ScripAction::CreateTickets->new(current_user => RT::CurrentUser->new(name => 'root'));
-ok ($action->current_user->id , "WE have a current user");
+ok ($action->current_user->id , "We have a current user");
  
 $action->Parse(Content => $data);
 my @results = $action->createByTemplate();

Modified: rt/branches/3.999-DANGEROUS/t/web/basic.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/basic.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/web/basic.t	Thu Dec 27 01:15:12 2007
@@ -66,8 +66,10 @@
     fields => { time_worked => 5, 'time_worked-TimeUnits' => "hours" }
 );
 
-like ($agent->{'content'}, qr/to &#39;300&#39;/, "5 hours is 300 minutes");
-
+TODO: {
+    local $TODO = "We don't handle time worked units yet";
+    like ($agent->{'content'}, qr/to &#39;300&#39;/, "5 hours is 300 minutes");
+}
 # }}}
 
 # {{{ Query Builder tests

Modified: rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t	Thu Dec 27 01:15:12 2007
@@ -12,7 +12,7 @@
 RT->Config->set( LogToScreen => 'debug' );
 RT->Config->set( LogStackTraces => 'error' );
 RT->Config->set( commentAddress => 'general at example.com');
-RT->Config->set( CorrespondAddress => 'general at example.com');
+RT->Config->set( correspond_address => 'general at example.com');
 RT->Config->set( DefaultSearchResultFormat => qq{
    '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
    '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
@@ -51,7 +51,7 @@
 
 my $queue = RT::Test->load_or_create_queue(
     name              => 'General',
-    CorrespondAddress => 'general at example.com',
+    correspond_address => 'general at example.com',
 );
 ok $queue && $queue->id, 'loaded or created queue';
 my $qid = $queue->id;
@@ -288,7 +288,6 @@
 is($m->status, 200, "request successful");
 
 $m->get($baseurl); # ensure that the mail has been processed
-
 @mail = RT::Test->fetch_caught_mails;
 ok(@mail, "got some mail");
 for my $mail (@mail) {
@@ -349,7 +348,6 @@
 }
 
 # now test the OwnernameKey and RequestorsKey fields
-
 my $nokey = RT::Test->load_or_create_user(name => 'nokey', email => 'nokey at example.com');
 $nokey->principal_object->GrantRight(Right => 'CreateTicket');
 $nokey->principal_object->GrantRight(Right => 'OwnTicket');
@@ -363,7 +361,6 @@
 $tick->create(Subject => 'owner has pubkey', Queue => 'general',
               Owner => 'root');
 ok($id = $tick->id, 'created ticket for owner-with-pubkey');
-
 my $mail = << "MAIL";
 Subject: Nokey requestor
 From: nokey\@example.com
@@ -375,11 +372,9 @@
 ((my $status), $id) = RT::Test->send_via_mailgate($mail);
 is ($status >> 8, 0, "The mail gateway exited normally");
 ok ($id, "got id of a newly created ticket - $id");
-
 $tick = RT::Model::Ticket->new(current_user => RT->system_user );
 $tick->load( $id );
 ok ($tick->id, "loaded ticket #$id");
-
 is ($tick->Subject,
     "Nokey requestor",
     "Correct subject"
@@ -389,7 +384,7 @@
 my $key1 = "EC1E81E7DC3DB42788FB0E4E9FA662C06DE22FC2";
 my $key2 = "75E156271DCCF02DDD4A7A8CDF651FA0632C4F50";
 
-ok($user = RT::Model::User->new($RT::system_user));
+ok($user = RT::Model::User->new(current_user => RT->system_user));
 ok($user->load('root'), "Loaded user 'root'");
 is($user->PreferredKey, $key1, "preferred key is set correctly");
 $m->get("$baseurl/Prefs/Other.html");

Modified: rt/branches/3.999-DANGEROUS/t/web/gnupg-outgoing.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/gnupg-outgoing.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/web/gnupg-outgoing.t	Thu Dec 27 01:15:12 2007
@@ -32,7 +32,7 @@
 
 my $queue = RT::Test->load_or_create_queue(
     name              => 'Regression',
-    CorrespondAddress => 'rt-recipient at example.com',
+    correspond_address => 'rt-recipient at example.com',
     commentAddress    => 'rt-recipient at example.com',
 );
 ok $queue && $queue->id, 'loaded or created queue';
@@ -81,7 +81,7 @@
     # to avoid encryption/signing during create
     set_queue_crypt_options();
 
-    my $ticket = RT::Model::Ticket->new( $RT::system_user );
+    my $ticket = RT::Model::Ticket->new( current_user =>RT->system_user );
     my ($id) = $ticket->create(
         Subject   => 'test',
         Queue     => $queue->id,
@@ -117,7 +117,7 @@
 
 my $tid;
 {
-    my $ticket = RT::Model::Ticket->new( $RT::system_user );
+    my $ticket = RT::Model::Ticket->new(current_user => RT->system_user );
     ($tid) = $ticket->create(
         Subject   => 'test',
         Queue     => $queue->id,
@@ -147,7 +147,7 @@
 
 $queue = RT::Test->load_or_create_queue(
     name              => 'Regression',
-    CorrespondAddress => 'rt-test at example.com',
+    correspond_address => 'rt-test at example.com',
     commentAddress    => 'rt-test at example.com',
 );
 ok $queue && $queue->id, 'changed props of the queue';
@@ -157,7 +157,7 @@
     is ($status >> 8, 0, "The mail gateway exited normally");
     ok ($id, "got id of a newly created ticket - $id");
 
-    my $tick = RT::Model::Ticket->new( $RT::system_user );
+    my $tick = RT::Model::Ticket->new(current_user => RT->system_user );
     $tick->load( $id );
     ok ($tick->id, "loaded ticket #$id");
 
@@ -178,7 +178,7 @@
     is ($status >> 8, 0, "The mail gateway exited normally");
     ok ($id, "got id of a newly created ticket - $id");
 
-    my $tick = RT::Model::Ticket->new( $RT::system_user );
+    my $tick = RT::Model::Ticket->new(current_user => RT->system_user );
     $tick->load( $id );
     ok ($tick->id, "loaded ticket #$id");
 
@@ -202,7 +202,7 @@
     is ($status >> 8, 0, "The mail gateway exited normally");
     ok ($id, "got id of a newly created ticket - $id");
 
-    my $tick = RT::Model::Ticket->new( $RT::system_user );
+    my $tick = RT::Model::Ticket->new(current_user => RT->system_user );
     $tick->load( $id );
     ok ($tick->id, "loaded ticket #$id");
 
@@ -225,7 +225,7 @@
     is ($status >> 8, 0, "The mail gateway exited normally");
     ok ($id, "got id of a newly created ticket - $id");
 
-    my $tick = RT::Model::Ticket->new( $RT::system_user );
+    my $tick = RT::Model::Ticket->new(current_user => RT->system_user );
     $tick->load( $id );
     ok ($tick->id, "loaded ticket #$id");
 

Modified: rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-create.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-create.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-create.t	Thu Dec 27 01:15:12 2007
@@ -30,7 +30,7 @@
 
 my $queue = RT::Test->load_or_create_queue(
     name              => 'Regression',
-    CorrespondAddress => 'rt-recipient at example.com',
+    correspond_address => 'rt-recipient at example.com',
     commentAddress    => 'rt-recipient at example.com',
 );
 ok $queue && $queue->id, 'loaded or created queue';

Modified: rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-update.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-update.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-update.t	Thu Dec 27 01:15:12 2007
@@ -30,7 +30,7 @@
 
 my $queue = RT::Test->load_or_create_queue(
     name              => 'Regression',
-    CorrespondAddress => 'rt-recipient at example.com',
+    correspond_address => 'rt-recipient at example.com',
     commentAddress    => 'rt-recipient at example.com',
 );
 ok $queue && $queue->id, 'loaded or created queue';

Modified: rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t	Thu Dec 27 01:15:12 2007
@@ -51,7 +51,7 @@
     $ticket->load( $tid );
     ok $ticket->id, 'loaded the ticket';
 
-    my ($status, $msg) = $ticket->Correspond( Content => 'bla-bla' );
+    my ($status, $msg) = $ticket->correspond( Content => 'bla-bla' );
     ok $status, 'added reply' or diag "error: $msg";
 
     $agent_a->goto_ticket($tid);


More information about the Rt-commit mailing list