rt 4.0.23

[freeside.git] / rt / lib / RT / Config.pm

diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm
index c56d4c6..8d30739 100644 (file)
--- a/rt/lib/RT/Config.pm
+++ b/rt/lib/RT/Config.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
 #
 # COPYRIGHT:
 #

-# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC

 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)


@@ -209,10 +209,11 @@ our %META = (
 
             $RT::Logger->warning(
                 "The default stylesheet ($value) does not exist in this instance of RT. "
 
             $RT::Logger->warning(
                 "The default stylesheet ($value) does not exist in this instance of RT. "

-              . "Defaulting to aileron."
+              . "Defaulting to freeside3."

             );
 
             );
 

-            $self->Set('WebDefaultStylesheet', 'aileron');
+            #$self->Set('WebDefaultStylesheet', 'aileron');
+            $self->Set('WebDefaultStylesheet', 'freeside3');

         },
     },
     UseSideBySideLayout => {
         },
     },
     UseSideBySideLayout => {


@@ -302,15 +303,6 @@ our %META = (
     },
 
     # User overridable options for RT at a glance
     },
 
     # User overridable options for RT at a glance

-    DefaultSummaryRows => {
-        Section         => 'RT at a glance',    #loc
-        Overridable     => 1,
-        SortOrder       => 1,
-        Widget          => '/Widgets/Form/Integer',
-        WidgetArguments => {
-            Description => 'Number of search results',    #loc
-        },
-    },

     HomePageRefreshInterval => {
         Section         => 'RT at a glance',                       #loc
         Overridable     => 1,
     HomePageRefreshInterval => {
         Section         => 'RT at a glance',                       #loc
         Overridable     => 1,


@@ -410,8 +402,8 @@ our %META = (
             Description => q|What tickets to display in the 'More about requestor' box|,                #loc
             Values      => [qw(Active Inactive All None)],
             ValuesLabel => {
             Description => q|What tickets to display in the 'More about requestor' box|,                #loc
             Values      => [qw(Active Inactive All None)],
             ValuesLabel => {

-                Active   => "Show the Requestor's 10 highest priority open tickets",                  #loc
-                Inactive => "Show the Requestor's 10 highest priority closed tickets",      #loc
+                Active   => "Show the Requestor's 10 highest priority active tickets",                  #loc
+                Inactive => "Show the Requestor's 10 highest priority inactive tickets",      #loc

                 All      => "Show the Requestor's 10 highest priority tickets",      #loc
                 None     => "Show no tickets for the Requestor", #loc
             },
                 All      => "Show the Requestor's 10 highest priority tickets",      #loc
                 None     => "Show no tickets for the Requestor", #loc
             },


@@ -445,10 +437,13 @@ our %META = (
             Description => 'Date format',                            #loc
             Callback => sub { my $ret = { Values => [], ValuesLabel => {}};
                               my $date = RT::Date->new($HTML::Mason::Commands::session{'CurrentUser'});
             Description => 'Date format',                            #loc
             Callback => sub { my $ret = { Values => [], ValuesLabel => {}};
                               my $date = RT::Date->new($HTML::Mason::Commands::session{'CurrentUser'});

-                              $date->Set;
+                              $date->SetToNow;

                               foreach my $value ($date->Formatters) {
                                  push @{$ret->{Values}}, $value;
                               foreach my $value ($date->Formatters) {
                                  push @{$ret->{Values}}, $value;

-                                 $ret->{ValuesLabel}{$value} = $date->$value();
+                                 $ret->{ValuesLabel}{$value} = $date->Get(
+                                     Format     => $value,
+                                     Timezone   => 'user',
+                                 );

                               }
                               return $ret;
             },
                               }
                               return $ret;
             },


@@ -465,7 +460,7 @@ our %META = (
                     '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.'
                     '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'
+                    .' It is especially important to set this option if RT receives'

                     .' emails on addresses that are not in the database or config.'
                 );
             } elsif (ref $value and ref $value eq "Regexp") {
                     .' emails on addresses that are not in the database or config.'
                 );
             } elsif (ref $value and ref $value eq "Regexp") {


@@ -748,7 +743,7 @@ our %META = (
 
             my %seen;
             foreach my $encoding ( grep defined && length, splice @$value ) {
 
             my %seen;
             foreach my $encoding ( grep defined && length, splice @$value ) {

-                next if $seen{ $encoding }++;
+                next if $seen{ $encoding };

                 if ( $encoding eq '*' ) {
                     unshift @$value, '*';
                     next;
                 if ( $encoding eq '*' ) {
                     unshift @$value, '*';
                     next;


@@ -1029,7 +1024,6 @@ sub Get {
 
     my $res;
     if ( $user && $user->id && $META{$name}->{'Overridable'} ) {
 
     my $res;
     if ( $user && $user->id && $META{$name}->{'Overridable'} ) {

-        $user = $user->UserObj if $user->isa('RT::CurrentUser');

         my $prefs = $user->Preferences($RT::System);
         $res = $prefs->{$name} if $prefs;
     }
         my $prefs = $user->Preferences($RT::System);
         $res = $prefs->{$name} if $prefs;
     }


@@ -1214,7 +1208,7 @@ sub SetFromConfig {
             # if the entry has a trailing '::' then
             # it is a link to another name space
             if ( substr( $k, -2 ) eq '::') {
             # if the entry has a trailing '::' then
             # it is a link to another name space
             if ( substr( $k, -2 ) eq '::') {

-                $name = $self->__GetNameByRef( $ref, $k );
+                $name = $self->__GetNameByRef( $ref, $pack eq 'main::'? $k : $pack.$k );

                 return $name if $name;
             }
 
                 return $name if $name;
             }
 


@@ -1224,18 +1218,28 @@ sub SetFromConfig {
             my $entry = ${$pack}{$k};
             next unless $entry;
 
             my $entry = ${$pack}{$k};
             next unless $entry;
 

-            # get entry for type we are looking for
-            # XXX skip references to scalars or other references.
-            # Otherwie 5.10 goes boom. maybe we should skip any
-            # reference
-            next if ref($entry) eq 'SCALAR' || ref($entry) eq 'REF';
-            my $entry_ref = *{$entry}{ ref($ref) };
+            # Inlined constants are simplified in the symbol table --
+            # namely, when possible, you only get a reference back in
+            # $entry, rather than a full GLOB.  In 5.10, scalar
+            # constants began being inlined this way; starting in 5.20,
+            # list constants are also inlined.  Notably, ref(GLOB) is
+            # undef, but inlined constants are currently either REF,
+            # SCALAR, or ARRAY.
+            next if ref($entry);
+
+            my $ref_type = ref($ref);
+
+            # regex/arrayref/hashref/coderef are stored in SCALAR glob
+            $ref_type = 'SCALAR' if $ref_type eq 'REF';
+
+            my $entry_ref = *{$entry}{ $ref_type };
+            next if ref $entry_ref && ref $entry_ref ne ref $ref;

             next unless $entry_ref;
 
             # if references are equal then we've found
             if ( $entry_ref == $ref ) {
                 $last_pack = $pack;
             next unless $entry_ref;
 
             # if references are equal then we've found
             if ( $entry_ref == $ref ) {
                 $last_pack = $pack;

-                return ( $REF_SYMBOLS{ ref($ref) } || '*' ) . $pack . $k;
+                return ( $REF_SYMBOLS{ $ref_type } || '*' ) . $pack . $k;

             }
         }
         return '';
             }
         }
         return '';