This commit was generated by cvs2svn to compensate for changes in r5562,

which included commits to RCS files with non-trunk default branches.

4 files changed, 184 insertions, 24 deletions

diff --git a/rt/etc/RT_Config.pm.in b/rt/etc/RT_Config.pm.in
index 10d46eb50..b8eabfbfa 100644
--- a/rt/etc/RT_Config.pm.in
+++ b/rt/etc/RT_Config.pm.in
@@ -255,6 +255,14 @@ Set($NotifyActor, 0);
 
 Set($RecordOutgoingEmail, 1);
 
+# VERP support (http://cr.yp.to/proto/verp.txt)
+# uncomment the following two directives to generate envelope senders
+# of the form ${VERPPrefix}${originaladdress}@${VERPDomain}
+# (i.e. rt-jesse=fsck.com@rt.example.com ) This currently only works
+# with sendmail and sendmailppie.
+# Set($VERPPrefix, 'rt-');
+# Set($VERPDomain, $RT::Organization);
+
 # }}}
 
 # {{{ Logging
@@ -279,6 +287,11 @@ Set($LogToFile      , undef);
 Set($LogDir, '@RT_LOG_PATH@');
 Set($LogToFileNamed , "rt.log");    #log to rt.log
 
+# If true generates stack traces to file log or screen
+# never generates traces to syslog
+
+Set($LogStackTraces , 0);
+
 # On Solaris or UnixWare, set to ( socket => 'inet' ).  Options here
 # override any other options RT passes to Log::Dispatch::Syslog.
 # Other interesting flags include facility and logopt.  (See the
@@ -287,23 +300,50 @@ Set($LogToFileNamed , "rt.log");    #log to rt.log
 
 @LogToSyslogConf = () unless (@LogToSyslogConf);
 
+# RT has rudimentary SQL statement logging support if you have
+# DBIx-SearchBuilder 1.31_1 or higher; simply set $StatementLog to be
+# the level that you wish SQL statements to be logged at.
+Set($StatementLog, undef);
+
 # }}}
 
 # {{{ Web interface configuration
 
+# This determines the default stylesheet the RT web interface will use.
+# RT ships with two valid values by default:
+#
+#   3.5-default     The totally new, default layout for RT 3.5
+#   3.4-compat      A 3.4 compatibility stylesheet to make RT 3.5 look
+#                   (mostly) like 3.4
+#
+# This value actually specifies a directory in share/html/NoAuth/css/
+# from which RT will try to load the file main.css (which should
+# @import any other files the stylesheet needs).  This allows you to
+# easily and cleanly create your own stylesheets to apply to RT.
+
+Set($WebDefaultStylesheet, '3.5-default');
+
 # Define the directory name to be used for images in rt web
 # documents.
 
 # If you're putting the web ui somewhere other than at the root of
-# your server
-# $WebPath requires a leading / but no trailing /
+# your server, you should set $WebPath to the path you'll be 
+# serving RT at.
+# $WebPath requires a leading / but no trailing /.
+#
+# In most cases, you should leave $WebPath set to '' (an empty value).
 
 Set($WebPath , "");
 
+# If we're running as a superuser, run on port 80
+# Otherwise, pick a high port for this user.
+
+Set($WebPort , 80);# + ($< * 7274) % 32766 + ($< && 1024));
+
 # This is the Scheme, server and port for constructing urls to webrt
 # $WebBaseURL doesn't need a trailing /
 
-Set($WebBaseURL , "http://localhost");
+Set($WebBaseURL , "http://localhost:$WebPort");
 
 Set($WebURL , $WebBaseURL . $WebPath . "/");
 
@@ -329,18 +369,24 @@ Set($MessageBoxWidth , 72);
 # Default wrapping: "HARD"  (choices "SOFT", "HARD")
 Set($MessageBoxWrap, "HARD");
 
+# Support implicit links in WikiText custom fields?  A true value
+# causes InterCapped or ALLCAPS words in WikiText fields to
+# automatically become links to searches for those words.  If used on
+# RTFM articles, it links to the RTFM article with that name.
+Set($WikiImplicitLinks, 0);
+
 # if TrustHTMLAttachments is not defined, we will display them
 # as text. This prevents malicious HTML and javascript from being
 # sent in a request (although there is probably more to it than that)
 Set($TrustHTMLAttachments , undef);
 
 # Should RT redistribute correspondence that it identifies as
-# machine generated? A true value (the default) will do so, setting
-# this to '0' will cause no such messages to be redistributed.
-# You can also use 'privileged', which will redistribute only to
-# privileged users. This is seful if you get malformed bounces caused by
-# autocreated requestors with bogus addresses.
-Set($RedistributeAutoGeneratedMessages, 1);
+# machine generated? A true value will do so; setting this to '0'
+# will cause no such messages to be redistributed.
+# You can also use 'privileged' (the default), which will redistribute
+# only to privileged users. This helps to protect against malformed
+# bounces and loops caused by autocreated requestors with bogus addresses.
+Set($RedistributeAutoGeneratedMessages, 'privileged');
 
 # If PreferRichText is set to a true value, RT will show HTML/Rich text
 # messages in preference to their plaintext alternatives. RT "scrubs" the 
@@ -375,12 +421,23 @@ Set($WebExternalAuto , undef);
 
 # Set($WebSessionClass , 'Apache::Session::File');
 
+
+# By default, RT's session cookie isn't marked as "secure" Some web browsers 
+# will treat secure cookies more carefully than non-secure ones, being careful
+# not to write them to disk, only send them over an SSL secured connection 
+# and so on. To enable this behaviour, set # $WebSecureCookies to a true value. 
+# NOTE: You probably don't want to turn this on _unless_ users are only connecting
+# via SSL encrypted HTTP connections.
+
+Set($WebSecureCookies, 0);
+
+
 # By default, RT clears its database cache after every page view.
 # This ensures that you've always got the most current information 
 # when working in a multi-process (mod_perl or FastCGI) Environment
 # Setting $WebFlushDbCacheEveryRequest to '0' will turn this off,
 # which will speed RT up a bit, at the expense of a tiny bit of data 
-# accuracy
+# accuracy.
 
 Set($WebFlushDbCacheEveryRequest, '1');
 
@@ -391,17 +448,26 @@ Set($WebFlushDbCacheEveryRequest, '1');
 
 Set($MaxInlineBody, 13456);
 
-# $MyTicketsLength is the length of the owned tickets table on the
-# front page. For some people, the default of 10 isn't big enough
-# to get a feel for how much work needs to be done before you get
-# some time off.
+# $DefaultSummaryRows is default number of rows displayed in for search
+# results on the frontpage.
+
+Set($DefaultSummaryRows, 10);
+
+# By default, RT shows newest transactions at the bottom of the ticket
+# history page, if you want see them at the top set this to '0'.
+
+Set($OldestTransactionsFirst, '1');
 
-Set($MyTicketsLength, 10);
+# By default, RT shows images attached to incoming (and outgoing) ticket updates
+# inline. Set this variable to 0 if you'd like to disable that behaviour
 
-# $MyRequestsLength is the length of the requested tickets table
-# on the front page.
+Set($ShowTransactionImages, 1);
 
-Set($MyRequestsLength, 10);
+
+# $HomepageComponents is an arrayref of allowed components on a user's
+# customized homepage ("RT at a glance").
+
+Set($HomepageComponents, [qw(QuickCreate Quicksearch MyAdminQueues MySupportQueues MyReminders  RefreshHomepage)]);
 
 # @MasonParameters is the list of parameters for the constructor of
 # HTML::Mason's Apache or CGI Handler.  This is normally only useful
@@ -427,6 +493,18 @@ Set ($DefaultSearchResultFormat, qq{
    '<small>__LastUpdatedRelative__</small>',
    '<small>__TimeLeft__</small>'});
 
+# If $SuppressInlineTextFiles is set to a true value, then uploaded
+# text files (text-type attachments with file names) are prevented
+# from being displayed in-line when viewing a ticket's history.
+
+Set($SuppressInlineTextFiles, undef);
+
+# If $DontSearchFileAttachments is set to a true value, then uploaded
+# files (attachments with file names) are not searched during full-content
+# ticket searches.
+
+Set($DontSearchFileAttachments, undef);
+
 
 # }}}
 
@@ -468,15 +546,21 @@ Set($AmbiguousDayInPast , 1);
 
 # You can define new statuses and even reorder existing statuses here.
 # WARNING. DO NOT DELETE ANY OF THE DEFAULT STATUSES. If you do, RT
-# will break horribly.
+# will break horribly. The statuses you add must be no longer than
+# 10 characters.
 
 @ActiveStatus = qw(new open stalled) unless @ActiveStatus;
 @InactiveStatus = qw(resolved rejected deleted) unless @InactiveStatus;
 
 # Backward compatability setting. Add/Delete Link used to record one
-# transaction and run one scrip. Set this value to 0 if you want
-# both link transactions to have a scrip run.
-Set($LinkTransactionsRun1Scrip , 1);
+# transaction and run one scrip. Set this value to 1 if you want
+# only one of the link transactions to have scrips run.
+Set($LinkTransactionsRun1Scrip , 0);
+
+# When this feature is enabled an user need ModifyTicket right on both
+# tickets to link them together, otherwise he can have right on any of
+# two.
+Set($StrictLinkACL, 1);
 
 # }}}
 
diff --git a/rt/etc/drop.Oracle b/rt/etc/drop.Oracle
index 4ce5de475..e120caa65 100644
--- a/rt/etc/drop.Oracle
+++ b/rt/etc/drop.Oracle
@@ -14,7 +14,8 @@ DROP TABLE SCRIPCONDITIONS;
 DROP TABLE SCRIPS;
 DROP TABLE SESSIONS;
 DROP TABLE TEMPLATES;
-DROP TABLE TICKETCUSTOMFIELDVALUES;
+DROP TABLE OBJECTUSTOMFIELDS;
+DROP TABLE OBJECTUSTOMFIELDVALUES;
 DROP TABLE TICKETS;
 DROP TABLE TRANSACTIONS;
 DROP TABLE USERS;
@@ -33,7 +34,8 @@ DROP SEQUENCE SCRIPACTIONS_seq;
 DROP SEQUENCE SCRIPCONDITIONS_seq;
 DROP SEQUENCE SCRIPS_seq;
 DROP SEQUENCE TEMPLATES_seq;
-DROP SEQUENCE TICKETCUSTOMFIELDVALUES_seq;
+DROP SEQUENCE OBJECTCUSTOMFIELDVALUES_seq;
+DROP SEQUENCE OBJECTCUSTOMFIELDS_seq;
 DROP SEQUENCE TICKETS_seq;
 DROP SEQUENCE TRANSACTIONS_seq;
 DROP SEQUENCE USERS_seq;
diff --git a/rt/etc/initialdata b/rt/etc/initialdata
index 3a21ce1f6..1d8181d1a 100644
--- a/rt/etc/initialdata
+++ b/rt/etc/initialdata
@@ -585,3 +585,41 @@ return 0; # ignore $passed;
       Right  => 'SuperUser', },
 
 );
+
+# Predefined searches
+
+@Attributes = (
+    { Name => 'Search - My Tickets',
+      Description => '[_1] highest priority tickets I own', # loc
+      Content     =>
+      { Format => "'<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', Priority, QueueName, ExtendedStatus",
+        Query   => " Owner = '__CurrentUser__' AND ( Status = 'new' OR Status = 'open')",
+        OrderBy => 'Priority',
+        Order   => 'DESC' },
+    },
+    { Name => 'Search - Unowned Tickets',
+      Description => '[_1] newest unowned tickets', # loc
+      Content     =>
+# 'Take' #loc
+      { Format => "'<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', QueueName, ExtendedStatus, CreatedRelative, '<A HREF=\"__WebPath__/Ticket/Display.html?Action=Take&id=__id__\">__loc(Take)__</a>/TITLE:&nbsp;' ",
+        Query   => " Owner = 'Nobody' AND ( Status = 'new' OR Status = 'open')",
+        OrderBy => 'Created',
+        Order   => 'DESC' },
+    },
+    { Name => 'HomepageSettings',
+      Description => 'HomepageSettings',
+      Content =>
+      { 'body' => # loc
+	[ { type => 'system', name => 'My Tickets' },
+	  { type => 'system', name => 'Unowned Tickets' },
+	  { type => 'component',  name => 'QuickCreate'},
+	],
+        'summary' => # loc
+	[ 
+	  { type => 'component', name => 'MyReminders' },
+          { type => 'component', name => 'Quicksearch' },
+	  { type => 'component', name => 'RefreshHomepage' },
+	]
+    },
+}
+);
diff --git a/rt/etc/upgrade/3.5.1/content b/rt/etc/upgrade/3.5.1/content
new file mode 100644
index 000000000..e3898a7cc
--- /dev/null
+++ b/rt/etc/upgrade/3.5.1/content
@@ -0,0 +1,36 @@
+@Attributes = (
+    { Name => 'Search - My Tickets',
+      Description => '[_1] highest priority tickets I own',
+      Content     =>
+      { Format => "'<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', Priority, QueueName, ExtendedStatus",
+        Query   => " Owner = '__CurrentUser__' AND ( Status = 'new' OR Status = 'open')",
+        OrderBy => 'Priority',
+        Order   => 'DESC' },
+    },
+    { Name => 'Search - Unowned Tickets',
+      Description => '[_1] newest unowned tickets',
+      Content     =>
+      { Format => "'<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', QueueName, ExtendedStatus, CreatedRelative, '<A HREF=\"__WebPath__/Ticket/Display.html?Action=Take&id=__id__\">__loc(Take)__</a>/TITLE:&nbsp;' ",
+        Query   => " Owner = 'Nobody' AND ( Status = 'new' OR Status = 'open')",
+        OrderBy => 'Created',
+        Order   => 'DESC' },
+    },
+    { Name => 'HomepageSettings',
+      Description => 'HomepageSettings',
+      Content =>
+      { 'body' =>
+	[ { type => 'system', name => 'My Tickets' },
+	  { type => 'system', name => 'Unowned Tickets' },
+	  { type => 'component',  name => 'QuickCreate'},
+	],
+        'summary' =>
+	[ 
+	  { type => 'component', name => 'MyReminders' },
+          { type => 'component', name => 'Quicksearch' },
+	  { type => 'component', name => 'RefreshHomepage' },
+	]
+    },
+}
+);
+
+1;