rt.patch 3.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899
  1. --- lib/RT/User_Overlay.pm.dist 2003-08-05 16:22:34.000000000 +0200
  2. +++ lib/RT/User_Overlay.pm 2003-08-05 16:29:17.000000000 +0200
  3. @@ -203,7 +203,6 @@
  4. @_ # get the real argumentlist
  5. );
  6. -
  7. $args{'EmailAddress'} = $self->CanonicalizeEmailAddress($args{'EmailAddress'});
  8. #Check the ACL
  9. @@ -274,7 +273,7 @@
  10. #If the create failed.
  11. unless ($id) {
  12. - $RT::Logger->error("Could not create a new user - " .join('-'. %args));
  13. + $RT::Logger->error("Could not create a new user - " .join('-', %args));
  14. return ( 0, $self->loc('Could not create user') );
  15. }
  16. --- html/Ticket/Elements/ShowMessageStanza.dist 2003-08-05 16:21:42.000000000 +0200
  17. +++ html/Ticket/Elements/ShowMessageStanza 2003-08-05 16:28:06.000000000 +0200
  18. @@ -22,22 +22,23 @@
  19. %#
  20. %# END LICENSE BLOCK
  21. <%perl>
  22. -foreach my $stanza (@$Message) {
  23. - if ( ref $stanza eq "ARRAY" ) {
  24. - $m->comp( 'ShowMessageStanza',
  25. - Depth => $Depth + 1,
  26. - Transaction => $Transaction,
  27. - Message => $stanza );
  28. + { my $msg = '';
  29. + foreach my $stanza (@$Message) {
  30. + if ( ref $stanza eq "ARRAY" ) {
  31. + $m->comp( 'ShowMessageStanza',
  32. + Depth => $Depth + 1,
  33. + Transaction => $Transaction,
  34. + Message => $stanza );
  35. + }
  36. + elsif ( ref $stanza eq "HASH" ) {
  37. + my $content = $stanza->{raw};
  38. + RT::Interface::Web::EscapeUTF8(\$content);
  39. + $m->comp('/Elements/Callback', content => \$content, %ARGS);
  40. + $msg .= "$content\n";
  41. + }
  42. }
  43. - elsif ( ref $stanza eq "HASH" ) {
  44. - my $content = $stanza->{raw};
  45. - RT::Interface::Web::EscapeUTF8(\$content);
  46. - $m->comp('/Elements/Callback', content => \$content, %ARGS);
  47. - $content =~ s/\n/<br>/gi;
  48. -
  49. </%perl>
  50. -<font color="<%$colors[$Depth]%>"><%$content |n%><br></font>
  51. -% }
  52. +<font color="<%$colors[$Depth]%>"><pre><%$msg |n%></pre><br></font>
  53. % }
  54. <%INIT>
  55. use URI::URL;
  56. --- html/Elements/Header.dist 2003-08-05 16:22:02.000000000 +0200
  57. +++ html/Elements/Header 2003-08-05 16:24:22.000000000 +0200
  58. @@ -40,9 +40,10 @@
  59. "
  60. % }
  61. >
  62. +% if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) {
  63. <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
  64. <tr>
  65. - <td colspan=2><a href="http://bestpractical.com"><img src="<%$RT::WebImagesURL%>/bplogo.gif" alt="" width="230" height="50"></a></td>
  66. + <td colspan=2><a href="<%$RT::LogoLink%>"><img src="<%$RT::LogoURL%>" alt="" width="230" height="50"></a></td>
  67. <td>&nbsp;</td>
  68. <td>&nbsp;</td>
  69. <td width="50%" align="right">
  70. @@ -62,6 +63,7 @@
  71. </td>
  72. </tr>
  73. </table>
  74. +% }
  75. <%INIT>
  76. $r->header_out('Pragma' => 'no-cache');
  77. --- html/Elements/Login.dist 2003-08-05 16:22:17.000000000 +0200
  78. +++ html/Elements/Login 2003-08-05 16:25:30.000000000 +0200
  79. @@ -87,12 +87,13 @@
  80. If you've forgotten your username or password, RT can <A
  81. href="/NoAuth/Reminder.html">send you a reminder</a>.
  82. -->
  83. +<!--
  84. <BR>
  85. <BR>
  86. <BR>
  87. <HR>
  88. <&|/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></&>
  89. -
  90. +-->
  91. <%ARGS>
  92. $user => ""
  93. $pass => undef