X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FConfig.pm;h=7aa25b3806083b1ed86c01df502bd3b23c9e13ca;hb=e6e50b882540c84743c97e5a671f108d9c5d5941;hp=76c45dcbd67151464883c4212a0b784c26f36fca;hpb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd;p=freeside.git

diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm
index 76c45dcbd..7aa25b380 100644
--- a/rt/lib/RT/Config.pm
+++ b/rt/lib/RT/Config.pm
@@ -173,7 +173,7 @@ our %META = (
         WidgetArguments => {
             Description => 'Theme',                  #loc
             # XXX: we need support for 'get values callback'
-            Values => [qw(3.5-default 3.4-compat web2)],
+            Values => [qw(3.5-default 3.4-compat web2 freeside2.1)],
         },
     },
     MessageBoxRichText => {
@@ -313,6 +313,16 @@ our %META = (
             Hints => 'Use css rules to display text monospaced and with formatting preserved, but wrap as needed.  This does not work well with IE6 and you should use the previous option', #loc
         },
     },
+    DisplayAfterQuickCreate => {
+        Section         => 'Ticket display',
+        Overridable     => 1,
+        SortOrder       => 6,
+        Widget          => '/Widgets/Form/Boolean',
+        WidgetArguments => {
+            Description => 'On Quick Create, redirect to ticket display', #loc
+            #Hints => '', #loc
+        },
+    },
 
     # User overridable locale options
     DateTimeFormat => {
@@ -333,6 +343,24 @@ our %META = (
         },
     },
 
+    RTAddressRegexp => {
+        Type    => 'SCALAR',
+        PostLoadCheck => sub {
+            my $self = shift;
+            my $value = $self->Get('RTAddressRegexp');
+            return if $value;
+
+            #XXX freeside - should fix this at some point, but it is being WAY
+            #too noisy in the logs
+            #$RT::Logger->error(
+            #    'The RTAddressRegexp option is not set in the config.'
+            #    .' Not setting this option results in additional SQL queries to'
+            #    .' check whether each address belongs to RT or not.'
+            #    .' It is especially important to set this option if RT recieves'
+            #    .' emails on addresses that are not in the database or config.'
+            #);
+        },
+    },
     # User overridable mail options
     EmailFrequency => {
         Section         => 'Mail',                                     #loc
@@ -349,6 +377,16 @@ our %META = (
             ]
         }
     },
+    NotifyActor => {
+        Section         => 'Mail',                                     #loc
+        Overridable     => 1,
+        SortOrder       => 2,
+        Widget          => '/Widgets/Form/Boolean',
+        WidgetArguments => {
+            Description => 'Outgoing mail', #loc
+            Hints => 'Should RT send you mail for ticket updates you make?', #loc
+        }
+    },
 
     # this tends to break extensions that stash links in ticket update pages
     Organization => {
@@ -821,7 +859,7 @@ sub SetFromConfig {
             # XXX skip references to scalars or other references.
             # Otherwie 5.10 goes boom. may be we should skip any
             # reference
-            return if ref($entry) eq 'SCALAR' || ref($entry) eq 'REF';
+            next if ref($entry) eq 'SCALAR' || ref($entry) eq 'REF';
             my $entry_ref = *{$entry}{ ref($ref) };
             next unless $entry_ref;