5 files changed, 4 insertions, 104 deletions

diff --git a/rt/lib/RT/Action.pm b/rt/lib/RT/Action.pm
index 1740b1d66..5c295cb8b 100755
--- a/rt/lib/RT/Action.pm
+++ b/rt/lib/RT/Action.pm
@@ -172,17 +172,6 @@ sub Prepare  {
 }
 
 
-sub Options {
-  my $self = shift;
-  return();
-}
-
-sub Rules {
-  my $self = shift;
-  return () if !$self->ScripObj or !$self->ScripObj->ActionRules;
-  return(split "\n", $self->ScripObj->ActionRules);
-}
-
 RT::Base->_ImportOverlays();
 
 1;
diff --git a/rt/lib/RT/Action/CreateTickets.pm b/rt/lib/RT/Action/CreateTickets.pm
index 03bc21255..d19f152d0 100644
--- a/rt/lib/RT/Action/CreateTickets.pm
+++ b/rt/lib/RT/Action/CreateTickets.pm
@@ -733,7 +733,6 @@ sub ParseLines {
         FinalPriority   => $args{'finalpriority'} || 0,
         SquelchMailTo   => $args{'squelchmailto'},
         Type            => $args{'type'},
-        $self->Rules
     );
 
     if ( $args{content} ) {
@@ -1140,7 +1139,10 @@ sub UpdateCustomFields {
         }
 
         foreach my $value (@values) {
-            next unless length($value);
+            next if $ticket->CustomFieldValueIsEmpty(
+                Field => $cf,
+                Value => $value,
+            );
             my ( $val, $msg ) = $ticket->AddCustomFieldValue(
                 Field => $cf,
                 Value => $value
@@ -1214,24 +1216,6 @@ sub PostProcess {
 
 }
 
-sub Options {
-  my $self = shift;
-  my $queues = RT::Queues->new($self->CurrentUser);
-  $queues->UnLimit;
-  my @names;
-  while (my $queue = $queues->Next) {
-    push @names, $queue->Id, $queue->Name;
-  }
-  return (
-    {
-      'name'    => 'Queue',
-      'label'   => 'In queue',
-      'type'    => 'select',
-      'options' => \@names
-    }
-  )
-}
-
 RT::Base->_ImportOverlays();
 
 1;
diff --git a/rt/lib/RT/Condition.pm b/rt/lib/RT/Condition.pm
index bd495db76..69aaf8664 100755
--- a/rt/lib/RT/Condition.pm
+++ b/rt/lib/RT/Condition.pm
@@ -193,19 +193,6 @@ sub IsApplicable  {
   return(undef);
 }
 
-sub Options {
-  my $self = shift;
-  return();
-}
-
-sub Rules {
-  my $self = shift;
-  return () if !$self->ScripObj or !$self->ScripObj->ConditionRules;
-  # By default, option names and values are on consecutive lines.
-  # Override this if you need anything more interesting.
-  return(split "\n", $self->ScripObj->ConditionRules);
-}
-
 sub DESTROY {
     my $self = shift;
 
diff --git a/rt/lib/RT/Condition/CustomFieldChange.pm b/rt/lib/RT/Condition/CustomFieldChange.pm
deleted file mode 100644
index b9228a50f..000000000
--- a/rt/lib/RT/Condition/CustomFieldChange.pm
+++ /dev/null
@@ -1,56 +0,0 @@
-package RT::Condition::CustomFieldChange;
-use base 'RT::Condition';
-use strict;
-
-=head2 IsApplicable
-
-If a custom field has a particular value.
-
-=cut
-
-# Based on Chuck Boeheim's code posted on the RT Wiki 3/13/06
-
-sub IsApplicable {
-    my $self = shift;
-    my $trans = $self->TransactionObj;
-    my $scrip = $self->ScripObj;
-    my %Rules = $self->Rules;
-    my ($field, $value) = @Rules{'field', 'value'};
-    return if !defined($field) or !defined($value);
-
-    if ($trans->Type eq 'Create') {
-        return 1 if $trans->TicketObj->FirstCustomFieldValue($field) eq $value;
-    }
-    if ($trans->Type eq 'CustomField') {
-        my $cf = RT::CustomField->new($self->CurrentUser);
-        $cf->Load($field);
-        return 1 if $trans->Field == $cf->Id and $trans->NewValue eq $value;
-    }
-    return undef;
-}
-
-sub Options {
-  my $self = shift;
-  my %args = ( 'QueueObj' => undef, @_ );
-  my $QueueObj = $args{'QueueObj'};
-  my $cfs = $QueueObj->TicketCustomFields();
-  my @fieldnames;
-  while ( my $cf = $cfs->Next ) {
-    push @fieldnames, $cf->Name, $cf->Name;
-  }
-  return (
-    { 
-      'name'    => 'field',
-      'label'   => 'Custom Field',
-      'type'    => 'select',
-      'options' => \@fieldnames,
-    },
-    {
-      'name'    => 'value',
-      'label'   => 'Value',
-      'type'    => 'text',
-    },
-  );
-}
-1;
-
diff --git a/rt/lib/RT/Scrip.pm b/rt/lib/RT/Scrip.pm
index eedd4060f..5bd86e0d7 100755
--- a/rt/lib/RT/Scrip.pm
+++ b/rt/lib/RT/Scrip.pm
@@ -113,8 +113,6 @@ sub Create {
         CustomPrepareCode      => undef,
         CustomCommitCode       => undef,
         CustomIsApplicableCode => undef,
-        ConditionRules         => undef,
-        ActionRules            => undef,
         @_
     );
 
@@ -198,8 +196,6 @@ sub Create {
         CustomPrepareCode      => $args{'CustomPrepareCode'},
         CustomCommitCode       => $args{'CustomCommitCode'},
         CustomIsApplicableCode => $args{'CustomIsApplicableCode'},
-        ConditionRules         => $args{'ConditionRules'},
-        ActionRules            => $args{'ActionRules'},
     );
     return ( $id, $msg ) unless $id;