1 files changed, 56 insertions, 157 deletions

diff --git a/rt/bin/rt-crontool b/rt/bin/rt-crontool
index 563a272fa..8fcd63111 100644
--- a/rt/bin/rt-crontool
+++ b/rt/bin/rt-crontool
@@ -2,8 +2,8 @@
 # BEGIN BPS TAGGED BLOCK {{{
 # 
 # COPYRIGHT:
-# 
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
+#  
+# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -25,7 +25,7 @@
 # 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/licenses/old-licenses/gpl-2.0.html.
+# http://www.gnu.org/copyleft/gpl.html.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
@@ -49,32 +49,9 @@
 use strict;
 use Carp;
 
-# fix lib paths, some may be relative
-BEGIN {
-    require File::Spec;
-    my @libs = ("lib", "local/lib");
-    my $bin_path;
-
-    for my $lib (@libs) {
-        unless ( File::Spec->file_name_is_absolute($lib) ) {
-            unless ($bin_path) {
-                if ( File::Spec->file_name_is_absolute(__FILE__) ) {
-                    $bin_path = ( File::Spec->splitpath(__FILE__) )[1];
-                }
-                else {
-                    require FindBin;
-                    no warnings "once";
-                    $bin_path = $FindBin::Bin;
-                }
-            }
-            $lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
-        }
-        unshift @INC, $lib;
-    }
+use lib ("/opt/rt3/local/lib", "/opt/rt3/lib");
 
-}
-
-use RT;
+package RT;
 
 use Getopt::Long;
 
@@ -85,66 +62,54 @@ use RT::Template;
 #Clean out all the nasties from the environment
 CleanEnv();
 
-my ( $search, $condition, $action, $search_arg, $condition_arg, $action_arg,
-     $template, $template_id, $transaction, $transaction_type, $help, $log, $verbose );
-GetOptions(
-    "search=s"           => \$search,
-    "search-arg=s"       => \$search_arg,
-    "condition=s"        => \$condition,
-    "condition-arg=s"    => \$condition_arg,
-    "action-arg=s"       => \$action_arg,
-    "action=s"           => \$action,
-    "template=s"         => \$template,
-    "template-id=s"      => \$template_id,
-    "transaction=s"      => \$transaction,
-    "transaction-type=s" => \$transaction_type,
-    "log=s"              => \$log,
-    "verbose|v"          => \$verbose,
-    "help"               => \$help,
-);
-
 # Load the config file
 RT::LoadConfig();
 
-# adjust logging to the screen according to options
-RT->Config->Set( LogToScreen => $log ) if $log;
-
 #Connect to the database and get RT::SystemUser and RT::Nobody loaded
 RT::Init();
 
 #Get the current user all loaded
 my $CurrentUser = GetCurrentUser();
 
-# show help even if there is no current user
-help() if $help;
-
 unless ( $CurrentUser->Id ) {
     print loc("No RT user found. Please consult your RT administrator.\n");
     exit(1);
 }
 
-help() unless $search && $action;
-
-$transaction = lc( $transaction||'' );
-if ( $transaction && $transaction !~ /^(first|all|last)$/i ) {
-    print STDERR loc("--transaction argument could be only 'first', 'last' or 'all'");
-    exit 1;
-}
-
-if ( $template && $template_id ) {
-    print STDERR loc("--template-id is deprecated argument and can not be used with --template");
+my ( $search, $condition, $action, $search_arg, $condition_arg, $action_arg,
+     $template_id, $transaction, $transaction_type, $help, $verbose );
+GetOptions( "search=s"           => \$search,
+            "search-arg=s"       => \$search_arg,
+            "condition=s"        => \$condition,
+            "condition-arg=s"    => \$condition_arg,
+            "action-arg=s"       => \$action_arg,
+            "action=s"           => \$action,
+            "template-id=s"      => \$template_id,
+            "transaction=s"      => \$transaction,
+            "transaction-type=s" => \$transaction_type,
+            "help"               => \$help,
+            "verbose|v"          => \$verbose );
+
+help() if $help or not $search or not $action;
+
+$transaction ||= 'first';
+unless ( $transaction =~ /^(first|last)$/i ) {
+    print STDERR loc("--transaction argument could be only 'first' or 'last'");
     exit 1;
 }
-elsif ( $template_id ) {
-# don't warn
-    $template = $template_id;
-}
+$transaction = lc($transaction) eq 'first'? 'ASC': 'DESC';
 
 # We _must_ have a search object
 load_module($search);
 load_module($action)    if ($action);
 load_module($condition) if ($condition);
 
+# load template if specified
+my $template_obj;
+if ($template_id) {
+    $template_obj = RT::Template->new($CurrentUser);
+    $template_obj->Load($template_id);
+}
 my $void_scrip = RT::Scrip->new( $CurrentUser );
 my $void_scrip_action = RT::ScripAction->new( $CurrentUser );
 
@@ -167,31 +132,9 @@ my $tickets = $search->TicketsObj;
 while ( my $ticket = $tickets->Next() ) {
     print $ticket->Id() . ": " if ($verbose);
 
-    my $template_obj = get_template( $ticket );
-
-    if ( $transaction ) {
-        my $txns = get_transactions($ticket);
-        my $found = 0;
-        while ( my $txn = $txns->Next ) {
-            print loc("Using transaction #[_1]...", $txn->id)
-                if $verbose;
-            process($ticket, $txn, $template_obj);
-            $found = 1;
-        }
-        print loc("Couldn't find suitable transaction, skipping")
-            if $verbose && !$found;
-    } else {
-        print loc("Processing without transaction, some conditions and actions may fail. Consider using --transaction argument")
-            if $verbose;
-
-        process($ticket, undef, $template_obj);
-    }
-}
-
-sub process {
-    my $ticket = shift;
-    my $transaction = shift;
-    my $template_obj = shift;
+    my $transaction = get_transaction($ticket);
+    print loc("Using transaction #[_1]...", $transaction->id)
+        if $verbose && $transaction;
 
     # perform some more advanced check
     if ($condition) {
@@ -206,8 +149,8 @@ sub process {
 
         # if the condition doesn't apply, get out of here
 
-        return unless $condition_obj->IsApplicable;
-        print loc("Condition matches...") if $verbose;
+        next unless ( $condition_obj->IsApplicable );
+        print loc("Condition matches...") if ($verbose);
     }
 
     #prepare our action
@@ -222,76 +165,34 @@ sub process {
     );
 
     #if our preparation, move onto the next ticket
-    return unless $action_obj->Prepare;
-    print loc("Action prepared...") if $verbose;
+    next unless ( $action_obj->Prepare );
+    print loc("Action prepared...") if ($verbose);
 
     #commit our action.
-    return unless $action_obj->Commit;
-    print loc("Action committed.\n") if $verbose;
+    next unless ( $action_obj->Commit );
+    print loc("Action committed.\n") if ($verbose);
 }
 
-=head2 get_transactions
+=head2 get_transaction
 
-Takes ticket and returns L<RT::Transactions> object with transactions
-of the ticket according to command line arguments C<--transaction>
-and <--transaction-type>.
+Takes ticket and returns its transaction acording to command
+line arguments C<--transaction> and <--transaction-type>.
 
 =cut
 
-sub get_transactions {
+sub get_transaction {
     my $ticket = shift;
     my $txns = $ticket->Transactions;
-    my $order = $transaction eq 'last'? 'DESC': 'ASC';
     $txns->OrderByCols(
-        { FIELD => 'Created', ORDER => $order },
-        { FIELD => 'id', ORDER => $order },
+        { FIELD => 'Created', ORDER => $transaction },
+        { FIELD => 'id', ORDER => $transaction },
     );
-    if ( $transaction_type ) {
-        $transaction_type =~ s/^\s+//;
-        $transaction_type =~ s/\s+$//;
-        foreach my $type ( split /\s*,\s*/, $transaction_type ) {
-            $txns->Limit( FIELD => 'Type', VALUE => $type, ENTRYAGGREGATOR => 'OR' );
-        }
-    }
-    $txns->RowsPerPage(1) unless $transaction eq 'all';
-    return $txns;
+    $txns->Limit( FIELD => 'Type', VALUE => $transaction_type )
+        if $transaction_type;
+    $txns->RowsPerPage(1);
+    return $txns->First;
 }
 
-=head2 get_template
-
-Takes a ticket and returns a template according to command line options.
-
-=cut
-
-{ my $cache = undef;
-sub get_template {
-    my $ticket = shift;
-    return undef unless $template;
-
-    unless ( $template =~ /\D/ ) {
-        # by id
-        return $cache if $cache;
-
-        my $cache = RT::Template->new( $RT::SystemUser );
-        $cache->Load( $template );
-        die "Failed to load template '$template'"
-            unless $cache->id;
-        return $cache;
-    }
-
-    my $queue = $ticket->Queue;
-    return $cache->{ $queue } if $cache->{ $queue };
-
-    my $res = RT::Template->new( $RT::SystemUser );
-    $res->LoadQueueTemplate( Queue => $queue, Name => $template );
-    unless ( $res->id ) {
-        $res->LoadGlobalTemplate( $template );
-        die "Failed to load template '$template', either for queue #$queue or global"
-            unless $res->id;
-    }
-    return $cache->{ $queue } = $res;
-} }
-
 # {{{ load_module 
 
 =head2 load_module
@@ -335,33 +236,31 @@ sub help {
       . loc( "[_1] - Specify the search module you want to use", "--search" )
       . "\n";
     print "	"
-      . loc( "[_1] - An argument to pass to [_2]", "--search-arg", "--search" )
+      . loc( "[_1] - An argument to pass to [_2]", "--search-argument", "--search" )
       . "\n";
 
     print "	"
       . loc( "[_1] - Specify the condition module you want to use", "--condition" )
       . "\n";
     print "	"
-      . loc( "[_1] - An argument to pass to [_2]", "--condition-arg", "--condition" )
+      . loc( "[_1] - An argument to pass to [_2]", "--condition-argument", "--condition" )
       . "\n";
     print "	"
       . loc( "[_1] - Specify the action module you want to use", "--action" )
       . "\n";
     print "	"
-      . loc( "[_1] - An argument to pass to [_2]", "--action-arg", "--action" )
+      . loc( "[_1] - An argument to pass to [_2]", "--action-argument", "--action" )
       . "\n";
     print "	"
-      . loc( "[_1] - Specify name or id of template(s) you want to use", "--template" )
+      . loc( "[_1] - Specify id of the template you want to use", "--template-id" )
       . "\n";
     print "	"
-      . loc( "[_1] - Specify if you want to use either 'first', 'last' or 'all' transactions", "--transaction" )
+      . loc( "[_1] - Specify if you want to use either 'first' or 'last' transaction", "--transaction" )
       . "\n";
     print "	"
-      . loc( "[_1] - Specify the comma separated list of transactions' types you want to use", "--transaction-type" )
+      . loc( "[_1] - Specify the type of a transaction you want to use", "--transaction-type" )
       . "\n";
     print "	"
-      . loc( "[_1] - Adjust LogToScreen config option", "--log" ) . "\n";
-    print "	"
       . loc( "[_1] - Output status updates to STDOUT", "--verbose" ) . "\n";
     print "\n";
     print "\n";