openpkg-packages/rt/rt.patch

--- lib/RT/User_Overlay.pm.dist	Wed Apr  2 14:44:58 2003
+++ lib/RT/User_Overlay.pm	Wed Apr  2 14:45:17 2003
@@ -541,7 +541,7 @@
     # coming from a subdomain as coming from second level domain
     # foo.com
     if ($RT::CanonicalizeEmailAddressMatch && $RT::CanonicalizeEmailAddressReplace ) {
-        $email =~ s/\$RT::CanonicalizeEmailAddressMatch/$RT::CanonicalizeEmailAddressReplace/gi;
+        $email =~ s/$RT::CanonicalizeEmailAddressMatch/$RT::CanonicalizeEmailAddressReplace/gi;
     }
     return ($email);
 }
--- html/Ticket/Elements/ShowMessageStanza.dist	Wed Apr  2 15:28:24 2003
+++ html/Ticket/Elements/ShowMessageStanza	Wed Apr  2 17:23:30 2003
@@ -22,21 +22,22 @@
 %# 
 %# END LICENSE BLOCK
 <%perl>
-foreach my $stanza (@$Message) {
-    if ( ref $stanza eq "ARRAY" ) {
-        $m->comp( 'ShowMessageStanza',
-                  Depth   => $Depth + 1,
-                  Message => $stanza );
+  { my $msg = '';
+    foreach my $stanza (@$Message) {
+        if ( ref $stanza eq "ARRAY" ) {
+            $m->comp( 'ShowMessageStanza',
+                      Depth   => $Depth + 1,
+                      Message => $stanza );
+        }
+        elsif ( ref $stanza eq "HASH" ) {
+            my $content = $stanza->{raw};
+            RT::Interface::Web::EscapeUTF8(\$content);
+            $m->comp('/Elements/Callback', content => \$content, %ARGS);
+            $msg .= "$content\n";
+           }
     }
-    elsif ( ref $stanza eq "HASH" ) {
-        my $content = $stanza->{raw};
-        RT::Interface::Web::EscapeUTF8(\$content);
-        $m->comp('/Elements/Callback', content => \$content, %ARGS);
-                $content =~ s/\n/<br>/gi;
-
 </%perl>
-<font color="<%$colors[$Depth]%>"><%$content |n%><br></font>
-%       }
+<font color="<%$colors[$Depth]%>"><pre><%$msg |n%></pre><br></font>
 % }
 <%INIT>
 use URI::URL;
--- etc/RT_Config.pm.dist	Mon Apr  7 12:02:13 2003
+++ etc/RT_Config.pm	Mon Apr  7 12:03:09 2003
@@ -262,7 +262,8 @@
 
 # $RTLogoURL points to the URL of the RT logo displayed in the web UI
 
-Set($LogoURL , $WebImagesURL . "rt.jpg");
+Set($LogoURL , $WebImagesURL . "/bplogo.gif");
+Set($LogoLink , "http://bestpractical.com/");
 
 # if TrustHTMLAttachments is not defined, we will display them
 # as text. This prevents malicious HTML and javascript from being
--- html/Elements/Header.dist	Mon Apr  7 12:03:42 2003
+++ html/Elements/Header	Mon Apr  7 12:11:40 2003
@@ -40,9 +40,10 @@
 "
 % }
 >
+% if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) {
 <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
   <tr> 
-    <td colspan=2><a href="http://bestpractical.com"><img src="<%$RT::WebImagesURL%>/bplogo.gif" alt="" width="230" height="50"></a></td>
+    <td colspan=2><a href="<%$RT::LogoLink%>"><img src="<%$RT::LogoURL%>" alt=""></a></td>
     <td>&nbsp;</td>
     <td>&nbsp;</td>
     <td width="50%" align="right">
@@ -61,6 +62,7 @@
     </td>
   </tr>
 </table>
+% }
 <%INIT>
 
 $r->header_out('Pragma' => 'no-cache');
--- html/Elements/Login.dist	Mon Apr  7 12:01:40 2003
+++ html/Elements/Login	Mon Apr  7 12:10:10 2003
@@ -86,12 +86,13 @@
 If you've forgotten your username or password, RT can <A
 href="/NoAuth/Reminder.html">send you a reminder</a>.
 -->
+<!--
 <BR>
 <BR>
 <BR>
 <HR>
 <&|/l, '2003'&>RT is &copy; Copyright 1996-[_1] Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href="http://www.gnu.org/copyleft/gpl.html">Version 2 of the GNU General Public License.</a></&>
-
+-->
 <%ARGS>
 $user => ""
 $pass => undef
--- lib/RT/Ticket_Overlay.pm.dist	Mon Apr  7 12:15:43 2003
+++ lib/RT/Ticket_Overlay.pm	Mon Apr  7 11:54:51 2003
@@ -3024,10 +3024,14 @@
     # Delete the owner in the owner group, then add a new one
     # TODO: is this safe? it's not how we really want the API to work 
     # for most things, but it's fast.
-    my ($del_id, $del_msg) = $self->OwnerGroup->MembersObj->First->Delete();
-    unless ($del_id) {
+    #
+    # it is neither safe nor working -- mlelstv
+    # -> find old owner, add new owner, modify ticket, remove old owner
+
+    my ( $old_owner ) = $self->OwnerGroup->MembersObj->First;
+    unless ($old_owner) {
         $RT::Handle->Rollback();
-        return(0, $self->loc("Could not change owner. "). $del_msg);
+        return(0, $self->loc("Could not find owner. "));
     }
 
     my ( $add_id, $add_msg ) = $self->OwnerGroup->_AddMember(
@@ -3035,7 +3039,7 @@
                                        InsideTransaction => 1 );
     unless ($add_id) {
         $RT::Handle->Rollback();
-        return(0, $self->loc("Could not change owner. "). $add_msg);
+        return(0, $self->loc("Could not add owner. "). $add_msg);
     }
    
     # We call set twice with slightly different arguments, so 
@@ -3051,7 +3055,13 @@
 
     unless ($val) {
         $RT::Handle->Rollback;
-        return(0, $self->loc("Could not change owner. "). $msg);
+        return(0, $self->loc("Could not set owner. "). $msg);
+    }
+
+    my ($del_id, $del_msg) = $old_owner->Delete();
+    unless ($del_id) {
+        $RT::Handle->Rollback();
+        return(0, $self->loc("Could not remove owner. "). $del_msg);
     }
 
     $RT::Handle->Commit();