[Rt-commit] [svn] r1383 - in rt/branches/3.3-TESTING: . bin etc etc/upgrade/3.1.0 html html/Admin html/Admin/Elements html/Admin/Global html/Admin/Groups html/Admin/Queues html/Admin/Tools html/Admin/Users html/Approvals html/Approvals/Elements html/Elements html/Elements/CollectionAsTable html/Elements/RT__Ticket html/NoAuth html/NoAuth/images html/REST/1.0 html/REST/1.0/Forms/queue html/REST/1.0/Forms/ticket html/REST/1.0/Forms/user html/REST/1.0/NoAuth html/REST/1.0/search html/REST/1.0/ticket html/Search html/Search/Elements html/SelfService html/SelfService/Attachment html/SelfService/Elements html/Ticket html/Ticket/Attachment html/Ticket/Elements html/Tools html/Tools/Elements html/User html/User/Elements html/User/Groups lib lib/RT lib/RT/Action lib/RT/Condition lib/RT/I18N lib/RT/Interface lib/RT/Interface/Email/Auth lib/RT/Interface/Email/Filter lib/RT/Interface/Web lib/RT/Search lib/RT/URI sbin

jesse at pallas.eruditorum.org jesse at pallas.eruditorum.org
Tue Aug 31 22:38:15 EDT 2004


Author: jesse
Date: Tue Aug 31 22:37:44 2004
New Revision: 1383

Added:
   rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/
   rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Header
   rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/ParseFormat
   rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Row
   rt/branches/3.3-TESTING/html/Elements/RT__Ticket/
   rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
   rt/branches/3.3-TESTING/html/NoAuth/images/autohandler
Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/Makefile.in
   rt/branches/3.3-TESTING/README
   rt/branches/3.3-TESTING/bin/mason_handler.fcgi.in
   rt/branches/3.3-TESTING/bin/mason_handler.scgi.in
   rt/branches/3.3-TESTING/bin/mason_handler.svc.in
   rt/branches/3.3-TESTING/bin/rt-crontool.in
   rt/branches/3.3-TESTING/bin/rt-mailgate.in
   rt/branches/3.3-TESTING/bin/rt.in
   rt/branches/3.3-TESTING/bin/standalone_httpd.in
   rt/branches/3.3-TESTING/bin/webmux.pl.in
   rt/branches/3.3-TESTING/etc/RT_Config.pm.in
   rt/branches/3.3-TESTING/etc/drop.Oracle
   rt/branches/3.3-TESTING/etc/upgrade/3.1.0/schema.Pg
   rt/branches/3.3-TESTING/html/Admin/Elements/AddCustomFieldValue
   rt/branches/3.3-TESTING/html/Admin/Elements/CreateUserCalled
   rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomField
   rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFieldValues
   rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields
   rt/branches/3.3-TESTING/html/Admin/Elements/EditQueueWatchers
   rt/branches/3.3-TESTING/html/Admin/Elements/EditScrip
   rt/branches/3.3-TESTING/html/Admin/Elements/EditScrips
   rt/branches/3.3-TESTING/html/Admin/Elements/EditTemplates
   rt/branches/3.3-TESTING/html/Admin/Elements/EditUserComments
   rt/branches/3.3-TESTING/html/Admin/Elements/GroupTabs
   rt/branches/3.3-TESTING/html/Admin/Elements/Header
   rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalCustomFields
   rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalScrips
   rt/branches/3.3-TESTING/html/Admin/Elements/ModifyTemplate
   rt/branches/3.3-TESTING/html/Admin/Elements/QueueRightsForUser
   rt/branches/3.3-TESTING/html/Admin/Elements/QueueTabs
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectCustomFieldType
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectGroups
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyGroup
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyQueue
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyUser
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectNewGroupMembers
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectScrip
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripAction
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripCondition
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectSingleOrMultiple
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectStage
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectTemplate
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectUsers
   rt/branches/3.3-TESTING/html/Admin/Elements/SystemTabs
   rt/branches/3.3-TESTING/html/Admin/Elements/Tabs
   rt/branches/3.3-TESTING/html/Admin/Elements/ToolTabs
   rt/branches/3.3-TESTING/html/Admin/Elements/UserTabs
   rt/branches/3.3-TESTING/html/Admin/Global/GroupRights.html
   rt/branches/3.3-TESTING/html/Admin/Global/Scrip.html
   rt/branches/3.3-TESTING/html/Admin/Global/Scrips.html
   rt/branches/3.3-TESTING/html/Admin/Global/Template.html
   rt/branches/3.3-TESTING/html/Admin/Global/Templates.html
   rt/branches/3.3-TESTING/html/Admin/Global/UserRights.html
   rt/branches/3.3-TESTING/html/Admin/Global/index.html
   rt/branches/3.3-TESTING/html/Admin/Groups/GroupRights.html
   rt/branches/3.3-TESTING/html/Admin/Groups/Members.html
   rt/branches/3.3-TESTING/html/Admin/Groups/Modify.html
   rt/branches/3.3-TESTING/html/Admin/Groups/UserRights.html
   rt/branches/3.3-TESTING/html/Admin/Groups/index.html
   rt/branches/3.3-TESTING/html/Admin/Queues/CustomField.html
   rt/branches/3.3-TESTING/html/Admin/Queues/CustomFields.html
   rt/branches/3.3-TESTING/html/Admin/Queues/GroupRights.html
   rt/branches/3.3-TESTING/html/Admin/Queues/Modify.html
   rt/branches/3.3-TESTING/html/Admin/Queues/People.html
   rt/branches/3.3-TESTING/html/Admin/Queues/Scrip.html
   rt/branches/3.3-TESTING/html/Admin/Queues/Scrips.html
   rt/branches/3.3-TESTING/html/Admin/Queues/Template.html
   rt/branches/3.3-TESTING/html/Admin/Queues/Templates.html
   rt/branches/3.3-TESTING/html/Admin/Queues/UserRights.html
   rt/branches/3.3-TESTING/html/Admin/Queues/index.html
   rt/branches/3.3-TESTING/html/Admin/Tools/Configuration.html
   rt/branches/3.3-TESTING/html/Admin/Tools/index.html
   rt/branches/3.3-TESTING/html/Admin/Users/Modify.html
   rt/branches/3.3-TESTING/html/Admin/Users/index.html
   rt/branches/3.3-TESTING/html/Admin/index.html
   rt/branches/3.3-TESTING/html/Approvals/Display.html
   rt/branches/3.3-TESTING/html/Approvals/Elements/Approve
   rt/branches/3.3-TESTING/html/Approvals/Elements/PendingMyApproval
   rt/branches/3.3-TESTING/html/Approvals/Elements/ShowDependency
   rt/branches/3.3-TESTING/html/Approvals/Elements/Tabs
   rt/branches/3.3-TESTING/html/Approvals/index.html
   rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedEnd
   rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedStart
   rt/branches/3.3-TESTING/html/Elements/Callback
   rt/branches/3.3-TESTING/html/Elements/Checkbox
   rt/branches/3.3-TESTING/html/Elements/CreateTicket
   rt/branches/3.3-TESTING/html/Elements/EditLinks
   rt/branches/3.3-TESTING/html/Elements/Error
   rt/branches/3.3-TESTING/html/Elements/Footer
   rt/branches/3.3-TESTING/html/Elements/GotoTicket
   rt/branches/3.3-TESTING/html/Elements/Header
   rt/branches/3.3-TESTING/html/Elements/ListActions
   rt/branches/3.3-TESTING/html/Elements/Login
   rt/branches/3.3-TESTING/html/Elements/Menu
   rt/branches/3.3-TESTING/html/Elements/MessageBox
   rt/branches/3.3-TESTING/html/Elements/MyRequests
   rt/branches/3.3-TESTING/html/Elements/MyTickets
   rt/branches/3.3-TESTING/html/Elements/PageLayout
   rt/branches/3.3-TESTING/html/Elements/QueryString
   rt/branches/3.3-TESTING/html/Elements/QuickCreate
   rt/branches/3.3-TESTING/html/Elements/Quicksearch
   rt/branches/3.3-TESTING/html/Elements/Refresh
   rt/branches/3.3-TESTING/html/Elements/ScrubHTML
   rt/branches/3.3-TESTING/html/Elements/Section
   rt/branches/3.3-TESTING/html/Elements/SelectAttachmentField
   rt/branches/3.3-TESTING/html/Elements/SelectBoolean
   rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldOperator
   rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldValue
   rt/branches/3.3-TESTING/html/Elements/SelectDate
   rt/branches/3.3-TESTING/html/Elements/SelectDateRelation
   rt/branches/3.3-TESTING/html/Elements/SelectDateType
   rt/branches/3.3-TESTING/html/Elements/SelectEqualityOperator
   rt/branches/3.3-TESTING/html/Elements/SelectGroups
   rt/branches/3.3-TESTING/html/Elements/SelectLang
   rt/branches/3.3-TESTING/html/Elements/SelectLinkType
   rt/branches/3.3-TESTING/html/Elements/SelectMatch
   rt/branches/3.3-TESTING/html/Elements/SelectNewTicketQueue
   rt/branches/3.3-TESTING/html/Elements/SelectOwner
   rt/branches/3.3-TESTING/html/Elements/SelectQueue
   rt/branches/3.3-TESTING/html/Elements/SelectResultsPerPage
   rt/branches/3.3-TESTING/html/Elements/SelectSortOrder
   rt/branches/3.3-TESTING/html/Elements/SelectStatus
   rt/branches/3.3-TESTING/html/Elements/SelectTicketSortBy
   rt/branches/3.3-TESTING/html/Elements/SelectTicketTypes
   rt/branches/3.3-TESTING/html/Elements/SelectUsers
   rt/branches/3.3-TESTING/html/Elements/SelectWatcherType
   rt/branches/3.3-TESTING/html/Elements/SetupSessionCookie
   rt/branches/3.3-TESTING/html/Elements/ShowLink
   rt/branches/3.3-TESTING/html/Elements/ShowLinks
   rt/branches/3.3-TESTING/html/Elements/SimpleSearch
   rt/branches/3.3-TESTING/html/Elements/Submit
   rt/branches/3.3-TESTING/html/Elements/Tabs
   rt/branches/3.3-TESTING/html/Elements/TicketList
   rt/branches/3.3-TESTING/html/Elements/TitleBox
   rt/branches/3.3-TESTING/html/Elements/TitleBoxEnd
   rt/branches/3.3-TESTING/html/Elements/TitleBoxStart
   rt/branches/3.3-TESTING/html/NoAuth/Logout.html
   rt/branches/3.3-TESTING/html/NoAuth/Reminder.html
   rt/branches/3.3-TESTING/html/NoAuth/webrt.css
   rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/default
   rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/ns
   rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/attachments
   rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/default
   rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/history
   rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/links
   rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/default
   rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/ns
   rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway
   rt/branches/3.3-TESTING/html/REST/1.0/autohandler
   rt/branches/3.3-TESTING/html/REST/1.0/dhandler
   rt/branches/3.3-TESTING/html/REST/1.0/logout
   rt/branches/3.3-TESTING/html/REST/1.0/search/dhandler
   rt/branches/3.3-TESTING/html/REST/1.0/search/ticket
   rt/branches/3.3-TESTING/html/REST/1.0/ticket/comment
   rt/branches/3.3-TESTING/html/REST/1.0/ticket/link
   rt/branches/3.3-TESTING/html/REST/1.0/ticket/merge
   rt/branches/3.3-TESTING/html/Search/Build.html
   rt/branches/3.3-TESTING/html/Search/Bulk.html
   rt/branches/3.3-TESTING/html/Search/Edit.html
   rt/branches/3.3-TESTING/html/Search/Elements/BuildFormatString
   rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions
   rt/branches/3.3-TESTING/html/Search/Elements/EditFormat
   rt/branches/3.3-TESTING/html/Search/Elements/EditSearches
   rt/branches/3.3-TESTING/html/Search/Elements/NewListActions
   rt/branches/3.3-TESTING/html/Search/Elements/PickBasics
   rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
   rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria
   rt/branches/3.3-TESTING/html/Search/Elements/SearchPrivacy
   rt/branches/3.3-TESTING/html/Search/Elements/SelectAndOr
   rt/branches/3.3-TESTING/html/Search/Elements/SelectLinks
   rt/branches/3.3-TESTING/html/Search/Elements/SelectPersonType
   rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchObject
   rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchesForObjects
   rt/branches/3.3-TESTING/html/Search/Results.html
   rt/branches/3.3-TESTING/html/Search/Results.rdf
   rt/branches/3.3-TESTING/html/Search/Results.tsv
   rt/branches/3.3-TESTING/html/SelfService/Attachment/dhandler
   rt/branches/3.3-TESTING/html/SelfService/Closed.html
   rt/branches/3.3-TESTING/html/SelfService/Create.html
   rt/branches/3.3-TESTING/html/SelfService/Display.html
   rt/branches/3.3-TESTING/html/SelfService/Elements/GotoTicket
   rt/branches/3.3-TESTING/html/SelfService/Elements/Header
   rt/branches/3.3-TESTING/html/SelfService/Elements/MyRequests
   rt/branches/3.3-TESTING/html/SelfService/Elements/Tabs
   rt/branches/3.3-TESTING/html/SelfService/Error.html
   rt/branches/3.3-TESTING/html/SelfService/Prefs.html
   rt/branches/3.3-TESTING/html/SelfService/Update.html
   rt/branches/3.3-TESTING/html/SelfService/index.html
   rt/branches/3.3-TESTING/html/Ticket/Attachment/dhandler
   rt/branches/3.3-TESTING/html/Ticket/Create.html
   rt/branches/3.3-TESTING/html/Ticket/Display.html
   rt/branches/3.3-TESTING/html/Ticket/Elements/AddWatchers
   rt/branches/3.3-TESTING/html/Ticket/Elements/BulkLinks
   rt/branches/3.3-TESTING/html/Ticket/Elements/EditBasics
   rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField
   rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomFields
   rt/branches/3.3-TESTING/html/Ticket/Elements/EditDates
   rt/branches/3.3-TESTING/html/Ticket/Elements/EditPeople
   rt/branches/3.3-TESTING/html/Ticket/Elements/EditWatchers
   rt/branches/3.3-TESTING/html/Ticket/Elements/FindAttachments
   rt/branches/3.3-TESTING/html/Ticket/Elements/LoadTextAttachments
   rt/branches/3.3-TESTING/html/Ticket/Elements/PreviewScrips
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowAttachments
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowBasics
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowCustomFields
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDates
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDependencies
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowGroupMembers
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowHistory
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMemberOf
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMembers
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageHeaders
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageStanza
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowPeople
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowReferences
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowRequestor
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowSummary
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransaction
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransactionAttachments
   rt/branches/3.3-TESTING/html/Ticket/Elements/ShowUserEntry
   rt/branches/3.3-TESTING/html/Ticket/Elements/Tabs
   rt/branches/3.3-TESTING/html/Ticket/History.html
   rt/branches/3.3-TESTING/html/Ticket/Modify.html
   rt/branches/3.3-TESTING/html/Ticket/ModifyAll.html
   rt/branches/3.3-TESTING/html/Ticket/ModifyDates.html
   rt/branches/3.3-TESTING/html/Ticket/ModifyLinks.html
   rt/branches/3.3-TESTING/html/Ticket/ModifyPeople.html
   rt/branches/3.3-TESTING/html/Ticket/ShowEmailRecord.html
   rt/branches/3.3-TESTING/html/Ticket/Update.html
   rt/branches/3.3-TESTING/html/Tools/Elements/Tabs
   rt/branches/3.3-TESTING/html/Tools/MyDay.html
   rt/branches/3.3-TESTING/html/Tools/Offline.html
   rt/branches/3.3-TESTING/html/User/Delegation.html
   rt/branches/3.3-TESTING/html/User/Elements/DelegateRights
   rt/branches/3.3-TESTING/html/User/Elements/GroupTabs
   rt/branches/3.3-TESTING/html/User/Elements/Tabs
   rt/branches/3.3-TESTING/html/User/Groups/Members.html
   rt/branches/3.3-TESTING/html/User/Groups/Modify.html
   rt/branches/3.3-TESTING/html/User/Groups/index.html
   rt/branches/3.3-TESTING/html/User/Prefs.html
   rt/branches/3.3-TESTING/html/autohandler
   rt/branches/3.3-TESTING/html/index.html
   rt/branches/3.3-TESTING/html/l
   rt/branches/3.3-TESTING/lib/RT.pm.in
   rt/branches/3.3-TESTING/lib/RT/ACE.pm
   rt/branches/3.3-TESTING/lib/RT/ACE_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/ACL.pm
   rt/branches/3.3-TESTING/lib/RT/ACL_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Action/AutoOpen.pm
   rt/branches/3.3-TESTING/lib/RT/Action/Autoreply.pm
   rt/branches/3.3-TESTING/lib/RT/Action/CreateTickets.pm
   rt/branches/3.3-TESTING/lib/RT/Action/EscalatePriority.pm
   rt/branches/3.3-TESTING/lib/RT/Action/Generic.pm
   rt/branches/3.3-TESTING/lib/RT/Action/Notify.pm
   rt/branches/3.3-TESTING/lib/RT/Action/NotifyAsComment.pm
   rt/branches/3.3-TESTING/lib/RT/Action/RecordComment.pm
   rt/branches/3.3-TESTING/lib/RT/Action/RecordCorrespondence.pm
   rt/branches/3.3-TESTING/lib/RT/Action/ResolveMembers.pm
   rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm
   rt/branches/3.3-TESTING/lib/RT/Action/SetPriority.pm
   rt/branches/3.3-TESTING/lib/RT/Action/UserDefined.pm
   rt/branches/3.3-TESTING/lib/RT/Attachment.pm
   rt/branches/3.3-TESTING/lib/RT/Attachment_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Attachments.pm
   rt/branches/3.3-TESTING/lib/RT/Attachments_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Attribute.pm
   rt/branches/3.3-TESTING/lib/RT/Attribute_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Attributes.pm
   rt/branches/3.3-TESTING/lib/RT/Attributes_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Base.pm
   rt/branches/3.3-TESTING/lib/RT/CachedGroupMember.pm
   rt/branches/3.3-TESTING/lib/RT/CachedGroupMember_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers.pm
   rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Condition/AnyTransaction.pm
   rt/branches/3.3-TESTING/lib/RT/Condition/BeforeDue.pm
   rt/branches/3.3-TESTING/lib/RT/Condition/Generic.pm
   rt/branches/3.3-TESTING/lib/RT/Condition/Overdue.pm
   rt/branches/3.3-TESTING/lib/RT/Condition/OwnerChange.pm
   rt/branches/3.3-TESTING/lib/RT/Condition/PriorityChange.pm
   rt/branches/3.3-TESTING/lib/RT/Condition/PriorityExceeds.pm
   rt/branches/3.3-TESTING/lib/RT/Condition/QueueChange.pm
   rt/branches/3.3-TESTING/lib/RT/Condition/StatusChange.pm
   rt/branches/3.3-TESTING/lib/RT/Condition/UserDefined.pm
   rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm
   rt/branches/3.3-TESTING/lib/RT/CustomField.pm
   rt/branches/3.3-TESTING/lib/RT/CustomFieldValue.pm
   rt/branches/3.3-TESTING/lib/RT/CustomFieldValues.pm
   rt/branches/3.3-TESTING/lib/RT/CustomFieldValues_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/CustomFields.pm
   rt/branches/3.3-TESTING/lib/RT/CustomFields_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Date.pm
   rt/branches/3.3-TESTING/lib/RT/EmailParser.pm
   rt/branches/3.3-TESTING/lib/RT/Group.pm
   rt/branches/3.3-TESTING/lib/RT/GroupMember.pm
   rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/GroupMembers.pm
   rt/branches/3.3-TESTING/lib/RT/GroupMembers_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Group_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Groups.pm
   rt/branches/3.3-TESTING/lib/RT/Groups_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Handle.pm
   rt/branches/3.3-TESTING/lib/RT/I18N.pm
   rt/branches/3.3-TESTING/lib/RT/I18N/cs.pm
   rt/branches/3.3-TESTING/lib/RT/I18N/cs.po
   rt/branches/3.3-TESTING/lib/RT/I18N/da.po
   rt/branches/3.3-TESTING/lib/RT/I18N/de.po
   rt/branches/3.3-TESTING/lib/RT/I18N/es.po
   rt/branches/3.3-TESTING/lib/RT/I18N/fi.po
   rt/branches/3.3-TESTING/lib/RT/I18N/fr.po
   rt/branches/3.3-TESTING/lib/RT/I18N/he.po
   rt/branches/3.3-TESTING/lib/RT/I18N/hu.po
   rt/branches/3.3-TESTING/lib/RT/I18N/i_default.pm
   rt/branches/3.3-TESTING/lib/RT/I18N/it.po
   rt/branches/3.3-TESTING/lib/RT/I18N/ja.po
   rt/branches/3.3-TESTING/lib/RT/I18N/nl.po
   rt/branches/3.3-TESTING/lib/RT/I18N/no.po
   rt/branches/3.3-TESTING/lib/RT/I18N/pt_br.po
   rt/branches/3.3-TESTING/lib/RT/I18N/ru.po
   rt/branches/3.3-TESTING/lib/RT/I18N/zh_cn.po
   rt/branches/3.3-TESTING/lib/RT/I18N/zh_tw.po
   rt/branches/3.3-TESTING/lib/RT/Interface/CLI.pm
   rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm
   rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/GnuPG.pm
   rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/MailFrom.pm
   rt/branches/3.3-TESTING/lib/RT/Interface/Email/Filter/SpamAssassin.pm
   rt/branches/3.3-TESTING/lib/RT/Interface/REST.pm
   rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
   rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
   rt/branches/3.3-TESTING/lib/RT/Link.pm
   rt/branches/3.3-TESTING/lib/RT/Link_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Links.pm
   rt/branches/3.3-TESTING/lib/RT/Links_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Principal.pm
   rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Principals.pm
   rt/branches/3.3-TESTING/lib/RT/Principals_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Queue.pm
   rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Queues.pm
   rt/branches/3.3-TESTING/lib/RT/Queues_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Record.pm
   rt/branches/3.3-TESTING/lib/RT/Scrip.pm
   rt/branches/3.3-TESTING/lib/RT/ScripAction.pm
   rt/branches/3.3-TESTING/lib/RT/ScripAction_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/ScripActions.pm
   rt/branches/3.3-TESTING/lib/RT/ScripActions_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/ScripCondition.pm
   rt/branches/3.3-TESTING/lib/RT/ScripCondition_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/ScripConditions.pm
   rt/branches/3.3-TESTING/lib/RT/ScripConditions_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Scrips.pm
   rt/branches/3.3-TESTING/lib/RT/Scrips_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Search/ActiveTicketsInQueue.pm
   rt/branches/3.3-TESTING/lib/RT/Search/FromSQL.pm
   rt/branches/3.3-TESTING/lib/RT/Search/Generic.pm
   rt/branches/3.3-TESTING/lib/RT/SearchBuilder.pm
   rt/branches/3.3-TESTING/lib/RT/System.pm
   rt/branches/3.3-TESTING/lib/RT/Template.pm
   rt/branches/3.3-TESTING/lib/RT/Template_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Templates.pm
   rt/branches/3.3-TESTING/lib/RT/Templates_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Ticket.pm
   rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue.pm
   rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues.pm
   rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Tickets.pm
   rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
   rt/branches/3.3-TESTING/lib/RT/Transaction.pm
   rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Transactions.pm
   rt/branches/3.3-TESTING/lib/RT/Transactions_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/URI.pm
   rt/branches/3.3-TESTING/lib/RT/URI/base.pm
   rt/branches/3.3-TESTING/lib/RT/URI/fsck_com_rt.pm
   rt/branches/3.3-TESTING/lib/RT/User.pm
   rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm
   rt/branches/3.3-TESTING/lib/RT/Users.pm
   rt/branches/3.3-TESTING/lib/RT/Users_Overlay.pm
   rt/branches/3.3-TESTING/sbin/extract-message-catalog
   rt/branches/3.3-TESTING/sbin/extract_pod_tests
   rt/branches/3.3-TESTING/sbin/factory
   rt/branches/3.3-TESTING/sbin/license_tag
   rt/branches/3.3-TESTING/sbin/regression_harness
   rt/branches/3.3-TESTING/sbin/rt-setup-database.in
   rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
Log:
 ----------------------------------------------------------------------
 r8270 at tinbook (orig r1270):  autrijus | 2004-07-22T00:39:33.156202Z
  ----------------------------------------------------------------------
  r6200 at not:  autrijus | 2004-07-22T00:37:31.494556Z
  
  * $Ticket->AddCustomFieldValue now takes FIELD as Name.
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8271 at tinbook (orig r1271):  autrijus | 2004-07-22T00:52:53.468442Z
  ----------------------------------------------------------------------
  r6204 at not:  autrijus | 2004-07-22T00:52:38.207887Z
  
  * Switch $Ticket->AddCustomFieldValue to use $cf->LoadByNameAndQueue for
    forward compatibility.
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8272 at tinbook (orig r1272):  jesse | 2004-07-22T01:04:55.279276Z
  ----------------------------------------------------------------------
  r8267 at tinbook:  jesse | 2004-07-22T01:01:02.633960Z
  
  Making license blocks fold away
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8282 at tinbook (orig r1276):  jesse | 2004-07-22T19:08:32.352834Z
  ----------------------------------------------------------------------
  r8281 at tinbook:  jesse | 2004-07-22T19:08:48.451578Z
  
  * The "/l" component now does all its work in the init block
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8286 at tinbook (orig r1277):  leira | 2004-07-23T02:30:36.111345Z
 If a template file is uploaded, clear out the old template first (as before).
 
 ----------------------------------------------------------------------
 r8287 at tinbook (orig r1278):  leira | 2004-07-23T02:32:27.864998Z
 Fill in the default queue if one was specified.
 
 ----------------------------------------------------------------------
 r8288 at tinbook (orig r1279):  leira | 2004-07-23T03:02:15.525380Z
 RT-Ticket: 5880
 RT-Status: resolved
 RT-Action: correspond
 NULL values can now be chosen, and the TicketSQL query is constructed properly.
 
 ----------------------------------------------------------------------
 r8289 at tinbook (orig r1280):  leira | 2004-07-23T03:04:27.962400Z
 No value is NULL, not null.
 
 ----------------------------------------------------------------------
 r8290 at tinbook (orig r1281):  autrijus | 2004-07-23T17:15:16.923948Z
 RT-Ticket: 5274 
 RT-Status: resolved
 RT-Update: correspond
  
 Apply Bart Duchesne's patch for correctly deleting old TCFV '0'
 when editing SingleValue TCFs.
 
 ----------------------------------------------------------------------
 r8291 at tinbook (orig r1282):  jesse | 2004-07-23T17:34:23.556934Z
 
  ----------------------------------------------------------------------
  r8285 at tinbook:  jesse | 2004-07-23T17:33:04.648260Z
  
  Using single quotes makes the email address in the copyright not get mangled
  ----------------------------------------------------------------------
 
 
 ----------------------------------------------------------------------
 r8293 at tinbook (orig r1283):  jesse | 2004-07-23T21:23:10.580796Z
  ----------------------------------------------------------------------
  r8292 at tinbook:  jesse | 2004-07-23T21:23:16.884303Z
  
  RT now goes out of its way to display images, like the logo... even when users fail to configure their webserver correctly
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8294 at tinbook (orig r1284):  leira | 2004-07-23T21:43:20.116290Z
 Reset string properly when uploading a template file.
 
 ----------------------------------------------------------------------
 r8304 at tinbook (orig r1285):  robert | 2004-07-26T19:07:58.942428Z
  ----------------------------------------------------------------------
  r1287 at dog:  rspier | 2004-07-26T18:56:48.690023Z
  
  [fsck.com #5879] - DBIx::SearchBuilder should treat 'IS' as case insensitive, since most databases do too.
  ----------------------------------------------------------------------
  r1288 at dog:  rspier | 2004-07-26T19:00:50.217330Z
  
  MicroOptimizations:
  	- if we're doing an IS NULL search already, there's no reason to do a $null_columns_ok
  	- use || instead of 'or' so we can short-circuit
  ----------------------------------------------------------------------
  r1289 at dog:  rspier | 2004-07-26T19:06:54.604573Z
  
  MicroOptimization/Cleanup:
  	- get rid of $null_columns_ok flag
  	- clean up logic, and use string compare instead of regexp
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8305 at tinbook (orig r1286):  robert | 2004-07-26T19:15:12.786172Z
  ----------------------------------------------------------------------
  r1291 at dog:  rspier | 2004-07-26T19:14:41.133769Z
  
  Revert the last microoptimization.  It smells funny and will create problems with merging to 3.3
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8307 at tinbook (orig r1288):  leira | 2004-07-28T04:04:12.240846Z
 Handle 0 values properly.
 
 ----------------------------------------------------------------------
 r8308 at tinbook (orig r1289):  huberth | 2004-07-28T18:35:38.638941Z
 RT-Ticket: 5908
 RT-Status: resolved
 
  * drop.Oracle now drops the attributes table.
 
 ----------------------------------------------------------------------
 r8309 at tinbook (orig r1290):  huberth | 2004-07-28T18:39:36.764074Z
 RT-Ticket: 5899
 RT-Status: resolved
 
  * html/Search/Results.tsv now works with custom fields that have line breaks
    within them.
 
 
 ----------------------------------------------------------------------
 r8311 at tinbook (orig r1292):  jesse | 2004-07-29T00:08:11.298269Z
  ----------------------------------------------------------------------
  r8303 at tinbook:  jesse | 2004-07-28T23:59:45.883318Z
  
  Removed the extra newlines we inserted after the copyright block, since it adds extra newlines to the mason pages, which can break some parsing.
  
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8316 at tinbook (orig r1293):  leira | 2004-07-29T05:41:51.040092Z
 Make the TitleBox title a link to the same search, only not limited to 10.
 
 ----------------------------------------------------------------------
 r8319 at tinbook (orig r1296):  alexmv | 2004-07-30T19:59:24.588580Z
  * Fix "Unrecognised line: foo at bar" caused by 5.8.0 not matching utf8
    against regexps
 
 ----------------------------------------------------------------------
 r8320 at tinbook (orig r1297):  huberth | 2004-07-30T21:46:43.639926Z
 RT-Ticket: 5699
 RT-Status: resolved
 
  * Bulk editing of custom fields (finally!) added.  Not quite as fast as
    would be preferred, probably, but it (should) work.
 
 
 
 ----------------------------------------------------------------------
 r8329 at tinbook (orig r1298):  huberth | 2004-08-03T14:02:14.558593Z
 RT-Ticket: 5927
 RT-Status: resolved
 
  * Due dates in the past no longer look like they're in the future,
    i.e. "6 days ago".
 
 ----------------------------------------------------------------------
 r8333 at tinbook (orig r1302):  huberth | 2004-08-03T22:06:00.556754Z
 RT-Ticket: 4473
 RT-Status: resolved
 
  * In Ticket/Elements/ShowAttachments, the font code that is generated
    no longer tries to escape the quotes (to give something like
    <font size=&#34;-1&#34;>).  Now the quotes appear.  Also, the default
    font size for the date and size has been changed to -2, because -1
    looks huge and out of place.
 
 ----------------------------------------------------------------------
 r8338 at tinbook (orig r1307):  alexmv | 2004-08-04T14:33:55.363891Z
 RT-Ticket: 5916
 RT-Status: resolved
  * Postgres doesn't use '#' as a comment character
 
 ----------------------------------------------------------------------
 r8339 at tinbook (orig r1308):  alexmv | 2004-08-04T15:54:14.363856Z
 RT-Ticket: 4036
 RT-Status: resolved
  * 'Create' is uppercase
  * TemplateObj->QueueObj is null if the template is just being created
 
 ----------------------------------------------------------------------
 r8340 at tinbook (orig r1309):  alexmv | 2004-08-04T17:42:42.591907Z
  * Warn if running MySQL < 4.0.x
 
  * Suggest something slightly more useful if we don't have InnoDB and
    we're running MySQL 3.23
 
 ----------------------------------------------------------------------
 r8341 at tinbook (orig r1310):  alexmv | 2004-08-04T19:03:51.226982Z
 RT-Ticket: 5942
 RT-Status: resolved
  * Use a:after {content: "..."} to put dots after titlebox links; this
    involves one loc string change
 
  * Also force titlebox hrefs to be white, not black
 
 ----------------------------------------------------------------------
 r8342 at tinbook (orig r1311):  huberth | 2004-08-05T00:44:40.527084Z
 RT-Ticket: 4234
 RT-Status: resolved
 
  * Doubled headers and navbars no longer appear when an unprivileged user
    creates a Custom Field.  (This happened because Abort was called within
    a subcomponent.)
 
 ----------------------------------------------------------------------
 r8343 at tinbook (orig r1312):  alexmv | 2004-08-05T00:50:16.625070Z
  * Removing accidental paste
 
 ----------------------------------------------------------------------
 r8344 at tinbook (orig r1313):  huberth | 2004-08-05T18:47:43.340906Z
  * Fixed a couple of other stupid errors resulting from r1311 relating to
    quoting of pathnames.
 
 ----------------------------------------------------------------------
 r8383 at tinbook (orig r1326):  alexmv | 2004-08-10T19:38:59.860454Z
  * Add callback in header proper, to allow injection of style and script tags
 
 ----------------------------------------------------------------------
 r8394 at tinbook (orig r1335):  leira | 2004-08-17T16:03:08.253892Z
 Added a new callback at the very beginning of the <%INIT> block.
 
 RTIR uses this callback to look at the queue and hijack the display
 page, however, the callback itself is more generic than that: it
 happens at the very beginning, and receives all arguments.
 
 
 ----------------------------------------------------------------------
 r8396 at tinbook (orig r1337):  alexmv | 2004-08-17T19:03:04.023840Z
 RT-Ticket: 5820
 RT-Update: correspond
 RT-Status: resolved
 
  * Use "local $_" to prevent "modification of read-only value..."
    caused by aliasing $_ to a constant
 
 ----------------------------------------------------------------------
 r8397 at tinbook (orig r1338):  alexmv | 2004-08-17T21:05:10.004165Z
 RT-Ticket: 5716
 RT-Update: correspond
 RT-Status: resolved
 
  * Move code which is not specific to parsing mime messages into
    RT::Email::Interface; this removes a large base of duplicated code,
    and some sketchy "methods" that were getting called with "" as self
    often
 
 
 ----------------------------------------------------------------------
 r8398 at tinbook (orig r1339):  alexmv | 2004-08-17T22:16:11.573879Z
 RT-Ticket: 5963
 RT-Update: correspond
 RT-Status: resolved
 
  * Applied patch provided by bobg at the domain of uic.edu to exit if
    there is no content on standard input
 
 
 ----------------------------------------------------------------------
 r8399 at tinbook (orig r1340):  alexmv | 2004-08-17T22:18:15.933790Z
 RT-Ticket: 5939
 RT-Status: resolved
 RT-Update: correspond
 
  * Take out un-needed $fontsize variable; removing <font> tags will
    have to wait
 
 ----------------------------------------------------------------------
 r8400 at tinbook (orig r1341):  alexmv | 2004-08-17T23:57:59.583821Z
 RT-Ticket: 5897
 RT-Update: correspond
 RT-Status: resolved
 
  * ModifyTicket includes CommentOnTicket and ReplyToTicket rights;
    this effects display of "[Reply] [Comment]" links per transaction
 
 ----------------------------------------------------------------------
 r8401 at tinbook (orig r1342):  alexmv | 2004-08-18T00:05:11.483081Z
 RT-Ticket: 5823
 RT-Update: correspond
 RT-Status: resolved
 
  * Applied patch from bobg at the domain of uic.edu, prefixing refresh
    form's url with $RT::WebPath
 
 ----------------------------------------------------------------------
 r8402 at tinbook (orig r1343):  huberth | 2004-08-18T02:23:42.094984Z
  * Made bulk editing of custom fields slightly more efficient and 
    simultaneously cleaned up some of its code.
  * Also added a little bit of docs for RT::Ticket::Create() - Priority
    is a valid arg also.
 
 ----------------------------------------------------------------------
 r8403 at tinbook (orig r1344):  alexmv | 2004-08-18T02:27:04.024544Z
 RT-Ticket: 5988
 RT-Update: correspond
 RT-Status: resolved
 
  * Back out change r1338, as it breaks API compatibility in a stable
    release
 
 ----------------------------------------------------------------------
 r8416 at tinbook (orig r1347):  alexmv | 2004-08-18T19:31:10.580958Z
 RT-Ticket: 5826
 RT-Update: correspond
 RT-Status: resolved
 
  * Fix logic; bounce message as a loop if $IsALoop and not $RT::StoreLoops;
    was "if $IsALoop and ($RT::LoopsToOwner and not $RT::StoreLoops)"
 
 ----------------------------------------------------------------------
 r8417 at tinbook (orig r1348):  alexmv | 2004-08-18T20:22:42.711734Z
 RT-Ticket: 5215
 RT-Update: correspond
 RT-Status: resolved
 
  * When merging tickets, the resulting ticket's
    Time{Estimated,Worked,Left} should be the sum of the fields from
    both tickets
 
 ----------------------------------------------------------------------
 r8418 at tinbook (orig r1349):  alexmv | 2004-08-18T20:38:09.170879Z
 RT-Ticket: 5963
 RT-Update: correspond
 RT-Status: resolved
 
  * Some mailers care about the return value rt-mailgate; 'return 0'
    instead of 'die' to ensure that we fake success
 
 ----------------------------------------------------------------------
 r8420 at tinbook (orig r1351):  alexmv | 2004-08-18T21:53:17.081053Z
 RT-Ticket: 5792
 RT-Update: correspond
 RT-Status: resolved
 
  * Move the lasttrans anchor into a table cell
 
 ----------------------------------------------------------------------
 r8421 at tinbook (orig r1352):  alexmv | 2004-08-18T22:04:57.879119Z
 RT-Ticket: 5809
 RT-Status: resolved
 
  * Derivative of the doc. patch in [fsck.com #5809] applied
 
 ----------------------------------------------------------------------
 r8456 at tinbook (orig r1372):  jesse | 2004-08-28T23:47:32.411217Z
  ----------------------------------------------------------------------
  r8454 at tinbook:  jesse | 2004-08-28T23:42:12.276700Z
  
  ----------------------------------------------------------------------
  r8455 at tinbook:  jesse | 2004-08-28T23:46:06.962020Z
  Adding a "SearchActions" callback to Search/Results.html
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8473 at tinbook (orig r1376):  jesse | 2004-08-31T04:22:49.340942Z
  ----------------------------------------------------------------------
  r8457 at tinbook:  jesse | 2004-08-29T01:52:08.449173Z
  Refactored the TicketList compnent to be more reusable
  ----------------------------------------------------------------------
  r8458 at tinbook:  jesse | 2004-08-29T02:41:50.808026Z
  Adding a callback for a customer
  ----------------------------------------------------------------------
  r8471 at tinbook:  jesse | 2004-08-31T04:20:29.035587Z
  Fixed the callback in Results.html to not flake out when we've got interesting %ARGS coming into it.
  
  ----------------------------------------------------------------------
  r8472 at tinbook:  jesse | 2004-08-31T04:21:47.346418Z
  Added "DependedOnBy" to TicketSQL  to mean what it means elsewhere.
  
  Made TicketSQL let you search by ticket type
  
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8479 at tinbook (orig r1379):  jesse | 2004-08-31T08:14:54.830848Z
  ----------------------------------------------------------------------
  r8478 at tinbook:  jesse | 2004-08-31T08:14:29.467020Z
  Inlined Tickets_Overlay_SQL's "match"
  
  ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 r8482 at tinbook (orig r1380):  jesse | 2004-08-31T18:49:23.384189Z
 
  ----------------------------------------------------------------------
  r8480 at tinbook:  jesse | 2004-08-31T18:48:19.505579Z
  Added callbacks to let users add entries to show and edit basics boxes
  
  Made "type" an editable field on tickets (at the web api level, not in the UI)
  
  ----------------------------------------------------------------------
 
 
 ----------------------------------------------------------------------


Modified: rt/branches/3.3-TESTING/Makefile.in
==============================================================================
--- rt/branches/3.3-TESTING/Makefile.in	(original)
+++ rt/branches/3.3-TESTING/Makefile.in	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 #
 # DO NOT HAND-EDIT the file named 'Makefile'. This file is autogenerated.
 # Have a look at "configure" and "Makefile.in" instead

Modified: rt/branches/3.3-TESTING/README
==============================================================================
--- rt/branches/3.3-TESTING/README	(original)
+++ rt/branches/3.3-TESTING/README	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 RT is an enterprise-grade issue tracking system. It allows
 organizations to keep track of their to-do lists, who is working
 on which tasks, what's already been done, and when tasks were

Modified: rt/branches/3.3-TESTING/bin/mason_handler.fcgi.in
==============================================================================
--- rt/branches/3.3-TESTING/bin/mason_handler.fcgi.in	(original)
+++ rt/branches/3.3-TESTING/bin/mason_handler.fcgi.in	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!@PERL@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 package RT::Mason;
 
 use strict;

Modified: rt/branches/3.3-TESTING/bin/mason_handler.scgi.in
==============================================================================
--- rt/branches/3.3-TESTING/bin/mason_handler.scgi.in	(original)
+++ rt/branches/3.3-TESTING/bin/mason_handler.scgi.in	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!@SPEEDY_BIN@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 package RT::Mason;
 
 use strict;

Modified: rt/branches/3.3-TESTING/bin/mason_handler.svc.in
==============================================================================
--- rt/branches/3.3-TESTING/bin/mason_handler.svc.in	(original)
+++ rt/branches/3.3-TESTING/bin/mason_handler.svc.in	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!@PERL@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
 mason_handler.svc - Win32 IIS Service handler for RT

Modified: rt/branches/3.3-TESTING/bin/rt-crontool.in
==============================================================================
--- rt/branches/3.3-TESTING/bin/rt-crontool.in	(original)
+++ rt/branches/3.3-TESTING/bin/rt-crontool.in	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!@PERL@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 use Carp;
 
@@ -224,19 +223,17 @@
       )
       . "\n\n";
 
-    print " bin/rt-cron-tool \\\n";
-    print
-      "  --search RT::Search::ActiveTicketsInQueue  --search-arg general \\\n";
-    print
-      "  --condition RT::Condition::UntouchedInHours --condition-arg 4 \\\n";
+    print " bin/rt-crontool \\\n";
+    print "  --search RT::Search::ActiveTicketsInQueue  --search-arg general \\\n";
+    print "  --condition RT::Condition::UntouchedInHours --condition-arg 4 \\\n";
     print "  --action RT::Action::SetPriority --action-arg 99 \\\n";
     print "  --verbose\n";
 
     print "\n";
-    print loc("Escalate tickets");
-    print "rt-crontool \\\n";
-    print " --search RT::Search::ActiveTicketsInQueue  --search-arg thequeuename \\\n";
-    print " --action RT::Action::EscalatePriority \\\n";
+    print loc("Escalate tickets"). "\n";
+    print " bin/rt-crontool \\\n";
+    print "  --search RT::Search::ActiveTicketsInQueue  --search-arg general \\\n";
+    print "  --action RT::Action::EscalatePriority\n";
  
  
  

Modified: rt/branches/3.3-TESTING/bin/rt-mailgate.in
==============================================================================
--- rt/branches/3.3-TESTING/bin/rt-mailgate.in	(original)
+++ rt/branches/3.3-TESTING/bin/rt-mailgate.in	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!@PERL@ -w
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 
 =head1 NAME
 
@@ -458,6 +458,10 @@
 # Read the message in from STDIN
 $args{'message'} = <>;
 
+unless ( $args{message} =~ /\S/ ) {
+    print STDERR "$0: no message passed on STDIN!\n";
+    exit 0;
+}
 
 if ($opts{'extension'}) {
         $args{$opts{'extension'}} = $ENV{'EXTENSION'};

Modified: rt/branches/3.3-TESTING/bin/rt.in
==============================================================================
--- rt/branches/3.3-TESTING/bin/rt.in	(original)
+++ rt/branches/3.3-TESTING/bin/rt.in	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!@PERL@ -w
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 
 # This program is intentionally written to have as few non-core module
@@ -1172,6 +1171,7 @@
 sub parse_config_file {
     my %cfg;
     my ($file) = @_;
+    local $_; # $_ may be aliased to a constant, from line 1163
 
     open(CFG, $file) && do {
         while (<CFG>) {

Modified: rt/branches/3.3-TESTING/bin/standalone_httpd.in
==============================================================================
--- rt/branches/3.3-TESTING/bin/standalone_httpd.in	(original)
+++ rt/branches/3.3-TESTING/bin/standalone_httpd.in	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!@PERL@ -w
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 package RT::Mason;
 
 use strict;

Modified: rt/branches/3.3-TESTING/bin/webmux.pl.in
==============================================================================
--- rt/branches/3.3-TESTING/bin/webmux.pl.in	(original)
+++ rt/branches/3.3-TESTING/bin/webmux.pl.in	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!@PERL@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 
 BEGIN {

Modified: rt/branches/3.3-TESTING/etc/RT_Config.pm.in
==============================================================================
--- rt/branches/3.3-TESTING/etc/RT_Config.pm.in	(original)
+++ rt/branches/3.3-TESTING/etc/RT_Config.pm.in	Tue Aug 31 22:37:44 2004
@@ -282,7 +282,7 @@
 
 # $WebImagesURL points to the base URL where RT can find its images.
 
-Set($WebImagesURL , $WebURL . "NoAuth/images/");
+Set($WebImagesURL , $WebPath . "/NoAuth/images/");
 
 # $RTLogoURL points to the URL of the RT logo displayed in the web UI
 

Modified: rt/branches/3.3-TESTING/etc/drop.Oracle
==============================================================================
--- rt/branches/3.3-TESTING/etc/drop.Oracle	(original)
+++ rt/branches/3.3-TESTING/etc/drop.Oracle	Tue Aug 31 22:37:44 2004
@@ -1,5 +1,6 @@
 DROP TABLE ACL;
 DROP TABLE ATTACHMENTS;
+DROP TABLE ATTRIBUTES;
 DROP TABLE CACHEDGROUPMEMBERS;
 DROP TABLE CUSTOMFIELDS;
 DROP TABLE CUSTOMFIELDVALUES;
@@ -19,6 +20,7 @@
 DROP TABLE USERS;
 DROP SEQUENCE ACL_seq;
 DROP SEQUENCE ATTACHMENTS_seq;
+DROP SEQUENCE ATTRIBUTES_seq;
 DROP SEQUENCE CACHEDGROUPMEMBERS_seq;
 DROP SEQUENCE CUSTOMFIELDS_seq;
 DROP SEQUENCE CUSTOMFIELDVALUES_seq;

Modified: rt/branches/3.3-TESTING/etc/upgrade/3.1.0/schema.Pg
==============================================================================
--- rt/branches/3.3-TESTING/etc/upgrade/3.1.0/schema.Pg	(original)
+++ rt/branches/3.3-TESTING/etc/upgrade/3.1.0/schema.Pg	Tue Aug 31 22:37:44 2004
@@ -9,7 +9,7 @@
   Content text,
   ContentType varchar(16),
   ObjectType varchar(64),
-  ObjectId integer, # foreign key to anything
+  ObjectId integer, -- foreign key to anything
   Creator integer NOT NULL DEFAULT 0  ,
   Created TIMESTAMP NULL  ,
   LastUpdatedBy integer NOT NULL DEFAULT 0  ,

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/AddCustomFieldValue
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/AddCustomFieldValue	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/AddCustomFieldValue	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <b><&|/l&>Add Value</&></b></b></b></b>
 <TABLE BORDER="0">
 <TR><TD><small>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/CreateUserCalled
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/CreateUserCalled	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/CreateUserCalled	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <FORM METHOD=get ACTION="<% $RT::WebPath %>/Admin/Users/Create.html">
 <&|/l&>New user called</&> <INPUT NAME="Name" size=10><input type=submit value="<&|/l&>Create</&>">
 </form>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomField
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomField	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomField	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/ListActions, actions => \@results &>
 
 
@@ -103,18 +103,26 @@
                                                  Type => $Type,
                                                  Description => $Description,
 						 );
-      Abort(loc("Could not create CustomField", $msg)) unless ($val);
-     push @results, $msg;
-     $CustomFieldObj->SetSortOrder($CustomFieldObj->id);
-     $title = loc('Created CustomField [_1]', $CustomFieldObj->Name()); 
+      
+      # if there is an error, then abort.  But since at this point there's
+      # stuff already printed, clear it out.
+      # (This only works in conjunction with temporarily turning autoflush
+      #  off in the files that use this component.)
+      unless ($val) {
+	  $m->clear_buffer;
+	  Abort(loc("Could not create CustomField: [_1]", $msg));
+      }
+      push @results, $msg;
+      $CustomFieldObj->SetSortOrder($CustomFieldObj->id);
+      $title = loc('Created CustomField [_1]', $CustomFieldObj->Name()); 
     } else {
-       $CustomFieldObj->Load($CustomField) || Abort(loc('No CustomField'));
+      $CustomFieldObj->Load($CustomField) || Abort(loc('No CustomField'));
       $title = loc('Editing CustomField [_1]', $CustomFieldObj->Name()); 
 
       my @aresults = ProcessCustomFieldUpdates ( 
                         CustomFieldObj => $CustomFieldObj,
                         ARGSRef => \%ARGS );
-     push @results, @aresults;
+      push @results, @aresults;
     }
 
 

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFieldValues
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFieldValues	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFieldValues	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % if (!$values->Count) {
 <p><em><&|/l&>(no values)</&></em></p>
 %    return;

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/ListActions, actions => \@results &>
 
 <FORM ACTION="CustomFields.html" METHOD=POST>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/EditQueueWatchers
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/EditQueueWatchers	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/EditQueueWatchers	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %if ($Members->Count == 0 ) {
 <ul>
 <li><i><&|/l&>none</&></i>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/EditScrip
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/EditScrip	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/EditScrip	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/ListActions, actions => \@actions &>
 
   

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/EditScrips
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/EditScrips	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/EditScrips	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/ListActions, actions => \@actions &>
 
 <form action="Scrips.html" method="post">

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/EditTemplates
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/EditTemplates	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/EditTemplates	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/ListActions, actions => \@actions &>
 
 <FORM METHOD=GET ACTION="Templates.html">

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/EditUserComments
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/EditUserComments	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/EditUserComments	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => "Comments about $name" &>
 <&|/l&>These comments aren't generally visible to the user</&>:<br>
 <input type="hidden" name="id" value="<%$id%>">

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/GroupTabs
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/GroupTabs	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/GroupTabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Tabs, 
     subtabs => $tabs, 
     current_tab => 'Admin/Groups/', 

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/Header
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/Header	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/Header	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, %ARGS &>
 
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalCustomFields
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalCustomFields	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalCustomFields	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %   my $count = 0;
 %   while (my $CustomFieldObj = $CustomFields->Next) { 
 %   $count++;

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalScrips
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalScrips	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalScrips	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %   my $count = 0;
 %   while (my $scrip = $Scrips->Next ) {
 %   $count++;

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/ModifyTemplate
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/ModifyTemplate	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/ModifyTemplate	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
 <TR>
 <TD ALIGN=RIGHT>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/QueueRightsForUser
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/QueueRightsForUser	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/QueueRightsForUser	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <UL>
 %while(my $ACE = $ACL->Next) {
 

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/QueueTabs
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/QueueTabs	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/QueueTabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Tabs, 
     subtabs => $tabs, 
     current_tab => 'Admin/Queues/', 

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectCustomFieldType
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectCustomFieldType	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectCustomFieldType	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 %for my $option ($cf->TypeComposites) {
 <OPTION VALUE="<%$option%>" <%$option eq $Default && "SELECTED"%>><% $cf->FriendlyTypeComposite($option) %></OPTION>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectGroups
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectGroups	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectGroups	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT MULTIPLE NAME="<%$Name%>"  SIZE=10>
 %while (my $group = $groups->Next) {
 <OPTION VALUE="<%$group->id%>"><%$group->Name%>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyGroup
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyGroup	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyGroup	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %while ( $Group = $Groups->Next) {
 <A HREF="Modify.html?id=<%$Group->id%>"><%$Group->id%>: <%$Group->Name%></a><BR>
 %}

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyQueue
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyQueue	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyQueue	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %while ( $queue = $queues->Next) {
 <A HREF="Modify.html?id=<%$queue->id%>"><%$queue->id%>: <%$queue->Name%></a><BR>
 %}

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyUser
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyUser	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyUser	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %while ( $user = $users->Next) {
 <A HREF="Modify.html?id=<%$user->id%>"><%$user->id%>: <%$user->Name%></a><BR>
 %}

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectNewGroupMembers
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectNewGroupMembers	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectNewGroupMembers	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % if ($Show ne 'Groups') {
 <b><&|/l&>Users</&></b>
 <SELECT MULTIPLE NAME="<%$Name%>Users"  SIZE=10>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <INPUT TYPE=HIDDEN NAME="CheckACL"  VALUE="<%$ACLDesc%>">
      <TABLE BORDER=0>
 <TR>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectScrip
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectScrip	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectScrip	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME=<%$Name%>>
 <OPTION VALUE="" 
 <% $Default eq undef && 'SELECTED' %>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripAction
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripAction	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripAction	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME=<%$Name%>>
 <OPTION VALUE="" 
 <% $Default eq undef && 'SELECTED' %>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripCondition
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripCondition	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripCondition	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME=<%$Name%>>
 <OPTION VALUE="" 
 <% $Default eq undef && 'SELECTED' %>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectSingleOrMultiple
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectSingleOrMultiple	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectSingleOrMultiple	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
   <select name="<%$Name%>">
     <option value="1" <%$SingleDefault%>><&|/l&>Single</&></option>
     <option value="0" <%$MultipleDefault%>><&|/l&>Multiple</&></option>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectStage
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectStage	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectStage	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME=<%$Name%>>
 % foreach my $stage (qw(TransactionCreate TransactionBatch Disabled)) {
 <OPTION VALUE=<%$stage%>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectTemplate
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectTemplate	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectTemplate	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME=<%$Name%>>
 <OPTION VALUE="" 
 <% $Default eq 'none' && 'SELECTED' %>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectUsers
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectUsers	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectUsers	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT MULTIPLE NAME="<%$Name%>"  SIZE=10>
 %while (my $user = $users->Next) {
 <OPTION VALUE="<%$user->id%>"><%$user->Name%>

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SystemTabs
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SystemTabs	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SystemTabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Tabs, subtabs => $tabs, 
     current_tab => 'Admin/Global/', 
     current_subtab => $current_tab, 

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/Tabs
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/Tabs	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/Tabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Tabs, 
     tabs => $tabs, 
     current_toptab => 'Admin/', 

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/ToolTabs
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/ToolTabs	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/ToolTabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Tabs, subtabs => $tabs, 
     current_tab => 'Admin/Tools/', 
     current_subtab => $current_tab, 

Modified: rt/branches/3.3-TESTING/html/Admin/Elements/UserTabs
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/UserTabs	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/UserTabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Tabs, 
     subtabs => $tabs,
     current_tab => 'Admin/Users/', 

Modified: rt/branches/3.3-TESTING/html/Admin/Global/GroupRights.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Global/GroupRights.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Global/GroupRights.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify global group rights') &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/GroupRights.html', 

Modified: rt/branches/3.3-TESTING/html/Admin/Global/Scrip.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Global/Scrip.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Global/Scrip.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title  &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/Scrips.html', 

Modified: rt/branches/3.3-TESTING/html/Admin/Global/Scrips.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Global/Scrips.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Global/Scrips.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title  &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/Scrips.html', 

Modified: rt/branches/3.3-TESTING/html/Admin/Global/Template.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Global/Template.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Global/Template.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc("Modify template [_1]", $TemplateObj->id)  &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/Templates.html', 

Modified: rt/branches/3.3-TESTING/html/Admin/Global/Templates.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Global/Templates.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Global/Templates.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title, FeedURI => 'templates' &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/Templates.html', 

Modified: rt/branches/3.3-TESTING/html/Admin/Global/UserRights.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Global/UserRights.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Global/UserRights.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify global user rights') &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/UserRights.html',

Modified: rt/branches/3.3-TESTING/html/Admin/Global/index.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Global/index.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Global/index.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Callback, tabs => $tabs, %ARGS &>
 <& /Admin/Elements/Header, Title => loc('Admin/Global configuration') &>
 <& /Admin/Elements/SystemTabs, 

Modified: rt/branches/3.3-TESTING/html/Admin/Groups/GroupRights.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Groups/GroupRights.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Groups/GroupRights.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify group rights for group [_1]', $GroupObj->Name) &>
 <& /Admin/Elements/GroupTabs, 
     GroupObj => $GroupObj, 

Modified: rt/branches/3.3-TESTING/html/Admin/Groups/Members.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Groups/Members.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Groups/Members.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => "RT/Admin/Edit the group ". $Group->Name &>
 <& /Admin/Elements/GroupTabs, GroupObj => $Group, 
     current_tab => 'Admin/Groups/Members.html?id='.$id, 

Modified: rt/branches/3.3-TESTING/html/Admin/Groups/Modify.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Groups/Modify.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Groups/Modify.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title  &>
 
 <& /Admin/Elements/GroupTabs, 

Modified: rt/branches/3.3-TESTING/html/Admin/Groups/UserRights.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Groups/UserRights.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Groups/UserRights.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify user rights for group [_1]', $GroupObj->Name) &>
 <& /Admin/Elements/GroupTabs, 
     GroupObj => $GroupObj, 

Modified: rt/branches/3.3-TESTING/html/Admin/Groups/index.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Groups/index.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Groups/index.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/GroupTabs, current_tab => 'Admin/Groups/',
     current_subtab => 'Admin/Groups/', 

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/CustomField.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/CustomField.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/CustomField.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $QueueObj->Id, 
     QueueObj => $QueueObj,                                                      
@@ -51,7 +51,7 @@
     subtabs => $subtabs, 
     Title => $title &>
 
-<& /Admin/Elements/EditCustomField, title => $title,  %ARGS &>
+<& /Admin/Elements/EditCustomField, title => $title, %ARGS &>
 
 <%INIT>
 my $QueueObj = new RT::Queue($session{'CurrentUser'});
@@ -80,3 +80,6 @@
 $CustomField => undef
 $Queue => 0
 </%ARGS>
+<%ATTR>
+AutoFlush => 0
+</%ATTR>

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/CustomFields.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/CustomFields.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/CustomFields.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,5 +42,5 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/ObjectCustomFields, %ARGS, ObjectType => 'RT::Queue' &>

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/GroupRights.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/GroupRights.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/GroupRights.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify group rights for queue [_1]', $QueueObj->Name) &>
 <& /Admin/Elements/QueueTabs, id => $id, 
     QueueObj => $QueueObj,                                                      

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/Modify.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/Modify.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $QueueObj->id, 
     QueueObj => $QueueObj,

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/People.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/People.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/People.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc('Modify people related to queue [_1]', $QueueObj->Name) &>
 <& /Admin/Elements/QueueTabs, id => $id, 
     QueueObj => $QueueObj,                                                      

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/Scrip.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/Scrip.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/Scrip.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $QueueObj->Id, 
     QueueObj => $QueueObj,                                                      

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/Scrips.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/Scrips.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/Scrips.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $QueueObj->id, 
     QueueObj => $QueueObj,                                                      

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/Template.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/Template.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/Template.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,10 +42,10 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $Queue, 
-    QueueObj => $TemplateObj->QueueObj,
+    QueueObj => $QueueObj,
      current_tab => 'Admin/Queues/Templates.html?id='.$Queue,
      current_subtab => $current_subtab, 
      subtabs => $subtabs, 
@@ -84,7 +84,7 @@
 
 if ($Create) {
   $title = loc("Create a template");
-  $current_subtab = "Admin/Queues/Template.html?create=1&Queue=".$Queue;
+  $current_subtab = "Admin/Queues/Template.html?Create=1&Queue=".$Queue;
 }
 
 else {
@@ -100,8 +100,10 @@
   
     
 }
+my $QueueObj;
 if ($TemplateObj->Id()) {
   $Queue = $TemplateObj->Queue;
+  $QueueObj = $TemplateObj->QueueObj;
 
   my @attribs = qw( Description Content Queue Name);
   my @aresults = UpdateRecordObject( AttributesRef => \@attribs, 
@@ -112,6 +114,9 @@
   		     	path => "Admin/Queues/Template.html?Queue=$Queue&Template=".$TemplateObj->Id(),
 			};
   push @results, @aresults;
+} else {
+  $QueueObj = RT::Queue->new($session{'CurrentUser'});
+  $QueueObj->Load($Queue);
 }
 
 </%INIT>

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/Templates.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/Templates.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/Templates.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $QueueObj->id, 
     current_tab => 'Admin/Queues/Templates.html?id='.$id, 

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/UserRights.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/UserRights.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/UserRights.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify user rights for queue [_1]', $QueueObj->Name) &>
 <& /Admin/Elements/QueueTabs, id => $id,
     QueueObj => $QueueObj,                                                      

Modified: rt/branches/3.3-TESTING/html/Admin/Queues/index.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Queues/index.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Queues/index.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc("Admin queues") &>
 <& /Admin/Elements/QueueTabs, current_tab => 'Admin/Queues/', 
     current_subtab => 'Admin/Queues/', 

Modified: rt/branches/3.3-TESTING/html/Admin/Tools/Configuration.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Tools/Configuration.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Tools/Configuration.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%init>
 require  Module::Versions::Report;
 my $title = loc('System Configuration');

Modified: rt/branches/3.3-TESTING/html/Admin/Tools/index.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Tools/index.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Tools/index.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%init>
 my $title = loc('System Tools');
 </%init>

Modified: rt/branches/3.3-TESTING/html/Admin/Users/Modify.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Users/Modify.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Users/Modify.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title  &>
 <& /Admin/Elements/UserTabs, 
     id => $id, 

Modified: rt/branches/3.3-TESTING/html/Admin/Users/index.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Users/index.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Users/index.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Select a user') &>
 <& /Admin/Elements/UserTabs, current_tab => 'Admin/Users/', 
     current_subtab => 'Admin/Users/',

Modified: rt/branches/3.3-TESTING/html/Admin/index.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/index.html	(original)
+++ rt/branches/3.3-TESTING/html/Admin/index.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('RT Administration') &>
 <& /Admin/Elements/Tabs, Title => loc('RT Administration') &>
 

Modified: rt/branches/3.3-TESTING/html/Approvals/Display.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Approvals/Display.html	(original)
+++ rt/branches/3.3-TESTING/html/Approvals/Display.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title =>  $title &>
 
 <& Elements/Tabs, 

Modified: rt/branches/3.3-TESTING/html/Approvals/Elements/Approve
==============================================================================
--- rt/branches/3.3-TESTING/html/Approvals/Elements/Approve	(original)
+++ rt/branches/3.3-TESTING/html/Approvals/Elements/Approve	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <tr bgcolor="#b9b9ff">
 <td colspan=2><font size="3">
 <a href="<%$RT::WebPath%>/Approvals/Display.html?id=<%$ticket->Id%>"><% loc("#[_1]: [_2]", $ticket->Id, $ticket->Subject) %></a> (<%loc($ticket->Status)%>)</font></td>

Modified: rt/branches/3.3-TESTING/html/Approvals/Elements/PendingMyApproval
==============================================================================
--- rt/branches/3.3-TESTING/html/Approvals/Elements/PendingMyApproval	(original)
+++ rt/branches/3.3-TESTING/html/Approvals/Elements/PendingMyApproval	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table width="100%">
 % my ($i, $class);
 % my %done;

Modified: rt/branches/3.3-TESTING/html/Approvals/Elements/ShowDependency
==============================================================================
--- rt/branches/3.3-TESTING/html/Approvals/Elements/ShowDependency	(original)
+++ rt/branches/3.3-TESTING/html/Approvals/Elements/ShowDependency	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % my $approving = $Ticket->DependedOnBy();
 % if ($approving->Count) {
 <h3><&|/l&>Tickets which depend on this approval:</&></h3>

Modified: rt/branches/3.3-TESTING/html/Approvals/Elements/Tabs
==============================================================================
--- rt/branches/3.3-TESTING/html/Approvals/Elements/Tabs	(original)
+++ rt/branches/3.3-TESTING/html/Approvals/Elements/Tabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Tabs,
     tabs => $tabs, 
     current_toptab => 'Approvals/', 

Modified: rt/branches/3.3-TESTING/html/Approvals/index.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Approvals/index.html	(original)
+++ rt/branches/3.3-TESTING/html/Approvals/index.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("My approvals") &>
 <& /Approvals/Elements/Tabs, Title => loc("My approvals") &>
 

Modified: rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedEnd
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedEnd	(original)
+++ rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedEnd	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
   </TD>
 </TR>
 </table>

Modified: rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedStart
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedStart	(original)
+++ rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedStart	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table cellspacing=0 cellpadding=0 width=100% height=100%>
       <TR>
         <TD width=100% height=100%> 

Modified: rt/branches/3.3-TESTING/html/Elements/Callback
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Callback	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Callback	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%once>
 my (%cache, $check);
 </%once>

Modified: rt/branches/3.3-TESTING/html/Elements/Checkbox
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Checkbox	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Checkbox	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <INPUT TYPE="Checkbox" NAME ="<%$Name%>" <%$IsChecked%>>
 
 <%ARGS>

Added: rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Header
==============================================================================
--- (empty file)
+++ rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Header	Tue Aug 31 22:37:44 2004
@@ -0,0 +1,91 @@
+%# BEGIN LICENSE BLOCK;
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse at bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+
+<%ARGS>
+ at Format => undef
+$AllowSorting => undef
+$Order=>undef
+$BaseURL => undef
+$Query => undef
+$Rows => undef
+$Page => undef
+$maxitems => undef
+</%ARGS>
+<TR>
+<%perl>
+
+my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page );
+
+my $item = 0;
+$$maxitems = 0;
+foreach my $col (@Format) {
+    $item++;
+    $$maxitems = $item if $item > $$maxitems;
+    if ( $col->{title} eq 'NEWLINE' ) {
+        $m->out('</TR>       <TR>');
+	$item = 0;
+    }
+    else {
+        $m->out('<TH align="center">');
+        my $title = $col->{title};
+        $title =~ s/^__(.*)__$/$1/o;
+        $title = ( $m->comp('/Elements/RT__Ticket/ColumnMap', 
+                     Name => $title, 
+                     Attr => 'title' 
+                 )  
+                     || $title
+                 );
+        if (   $AllowSorting
+            && $col->{'attribute'}
+            && $m->comp('/Elements/RT__Ticket/ColumnMap',
+                          Name => $col->{'attribute'},
+                          Attr => 'attribute' ) 
+           )
+        {
+
+            $m->out(
+                '<a href="' . $BaseURL 
+                  . $m->comp(
+                    '/Elements/QueryString',
+                    %generic_query_args,
+                    OrderBy => (
+                        $m->comp('/Elements/RT__Ticket/ColumnMap',
+                          Name => $col->{'attribute'},
+                          Attr => 'attribute' 
+                    )
+                          || $col->{'attribute'}
+                    ),
+                    Order => ( $ARGS{'Order'} eq 'ASC' ? 'DESC' : 'ASC' )
+                  ).
+                  '">' . loc($title) . '</a>'
+            );
+        }
+        else {
+            $m->out( loc($title) );
+        }
+        $m->out('</TH>');
+    }
+}
+</%perl>
+</TR>

Added: rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/ParseFormat
==============================================================================
--- (empty file)
+++ rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/ParseFormat	Tue Aug 31 22:37:44 2004
@@ -0,0 +1,81 @@
+%# BEGIN LICENSE BLOCK;
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse at bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+
+<%ARGS>
+$Format
+</%ARGS>
+
+<%init>
+use Regexp::Common qw(delimited);
+my @Columns;
+#my $quoted = qr[$RE{delimited}{-delim=>qq{\'\"}}|(?:\{|\}|\w|\.)+];
+my $justquoted = qr[$RE{delimited}{-delim=>qq{\'\"}}];
+#my $quoted =        $RE{quoted}{-esc};
+my $word = qr [(?:\{|\}|\w|\.)+];
+
+while ($Format =~ /($justquoted|$word)/igx) {
+    my $col = $1;
+
+    if ($col =~ /^$RE{quoted}{-esc}$/) {
+        substr($col,0,1) = "";
+        substr($col,-1,1) = "";
+    }
+
+    my $colref;
+    if ( $col =~ s/\/STYLE:(.*?)$//io ) {
+        $colref->{'style'} = $1;
+    }
+    if ( $col =~ s/\/CLASS:(.*?)$//io ) {
+        $colref->{'class'} = $1;
+    }
+    if ( $col =~ s/\/TITLE:(.*?)$//io ) {
+        $colref->{'title'} = $1;
+    }
+    if ( $col =~ /__(.*?)__/gio ) {
+        my @subcols;
+        while ( $col =~ s/^(.*?)__(.*?)__//o ) {
+            push ( @subcols, $1 ) if ($1);
+            push ( @subcols, "__$2__" );
+            $colref->{'attribute'} = $2;
+        }
+        push ( @subcols, $col );
+        @{ $colref->{'output'} } = @subcols;
+    }
+    else {
+        @{ $colref->{'output'} } = ( "__" . $col . "__" );
+        $colref->{'attribute'} = $col;
+    }
+    
+    if ( !$colref->{'title'} && grep { /^__(.*?)__$/io }
+        @{ $colref->{'output'} } )
+    {   
+        $colref->{'title'}     = $1;
+        $colref->{'attribute'} = $1;
+    }
+
+
+    push @Columns, $colref;
+}
+    return(@Columns);
+</%init>

Added: rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Row
==============================================================================
--- (empty file)
+++ rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Row	Tue Aug 31 22:37:44 2004
@@ -0,0 +1,69 @@
+%# BEGIN LICENSE BLOCK;
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse at bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+
+<%ARGS>
+$i => undef
+ at Format => undef
+$record => undef
+$maxitems => undef
+$Depth => undef
+$Warning => undef
+</%ARGS>
+
+<%PERL>
+$m->out( '<TR class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
+my $item;
+foreach my $column (@Format) {
+    if ( $column->{title} eq 'NEWLINE' ) {
+	while ($item < $maxitems) {
+	    $m->out("<td>&nbsp;</td>\n");
+	    $item++;
+	}
+	$item = 0;
+        $m->out('</TR>');
+        $m->out( '<TR class="' . 
+               ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
+        next;
+    }
+    $item++;
+    $m->out('<td align="left">');
+    foreach my $subcol ( @{ $column->{output} } ) {
+        if ( $subcol =~ /^__(.*?)__$/o ) {
+            my $col = $1;
+            my $value = $m->comp('/Elements/RT__Ticket/ColumnMap', Name => $col, Attr => 'value');
+
+            if ( $value && ref($value)) {
+                $m->out( &{ $value } ( $record, $i ) );
+            } else {
+                $m->out($value );
+            }
+        }
+        else {
+            $m->out( Encode::decode_utf8($subcol) );
+        }
+    }
+    $m->out('</td>');
+}
+$m->out('</TR>');
+</%PERL>

Modified: rt/branches/3.3-TESTING/html/Elements/CreateTicket
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/CreateTicket	(original)
+++ rt/branches/3.3-TESTING/html/Elements/CreateTicket	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <FORM ACTION="<% $RT::WebPath%>/Ticket/Create.html">
 <&|/l, $m->scomp('/Elements/SelectNewTicketQueue')&><input type="submit" value="New ticket in">&nbsp;[_1]</&>
 </FORM>

Modified: rt/branches/3.3-TESTING/html/Elements/EditLinks
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/EditLinks	(original)
+++ rt/branches/3.3-TESTING/html/Elements/EditLinks	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TABLE width=100%>
   <TR>
     <TD VALIGN=TOP WIDTH=50%>

Modified: rt/branches/3.3-TESTING/html/Elements/Error
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Error	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Error	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Callback, %ARGS, error => $error &>
 <& /Elements/Header, Code => $Code, Why => $Why &>
 <& /Elements/Tabs &>

Modified: rt/branches/3.3-TESTING/html/Elements/Footer
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Footer	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Footer	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % if ($Menu) {
 </td>
 </tr>

Modified: rt/branches/3.3-TESTING/html/Elements/GotoTicket
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/GotoTicket	(original)
+++ rt/branches/3.3-TESTING/html/Elements/GotoTicket	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,5 +42,5 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <FORM ACTION="<%$RT::WebPath%>/Ticket/Display.html"><input type=submit value="<&|/l&>Goto ticket</&>">&nbsp;<input size=5 name=id accesskey="0"></FORM>

Modified: rt/branches/3.3-TESTING/html/Elements/Header
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Header	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Header	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %#<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
@@ -65,6 +65,7 @@
     }
 }   
 </script>
+<& /Elements/Callback, _CallbackName => 'Head', %ARGS &>
 </HEAD>
 <BODY BGCOLOR="<%$BgColor%>"
 % if ($Focus) {

Modified: rt/branches/3.3-TESTING/html/Elements/ListActions
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/ListActions	(original)
+++ rt/branches/3.3-TESTING/html/Elements/ListActions	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % if ($actions[0] ) {
 <& /Elements/TitleBoxStart, title => loc('Results') &>
 <UL>

Modified: rt/branches/3.3-TESTING/html/Elements/Login
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Login	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Login	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 if ($m->request_comp->path =~ '^/REST/\d+\.\d+/') {
     $r->content_type("text/plain");

Modified: rt/branches/3.3-TESTING/html/Elements/Menu
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Menu	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Menu	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# font size depends on level
 % if ($level ge 3) {
 %   $size = $basesize-(6);

Modified: rt/branches/3.3-TESTING/html/Elements/MessageBox
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/MessageBox	(original)
+++ rt/branches/3.3-TESTING/html/Elements/MessageBox	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TEXTAREA COLS=<%$Width%> ROWS=<%$Height%> WRAP=<%$Wrap%> NAME="<%$Name%>"><& /Elements/Callback, %ARGS &><% $Default %><%$message%><%$IncludeSignature ? $signature : ''%></TEXTAREA>
 <%INIT>
 

Modified: rt/branches/3.3-TESTING/html/Elements/MyRequests
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/MyRequests	(original)
+++ rt/branches/3.3-TESTING/html/Elements/MyRequests	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,12 +42,13 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <&|/Elements/TitleBox, 
-        title => loc("[_1] newest unowned tickets...", $rows) &>
+        title => loc("[_1] newest unowned tickets", $rows),
+	title_href => "Search/Results.html".$QueryString &>
 <& /Elements/TicketList, 
         Format => "'<a href=\"$RT::WebPath/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"$RT::WebPath/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', QueueName, ExtendedStatus, CreatedRelative, '<A HREF=\"$RT::WebPath/Ticket/Display.html?Action=Take&id=__id__\">".loc('Take')."</a>/TITLE:&nbsp;' ",
-        Query => "Owner = 'Nobody' AND ( Status = 'new' OR Status = 'open')",
+        Query => $Query,
         OrderBy => 'Created',
         Order => 'DESC',
         ShowNavigation => 0,
@@ -57,4 +58,12 @@
 </&>
 <%init>
 my $rows = $RT::MyRequestsLength;
+
+my $Query = "Owner = 'Nobody' AND ( Status = 'new' OR Status = 'open')";
+
+my $QueryString = '?' . $m->comp('/Elements/QueryString', 
+            Query => $Query,
+            Order => 'DESC',
+            OrderBy => 'Priority') if ($Query);
+
 </%init>

Modified: rt/branches/3.3-TESTING/html/Elements/MyTickets
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/MyTickets	(original)
+++ rt/branches/3.3-TESTING/html/Elements/MyTickets	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,13 +42,14 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
-<&|/Elements/TitleBox, title => loc('[_1] highest priority tickets I own', $rows) &>
+%# }}} END BPS TAGGED BLOCK
+<&|/Elements/TitleBox, 
+	title => loc('[_1] highest priority tickets I own', $rows),
+	title_href => "Search/Results.html".$QueryString &>
 <& /Elements/TicketList, 
-        Title => loc("[_1] highest priority tickets I requested...", $rows),
         Format => "'<a href=\"$RT::WebPath/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"$RT::WebPath/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', Priority, QueueName, ExtendedStatus",
 
-        Query => " Owner = '".$session{'CurrentUser'}->Id."' AND ( Status = 'new' OR Status = 'open')",
+        Query => $Query,
         OrderBy => 'Priority',
         Order => 'DESC',
         Rows => $rows,
@@ -57,5 +58,13 @@
 </&> 
 <%init>
 my $rows = $RT::MyTicketsLength;
+
+my $Query = " Owner = '".$session{'CurrentUser'}->Id."' AND ( Status = 'new' OR Status = 'open')";
+
+my $QueryString = '?' . $m->comp('/Elements/QueryString', 
+            Query => $Query,
+            Order => 'DESC',
+            OrderBy => 'Priority') if ($Query);
+
 </%init>
 

Modified: rt/branches/3.3-TESTING/html/Elements/PageLayout
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/PageLayout	(original)
+++ rt/branches/3.3-TESTING/html/Elements/PageLayout	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table class="darkblue" border=0 cellspacing=0 cellpadding=0 width="100%">
   <th class="titlebox" align="left"><span class="rtname"><%$AppName%></span>
   </th>

Modified: rt/branches/3.3-TESTING/html/Elements/QueryString
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/QueryString	(original)
+++ rt/branches/3.3-TESTING/html/Elements/QueryString	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%init>
 my @params;
 while ( (my $key, my $value) = each %ARGS ){

Modified: rt/branches/3.3-TESTING/html/Elements/QuickCreate
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/QuickCreate	(original)
+++ rt/branches/3.3-TESTING/html/Elements/QuickCreate	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title => loc('Quick ticket creation') &>
 <form method="post" action="<%$RT::WebPath%>/index.html">
 <input type="hidden" name="QuickCreate" value="1">

Modified: rt/branches/3.3-TESTING/html/Elements/Quicksearch
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Quicksearch	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Quicksearch	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title => loc("Quick search"), bodyclass => "" &>
 
 <TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>                       

Added: rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
==============================================================================
--- (empty file)
+++ rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap	Tue Aug 31 22:37:44 2004
@@ -0,0 +1,387 @@
+%# BEGIN LICENSE BLOCK;
+%# 
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse at bestpractical.com>
+%# 
+%# (Except where explictly superceded by other copyright notices)
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
+%# 
+%# 
+%# END LICENSE BLOCK
+
+<%ARGS>
+$Name => undef
+$Attr => undef
+</%ARGS>
+
+<%perl>
+return ColumnMap($Name, $Attr);
+</%perl>
+
+<%INIT>
+our ( $COLUMN_MAP, $CUSTOM_FIELD_MAP );
+
+sub ColumnMap {
+    my $name = shift;
+    my $attr = shift;
+
+    # First deal with the simple things from the map
+    if ( $COLUMN_MAP->{$name} ) {
+        return ( $COLUMN_MAP->{$name}->{$attr} );
+    }
+
+    # now, let's deal with harder things, like Custom Fields
+
+    elsif ( $name =~ /^(?:CF|CustomField).(.*)$/ ) {
+        my $field = $1;
+        my $cf;
+        if ( $CUSTOM_FIELD_MAP->{$field} ) {
+            $cf = $CUSTOM_FIELD_MAP->{$field};
+        }
+        else {
+
+            $cf = RT::CustomField->new( $session{'CurrentUser'} );
+
+            if ( $field =~ /^(.+?)\.{(.+)}$/ ) {
+                $cf->LoadByNameAndQueue( Queue => $1, Name => $2 );
+            }
+            else {
+                $field = $1 if $field =~ /^{(.+)}$/;    # trim { }
+                $cf->LoadByNameAndQueue( Queue => "0", Name => $field );
+            }
+            $CUSTOM_FIELD_MAP->{$field} = $cf if ( $cf->id );
+        }
+
+        unless ( $cf->id ) {
+            return undef;
+        }
+
+        if ( $attr eq 'attribute' ) {
+            return (undef);
+        }
+        elsif ( $attr eq 'title' ) {
+            return ( $cf->Name );
+        }
+        elsif ( $attr eq 'value' ) {
+            my $value = eval "sub {
+                    my \$values = \$_[0]->CustomFieldValues('" . $cf->id . "');
+                    return ( join( ', ', map { \$_->Content } \@{ \$values->ItemsArrayRef } ))
+                  }" || die $@;
+            return ($value);
+        }
+    }
+}
+
+$COLUMN_MAP = {
+    QueueName => {
+        attribute => 'Queue',
+        title     => 'Queue',
+        value     => sub { return $_[0]->QueueObj->Name }
+    },
+    OwnerName => {
+        title     => 'Owner',
+        attribute => 'Owner',
+        value     => sub { return $_[0]->OwnerObj->Name }
+    },
+    id => {
+        attribute => 'id',
+        align     => 'right',
+        value     => sub { return $_[0]->id }
+    },
+    Status => {
+        attribute => 'Status',
+        value     => sub { return $_[0]->Status }
+    },
+    Subject => {
+        attribute => 'Subject',
+        value => sub { return $_[0]->Subject || "(" . loc('No subject') . ")" }
+    },
+    ExtendedStatus => {
+        title     => 'Status',
+        attribute => 'Status',
+        value     => sub {
+            my $Ticket = shift;
+
+            if ( $Ticket->HasUnresolvedDependencies ) {
+                if (   $Ticket->HasUnresolvedDependencies( Type => 'approval' )
+                    or $Ticket->HasUnresolvedDependencies( Type => 'code' ) )
+                {
+                    return "<em>" . loc('(pending approval)') . "</em>";
+                }
+                else {
+                    return "<em>" . loc('(pending other Collection)') . "</em>";
+                }
+            }
+            else {
+                return loc( $Ticket->Status );
+            }
+
+          }
+    },
+    Priority => {
+        attribute => 'Priority',
+        value     => sub { return $_[0]->Priority }
+    },
+    InitialPriority => {
+        attribute => 'InitialPriority',
+        value     => sub { return $_[0]->InitialPriority }
+    },
+    FinalPriority => {
+        attribute => 'FinalPriority',
+        value     => sub { return $_[0]->FinalPriority }
+    },
+    EffectiveId => {
+        attribute => 'EffectiveId',
+        value     => sub { return $_[0]->EffectiveId }
+    },
+    Type => {
+        attribute => 'Type',
+        value     => sub { return $_[0]->Type }
+    },
+    TimeWorked => {
+        attribute => 'TimeWorked',
+        value     => sub { return $_[0]->TimeWorked }
+    },
+    TimeLeft => {
+        attribute => 'TimeLeft',
+        value     => sub { return $_[0]->TimeLeft }
+    },
+    TimeEstimated => {
+        attribute => 'TimeEstimated',
+        value     => sub { return $_[0]->TimeEstimated }
+    },
+    Requestors => {
+        value => sub { return $_[0]->Requestors->MemberEmailAddressesAsString }
+    },
+    Cc => {
+        value => sub { return $_[0]->Cc->MemberEmailAddressesAsString }
+    },
+    AdminCc => {
+        value => sub { return $_[0]->AdminCc->MemberEmailAddressesAsString }
+    },
+    StartsRelative => {
+        title     => 'Starts',
+        attribute => 'Starts',
+        value     => sub { return $_[0]->StartsObj->AgeAsString }
+    },
+    StartedRelative => {
+        title     => 'Started',
+        attribute => 'Started',
+        value     => sub { return $_[0]->StartedObj->AgeAsString }
+    },
+    CreatedRelative => {
+        title     => 'Created',
+        attribute => 'Created',
+        value     => sub { return $_[0]->CreatedObj->AgeAsString }
+    },
+    LastUpdatedRelative => {
+        title     => 'LastUpdated',
+        attribute => 'LastUpdated',
+        value     => sub { return $_[0]->LastUpdatedObj->AgeAsString }
+    },
+    ToldRelative => {
+        title     => 'Told',
+        attribute => 'Told',
+        value     => sub { return $_[0]->ToldObj->AgeAsString }
+    },
+    DueRelative => {
+        title     => 'Due',
+        attribute => 'Due',
+        value     => sub { return $_[0]->DueObj->AgeAsString }
+    },
+    ResolvedRelative => {
+        title     => 'Resolved',
+        attribute => 'Resolved',
+        value     => sub { return $_[0]->ResolvedObj->AgeAsString }
+    },
+    Starts => {
+        attribute => 'Starts',
+        value     => sub { return $_[0]->StartsObj->AsString }
+    },
+    Started => {
+        attribute => 'Started',
+        value     => sub { return $_[0]->StartedObj->AsString }
+    },
+    Created => {
+        attribute => 'Created',
+        value     => sub { return $_[0]->CreatedObj->AsString }
+    },
+    CreatedBy => {
+        attribute => 'CreatedBy',
+        value     => sub { return $_[0]->CreatorObj->Name }
+    },
+    LastUpdated => {
+        attribute => 'LastUpdated',
+        value     => sub { return $_[0]->LastUpdatedObj->AsString }
+    },
+    LastUpdatedBy => {
+        attribute => 'LastUpdatedBy',
+        value     => sub { return $_[0]->LastUpdatedByObj->Name }
+    },
+    Told => {
+        attribute => 'Told',
+        value     => sub { return $_[0]->ToldObj->AsString }
+    },
+    Due => {
+        attribute => 'Due',
+        value     => sub { return $_[0]->DueObj->AsString }
+    },
+    Resolved => {
+        attribute => 'Resolved',
+        value     => sub { return $_[0]->ResolvedObj->AsString }
+    },
+
+    DependedOnBy => {
+        value => sub {
+            my $links = $_[0]->DependedOnBy;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->BaseURI->Resolver->HREF . '">'
+                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    Members => {
+        value => sub {
+            my $links = $_[0]->Members;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->BaseURI->Resolver->HREF . '">'
+                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    Children => {
+        value => sub {
+            my $links = $_[0]->Members;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->BaseURI->Resolver->HREF . '">'
+                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    ReferredToBy => {
+        value => sub {
+            my $links = $_[0]->ReferredToBy;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->BaseURI->Resolver->HREF . '">'
+                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+
+    DependsOn => {
+        value => sub {
+            my $links = $_[0]->DependsOn;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->TargetURI->Resolver->HREF . '">'
+                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    MemberOf => {
+        value => sub {
+            my $links = $_[0]->MemberOf;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->TargetURI->Resolver->HREF . '">'
+                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    Parents => {
+        value => sub {
+            my $links = $_[0]->MemberOf;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->TargetURI->Resolver->HREF . '">'
+                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    RefersTo => {
+        value => sub {
+            my $links = $_[0]->RefersTo;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->TargetURI->Resolver->HREF . '">'
+                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+
+    '_CLASS' => {
+        value => sub { return $_[1] % 2 ? 'oddline' : 'evenline' }
+    },
+
+};
+
+
+
+# }}}
+$m->comp( '/Elements/Callback', COLUMN_MAP    => $COLUMN_MAP, _CallbackName => 'ColumnMap');
+</%INIT>

Modified: rt/branches/3.3-TESTING/html/Elements/Refresh
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Refresh	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Refresh	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 <OPTION VALUE="-1"
 %unless ($Default) {

Modified: rt/branches/3.3-TESTING/html/Elements/ScrubHTML
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/ScrubHTML	(original)
+++ rt/branches/3.3-TESTING/html/Elements/ScrubHTML	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%init>
 my $scrubber = HTML::Scrubber->new();
 

Modified: rt/branches/3.3-TESTING/html/Elements/Section
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Section	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Section	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TABLE WIDTH=100%>
 <TR>
 <TD>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectAttachmentField
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectAttachmentField	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectAttachmentField	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 <OPTION VALUE="Subject"><&|/l&>Subject</&></OPTION>
 <OPTION VALUE="Content"><&|/l&>Content</&></OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectBoolean
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectBoolean	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectBoolean	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 <OPTION VALUE="<%$TrueVal%>" <%$TrueDefault%>><%$True%></OPTION>
 <OPTION VALUE="<%$FalseVal%>" <%$FalseDefault%>><%$False%></OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldOperator
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldOperator	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldOperator	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 % while (my $option = shift @Options) {
 % my $value = shift @Values;

Modified: rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldValue
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldValue	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldValue	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,13 +42,13 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Callback, %ARGS &>
 % if ($CustomField->Type =~ /Select/i) {
 % my $values = $CustomField->Values;
 <select name="<%$Name%>">
 <option value="" SELECTED>-</option>
-<option value="null"><&|/l&>(no value)</&></option>
+<option value="NULL"><&|/l&>(no value)</&></option>
 % while (my $value = $values->Next) {
 <option value="<%$value->Name%>"><%$value->Name%></option>
 % }

Modified: rt/branches/3.3-TESTING/html/Elements/SelectDate
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectDate	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectDate	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <INPUT NAME="<%$Name%>" VALUE="<%$Default%>" size=<%$Size%>> 
 
 <%init>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectDateRelation
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectDateRelation	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectDateRelation	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 <OPTION VALUE="&lt;"><%$Before%></OPTION>
 <OPTION VALUE="="><%$On%></OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectDateType
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectDateType	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectDateType	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 <OPTION VALUE="Created"><&|/l&>Created</&></OPTION>
 <OPTION VALUE="Started"><&|/l&>Started</&></OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectEqualityOperator
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectEqualityOperator	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectEqualityOperator	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 % while (my $option = shift @Options) {
 % my $value = shift @Values;

Modified: rt/branches/3.3-TESTING/html/Elements/SelectGroups
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectGroups	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectGroups	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <select name="GroupField">
 % foreach my $col (RT::Group->BasicColumns) {
 <option value="<% $col->[0] %>"><% loc($col->[1]) %>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectLang
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectLang	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectLang	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 % if ($ShowNullOption) {
 <OPTION VALUE="">-</OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectLinkType
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectLinkType	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectLinkType	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 <OPTION VALUE="MemberOf"><&|/l&>Member of</&></OPTION>
 <OPTION VALUE="DependsOn"><&|/l&>Depends on</&></OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectMatch
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectMatch	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectMatch	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 <OPTION VALUE="LIKE" <%$LikeDefault%>><%$Like%></OPTION>
 <OPTION VALUE="NOT LIKE" <%$NotLikeDefault%>><%$NotLike%></OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectNewTicketQueue
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectNewTicketQueue	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectNewTicketQueue	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <LABEL ACCESSKEY="9">
 <SELECT NAME ="<%$Name%>">
 % foreach my $queue (@{$session{'create_in_queues'}}) {

Modified: rt/branches/3.3-TESTING/html/Elements/SelectOwner
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectOwner	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectOwner	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 %if ($DefaultValue) {
 <OPTION <% !$Default && "SELECTED" %> VALUE=""><%$DefaultLabel%></OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectQueue
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectQueue	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectQueue	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % if ($Lite) {
 % my $d = new RT::Queue($session{'CurrentUser'});
 % $d->Load($Default);

Modified: rt/branches/3.3-TESTING/html/Elements/SelectResultsPerPage
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectResultsPerPage	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectResultsPerPage	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# TODO: Better default handling
 
 <SELECT NAME ="<%$Name%>">

Modified: rt/branches/3.3-TESTING/html/Elements/SelectSortOrder
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectSortOrder	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectSortOrder	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 %foreach my $order (@orders) {
 <OPTION VALUE="<%$order%>" <%$order eq $Default && 'SELECTED' %>>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectStatus
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectStatus	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectStatus	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 %if ($DefaultValue) {
 <OPTION <% !$Default && "SELECTED" %> VALUE=""><%$DefaultLabel%></OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectTicketSortBy
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectTicketSortBy	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectTicketSortBy	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 % foreach my $field (@sortfields) {
 <OPTION VALUE="<%$field%>" <% $field eq $Default && 'SELECTED'%>><% loc($field) %></OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectTicketTypes
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectTicketTypes	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectTicketTypes	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 %foreach (@Types) {
 <OPTION VALUE="<% $_ %>" <% ($_ eq $Default) && "SELECTED" %>><&|/l&><% $_ %></&>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectUsers
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectUsers	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectUsers	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <select name="UserField">
 % foreach my $col (RT::User->BasicColumns) {
 <option value="<% $col->[0] %>"><% loc($col->[1]) %>

Modified: rt/branches/3.3-TESTING/html/Elements/SelectWatcherType
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SelectWatcherType	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SelectWatcherType	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 % if ($AllowNull) {
 <OPTION VALUE="">-</OPTION>

Modified: rt/branches/3.3-TESTING/html/Elements/SetupSessionCookie
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SetupSessionCookie	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SetupSessionCookie	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%init>
 return if $m->is_subrequest; # avoid reentrancy, as suggested by masonbook
 

Modified: rt/branches/3.3-TESTING/html/Elements/ShowLink
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/ShowLink	(original)
+++ rt/branches/3.3-TESTING/html/Elements/ShowLink	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <A href="<%$URI->Resolver->HREF%>">
 % if ($URI->IsLocal) {
 % my $member = $URI->Object;

Modified: rt/branches/3.3-TESTING/html/Elements/ShowLinks
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/ShowLinks	(original)
+++ rt/branches/3.3-TESTING/html/Elements/ShowLinks	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table>
   <tr>
     <td class="labeltop"><&|/l&>Depends on</&>:</td>

Modified: rt/branches/3.3-TESTING/html/Elements/SimpleSearch
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/SimpleSearch	(original)
+++ rt/branches/3.3-TESTING/html/Elements/SimpleSearch	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <form action="<% $RT::WebPath %>/index.html">
 <input size="12" name="q" autocomplete="off" accesskey="0">
 <input type="submit" value="<&|/l&>Search</&>">&nbsp;

Modified: rt/branches/3.3-TESTING/html/Elements/Submit
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Submit	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Submit	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % if ($CheckAll or $ClearAll) {
 <script><!--
 function set_checkbox (obj, val) {

Modified: rt/branches/3.3-TESTING/html/Elements/Tabs
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/Tabs	(original)
+++ rt/branches/3.3-TESTING/html/Elements/Tabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/PageLayout,
     current_toptab => $current_toptab,
     current_tab => $current_tab,

Modified: rt/branches/3.3-TESTING/html/Elements/TicketList
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/TicketList	(original)
+++ rt/branches/3.3-TESTING/html/Elements/TicketList	Tue Aug 31 22:37:44 2004
@@ -1,14 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK
+%# BEGIN LICENSE BLOCK;
 %# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse at bestpractical.com>
 %# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
+%# (Except where explictly superceded by other copyright notices)
 %# 
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
@@ -20,31 +14,22 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
 %# 
-%# CONTRIBUTION SUBMISSION POLICY:
 %# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK
+%# END LICENSE BLOCK
+
+%# If you're having TicketList display a single record, you need
+%# to wrap the calls in your own table(s).
+% unless (defined $SingleRecord) {
 <TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
-<& .Header, 
+% }
+
+% if ($ShowHeader) {
+<& /Elements/CollectionAsTable/Header, 
     Format => \@Format, 
     AllowSorting => $AllowSorting, 
     Order => $Order, 
@@ -54,14 +39,23 @@
     OrderBy => $OrderBy , 
     BaseURL => $BaseURL,
     maxitems => \$maxitems &> 
+% }
 
-% my $i;
-% while (my $record = $Collection->Next) {
-% $i++;
-<& .Row, Format => \@Format, i => $i, record => $record, maxitems => $maxitems &>
+% if (defined $SingleRecord) {
+<&   /Elements/CollectionAsTable/Row, Format => \@Format, i => 0, record => $SingleRecord, maxitems => $maxitems &>
+% } else {
+%   my $i;
+%   while (my $record = $Collection->Next) {
+%   $i++;
+<&   /Elements/CollectionAsTable/Row, Format => \@Format, i => $i, record => $record, maxitems => $maxitems &>
+%   }
 % }
+
+% unless (defined $SingleRecord) {
 </TABLE>
-% if ($Rows && $ShowNavigation) {
+% }
+
+% if ($ShowNavigation) {
 <hr>
 <&|/l, $Page, int($TotalFound/$Rows)+1&>Page [_1] of [_2]</&>
 
@@ -91,551 +85,37 @@
 <%INIT>
 my $maxitems;
 
-use vars qw($COLUMN_MAP $CUSTOM_FIELD_MAP);
-
 $Format ||= $RT::DefaultSearchResultFormat;
 # Scrub the html of the format string to remove any potential nasties.
 $Format = $m->comp('/Elements/ScrubHTML', Content => $Format);
 
-
-# {{{ item map
-
-sub ColumnMap {
-    my $name = shift;
-    my $attr = shift;
-
-    # First deal with the simple things from the map
-    if ( $COLUMN_MAP->{$name} ) {
-        return ( $COLUMN_MAP->{$name}->{$attr} );
-    }
-
-    # now, let's deal with harder things, like Custom Fields
-
-    elsif ( $name =~ /^(?:CF|CustomField).(.*)$/ ) {
-        my $field = $1;
-        my $cf;
-        if ( $CUSTOM_FIELD_MAP->{$field} ) {
-            $cf = $CUSTOM_FIELD_MAP->{$field};
-        }
-        else {
-
-            $cf = RT::CustomField->new( $session{'CurrentUser'} );
-
-            if ( $field =~ /^(.+?)\.{(.+)}$/ ) {
-                $cf->LoadByNameAndQueue( Queue => $1, Name => $2 );
-            }
-            else {
-                $field = $1 if $field =~ /^{(.+)}$/;    # trim { }
-                $cf->LoadByNameAndQueue( Queue => "0", Name => $field );
-            }
-            $CUSTOM_FIELD_MAP->{$field} = $cf if ( $cf->id );
-        }
-
-        unless ( $cf->id ) {
-            return undef;
-        }
-
-        if ( $attr eq 'attribute' ) {
-            return (undef);
-        }
-        elsif ( $attr eq 'title' ) {
-            return ( $cf->Name );
-        }
-        elsif ( $attr eq 'value' ) {
-	    my $value = eval "sub {
-                    my \$values = \$_[0]->CustomFieldValues('".$cf->id."');
-                    return ( join( ', ', map { \$_->Content } \@{ \$values->ItemsArrayRef } ))
-                  }" || die $@;
-            return($value);
-	}
-    }
-}
-$COLUMN_MAP = {
-    QueueName => {
-        attribute => 'Queue',
-        title => 'Queue',
-        value => sub { return $_[0]->QueueObj->Name }
-    },
-    OwnerName => {
-        title => 'Owner',
-        attribute => 'Owner',
-        value => sub { return $_[0]->OwnerObj->Name }
-    },
-    id => {
-        attribute => 'id',
-        align => 'right',
-        value => sub { return $_[0]->id }
-    },
-    Status => {
-        attribute => 'Status',
-        value => sub { return $_[0]->Status }
-    },
-    Subject => {
-        attribute => 'Subject',
-        value => sub { length( $_[0]->Subject) ? $_[0]->Subject : "(".loc('No subject').")" }
-    },
-    ExtendedStatus => {
-        title => 'Status',
-        attribute => 'Status',
-        value => sub {
-            my $Ticket = shift;
-
-            if ( $Ticket->HasUnresolvedDependencies ) {
-                if ( $Ticket->HasUnresolvedDependencies( Type => 'approval' )
-                    or $Ticket->HasUnresolvedDependencies( Type => 'code' ) )
-                {
-                    return "<em>" . loc('(pending approval)') . "</em>";
-                }
-                else {
-                    return "<em>" . loc('(pending other Collection)') . "</em>";
-                }
-            }
-            else {
-                return loc( $Ticket->Status );
-            }
-
-        }
-    }, Priority => {
-        attribute => 'Priority',
-        value => sub { return $_[0]->Priority }
-    },
-    InitialPriority => {
-        attribute => 'InitialPriority',
-        value => sub { return $_[0]->InitialPriority }
-    },
-    FinalPriority => {
-        attribute => 'FinalPriority',
-        value => sub { return $_[0]->FinalPriority }
-    },
-    EffectiveId => {
-        attribute => 'EffectiveId',
-        value => sub { return $_[0]->EffectiveId }
-    },
-    Type => {
-        attribute => 'Type',
-        value => sub { return $_[0]->Type }
-    },
-    TimeWorked => {
-        attribute => 'TimeWorked',
-        value => sub { return $_[0]->TimeWorked }
-    },
-    TimeLeft => {
-        attribute => 'TimeLeft',
-        value => sub { return $_[0]->TimeLeft }
-    },
-    TimeEstimated => {
-        attribute => 'TimeEstimated',
-        value => sub { return $_[0]->TimeEstimated }
-    },
-    Requestors => {
-        value => sub { return $_[0]->Requestors->MemberEmailAddressesAsString }
-    },
-    Cc => {
-        value => sub { return $_[0]->Cc->MemberEmailAddressesAsString }
-    },
-    AdminCc => {
-        value => sub { return $_[0]->AdminCc->MemberEmailAddressesAsString }
-    },
-    StartsRelative => {
-        title => 'Starts',
-        attribute => 'Starts',
-        value => sub { return $_[0]->StartsObj->AgeAsString }
-    },
-    StartedRelative => {
-        title => 'Started',
-        attribute => 'Started',
-        value => sub { return $_[0]->StartedObj->AgeAsString }
-    },
-    CreatedRelative => {
-        title => 'Created',
-        attribute => 'Created',
-        value => sub { return $_[0]->CreatedObj->AgeAsString }
-    },
-    LastUpdatedRelative => {
-        title => 'LastUpdated',
-        attribute => 'LastUpdated',
-        value => sub { return $_[0]->LastUpdatedObj->AgeAsString }
-    },
-    ToldRelative => {
-        title => 'Told',
-        attribute => 'Told',
-        value => sub { return $_[0]->ToldObj->AgeAsString }
-    },
-    DueRelative => {
-        title => 'Due',
-        attribute => 'Due',
-        value => sub { return $_[0]->DueObj->AgeAsString }
-    },
-    ResolvedRelative => {
-        title => 'Resolved',
-        attribute => 'Resolved',
-        value => sub { return $_[0]->ResolvedObj->AgeAsString }
-    },
-    Starts => {
-        attribute => 'Starts',
-        value => sub { return $_[0]->StartsObj->AsString }
-    },
-    Started => {
-        attribute => 'Started',
-        value => sub { return $_[0]->StartedObj->AsString }
-    },
-    Created => {
-        attribute => 'Created',
-        value => sub { return $_[0]->CreatedObj->AsString }
-    },
-    CreatedBy => {
-	attribute => 'CreatedBy',
-        value => sub { return $_[0]->CreatorObj->Name }
-    },
-    LastUpdated => {
-        attribute => 'LastUpdated',
-        value => sub { return $_[0]->LastUpdatedObj->AsString }
-    },
-    LastUpdatedBy => {
-        attribute => 'LastUpdatedBy',
-        value => sub { return $_[0]->LastUpdatedByObj->Name }
-    },
-    Told => {
-        attribute => 'Told',
-        value => sub { return $_[0]->ToldObj->AsString }
-    },
-    Due => {
-        attribute => 'Due',
-        value => sub { return $_[0]->DueObj->AsString }
-    },
-    Resolved => {
-        attribute => 'Resolved',
-        value => sub { return $_[0]->ResolvedObj->AsString }
-    },
-
-    DependedOnBy => {
-        value => sub {
-            my $links = $_[0]->DependedOnBy;
-            return (
-                join(
-                    "<br>",
-                    map {
-                            '<A HREF="'
-                          . $_->BaseURI->Resolver->HREF . '">'
-                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
-                          . '</A>'
-                      } @{ $links->ItemsArrayRef } ) );
-          }
-    },
-    Members => {
-        value => sub {
-            my $links = $_[0]->Members;
-            return (
-                join(
-                    "<br>",
-                    map {
-                            '<A HREF="'
-                          . $_->BaseURI->Resolver->HREF . '">'
-                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
-                          . '</A>'
-                      } @{ $links->ItemsArrayRef } ) );
-          }
-    },
-    Children => {
-        value => sub {
-            my $links = $_[0]->Members;
-            return (
-                join(
-                    "<br>",
-                    map {
-                            '<A HREF="'
-                          . $_->BaseURI->Resolver->HREF . '">'
-                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
-                          . '</A>'
-                      } @{ $links->ItemsArrayRef } ) );
-          }
-    },
-    ReferredToBy => {
-        value => sub {
-            my $links = $_[0]->ReferredToBy;
-            return (
-                join(
-                    "<br>",
-                    map {
-                            '<A HREF="'
-                          . $_->BaseURI->Resolver->HREF . '">'
-                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
-                          . '</A>'
-                      } @{ $links->ItemsArrayRef } ) );
-          }
-    },
-
-    DependsOn => {
-        value => sub {
-            my $links = $_[0]->DependsOn;
-            return (
-                join(
-                    "<br>",
-                    map {
-                            '<A HREF="'
-                          . $_->TargetURI->Resolver->HREF . '">'
-                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
-                          . '</A>'
-                      } @{ $links->ItemsArrayRef } ) );
-          }
-    },
-    MemberOf => {
-        value => sub {
-            my $links = $_[0]->MemberOf;
-            return (
-                join(
-                    "<br>",
-                    map {
-                            '<A HREF="'
-                          . $_->TargetURI->Resolver->HREF . '">'
-                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
-                          . '</A>'
-                      } @{ $links->ItemsArrayRef } ) );
-          }
-    },
-    Parents => {
-        value => sub {
-            my $links = $_[0]->MemberOf;
-            return (
-                join(
-                    "<br>",
-                    map {
-                            '<A HREF="'
-                          . $_->TargetURI->Resolver->HREF . '">'
-                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
-                          . '</A>'
-                      } @{ $links->ItemsArrayRef } ) );
-          }
-    },
-    RefersTo => {
-        value => sub {
-            my $links = $_[0]->RefersTo;
-            return (
-                join(
-                    "<br>",
-                    map {
-                            '<A HREF="'
-                          . $_->TargetURI->Resolver->HREF . '">'
-                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
-                          . '</A>'
-                      } @{ $links->ItemsArrayRef } ) );
-          }
-    },
-
-
-
-
-    '_CLASS' => {
-        value => sub { return  $_[1] %2 ? 'oddline' : 'evenline' } 
-        },
-
-};
-
-# }}}
+$Rows ||= '25'; # we need a positive value
 
 unless ($Collection) {
         $Collection = RT::Tickets->new($session{'CurrentUser'});
         $Collection->FromSQL($Query);
 }
 
-my (@Format) = $m->comp('.ParseColumnDefinitions', Format => $Format);
-    
+my (@Format) = $m->comp('/Elements/CollectionAsTable/ParseFormat', Format => $Format);
 
 $Collection->OrderBy(FIELD => $OrderBy, ORDER => $Order); 
-$Collection->RowsPerPage($Rows) if ($Rows);
+$Collection->RowsPerPage($Rows);
 $Collection->GotoPage($Page-1); # SB uses page 0 as the first page
 my $TotalFound =  $Collection->CountAll();
 
-
-
-
-
 </%INIT>
 <%ARGS>
 $Query => undef
-$Rows => 50
+$Rows => 10
 $Page => 1
 $Title => 'Ticket Search'
 $Collection => undef
+$SingleRecord => undef
 $AllowSorting => undef
 $Order => undef
 $OrderBy => undef
 $BaseURL => undef
 $Format => $RT::DefaultSearchResultFormat
 $ShowNavigation => 1
+$ShowHeader => 1
 </%ARGS>
-%#### SUB COMPONENTS
-%#
-%#
-%# {{{ Header
-<%DEF .Header>
-<%ARGS>
- at Format => undef
-$AllowSorting => undef
-$Order=>undef
-$BaseURL => undef
-$Query => undef
-$Rows => undef
-$Page => undef
-$maxitems => undef
-</%ARGS>
-<TR>
-<%perl>
-
-
-
-my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page );
-
-my $item = 0;
-$$maxitems = 0;
-foreach my $col (@Format) {
-    $item++;
-    $$maxitems = $item if $item > $$maxitems;
-    if ( $col->{title} eq 'NEWLINE' ) {
-        $m->out('</TR>       <TR>');
-	$item = 0;
-    }
-    else {
-        $m->out('<TH align="center">');
-        my $title = $col->{title};
-        $title =~ s/^__(.*)__$/$1/o;
-        $title = ( ColumnMap( $title, 'title' ) || $title );
-        if (   $AllowSorting
-            && $col->{'attribute'}
-            && ColumnMap( $col->{'attribute'}, 'attribute' ) )
-        {
-
-            $m->out(
-                '<a href="' . $BaseURL 
-                  . $m->comp(
-                    '/Elements/QueryString',
-                    %generic_query_args,
-                    OrderBy => (
-                        ColumnMap( $col->{'attribute'}, 'attribute' )
-                          || $col->{'attribute'}
-                    ),
-                    Order => ( $ARGS{'Order'} eq 'ASC' ? 'DESC' : 'ASC' )
-                  ).
-                  '">' . loc($title) . '</a>'
-            );
-        }
-        else {
-            $m->out( loc($title) );
-        }
-        $m->out('</TH>');
-    }
-}
-</%perl>
-</TR>
-</%DEF>
-%# }}}
-%# {{{ Row
-<%DEF .Row>
-<%ARGS>
-$i => undef
- at Format => undef
-$record => undef
-$maxitems => undef
-</%ARGS>
-<%PERL>
-$m->out( '<TR class="' . ( $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
-my $item;
-foreach my $column (@Format) {
-    if ( $column->{title} eq 'NEWLINE' ) {
-	while ($item < $maxitems) {
-	    $m->out("<td>&nbsp;</td>\n");
-	    $item++;
-	}
-	$item = 0;
-        $m->out('</TR>');
-        $m->out( '<TR class="' . ( $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
-        next;
-    }
-    $item++;
-    $m->out('<td align="left">');
-    foreach my $subcol ( @{ $column->{output} } ) {
-        if ( $subcol =~ /^__(.*?)__$/o ) {
-            my $col = $1;
-            my $value = ColumnMap($col, 'value');
-
-            if ( $value && ref($value)) {
-                $m->out( &{ $value } ( $record, $i ) );
-            } else {
-                $m->out($value );
-            }
-        }
-        else {
-            $m->out( Encode::decode_utf8($subcol) );
-        }
-    }
-    $m->out('</td>');
-}
-$m->out('</TR>');
-</%PERL>
-
-
-</%DEF>
-%# }}}
-%# {{{ ParseColumnDefinitions
-
-<%DEF .ParseColumnDefinitions >
-<%ARGS>
-$Format => "id, Subject"
-</%ARGS>
-
-<%init>
-
-use Regexp::Common qw(delimited);
-my @Columns;
-#my $quoted = qr[$RE{delimited}{-delim=>qq{\'\"}}|(?:\{|\}|\w|\.)+];
-my $justquoted = qr[$RE{delimited}{-delim=>qq{\'\"}}];
-#my $quoted =        $RE{quoted}{-esc};
-my $word = qr [(?:\{|\}|\w|\.)+];
-
-while ($Format =~ /($justquoted|$word)/igx) {
-    my $col = $1;
-
-    if ($col =~ /^$RE{quoted}{-esc}$/) {
-        substr($col,0,1) = "";
-        substr($col,-1,1) = "";
-    }
-
-    my $colref;
-    if ( $col =~ s/\/STYLE:(.*?)$//io ) {
-        $colref->{'style'} = $1;
-    }
-    if ( $col =~ s/\/CLASS:(.*?)$//io ) {
-        $colref->{'class'} = $1;
-    }
-    if ( $col =~ s/\/TITLE:(.*?)$//io ) {
-        $colref->{'title'} = $1;
-    }
-    if ( $col =~ /__(.*?)__/gio ) {
-        my @subcols;
-        while ( $col =~ s/^(.*?)__(.*?)__//o ) {
-            push ( @subcols, $1 ) if ($1);
-            push ( @subcols, "__$2__" );
-            $colref->{'attribute'} = $2;
-        }
-        push ( @subcols, $col );
-        @{ $colref->{'output'} } = @subcols;
-    }
-    else {
-        @{ $colref->{'output'} } = ( "__" . $col . "__" );
-        $colref->{'attribute'} = $col;
-    }
-    
-    if ( !$colref->{'title'} && grep { /^__(.*?)__$/io }
-        @{ $colref->{'output'} } )
-    {   
-        $colref->{'title'}     = $1;
-        $colref->{'attribute'} = $1;
-    }
-
-
-    push @Columns, $colref;
-}
-    return(@Columns);
-</%init>
-</%DEF>
-%# }}}

Modified: rt/branches/3.3-TESTING/html/Elements/TitleBox
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/TitleBox	(original)
+++ rt/branches/3.3-TESTING/html/Elements/TitleBox	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,5 +42,5 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& TitleBoxStart, %ARGS&><%$m->content|n%><& TitleBoxEnd&>

Modified: rt/branches/3.3-TESTING/html/Elements/TitleBoxEnd
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/TitleBoxEnd	(original)
+++ rt/branches/3.3-TESTING/html/Elements/TitleBoxEnd	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
     </TD>
   </TR>
 </TABLE>

Modified: rt/branches/3.3-TESTING/html/Elements/TitleBoxStart
==============================================================================
--- rt/branches/3.3-TESTING/html/Elements/TitleBoxStart	(original)
+++ rt/branches/3.3-TESTING/html/Elements/TitleBoxStart	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TABLE CLASS="box <%$class|n%>" 
         BGCOLOR="<%$color%>" 
         CELLSPACING=0
@@ -54,10 +54,10 @@
     <TH 
         <%$color && "style=\"color: $color;\""|n%>
         <%$class ? "class=\"$class\"" : "class=\"titlebox\""|n%>>
+      <span class="titleboxclose">
+        <a href="#" onClick="hideshow('<%$id%>')">X</A></span>&nbsp;
       <span class="titleboxtitle">
-    <a href="#" onClick="hideshow('<%$id%>')">X</A>&nbsp;
-        <b>
-         <% $title_href && "<A CLASS=\"$title_class\" HREF=\"$title_href\">"|n%><%$title |n %><%  $title_href && "</A>" |n%></b>
+        <b><% $title_href && "<A $title_class HREF=\"$title_href\">"|n%><%$title |n %><%  $title_href && "</A>" |n%></b>
       </span>
     </TH>
     <TH  
@@ -83,4 +83,6 @@
 </%ARGS>
 <%init>
 my $id = rand(2000);
+
+$title_class = "CLASS=\"$title_class\"" if $title_class;
 </%init>

Modified: rt/branches/3.3-TESTING/html/NoAuth/Logout.html
==============================================================================
--- rt/branches/3.3-TESTING/html/NoAuth/Logout.html	(original)
+++ rt/branches/3.3-TESTING/html/NoAuth/Logout.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <HTML>
 <HEAD>
 <TITLE>RT: Logout</TITLE>

Modified: rt/branches/3.3-TESTING/html/NoAuth/Reminder.html
==============================================================================
--- rt/branches/3.3-TESTING/html/NoAuth/Reminder.html	(original)
+++ rt/branches/3.3-TESTING/html/NoAuth/Reminder.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, title => loc('Password Reminder') &>
 
 <&|/l&>Not yet implemented.</&>

Added: rt/branches/3.3-TESTING/html/NoAuth/images/autohandler
==============================================================================
--- (empty file)
+++ rt/branches/3.3-TESTING/html/NoAuth/images/autohandler	Tue Aug 31 22:37:44 2004
@@ -0,0 +1,21 @@
+<%init>
+
+# This autohandler will spit out RT's images if the user hasn't 
+# properly configured their webserver to stop RT from passing 
+# images through the mason handler.
+
+my $file = $m->base_comp->source_file;
+my $type = "application/octet-stream";
+
+if ($file =~ /\.(gif|png|jpe?g)$/i) {
+    $type = "image/$1";
+    $type =~ s/jpg/jpeg/gi;
+}
+
+die unless (-f $file && -r $file);
+$r->content_type($type);
+open (FILE, "<$file") || die;
+$m->out($_) while (<FILE>);
+close(FILE);
+$m->abort;
+</%init>

Modified: rt/branches/3.3-TESTING/html/NoAuth/webrt.css
==============================================================================
--- rt/branches/3.3-TESTING/html/NoAuth/webrt.css	(original)
+++ rt/branches/3.3-TESTING/html/NoAuth/webrt.css	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 font-size: 12px;
 	 color: #FFFFFF;
@@ -310,12 +310,18 @@
              color: #ffffff;}
 span.productname { font-size: 2em;
              color: #0066cc;}
-SPAN.titleboxtitle {
+SPAN.titleboxtitle, SPAN.titleboxclose {
         font-size: 80%;
         color: #ffffff;
 	 vertical-align: middle;
 	 text-align: left;
         }
+SPAN.titleboxtitle a {
+        color: #ffffff;
+}
+SPAN.titleboxtitle a:after {
+	content: "...";
+}
 
 SPAN.titleboxright {
         font-size: 0.8em;

Modified: rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/default
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/default	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/default	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/queue/default
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/ns
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/ns	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/ns	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/queue/ns
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/attachments
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/attachments	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/attachments	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/ticket/attachments
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/default
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/default	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/default	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/ticket/default
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/history
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/history	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/history	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/ticket/history
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/links
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/links	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/links	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/ticket/links
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/default
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/default	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/default	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/user/default
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/ns
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/ns	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/ns	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/user/ns
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,10 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
+<%flags>
+inherit => undef # inhibit UTF8 conversion done in /autohandler
+</%flags>
 <%ARGS>
 $message
 $queue => 1
@@ -52,23 +55,20 @@
 <%init>
 use RT::Interface::Email; 
 my ( $status, $error, $Ticket ) = RT::Interface::Email::Gateway(\%ARGS);
+ if ($status == -75 ) {
+$m->out("temporary failure - ". $error);
+ }
+    elsif ($status == 1) {
+$m->out('ok');
+        if ( $Ticket->Id ) {
+$m->out('Ticket: '. $Ticket->Id);
+$m->out('Queue: '. $Ticket->QueueObj->Name );
+$m->out('Owner: '. $Ticket->OwnerObj->Name);
+$m->out('Status: '. $Ticket->Status );
+$m->out('Subject: '. $Ticket->Subject );
+$m->out('Requestor: '. $Ticket->Requestors->MemberEmailAddressesAsString );
+        }
+ }   else { 
+$m->out('not ok - '.$error);
+ }
 </%init>
-<%flags>
-inherit => undef # inhibit UTF8 conversion done in /autohandler
-</%flags>
-% if ($status == -75 ) {
-temporary failure - <% $error %>
-% }
-%    elsif ($status == 1) {
-ok
-%        if ( $Ticket->Id ) {
-Ticket: <% $Ticket->Id %>
-Queue: <% $Ticket->QueueObj->Name %>
-Owner: <% $Ticket->OwnerObj->Name %>
-Status: <% $Ticket->Status %>
-Subject: <% $Ticket->Subject %>
-Requestor: <% $Ticket->Requestors->MemberEmailAddressesAsString %>
-%        }
-% }   else { 
-not ok - <%$error%> 
-% }

Modified: rt/branches/3.3-TESTING/html/REST/1.0/autohandler
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/autohandler	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/autohandler	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/autohandler
 %#
 <%INIT>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/dhandler
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/dhandler	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/dhandler	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/dhandler
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/logout
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/logout	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/logout	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%PERL>
 tied(%session)->delete if (defined %session);
 </%PERL>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/search/dhandler
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/search/dhandler	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/search/dhandler	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/search/dhandler
 %#
 <%INIT>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/search/ticket
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/search/ticket	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/search/ticket	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/search/ticket
 %#
 <%ARGS>
@@ -135,7 +135,7 @@
 $output = form_compose(\@output) if @output;
 
 OUTPUT:
-</%INIT>
-RT/<% $RT::VERSION %> <% $status %>
+$m->out("RT/". $RT::VERSION . " " . $status);
 
-<% $output |n %>
+$m->out($output );
+</%INIT>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/ticket/comment
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/ticket/comment	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/ticket/comment	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/ticket/comment
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/ticket/link
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/ticket/link	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/ticket/link	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/ticket/link
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/REST/1.0/ticket/merge
==============================================================================
--- rt/branches/3.3-TESTING/html/REST/1.0/ticket/merge	(original)
+++ rt/branches/3.3-TESTING/html/REST/1.0/ticket/merge	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/ticket/merge
 %#
 <%ARGS>

Modified: rt/branches/3.3-TESTING/html/Search/Build.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Build.html	(original)
+++ rt/branches/3.3-TESTING/html/Search/Build.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title &>
 <& /Ticket/Elements/Tabs, 
     current_tab => "Search/Build.html".$QueryString, 
@@ -244,10 +244,10 @@
 
 # {{{ Try to find if we're adding a clause
 foreach my $arg ( keys %ARGS ) {
-    if ( $arg =~ m/ValueOf(.+)/ && $ARGS{$arg} ) {
+    if ( $arg =~ m/ValueOf(.+)/ && $ARGS{$arg} ne "") {
 	# We're adding a $1 clause
 	my $field = $1;
-	my $keyword;
+	my ($keyword, $op, $value);
 
 	#figure out if it's a grouping
 	if ( $ARGS{ $field . "Field" } ) {
@@ -256,10 +256,27 @@
 	else {
 	    $keyword = $field;
 	}
+
+        $value = $ARGS{'ValueOf' . $field};
+        $op = $ARGS{ $field . 'Op' };
+	if ( $value eq 'NULL' && $op =~ /=/) {
+            if ($op eq '=') {
+                $op = "IS";
+            } elsif ($op eq '!=') {
+                $op = "IS NOT";
+            }
+
+            # This isn't "right", but...
+            # It has to be this way until #5182 is fixed
+            $value = "'NULL'";
+	} else {
+            $value = "'$value'";
+        }
+
 	my $clause = {
             Key   => $keyword,
-            Op    => $ARGS{ $field . 'Op' },
-            Value => "'$ARGS{'ValueOf' . $field}'"
+            Op    => $op,
+            Value => $value
         };
 	    
 	my $newnode = Tree::Simple->new($clause);

Modified: rt/branches/3.3-TESTING/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Bulk.html	(original)
+++ rt/branches/3.3-TESTING/html/Search/Bulk.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Bulk ticket update") &>
 <& /Elements/Tabs, Title => loc("Bulk ticket update") &>
 
@@ -164,6 +164,35 @@
  <& /Elements/MessageBox, Name=>"UpdateContent"&>
  </td></tr>
  </table>
+
+<table>
+% foreach (keys %allcfs) {
+<tr><td class=label>
+%     my $cf = $allcfs{$_};
+%     my $pref;
+%     if ($cf->Queue == 0) {
+%         $pref = "[Global]";
+%     } else {
+%         $pref = "[Queue: " . $cfqnames{$_} . "]";
+%     }
+<%$pref%> <b><% $cf->Name %></b><br>
+<% $cf->FriendlyType %>
+</td>
+<td>
+% if ($cf->Type ne "FreeformMultiple") {
+<& /Ticket/Elements/EditCustomField, CustomField => $cf &>
+% } else {
+Add Values<br>
+<textarea cols=15 rows=3 name="<%$cf->Id%>-Values"></textarea>
+</td><td>
+Delete Values<br>
+<textarea cols=15 rows=3 name="<%$cf->Id%>-DeleteValues"></textarea>
+% }    
+</td>
+</tr>
+% }
+</table>
+
 <& /Elements/TitleBoxEnd &>
 
 <& /Elements/TitleBoxStart, title => loc('Edit Links'), color => "#336633"&>
@@ -189,6 +218,24 @@
 
 Abort(loc("No search to operate on.")) unless ($Tickets);
 
+my %allcfs;
+my %cfqnames;
+my %cfqs;
+my $count = 0;
+while (my $Ticket = $Tickets->Next) {
+    my $cfq = $Ticket->QueueObj;
+    my $cfqid = $cfq->Id;
+    my $cfqn = $cfq->Name;
+    unless ( exists $cfqs{$cfqid} ) {
+	$cfqs{$cfqid} = 1;
+	$count++;
+	my $cfs = $cfq->CustomFields;
+	while (my $cf = $cfs->Next) {
+	    $allcfs{$cf->Id} = $cf;
+	    $cfqnames{$cf->Id} = $cfqn;
+	}
+    }
+}
 
 my $do_comment_reply=0;
 # Prepare for ticket updates
@@ -223,6 +270,17 @@
     #Update the watchers
     my @watchresults = ProcessTicketWatchers(TicketObj => $Ticket, ARGSRef => \%ARGS);    
 
+    #Update custom fields
+    my $pat = "^(\\d+)-(.*)\$";
+    foreach (keys %ARGS) {
+	$ARGS{"Ticket-" . $Ticket->Id . "-CustomField-" . $1 . "-" . $2} = $ARGS{$_} if (/$pat/o);
+    }
+    my @cfresults = ProcessTicketCustomFieldUpdates(ARGSRef => \%ARGS);
+    foreach (keys %ARGS) {
+	delete $ARGS{"Ticket-" . $Ticket->Id . "-CustomField-" . $1 . "-" . $2} if (/$pat/o);
+    }
+
+
     #Update the links
     $ARGS{'id'} = $Ticket;
     $ARGS{$Ticket->Id.'-MergeInto'} = $ARGS{'Ticket-MergeInto'};
@@ -242,7 +300,7 @@
     delete $ARGS{$Ticket->Id.'-RefersTo'};
     delete $ARGS{'RefersTo-'.$Ticket->Id};
     
-    my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults, @linkresults);
+    my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults, @linkresults, @cfresults);
     @tempresults = map { loc("Ticket [_1]: [_2]",$Ticket->Id,$_) } @tempresults;
 
     @results = (@results, @tempresults);

Modified: rt/branches/3.3-TESTING/html/Search/Edit.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Edit.html	(original)
+++ rt/branches/3.3-TESTING/html/Search/Edit.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title&>
 <& /Ticket/Elements/Tabs, 
     current_tab => "Search/Edit.html?".$QueryString, 

Modified: rt/branches/3.3-TESTING/html/Search/Elements/BuildFormatString
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/BuildFormatString	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/BuildFormatString	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%args>
 $Format => undef
 %cfqueues => undef

Modified: rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title => loc("Display Columns") &>
 <table>
 <tr>

Modified: rt/branches/3.3-TESTING/html/Search/Elements/EditFormat
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/EditFormat	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/EditFormat	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table>
 <tr>
 <td>

Modified: rt/branches/3.3-TESTING/html/Search/Elements/EditSearches
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/EditSearches	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/EditSearches	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title => loc('Saved searches') &>
 <&|/l&>Privacy:</&>
 % if ($CurrentSearch->{'Object'} && $CurrentSearch->{'Object'}->id) {

Modified: rt/branches/3.3-TESTING/html/Search/Elements/NewListActions
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/NewListActions	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/NewListActions	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % if ($actions[0] ) {
 <b><%loc('Results')%></b><br>
 % foreach my $action (@actions) {

Modified: rt/branches/3.3-TESTING/html/Search/Elements/PickBasics
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/PickBasics	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/PickBasics	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table cellspacing=0 border=0>
 <tr><td>
 % foreach my $field (@fields) {
@@ -177,8 +177,7 @@
 % }
 </td></tr>
 % }
-</table>
-
+<& '/Elements/Callback', _CallbackName => 'EndOfList' &>
 <%INIT>
 my @fields = ('Attachment',
     'Queue',

Modified: rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/PickCFs	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/PickCFs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table cellspacing=0 border=0>
 % while ( my $CustomField = $CustomFields->Next ) {
 <tr><td>

Modified: rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title => loc('Add Criteria')&>
 <table width=100% cellspacing=0 cellpadding=0 border=0>
   <tr>

Modified: rt/branches/3.3-TESTING/html/Search/Elements/SearchPrivacy
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/SearchPrivacy	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/SearchPrivacy	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%args>
 $Object => undef
 </%args>

Modified: rt/branches/3.3-TESTING/html/Search/Elements/SelectAndOr
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/SelectAndOr	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/SelectAndOr	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <input type=radio NAME="<%$Name%>" CHECKED VALUE="AND">AND</input>
 <input type=radio NAME="<%$Name%>" VALUE="OR">OR</input>
 

Modified: rt/branches/3.3-TESTING/html/Search/Elements/SelectLinks
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/SelectLinks	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/SelectLinks	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 % foreach (@fields) {
 <OPTION VALUE="<%$_%>"><&|/l&><%$_%></&></OPTION>

Modified: rt/branches/3.3-TESTING/html/Search/Elements/SelectPersonType
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/SelectPersonType	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/SelectPersonType	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 % if ($AllowNull) {
 <OPTION VALUE="">-</OPTION>

Modified: rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchObject
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchObject	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchObject	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%args>
 @Objects => undef
 $Name => undef

Modified: rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchesForObjects
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchesForObjects	(original)
+++ rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchesForObjects	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%args>
 @Objects => undef
 $Name => undef

Modified: rt/branches/3.3-TESTING/html/Search/Results.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Results.html	(original)
+++ rt/branches/3.3-TESTING/html/Search/Results.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'} &>
 <& /Ticket/Elements/Tabs, 
     current_tab => "Search/Results.html".$QueryString, 
@@ -70,6 +70,7 @@
 <a href="<%$RT::WebPath%>/Search/Results.tsv<%$QueryString%>"><&|/l&>spreadsheet</&></a> |
 <a href="<%$RT::WebPath%>/Search/Results.rdf<%$QueryString%>"><&|/l&>RSS</&></a> |
 <a href="<%$RT::WebPath%>/Tools/Offline.html<%$QueryString%>"><&|/l&>Work offline</&></a><br>
+<& /Elements/Callback, _CallbackName => 'SearchActions', QueryString => $QueryString&>
 </div>
 <%INIT>
 my ($title, $ticketcount);

Modified: rt/branches/3.3-TESTING/html/Search/Results.rdf
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Results.rdf	(original)
+++ rt/branches/3.3-TESTING/html/Search/Results.rdf	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 
 my $Tickets = RT::Tickets->new($session{'CurrentUser'});

Modified: rt/branches/3.3-TESTING/html/Search/Results.tsv
==============================================================================
--- rt/branches/3.3-TESTING/html/Search/Results.tsv	(original)
+++ rt/branches/3.3-TESTING/html/Search/Results.tsv	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 
 my $Tickets = RT::Tickets->new($session{'CurrentUser'});
@@ -84,7 +84,7 @@
 my @header;
     foreach my $attr (@attrs) {
         my $label = $attr;
-        $label =~ s'Obj-.(AsString|Name)''g;
+        $label =~ s'Obj-.(AsString|Name|ISO)''g;
 	push @header, $label;
     }
     foreach my $id (sort keys %known_cfs) {
@@ -99,8 +99,10 @@
         foreach my $attr(@attrs) {
                 push @row, $row->{"$attr"};
         }
-    foreach my $id (sort keys %known_cfs) {
-                push @row, $row->{'CustomField-'.$id};
+        foreach my $id (sort keys %known_cfs) {
+	        my $val = $row->{'CustomField-'.$id};
+                $val =~ s/(\n|\r)//g;
+                push @row, $val;
         }
         
         $m->out(join("\t", at row));

Modified: rt/branches/3.3-TESTING/html/SelfService/Attachment/dhandler
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Attachment/dhandler	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Attachment/dhandler	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%init>
 $m->comp('/Ticket/Attachment/dhandler', %ARGS);
 $m->abort;

Modified: rt/branches/3.3-TESTING/html/SelfService/Closed.html
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Closed.html	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Closed.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /SelfService/Elements/Header, Title => loc('Closed tickets') &>
 
 <& /SelfService/Elements/MyRequests, status => ['rejected', 'resolved'], friendly_status =>

Modified: rt/branches/3.3-TESTING/html/SelfService/Create.html
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Create.html	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Create.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& Elements/Header, Title => loc("Create a ticket") &>
 
 <FORM ACTION="Display.html" METHOD="POST" ENCTYPE="multipart/form-data">

Modified: rt/branches/3.3-TESTING/html/SelfService/Display.html
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Display.html	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Display.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /SelfService/Elements/Header, Title => loc('#[_1]: [_2]', $Ticket->id, $Ticket->Subject) &>
 
 <& /Elements/ListActions, actions => \@results &>

Modified: rt/branches/3.3-TESTING/html/SelfService/Elements/GotoTicket
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Elements/GotoTicket	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Elements/GotoTicket	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,5 +42,5 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <FORM ACTION="<%$RT::WebPath%>/SelfService/Display.html"><input type=submit value="<&|/l&>Goto ticket</&>">&nbsp;<input size=4 name=id></FORM>

Modified: rt/branches/3.3-TESTING/html/SelfService/Elements/Header
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Elements/Header	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Elements/Header	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,6 +42,6 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, %ARGS, Prefs => '/SelfService/Prefs.html' &>
 <& /SelfService/Elements/Tabs, %ARGS &>

Modified: rt/branches/3.3-TESTING/html/SelfService/Elements/MyRequests
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Elements/MyRequests	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Elements/MyRequests	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title =>  $title &>
 <TABLE BORDER=0 cellspacing=1 cellpadding=1 BGCOLOR="#eeeeee" WIDTH=100%>
 <TR>

Modified: rt/branches/3.3-TESTING/html/SelfService/Elements/Tabs
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Elements/Tabs	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Elements/Tabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/PageLayout,
     current_toptab => $current_toptab,
     current_tab => $current_tab,

Modified: rt/branches/3.3-TESTING/html/SelfService/Error.html
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Error.html	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Error.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /SelfService/Elements/Header, Title => loc('Error') &>
 <h2 class="title"><%loc('Error')%></h2>
 <& /Elements/TitleBoxStart, title => $Title &>

Modified: rt/branches/3.3-TESTING/html/SelfService/Prefs.html
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Prefs.html	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Prefs.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /SelfService/Elements/Header, Title => loc('Preferences') &>
 
 <& /Elements/ListActions, actions => \@results &>

Modified: rt/branches/3.3-TESTING/html/SelfService/Update.html
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/Update.html	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/Update.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /SelfService/Elements/Header, Title =>loc('Update ticket #[_1]', $Ticket->id) &>
 
 

Modified: rt/branches/3.3-TESTING/html/SelfService/index.html
==============================================================================
--- rt/branches/3.3-TESTING/html/SelfService/index.html	(original)
+++ rt/branches/3.3-TESTING/html/SelfService/index.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /SelfService/Elements/Header, Title => undef &>
 
 <& /SelfService/Elements/MyRequests &>

Modified: rt/branches/3.3-TESTING/html/Ticket/Attachment/dhandler
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Attachment/dhandler	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Attachment/dhandler	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%perl>
      my ($ticket, $trans,$attach, $filename);
      my $arg = $m->dhandler_arg;                # get rest of path

Modified: rt/branches/3.3-TESTING/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Create.html	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Create.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Create a new ticket") &>
 <& /Elements/Tabs, 
     current_toptab => "Ticket/Create.html", 

Modified: rt/branches/3.3-TESTING/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Display.html	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Display.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, 
     Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
 <& /Ticket/Elements/Tabs, 
@@ -78,6 +78,9 @@
 </%ARGS>
 
 <%INIT>
+
+$m->comp('/Elements/Callback', _CallbackName => 'Initial', TicketObj => $TicketObj, ARGSRef => \%ARGS);
+
 my ($linkid, $message, $tid, @Actions, $Tickets);  
 
 unless ($id || $TicketObj) {

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/AddWatchers
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/AddWatchers	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/AddWatchers	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <BR>
 <%$msg%><br>
 

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/BulkLinks
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/BulkLinks	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/BulkLinks	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
   <TR>
     <TD class="label"><&|/l&>Merge into</&>:</TD>

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/EditBasics
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/EditBasics	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/EditBasics	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
   <TR>
       <td class="label"><&|/l&>Subject</&>:</td>
@@ -79,8 +79,7 @@
       <td class="label"><&|/l&>Final Priority</&>:</td>
       <td class="value"><input name=FinalPriority value="<%$TicketObj->FinalPriority|h%>" SIZE="5"></td>
     </TR>
-
-
+<& /Elements/Callback, _CallbackName => 'EndOfList', TicketObj => $TicketObj, %ARGS &>
 </TABLE>
 
 <%INIT>

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % my $Values;
 % if ($TicketObj) {
 %          $Values  = $TicketObj->CustomFieldValues($CustomField->id);

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomFields
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomFields	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomFields	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table>
 <tr>
 <td valign="top" width="50%">

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/EditDates
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/EditDates	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/EditDates	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
   <TR>
     <TD class="label"><&|/l&>Starts</&>:</TD>

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/EditPeople
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/EditPeople	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/EditPeople	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
 <TR>
 <TD VALIGN=TOP>

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/EditWatchers
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/EditWatchers	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/EditWatchers	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <ul>
 %# Print out a placeholder if there are none.
 %if ($Members->Count == 0 ) {

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/FindAttachments
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/FindAttachments	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/FindAttachments	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 my %documents;
 

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/LoadTextAttachments
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/LoadTextAttachments	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/LoadTextAttachments	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 
 my $attachments = RT::Attachments->new( $session{'CurrentUser'} );

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/PreviewScrips
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/PreviewScrips	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/PreviewScrips	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%args>
 $TicketObj => undef
 

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowAttachments
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowAttachments	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowAttachments	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,14 +42,13 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % if (keys %documents) {
 <& /Elements/TitleBoxStart, title => loc('Attachments'), 
         title_class=> 'inverse',  
         color => "#336699" &>
 
 % foreach my $key (keys %documents) {
-% my $fontsize='size="-1"';
 
 <%$key%><br>
 <ul>
@@ -68,13 +67,12 @@
 
 </%PERL>
 
-<li><font <%$fontsize%>>
+<li><font size="-2">
 <A HREF="<%$RT::WebPath%>/Ticket/Attachment/<%$rev->TransactionId%>/<%$rev->Id%>/<%$rev->Filename | u%>">
 <&|/l, $rev->CreatedAsString, $size, $rev->CreatorObj->Name &>[_1] ([_2]) by [_3]</&>
 </a>
 </font></li>
 % }
-% $fontsize='size="-2"';
 % }
 </ul>
 

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowBasics
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowBasics	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowBasics	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table>
   <tr>
     <td class="label"><&|/l&>Id</&>:</td>
@@ -76,6 +76,7 @@
     <td class="label"><&|/l&>Queue</&>:</td>
     <td class="value"><%$Ticket->QueueObj->Name%></td>
   </tr>
+<& /Elements/Callback, _CallbackName => 'EndOfList', TicketObj => $Ticket, %ARGS &>
 </table>
 <%ARGS>
 $Ticket => undef

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowCustomFields
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowCustomFields	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowCustomFields	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/ShowCustomFields, Object => $Ticket &>
 <%ARGS>
 $Ticket => undef

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDates
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDates	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDates	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
   <TR>
     <TD class="label"><&|/l&>Created</&>:</TD>

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDependencies
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDependencies	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDependencies	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <&|/l&>Depends on</&>:<BR>
 % while (my $Link = $Ticket->DependsOn->Next) {
 % my $member = $Link->TargetObj;

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowGroupMembers
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowGroupMembers	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowGroupMembers	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# Released under the terms of version 2 of the GNU Public License
 
 % my $UserMembers = $Group->UserMembersObj;

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowHistory
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowHistory	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowHistory	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%perl>
  if ($ShowDisplayModes or $ShowTitle) {
 my $title;
@@ -94,8 +94,6 @@
     next if $skip;
     $i++;
 
-    $m->out('<a name="lasttrans"></a>') if ( $Transactions->IsLast );
-
     my @trans_attachments = grep { $_->TransactionId == $Transaction->Id } @attachments;
 
     my $trans_content = {};
@@ -115,7 +113,8 @@
               RowNum               => $i,
               ShowTitleBarCommands => $ShowTitleBarCommands,
               Attachments          => \@trans_attachments,
-              AttachmentContent    => $trans_content
+              AttachmentContent    => $trans_content,
+              LastTransaction      => $Transactions->IsLast
  );
 }
 

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMemberOf
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMemberOf	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMemberOf	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <UL>
 % my $memberof = $Ticket->MemberOf;
 % while (my $member_of = $memberof->Next) {

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMembers
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMembers	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMembers	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % if ($members->Count) {
 <UL>
 % while (my $link = $members->Next) {

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageHeaders
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageHeaders	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageHeaders	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % use Data::Dumper;
 <table>
 % foreach my $header (@headers) {

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageStanza
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageStanza	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageStanza	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 % if (ref($Message)) {
 <font color="<%$colors[$Depth]%>">
 <%perl>

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowPeople
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowPeople	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowPeople	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <table>
   <tr>
     <td class="label"><&|/l&>Owner</&>:</td>

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowReferences
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowReferences	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowReferences	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <UL>
 % while (my $Link = $Ticket->RefersTo->Next) {
 <LI>

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowRequestor
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowRequestor	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowRequestor	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%PERL>
 my $rows = 10;
 my $people = $Ticket->Requestors->UserMembersObj;

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowSummary
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowSummary	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowSummary	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
       <TABLE WIDTH="100%" class="ticketsummary" >
       <TR>
 	<TD VALIGN=TOP WIDTH="50%" class="boxcontainer">

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransaction	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransaction	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,9 +42,9 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <TR class="<% $RowNum%2 ? 'oddline' : 'evenline'%>" >
-<TD rowspan="2" valign="top" bgcolor="<%$bgcolor%>"><A NAME="txn-<%$Transaction->Id%>" href="#txn-<%$Transaction->Id%>">#</A>&nbsp;</TD>
+<TD rowspan="2" valign="top" bgcolor="<%$bgcolor%>"><A NAME="txn-<%$Transaction->Id%>" href="#txn-<%$Transaction->Id%>">#</A><% $LastTransaction ? '<a name="lasttrans">&nbsp;</a>' : '&nbsp;' |n %></TD>
 <TD>&nbsp&nbsp;</TD>
 <TD><font size=-2><% $transdate|n %></font>&nbsp;</TD>
 % my $desc = $Transaction->BriefDescription;
@@ -76,6 +76,7 @@
 $Attachments => undef
 $AttachmentContent => undef
 $ShowBody => 1
+$LastTransaction => 0
 </%ARGS>
 
 <%INIT>
@@ -157,7 +158,8 @@
     }
 
     if ( $Attachments->[0] && $ShowTitleBarCommands ) {
-        if ( $Transaction->TicketObj->CurrentUserHasRight('ReplyToTicket') ) {
+        if ( $Transaction->TicketObj->CurrentUserHasRight('ReplyToTicket')
+             or $Transaction->TicketObj->CurrentUserHasRight('ModifyTicket')) {
             $titlebar_commands .=
                 "[<a href=\"".$UpdatePath."?id="
               . $Transaction->Ticket
@@ -167,7 +169,8 @@
               . loc('Reply')
               . "</a>]&nbsp;";
         }
-        if ( $Transaction->TicketObj->CurrentUserHasRight('CommentOnTicket') ) {
+        if ( $Transaction->TicketObj->CurrentUserHasRight('CommentOnTicket')
+             or $Transaction->TicketObj->CurrentUserHasRight('ModifyTicket')) {
             $titlebar_commands .=
                 "[<a href=\"".$UpdatePath."?id="
               . $Transaction->Ticket

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransactionAttachments
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransactionAttachments	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransactionAttachments	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%perl>
 # Find all the attachments which have parent $Parent
 # For each of these attachments

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/ShowUserEntry
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/ShowUserEntry	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/ShowUserEntry	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 %# Released under the terms of version 2 of the GNU Public License
 
 <%$User->Name%>

Modified: rt/branches/3.3-TESTING/html/Ticket/Elements/Tabs
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Elements/Tabs	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Elements/Tabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Callback, Ticket => $Ticket, actions=> $actions, tabs => $tabs, %ARGS &>
 <& /Elements/Tabs, 
     tabs => $tabs, 

Modified: rt/branches/3.3-TESTING/html/Ticket/History.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/History.html	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/History.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Ticket History # [_1] [_2]", $Ticket->Id, $Ticket->Subject) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $Ticket, current_tab => 'Ticket/History.html?id='.$Ticket->id, 

Modified: rt/branches/3.3-TESTING/html/Ticket/Modify.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Modify.html	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Modify.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc('Modify ticket #[_1]', $TicketObj->Id) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $TicketObj, current_subtab => "Ticket/Modify.html?id=".$TicketObj->Id, 

Modified: rt/branches/3.3-TESTING/html/Ticket/ModifyAll.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/ModifyAll.html	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/ModifyAll.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Ticket #[_1] Jumbo update: [_2]", $Ticket->Id, $Ticket->Subject) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $Ticket, 

Modified: rt/branches/3.3-TESTING/html/Ticket/ModifyDates.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/ModifyDates.html	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/ModifyDates.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc('Modify dates for #[_1]', $TicketObj->Id) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $TicketObj, 

Modified: rt/branches/3.3-TESTING/html/Ticket/ModifyLinks.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/ModifyLinks.html	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/ModifyLinks.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Link ticket #[_1]", $Ticket->Id) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $Ticket, 

Modified: rt/branches/3.3-TESTING/html/Ticket/ModifyPeople.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/ModifyPeople.html	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/ModifyPeople.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc('Modify people related to ticket #[_1]', $Ticket->id) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $Ticket, 

Modified: rt/branches/3.3-TESTING/html/Ticket/ShowEmailRecord.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/ShowEmailRecord.html	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/ShowEmailRecord.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%args>
 $Attachment => undef
 $Transaction => undef

Modified: rt/branches/3.3-TESTING/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Ticket/Update.html	(original)
+++ rt/branches/3.3-TESTING/html/Ticket/Update.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $TicketObj, 

Modified: rt/branches/3.3-TESTING/html/Tools/Elements/Tabs
==============================================================================
--- rt/branches/3.3-TESTING/html/Tools/Elements/Tabs	(original)
+++ rt/branches/3.3-TESTING/html/Tools/Elements/Tabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Tabs, 
     tabs => $tabs, 
     current_toptab => 'Tools/Offline.html', 

Modified: rt/branches/3.3-TESTING/html/Tools/MyDay.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Tools/MyDay.html	(original)
+++ rt/branches/3.3-TESTING/html/Tools/MyDay.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, title => "What I did today" &>
 (displaying new and open tickets for <%$session{'CurrentUser'}->Name%>)
 <FORM METHOD=POST ACTION="MyDay.html">

Modified: rt/branches/3.3-TESTING/html/Tools/Offline.html
==============================================================================
--- rt/branches/3.3-TESTING/html/Tools/Offline.html	(original)
+++ rt/branches/3.3-TESTING/html/Tools/Offline.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Offline upload") &>
 <& Elements/Tabs, 
     current_tab => "Tools/Offline.html", 
@@ -114,7 +114,7 @@
 
     my ($buffer, $template);
     while ( my $bytesread = read( $fh, $buffer, 4096 ) ) {
-	$template .= $buffer;
+	    $template .= $buffer;
     }
     $action->Parse(Content => $template, Queue => $qname, Requestor => $requestoraddress);
     foreach (@{ $action->{'create_tickets'} }) {

Modified: rt/branches/3.3-TESTING/html/User/Delegation.html
==============================================================================
--- rt/branches/3.3-TESTING/html/User/Delegation.html	(original)
+++ rt/branches/3.3-TESTING/html/User/Delegation.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Delegate rights") &>
 <& /User/Elements/Tabs, 
     current_tab => 'User/Delegation.html', 

Modified: rt/branches/3.3-TESTING/html/User/Elements/DelegateRights
==============================================================================
--- rt/branches/3.3-TESTING/html/User/Elements/DelegateRights	(original)
+++ rt/branches/3.3-TESTING/html/User/Elements/DelegateRights	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <h2><%$sectionheading%></h2>
 <%perl>
 

Modified: rt/branches/3.3-TESTING/html/User/Elements/GroupTabs
==============================================================================
--- rt/branches/3.3-TESTING/html/User/Elements/GroupTabs	(original)
+++ rt/branches/3.3-TESTING/html/User/Elements/GroupTabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /User/Elements/Tabs, 
     subtabs => $tabs, 
     current_tab => 'User/Groups/', 

Modified: rt/branches/3.3-TESTING/html/User/Elements/Tabs
==============================================================================
--- rt/branches/3.3-TESTING/html/User/Elements/Tabs	(original)
+++ rt/branches/3.3-TESTING/html/User/Elements/Tabs	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Tabs, 
     tabs => $tabs, 
     current_toptab => 'User/Prefs.html', 

Modified: rt/branches/3.3-TESTING/html/User/Groups/Members.html
==============================================================================
--- rt/branches/3.3-TESTING/html/User/Groups/Members.html	(original)
+++ rt/branches/3.3-TESTING/html/User/Groups/Members.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title &>
 <& /User/Elements/GroupTabs, 
     GroupObj => $Group, 

Modified: rt/branches/3.3-TESTING/html/User/Groups/Modify.html
==============================================================================
--- rt/branches/3.3-TESTING/html/User/Groups/Modify.html	(original)
+++ rt/branches/3.3-TESTING/html/User/Groups/Modify.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title &>
 
 <& /User/Elements/GroupTabs, 

Modified: rt/branches/3.3-TESTING/html/User/Groups/index.html
==============================================================================
--- rt/branches/3.3-TESTING/html/User/Groups/index.html	(original)
+++ rt/branches/3.3-TESTING/html/User/Groups/index.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title &>
 <& /User/Elements/GroupTabs, 
     current_subtab => 'User/Groups/index.html', 

Modified: rt/branches/3.3-TESTING/html/User/Prefs.html
==============================================================================
--- rt/branches/3.3-TESTING/html/User/Prefs.html	(original)
+++ rt/branches/3.3-TESTING/html/User/Prefs.html	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title=>loc("Preferences") &>
 <& /User/Elements/Tabs, 
     current_tab => 'User/Prefs.html', 

Modified: rt/branches/3.3-TESTING/html/autohandler
==============================================================================
--- rt/branches/3.3-TESTING/html/autohandler	(original)
+++ rt/branches/3.3-TESTING/html/autohandler	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 
 # Roll back any dangling transactions from a previous failed connection

Modified: rt/branches/3.3-TESTING/html/index.html
==============================================================================
--- rt/branches/3.3-TESTING/html/index.html	(original)
+++ rt/branches/3.3-TESTING/html/index.html	Tue Aug 31 22:37:44 2004
@@ -24,12 +24,12 @@
 <!--
 % }
 
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -68,7 +68,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title=>loc("RT at a glance"), Refresh => $session{'home_refresh_interval'} &>
 <& /Elements/Tabs, 
     current_toptab => '', 
@@ -86,7 +86,7 @@
 <TD class="boxcontainer">
 <& /Elements/Quicksearch &>
 <BR>
-<form method=get action="index.html">
+<form method=get action="<%$RT::WebPath%>/index.html">
 <& /Elements/Refresh, Name => 'HomeRefreshInterval', Default => $session {'home_refresh_interval'} &>
 <div align=right><input type=submit value="<&|/l&>Go!</&>"></div>
 </form>

Modified: rt/branches/3.3-TESTING/html/l
==============================================================================
--- rt/branches/3.3-TESTING/html/l	(original)
+++ rt/branches/3.3-TESTING/html/l	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-%# BEGIN BPS TAGGED BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
 %# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse.com>
+%#                                          <jesse at bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
 %# 
@@ -42,7 +42,9 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK
-% my $hand = ($session{'CurrentUser'} ||= RT::CurrentUser->new)->LanguageHandle;
-% $m->print($hand->maketext($m->content, at _));
-% return(1);
+%# }}} END BPS TAGGED BLOCK
+<%init>
+ my $hand = ($session{'CurrentUser'} ||= RT::CurrentUser->new)->LanguageHandle;
+ $m->print($hand->maketext($m->content, at _));
+ return(1);
+</%init>

Modified: rt/branches/3.3-TESTING/lib/RT.pm.in
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT.pm.in	(original)
+++ rt/branches/3.3-TESTING/lib/RT.pm.in	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT;
 use strict;
 use RT::I18N;

Modified: rt/branches/3.3-TESTING/lib/RT/ACE.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ACE.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ACE.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/ACE_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ACE_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ACE_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 SYNOPSIS
 
   use RT::ACE;

Modified: rt/branches/3.3-TESTING/lib/RT/ACL.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ACL.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ACL.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/ACL_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ACL_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ACL_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::ACL - collection of RT ACE objects

Modified: rt/branches/3.3-TESTING/lib/RT/Action/AutoOpen.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/AutoOpen.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/AutoOpen.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # This Action will open the BASE if a dependent is resolved.
 
 package RT::Action::AutoOpen;

Modified: rt/branches/3.3-TESTING/lib/RT/Action/Autoreply.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/Autoreply.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/Autoreply.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::Action::Autoreply;
 require RT::Action::SendEmail;
 

Modified: rt/branches/3.3-TESTING/lib/RT/Action/CreateTickets.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/CreateTickets.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/CreateTickets.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::Action::CreateTickets;
 require RT::Action::Generic;
 
@@ -772,7 +772,7 @@
         foreach my $line ( split( /\n/, $args{'Content'} ) ) {
             $line =~ s/\r$//;
             $RT::Logger->debug("Line: $line");
-            if ( $line =~ /^===$/ ) {
+            if ( $line =~ /^===/ ) {
                 if ( $template_id && !$queue && $args{'Queue'} ) {
                     $self->{'templates'}->{$template_id} .= "Queue: $args{'Queue'}\n";
                 }
@@ -825,6 +825,9 @@
                 $self->{'templates'}->{$template_id} .= $line . "\n";
             }
         }
+	if ( $template_id && !$queue && $args{'Queue'} ) {
+	    $self->{'templates'}->{$template_id} .= "Queue: $args{'Queue'}\n";
+	}
     }
     elsif ( substr( $args{'Content'}, 0, 2 ) =~ /^id$/i ) {
         $RT::Logger->debug("Line: id");

Modified: rt/branches/3.3-TESTING/lib/RT/Action/EscalatePriority.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/EscalatePriority.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/EscalatePriority.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Action::EscalatePriority

Modified: rt/branches/3.3-TESTING/lib/RT/Action/Generic.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/Generic.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/Generic.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Action::Generic - a generic baseclass for RT Actions

Modified: rt/branches/3.3-TESTING/lib/RT/Action/Notify.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/Notify.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/Notify.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 #
 package RT::Action::Notify;
 require RT::Action::SendEmail;

Modified: rt/branches/3.3-TESTING/lib/RT/Action/NotifyAsComment.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/NotifyAsComment.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/NotifyAsComment.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::Action::NotifyAsComment;
 require RT::Action::Notify;
 

Modified: rt/branches/3.3-TESTING/lib/RT/Action/RecordComment.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/RecordComment.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/RecordComment.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,8 +42,8 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-#
+# }}} END BPS TAGGED BLOCK
+
 package RT::Action::RecordComment;
 require RT::Action::Generic;
 use strict;

Modified: rt/branches/3.3-TESTING/lib/RT/Action/RecordCorrespondence.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/RecordCorrespondence.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/RecordCorrespondence.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,8 +42,8 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-#
+# }}} END BPS TAGGED BLOCK
+
 package RT::Action::RecordCorrespondence;
 require RT::Action::Generic;
 use strict;

Modified: rt/branches/3.3-TESTING/lib/RT/Action/ResolveMembers.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/ResolveMembers.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/ResolveMembers.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # This Action will resolve all members of a resolved group ticket
 
 package RT::Action::ResolveMembers;

Modified: rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Portions Copyright 2000 Tobias Brox <tobix at cpan.org>
 
 package RT::Action::SendEmail;

Modified: rt/branches/3.3-TESTING/lib/RT/Action/SetPriority.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/SetPriority.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/SetPriority.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::Action::SetPriority;
 require RT::Action::Generic;
 

Modified: rt/branches/3.3-TESTING/lib/RT/Action/UserDefined.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Action/UserDefined.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Action/UserDefined.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
  
 
 package RT::Action::UserDefined;

Modified: rt/branches/3.3-TESTING/lib/RT/Attachment.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Attachment.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Attachment.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Attachment_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Attachment_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Attachment_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 SYNOPSIS
 
   use RT::Attachment;

Modified: rt/branches/3.3-TESTING/lib/RT/Attachments.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Attachments.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Attachments.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Attachments_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Attachments_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Attachments_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Attachments - a collection of RT::Attachment objects

Modified: rt/branches/3.3-TESTING/lib/RT/Attribute.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Attribute.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Attribute.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Attribute_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Attribute_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Attribute_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 use Storable qw/nfreeze thaw/;

Modified: rt/branches/3.3-TESTING/lib/RT/Attributes.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Attributes.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Attributes.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Attributes_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Attributes_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Attributes_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Attributes - collection of RT::Attribute objects

Modified: rt/branches/3.3-TESTING/lib/RT/Base.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Base.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Base.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::Base;
 use Carp;
 use Scalar::Util;

Modified: rt/branches/3.3-TESTING/lib/RT/CachedGroupMember.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CachedGroupMember.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CachedGroupMember.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/CachedGroupMember_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CachedGroupMember_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CachedGroupMember_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 

Modified: rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::CachedGroupMembers - a collection of RT::GroupMember objects

Modified: rt/branches/3.3-TESTING/lib/RT/Condition/AnyTransaction.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Condition/AnyTransaction.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Condition/AnyTransaction.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
  
 
 package RT::Condition::AnyTransaction;

Modified: rt/branches/3.3-TESTING/lib/RT/Condition/BeforeDue.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Condition/BeforeDue.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Condition/BeforeDue.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::Condition::BeforeDue;
 require RT::Condition::Generic;
 

Modified: rt/branches/3.3-TESTING/lib/RT/Condition/Generic.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Condition/Generic.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Condition/Generic.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Condition::Generic - ;

Modified: rt/branches/3.3-TESTING/lib/RT/Condition/Overdue.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Condition/Overdue.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Condition/Overdue.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
  
 
 

Modified: rt/branches/3.3-TESTING/lib/RT/Condition/OwnerChange.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Condition/OwnerChange.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Condition/OwnerChange.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
  
 
 

Modified: rt/branches/3.3-TESTING/lib/RT/Condition/PriorityChange.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Condition/PriorityChange.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Condition/PriorityChange.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
  
 
 

Modified: rt/branches/3.3-TESTING/lib/RT/Condition/PriorityExceeds.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Condition/PriorityExceeds.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Condition/PriorityExceeds.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
  
 
 

Modified: rt/branches/3.3-TESTING/lib/RT/Condition/QueueChange.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Condition/QueueChange.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Condition/QueueChange.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
  
 
 

Modified: rt/branches/3.3-TESTING/lib/RT/Condition/StatusChange.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Condition/StatusChange.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Condition/StatusChange.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
  
 
 

Modified: rt/branches/3.3-TESTING/lib/RT/Condition/UserDefined.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Condition/UserDefined.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Condition/UserDefined.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
  
 
 package RT::Condition::UserDefined;

Modified: rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::CurrentUser - an RT object representing the current user

Modified: rt/branches/3.3-TESTING/lib/RT/CustomField.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CustomField.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CustomField.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/CustomFieldValue.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CustomFieldValue.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CustomFieldValue.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/CustomFieldValues.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CustomFieldValues.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CustomFieldValues.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/CustomFieldValues_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CustomFieldValues_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CustomFieldValues_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 

Modified: rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 

Modified: rt/branches/3.3-TESTING/lib/RT/CustomFields.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CustomFields.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CustomFields.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/CustomFields_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/CustomFields_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/CustomFields_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::CustomFields - a collection of RT CustomField objects

Modified: rt/branches/3.3-TESTING/lib/RT/Date.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Date.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Date.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Date - a simple Object Oriented date.
@@ -352,7 +352,8 @@
         $s         = int( $duration / $YEAR );
         $time_unit = $self->loc("years");
     }
-    if (0) { # For now, never display the "AGO" # $negative) {
+
+    if ($negative) {
         return $self->loc( "[_1] [_2] ago", $s, $time_unit );
     }
     else {

Modified: rt/branches/3.3-TESTING/lib/RT/EmailParser.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/EmailParser.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/EmailParser.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::EmailParser;
 
 
@@ -267,6 +267,216 @@
 
 # }}}
 
+# {{{ sub ParseTicketId 
+
+sub ParseTicketId {
+    my $self = shift;
+
+    my $Subject = shift;
+
+    if ( $Subject =~ s/\[\Q$RT::rtname\E\s+\#(\d+)\s*\]//i ) {
+        my $id = $1;
+        $RT::Logger->debug("Found a ticket ID. It's $id");
+        return ($id);
+    }
+    else {
+        return (undef);
+    }
+}
+
+# }}}
+
+
+
+# {{{ ParseCcAddressesFromHead 
+
+=head2 ParseCcAddressesFromHead HASHREF
+
+Takes a hashref object containing QueueObj, Head and CurrentUser objects.
+Returns a list of all email addresses in the To and Cc 
+headers b<except> the current Queue\'s email addresses, the CurrentUser\'s 
+email address  and anything that the $RTAddressRegexp matches.
+
+=cut
+
+sub ParseCcAddressesFromHead {
+
+    my $self = shift;
+
+    my %args = (
+        QueueObj    => undef,
+        CurrentUser => undef,
+        @_
+    );
+
+    my (@Addresses);
+
+    my @ToObjs = Mail::Address->parse( $self->Head->get('To') );
+    my @CcObjs = Mail::Address->parse( $self->Head->get('Cc') );
+
+    foreach my $AddrObj ( @ToObjs, @CcObjs ) {
+        my $Address = $AddrObj->address;
+        my $user = RT::User->new($RT::SystemUser);
+        $Address = $user->CanonicalizeEmailAddress($Address);
+        next if ( $args{'CurrentUser'}->EmailAddress   =~ /^$Address$/i );
+        next if ( $args{'QueueObj'}->CorrespondAddress =~ /^$Address$/i );
+        next if ( $args{'QueueObj'}->CommentAddress    =~ /^$Address$/i );
+        next if ( IsRTAddress($Address) );
+
+        push ( @Addresses, $Address );
+    }
+    return (@Addresses);
+}
+
+# }}}
+
+# {{{ ParseSenderAdddressFromHead
+
+=head2 ParseSenderAddressFromHead
+
+Takes a MIME::Header object. Returns a tuple: (user at host, friendly name) 
+of the From (evaluated in order of Reply-To:, From:, Sender)
+
+=cut
+
+sub ParseSenderAddressFromHead {
+    my $self = shift;
+
+    #Figure out who's sending this message.
+    my $From = $self->Head->get('Reply-To')
+      || $self->Head->get('From')
+      || $self->Head->get('Sender');
+    return ( $self->ParseAddressFromHeader($From) );
+}
+
+# }}}
+
+# {{{ ParseErrorsToAdddressFromHead
+
+=head2 ParseErrorsToAddressFromHead
+
+Takes a MIME::Header object. Return a single value : user at host
+of the From (evaluated in order of Errors-To:,Reply-To:, From:, Sender)
+
+=cut
+
+sub ParseErrorsToAddressFromHead {
+    my $self = shift;
+
+    #Figure out who's sending this message.
+
+    foreach my $header ( 'Errors-To', 'Reply-To', 'From', 'Sender' ) {
+
+        # If there's a header of that name
+        my $headerobj = $self->Head->get($header);
+        if ($headerobj) {
+            my ( $addr, $name ) = $self->ParseAddressFromHeader($headerobj);
+
+            # If it's got actual useful content...
+            return ($addr) if ($addr);
+        }
+    }
+}
+
+# }}}
+
+# {{{ ParseAddressFromHeader
+
+=head2 ParseAddressFromHeader ADDRESS
+
+Takes an address from $self->Head->get('Line') and returns a tuple: user at host, friendly name
+
+=cut
+
+sub ParseAddressFromHeader {
+    my $self = shift;
+    my $Addr = shift;
+
+    # Perl 5.8.0 breaks when doing regex matches on utf8
+    Encode::_utf8_off($Addr) if $] == 5.008;
+    my @Addresses = Mail::Address->parse($Addr);
+
+    my $AddrObj = $Addresses[0];
+
+    unless ( ref($AddrObj) ) {
+        return ( undef, undef );
+    }
+
+    my $Name = ( $AddrObj->phrase || $AddrObj->comment || $AddrObj->address );
+
+    #Lets take the from and load a user object.
+    my $Address = $AddrObj->address;
+
+    return ( $Address, $Name );
+}
+
+# }}}
+
+# {{{ IsRTAddress
+
+=item IsRTaddress ADDRESS
+
+Takes a single parameter, an email address. 
+Returns true if that address matches the $RTAddressRegexp.  
+Returns false, otherwise.
+
+=begin testing
+
+is(RT::EmailParser::IsRTAddress("","rt\@example.com"),1, "Regexp matched rt address" );
+is(RT::EmailParser::IsRTAddress("","frt\@example.com"),undef, "Regexp didn't match non-rt address" );
+
+=end testing
+
+=cut
+
+sub IsRTAddress {
+    my $self = shift;
+    my $address = shift;
+
+    # Example: the following rule would tell RT not to Cc 
+    #   "tickets at noc.example.com"
+    if ( defined($RT::RTAddressRegexp) &&
+                       $address =~ /$RT::RTAddressRegexp/ ) {
+        return(1);
+    } else {
+        return (undef);
+    }
+}
+
+# }}}
+
+
+# {{{ CullRTAddresses
+
+=item CullRTAddresses ARRAY
+
+Takes a single argument, an array of email addresses.
+Returns the same array with any IsRTAddress()es weeded out.
+
+=begin testing
+
+ at before = ("rt\@example.com", "frt\@example.com");
+ at after = ("frt\@example.com");
+ok(eq_array(RT::EmailParser::CullRTAddresses("", at before), at after), "CullRTAddresses only culls RT addresses");
+
+=end testing
+
+=cut
+
+sub CullRTAddresses {
+    my $self = shift;
+    my @addresses= (@_);
+    my @addrlist;
+
+    foreach my $addr( @addresses ) {
+      push (@addrlist, $addr)    unless IsRTAddress("", $addr);
+    }
+    return (@addrlist);
+}
+
+# }}}
+
+
 # {{{ LookupExternalUserInfo
 
 

Modified: rt/branches/3.3-TESTING/lib/RT/Group.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Group.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Group.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/GroupMember.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/GroupMember.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/GroupMember.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::GroupMember - a member of an RT Group

Modified: rt/branches/3.3-TESTING/lib/RT/GroupMembers.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/GroupMembers.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/GroupMembers.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/GroupMembers_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/GroupMembers_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/GroupMembers_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::GroupMembers - a collection of RT::GroupMember objects

Modified: rt/branches/3.3-TESTING/lib/RT/Group_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Group_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Group_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Released under the terms of version 2 of the GNU Public License
 
 =head1 NAME

Modified: rt/branches/3.3-TESTING/lib/RT/Groups.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Groups.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Groups.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Groups_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Groups_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Groups_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Groups - a collection of RT::Group objects

Modified: rt/branches/3.3-TESTING/lib/RT/Handle.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Handle.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Handle.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Handle - RT's database handle

Modified: rt/branches/3.3-TESTING/lib/RT/I18N.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
 RT::I18N - a base class for localization of RT

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/cs.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/cs.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/cs.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::I18N::cs;
 
 # # CZECH TRANSLATORS COMMENTS see Locale::Maketext::TPJ13

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/cs.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/cs.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/cs.po	Tue Aug 31 22:37:44 2004
@@ -249,7 +249,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/da.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/da.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/da.po	Tue Aug 31 22:37:44 2004
@@ -240,7 +240,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/de.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/de.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/de.po	Tue Aug 31 22:37:44 2004
@@ -264,7 +264,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/es.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/es.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/es.po	Tue Aug 31 22:37:44 2004
@@ -265,7 +265,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/fi.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/fi.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/fi.po	Tue Aug 31 22:37:44 2004
@@ -266,7 +266,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/fr.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/fr.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/fr.po	Tue Aug 31 22:37:44 2004
@@ -275,8 +275,8 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
-msgstr "les %1 derniers tickets sans propiétaire..."
+msgid "%1 newest unowned tickets"
+msgstr "les %1 derniers tickets sans propiétaire"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 not shown"

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/he.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/he.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/he.po	Tue Aug 31 22:37:44 2004
@@ -302,7 +302,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/hu.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/hu.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/hu.po	Tue Aug 31 22:37:44 2004
@@ -296,7 +296,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/i_default.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/i_default.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/i_default.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::I18N::i_default;
 
 use strict;

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/it.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/it.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/it.po	Tue Aug 31 22:37:44 2004
@@ -300,7 +300,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/ja.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/ja.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/ja.po	Tue Aug 31 22:37:44 2004
@@ -306,7 +306,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/nl.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/nl.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/nl.po	Tue Aug 31 22:37:44 2004
@@ -300,7 +300,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/no.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/no.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/no.po	Tue Aug 31 22:37:44 2004
@@ -304,7 +304,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/pt_br.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/pt_br.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/pt_br.po	Tue Aug 31 22:37:44 2004
@@ -305,7 +305,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/ru.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/ru.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/ru.po	Tue Aug 31 22:37:44 2004
@@ -302,7 +302,7 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
+msgid "%1 newest unowned tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/zh_cn.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/zh_cn.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/zh_cn.po	Tue Aug 31 22:37:44 2004
@@ -322,8 +322,8 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
-msgstr "前 %1 份待认领的申请单..."
+msgid "%1 newest unowned tickets"
+msgstr "前 %1 份待认领的申请单"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 not shown"

Modified: rt/branches/3.3-TESTING/lib/RT/I18N/zh_tw.po
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/I18N/zh_tw.po	(original)
+++ rt/branches/3.3-TESTING/lib/RT/I18N/zh_tw.po	Tue Aug 31 22:37:44 2004
@@ -322,8 +322,8 @@
 
 #: html/Elements/MyRequests:25
 #. ($rows)
-msgid "%1 newest unowned tickets..."
-msgstr "前 %1 份待認領的申請單..."
+msgid "%1 newest unowned tickets"
+msgstr "前 %1 份待認領的申請單"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 not shown"

Modified: rt/branches/3.3-TESTING/lib/RT/Interface/CLI.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Interface/CLI.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Interface/CLI.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 use strict;
 
 use RT;

Modified: rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::Interface::Email;
 
 use strict;
@@ -686,10 +686,10 @@
                 Explanation => "RT thinks this message may be a bounce",
                 MIMEObj     => $Message
             );
-
-            #Do we actually want to store it?
-            return ( 0, "Message Bounced", undef ) unless ($RT::StoreLoops);
         }
+
+        #Do we actually want to store it?
+        return ( 0, "Message Bounced", undef ) unless ($RT::StoreLoops);
     }
 
     # }}}

Modified: rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/GnuPG.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/GnuPG.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/GnuPG.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 #
 package RT::Interface::Email::Auth::GnuPG;
 use Mail::GnuPG;

Modified: rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/MailFrom.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/MailFrom.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/MailFrom.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::Interface::Email::Auth::MailFrom;
 use RT::Interface::Email qw(ParseSenderAddressFromHead CreateUser);
 

Modified: rt/branches/3.3-TESTING/lib/RT/Interface/Email/Filter/SpamAssassin.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Interface/Email/Filter/SpamAssassin.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Interface/Email/Filter/SpamAssassin.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::Interface::Email::Filter::SpamAssassin;
 
 use Mail::SpamAssassin;

Modified: rt/branches/3.3-TESTING/lib/RT/Interface/REST.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Interface/REST.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Interface/REST.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # lib/RT/Interface/REST.pm
 #
 

Modified: rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 ## Portions Copyright 2000 Tobias Brox <tobix at fsck.com>
 
 ## This is a library of static subs to be used by the Mason web
@@ -995,6 +995,7 @@
       TimeEstimated
       TimeWorked
       TimeLeft
+      Type
       Status
       Queue
     );

Modified: rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::Interface::Web::Handler;
 
 sub DefaultHandlerArgs  { (

Modified: rt/branches/3.3-TESTING/lib/RT/Link.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Link.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Link.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Link_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Link_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Link_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Link - an RT Link object

Modified: rt/branches/3.3-TESTING/lib/RT/Links.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Links.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Links.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Links_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Links_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Links_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Links - A collection of Link objects

Modified: rt/branches/3.3-TESTING/lib/RT/Principal.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Principal.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Principal.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 use strict;
 
 no warnings qw(redefine);

Modified: rt/branches/3.3-TESTING/lib/RT/Principals.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Principals.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Principals.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Principals_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Principals_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Principals_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Principals - a collection of RT::Principal objects

Modified: rt/branches/3.3-TESTING/lib/RT/Queue.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Queue.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Queue.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Queue - an RT Queue object

Modified: rt/branches/3.3-TESTING/lib/RT/Queues.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Queues.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Queues.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Queues_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Queues_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Queues_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Queues - a collection of RT::Queue objects

Modified: rt/branches/3.3-TESTING/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Record.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Record.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Record - Base class for RT record objects

Modified: rt/branches/3.3-TESTING/lib/RT/Scrip.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Scrip.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Scrip.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/ScripAction.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ScripAction.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ScripAction.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/ScripAction_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ScripAction_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ScripAction_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::ScripAction - RT Action object

Modified: rt/branches/3.3-TESTING/lib/RT/ScripActions.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ScripActions.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ScripActions.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/ScripActions_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ScripActions_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ScripActions_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::ScripActions - Collection of Action objects

Modified: rt/branches/3.3-TESTING/lib/RT/ScripCondition.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ScripCondition.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ScripCondition.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/ScripCondition_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ScripCondition_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ScripCondition_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::ScripCondition - RT scrip conditional

Modified: rt/branches/3.3-TESTING/lib/RT/ScripConditions.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ScripConditions.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ScripConditions.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/ScripConditions_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/ScripConditions_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/ScripConditions_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::ScripConditions - Collection of Action objects

Modified: rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Scrip - an RT Scrip object

Modified: rt/branches/3.3-TESTING/lib/RT/Scrips.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Scrips.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Scrips.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Scrips_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Scrips_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Scrips_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Scrips - a collection of RT Scrip objects

Modified: rt/branches/3.3-TESTING/lib/RT/Search/ActiveTicketsInQueue.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Search/ActiveTicketsInQueue.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Search/ActiveTicketsInQueue.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Search::ActiveTicketsInQueue

Modified: rt/branches/3.3-TESTING/lib/RT/Search/FromSQL.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Search/FromSQL.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Search/FromSQL.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,9 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
+
+
 =head1 NAME
 
   RT::Search::FromSQL

Modified: rt/branches/3.3-TESTING/lib/RT/Search/Generic.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Search/Generic.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Search/Generic.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Search::Generic - ;

Modified: rt/branches/3.3-TESTING/lib/RT/SearchBuilder.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/SearchBuilder.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/SearchBuilder.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::SearchBuilder - a baseclass for RT collection objects

Modified: rt/branches/3.3-TESTING/lib/RT/System.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/System.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/System.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME 
 
 RT::System

Modified: rt/branches/3.3-TESTING/lib/RT/Template.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Template.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Template.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Template_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Template_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Template_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Portions Copyright 2000 Tobias Brox <tobix at cpan.org> 
 
 =head1 NAME

Modified: rt/branches/3.3-TESTING/lib/RT/Templates.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Templates.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Templates.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Templates_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Templates_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Templates_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Templates - a collection of RT Template objects

Modified: rt/branches/3.3-TESTING/lib/RT/Ticket.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Ticket.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Ticket.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 

Modified: rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 

Modified: rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # {{{ Front Material 
 
 =head1 SYNOPSIS
@@ -304,6 +304,7 @@
   Type -- The ticket\'s type. ignore this for now
   Owner -- This ticket\'s owner. either an RT::User object or this user\'s id
   Subject -- A string describing the subject of the ticket
+  Priority -- an integer from 0 to 99
   InitialPriority -- an integer from 0 to 99
   FinalPriority -- an integer from 0 to 99
   Status -- any valid status (Defined in RT::Queue)
@@ -2787,6 +2788,10 @@
 
     }
 
+    # Update time fields
+    $NewTicket->SetTimeEstimated(($NewTicket->TimeEstimated || 0) + ($self->TimeEstimated || 0));
+    $NewTicket->SetTimeWorked(   ($NewTicket->TimeWorked || 0)    + ($self->TimeWorked || 0));
+    $NewTicket->SetTimeLeft(     ($NewTicket->TimeLeft || 0)      + ($self->TimeLeft || 0));   
 
     #add all of this ticket's watchers to that ticket.
     my $requestors = $self->Requestors->MembersObj;

Modified: rt/branches/3.3-TESTING/lib/RT/Tickets.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Tickets.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Tickets.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Major Changes:
 
 # - Decimated ProcessRestrictions and broke it into multiple
@@ -107,6 +107,7 @@
     RefersTo        => ['LINK' => To => 'RefersTo',],
     HasMember	    => ['LINK' => From => 'MemberOf',],
     DependentOn     => ['LINK' => From => 'DependsOn',],
+    DependedOnBy     => ['LINK' => From => 'DependsOn',],
     ReferredToBy    => ['LINK' => From => 'RefersTo',],
 #   HasDepender	    => ['LINK',],
 #   RelatedTo	    => ['LINK',],
@@ -118,7 +119,6 @@
     LastUpdated	    => ['DATE' => 'LastUpdated',],
     Created	    => ['DATE' => 'Created',],
     Subject	    => ['STRING',],
-    Type	    => ['STRING',],
     Content	    => ['TRANSFIELD',],
     ContentType	    => ['TRANSFIELD',],
     Filename        => ['TRANSFIELD',],
@@ -852,7 +852,7 @@
   my $queue = 0;
 
     if ( $field =~ /^(.+?)\.{(.+)}$/ ) {
-        $queue = $1;
+    $queue =  $1;
     $field = $2;
    }
     $field = $1 if $field =~ /^{(.+)}$/; # trim { }
@@ -881,9 +881,9 @@
         $cf->LoadByNameAndQueue( Queue => '0', Name => $field );
     }
 
-    my $cfid = $cf->id;
+  my $cfid = $cf->id;
 
-    die "No custom field named $field found\n" unless $cfid;
+  die "No custom field named $field found\n" unless $cfid;
 
 
     my $TicketCFs;

Modified: rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 use strict;
 use warnings;
 
@@ -83,11 +83,19 @@
 }
 
 sub _SQLLimit {
+  my $self = shift;
+    my %args = (@_);
+    if ($args{'FIELD'} eq 'EffectiveId') {
+        $self->{'looking_at_effective_id'} = 1;
+    }      
+    
+    if ($args{'FIELD'} eq 'Type') {
+        $self->{'looking_at_type'} = 1;
+    }
+
   # All SQL stuff goes into one SB subclause so we can deal with all
   # the aggregation
-  my $this = shift;
-
-  $this->SUPER::Limit(@_,
+  $self->SUPER::Limit(%args,
                       SUBCLAUSE => 'ticketsql');
 }
 
@@ -112,14 +120,6 @@
 
 =cut
 
-sub _match {
-  # Case insensitive equality
-  my ($y,$x) = @_;
-  return 1 if $x =~ /^$y$/i;
-  #  return 1 if ((lc $x) eq (lc $y)); # Why isnt this equiv?
-  return 0;
-}
-
 =head2 Robert's Simple SQL Parser
 
 Documentation In Progress
@@ -227,11 +227,11 @@
     my $current = 0;
 
     # Highest priority is last
-    $current = OP      if _match($re_op,$val) ;
-    $current = VALUE   if _match($re_value,$val);
-    $current = KEYWORD if _match($re_keyword,$val) && ($want & KEYWORD);
-    $current = AGGREG  if _match($re_aggreg,$val);
-    $current = PAREN   if _match($re_paren,$val);
+    $current = OP      if $val =~ /^$re_op$/io;
+    $current = VALUE   if $val =~ /^$re_value$/io;
+    $current = KEYWORD if $val =~ /^$re_keyword$/io && ($want & KEYWORD);
+    $current = AGGREG  if $val =~ /^$re_aggreg$/io;
+    $current = PAREN   if $val =~ /^$re_paren$/io;
     $current = COLUMN if _match($re_keyword,$val) && ($want & COLUMN);
     $current = WHERE if _match($re_where,$val) && ($want & WHERE);
     $current = SELECT if _match($re_select,$val);

Modified: rt/branches/3.3-TESTING/lib/RT/Transaction.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Transaction.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Transaction.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Transaction - RT\'s transaction object

Modified: rt/branches/3.3-TESTING/lib/RT/Transactions.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Transactions.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Transactions.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Transactions_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Transactions_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Transactions_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Transactions - a collection of RT Transaction objects

Modified: rt/branches/3.3-TESTING/lib/RT/URI.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/URI.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/URI.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::URI;;
 
 use strict;

Modified: rt/branches/3.3-TESTING/lib/RT/URI/base.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/URI/base.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/URI/base.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::URI::base;
 
 use strict;

Modified: rt/branches/3.3-TESTING/lib/RT/URI/fsck_com_rt.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/URI/fsck_com_rt.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/URI/fsck_com_rt.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 package RT::URI::fsck_com_rt;
 
 use RT::Ticket;

Modified: rt/branches/3.3-TESTING/lib/RT/User.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/User.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/User.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::User - RT User object

Modified: rt/branches/3.3-TESTING/lib/RT/Users.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Users.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Users.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse at bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 

Modified: rt/branches/3.3-TESTING/lib/RT/Users_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Users_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Users_Overlay.pm	Tue Aug 31 22:37:44 2004
@@ -1,9 +1,9 @@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Users - Collection of RT::User objects

Modified: rt/branches/3.3-TESTING/sbin/extract-message-catalog
==============================================================================
--- rt/branches/3.3-TESTING/sbin/extract-message-catalog	(original)
+++ rt/branches/3.3-TESTING/sbin/extract-message-catalog	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w 
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 # Portions Copyright 2002 Autrijus Tang <autrijus at autrijus.org>
 
 use strict;

Modified: rt/branches/3.3-TESTING/sbin/extract_pod_tests
==============================================================================
--- rt/branches/3.3-TESTING/sbin/extract_pod_tests	(original)
+++ rt/branches/3.3-TESTING/sbin/extract_pod_tests	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 use vars qw($VERSION);
 $VERSION = '0.06';

Modified: rt/branches/3.3-TESTING/sbin/factory
==============================================================================
--- rt/branches/3.3-TESTING/sbin/factory	(original)
+++ rt/branches/3.3-TESTING/sbin/factory	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 use DBI;
 
 my $database  = shift;

Modified: rt/branches/3.3-TESTING/sbin/license_tag
==============================================================================
--- rt/branches/3.3-TESTING/sbin/license_tag	(original)
+++ rt/branches/3.3-TESTING/sbin/license_tag	Tue Aug 31 22:37:44 2004
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 
 
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -45,9 +45,8 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
-my $LICENSE  = <<EOL;
+# }}} END BPS TAGGED BLOCK
+my $LICENSE  = <<'EOL';
 
 COPYRIGHT:
  
@@ -117,16 +116,16 @@
 
 
         print "$pm - ";
-        if ($file =~ /^%# BEGIN BPS TAGGED BLOCK/ms) {
+        if ($file =~ /^%# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^%# BEGIN BPS TAGGED BLOCK(.*?)%# END BPS TAGGED BLOCK/%# BEGIN BPS TAGGED BLOCK\n$pmlic%# END BPS TAGGED BLOCK/ms;
+             $file =~ s/^%# {{{ BEGIN BPS TAGGED BLOCK(.*?)%# }}} END BPS TAGGED BLOCK/%# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic%# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
-             $file ="%# BEGIN BPS TAGGED BLOCK\n$pmlic%# END BPS TAGGED BLOCK\n". $file;
+             $file ="%# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic%# }}} END BPS TAGGED BLOCK\n". $file;
         }
-        $file =~ s/%# END BPS TAGGED BLOCK(\n+)/%# END BPS TAGGED BLOCK\n/mg;
+        $file =~ s/%# }}} END BPS TAGGED BLOCK(\n+)/%# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
         
@@ -149,16 +148,16 @@
 
 
         print "$pm - ";
-        if ($file =~ /^# BEGIN BPS TAGGED BLOCK/ms) {
+        if ($file =~ /^# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^# BEGIN BPS TAGGED BLOCK(.*?)# END BPS TAGGED BLOCK/# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK/ms;
+             $file =~ s/^# {{{ BEGIN BPS TAGGED BLOCK(.*?)# }}} END BPS TAGGED BLOCK/# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
-             $file ="# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK\n". $file;
+             $file ="# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK\n". $file;
         }
-        $file =~ s/# END BPS TAGGED BLOCK(\n+)/# END BPS TAGGED BLOCK\n/mg;
+        $file =~ s/# }}} END BPS TAGGED BLOCK(\n+)/# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
         
@@ -182,16 +181,16 @@
 
 
         print "$pm - ";
-        if ($file =~ /^# BEGIN BPS TAGGED BLOCK/ms) {
+        if ($file =~ /^# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^# BEGIN BPS TAGGED BLOCK(.*?)# END BPS TAGGED BLOCK/# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK/ms;
+             $file =~ s/^# {{{ BEGIN BPS TAGGED BLOCK(.*?)# }}} END BPS TAGGED BLOCK/# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
-             $file ="# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK\n". $file;
+             $file ="# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK\n". $file;
         }
-        $file =~ s/# END BPS TAGGED BLOCK(\n+)/# END BPS TAGGED BLOCK\n/mg;
+        $file =~ s/# }}} END BPS TAGGED BLOCK(\n+)/# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
         
@@ -214,21 +213,21 @@
         $pmlic =~ s/^/# /msg;
 
         print "$pm - ";
-        if ($file =~ /^# BEGIN BPS TAGGED BLOCK/ms) {
+        if ($file =~ /^# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^# BEGIN BPS TAGGED BLOCK(.*?)# END BPS TAGGED BLOCK/# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK/ms;
+             $file =~ s/^# {{{ BEGIN BPS TAGGED BLOCK(.*?)# }}} END BPS TAGGED BLOCK/# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
                 if ($file =~ /^(#!.*?)\n/) {
 
-            my  $lic ="# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK\n";
+            my  $lic ="# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK\n";
                 $file =~ s/^(#!.*?)\n/$1\n$lic/; 
 
                 } 
         }
-        $file =~ s/# END BPS TAGGED BLOCK(\n+)/# END BPS TAGGED BLOCK\n\n/mg;
+        $file =~ s/# }}} END BPS TAGGED BLOCK(\n+)/# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
 

Modified: rt/branches/3.3-TESTING/sbin/regression_harness
==============================================================================
--- rt/branches/3.3-TESTING/sbin/regression_harness	(original)
+++ rt/branches/3.3-TESTING/sbin/regression_harness	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 open (FH,"make regression|");
 
 my $skip_frontmatter = 1;

Modified: rt/branches/3.3-TESTING/sbin/rt-setup-database.in
==============================================================================
--- rt/branches/3.3-TESTING/sbin/rt-setup-database.in	(original)
+++ rt/branches/3.3-TESTING/sbin/rt-setup-database.in	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!@PERL@ -w
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 use vars qw($PROMPT $VERSION $Handle $Nobody $SystemUser $item);
 use vars
@@ -109,15 +108,21 @@
         print "...skipped as ".$args{'dba'} ." is not " . $RT::DatabaseUser . " or we're working with Oracle.\n";
     }
 
-    # MySQL must have InnoDB support
     if ($RT::DatabaseType eq "mysql") {
+        # Check which version we're running
+        my ($version) = $dbh->selectrow_hashref("show variables like 'version'")->{Value} =~ /^(\d\.\d+)/;
+        print "*** Warning: RT is unsupported on MySQL versions before 4.0.x\n" if $version < 4;
+
+        # MySQL must have InnoDB support
         my $innodb = $dbh->selectrow_hashref("show variables like 'have_innodb'")->{Value};
         if ($innodb eq "NO") {
             die "RT requires that MySQL be compiled with InnoDB table support.\n".
               "See http://dev.mysql.com/doc/mysql/en/InnoDB.html\n";
         } elsif ($innodb eq "DISABLED") {
-            die "RT requires that MySQL be InnoDB table support be enabled.\n".
-              "Remove the 'skip-innodb' line from your my.cnf file, restart MySQL, and try again.\n"
+            die "RT requires that MySQL InnoDB table support be enabled.\n".
+              ($version < 4
+               ? "Add 'innodb_data_file_path=ibdata1:10M:autoextend' to the [mysqld] section of my.cnf\n"
+               : "Remove the 'skip-innodb' line from your my.cnf file, restart MySQL, and try again.\n");
         }
     }
     

Modified: rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
==============================================================================
--- rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in	(original)
+++ rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in	Tue Aug 31 22:37:44 2004
@@ -1,10 +1,10 @@
 #!@PERL@
-# BEGIN BPS TAGGED BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
 # This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
+#                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK
-
+# }}} END BPS TAGGED BLOCK
 #
 # This is just a basic script that checks to make sure that all
 # the modules needed by RT before you can install it.


More information about the Rt-commit mailing list