OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Nov-2003 17:23:14
Branch: HEAD Handle: 2003112516231100
Modified files:
openpkg-src/rt rt.patch
Log:
fix ShowMessageStanza patch and cleanup the whole stuff by
regenerating from scratch
Summary:
Revision Changes Path
1.18 +66 -60 openpkg-src/rt/rt.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rt.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 rt.patch
--- openpkg-src/rt/rt.patch 20 Nov 2003 11:16:38 -0000 1.17
+++ openpkg-src/rt/rt.patch 25 Nov 2003 16:23:11 -0000 1.18
@@ -1,17 +1,48 @@
---- lib/RT/User_Overlay.pm.dist Tue Sep 9 17:16:16 2003
-+++ lib/RT/User_Overlay.pm Tue Sep 9 17:18:24 2003
-@@ -279,7 +279,7 @@
- #If the create failed.
- unless ($id) {
- $RT::Handle->Rollback();
-- $RT::Logger->error("Could not create a new user - " .join('-'. %args));
-+ $RT::Logger->error("Could not create a new user - " .join('-', %args));
+Index: html/Elements/Header
+--- html/Elements/Header.orig 2003-11-18 01:31:11.000000000 +0100
++++ html/Elements/Header 2003-11-25 17:08:38.000000000 +0100
+@@ -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=""
width="230" height="50"></a></td>
+ <td> </td>
+ <td> </td>
+ <td width="50%" align="right">
+@@ -62,6 +63,7 @@
+ </td>
+ </tr>
+ </table>
++% }
+ <%INIT>
- return ( 0, $self->loc('Could not create user') );
- }
+ $r->header_out('Pragma' => 'no-cache');
+Index: html/Elements/Login
+--- html/Elements/Login.orig 2003-11-18 01:31:11.000000000 +0100
++++ html/Elements/Login 2003-11-25 17:08:38.000000000 +0100
+@@ -87,12 +87,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 © Copyright 1996-[_1] Jesse Vincent <[EMAIL
PROTECTED]>. 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
+Index: html/Ticket/Elements/ShowMessageStanza
--- html/Ticket/Elements/ShowMessageStanza.orig 2003-11-18 01:31:12.000000000
+0100
-+++ html/Ticket/Elements/ShowMessageStanza 2003-11-20 09:53:28.000000000 +0100
-@@ -23,19 +23,46 @@
++++ html/Ticket/Elements/ShowMessageStanza 2003-11-25 17:19:25.000000000 +0100
+@@ -23,23 +23,44 @@
%# END LICENSE BLOCK
<%perl>
if (ref($Message)) {
@@ -21,7 +52,7 @@
- Depth => $Depth + 1,
- Transaction => $Transaction,
- Message => $stanza );
-+ { my $msg='';
++ my $msg='';
+ my $wrapfunc = sub {
+ my $max = 0;
+ foreach ( split ( /\n/, $_[0] ) ) {
@@ -63,54 +94,17 @@
- $content =~ s/\n/<br>/gi;
-
+ $wrapfunc->($msg);
-+</%perl>
-+<font color="<%$colors[$Depth]%>"><pre><%$msg |n%></pre></font>
-+<%perl>
-+ }
</%perl>
- <font color="<%$colors[$Depth]%>"><%$content |n%><br></font>
- % }
---- html/Elements/Header.dist 2003-08-05 16:22:02.000000000 +0200
-+++ html/Elements/Header 2003-08-05 16:24:22.000000000 +0200
-@@ -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=""
width="230" height="50"></a></td>
- <td> </td>
- <td> </td>
- <td width="50%" align="right">
-@@ -62,6 +63,7 @@
- </td>
- </tr>
- </table>
-+% }
- <%INIT>
-
- $r->header_out('Pragma' => 'no-cache');
---- html/Elements/Login.dist 2003-08-05 16:22:17.000000000 +0200
-+++ html/Elements/Login 2003-08-05 16:25:30.000000000 +0200
-@@ -87,12 +87,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 © Copyright 1996-[_1] Jesse Vincent <[EMAIL
PROTECTED]>. 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/Attachment_Overlay.pm.dist 2003-09-08 20:18:38.000000000 +0200
-+++ lib/RT/Attachment_Overlay.pm 2003-09-09 17:28:52.000000000 +0200
+-<font color="<%$colors[$Depth]%>"><%$content |n%><br></font>
+-% }
+-% }
++<font color="<%$colors[$Depth]%>"><pre><%$msg |n%></pre></font>
+ % } else {
+ % my $content = $Message;
+ % RT::Interface::Web::EscapeUTF8(\$content);
+Index: lib/RT/Attachment_Overlay.pm
+--- lib/RT/Attachment_Overlay.pm.orig 2003-11-18 01:31:13.000000000 +0100
++++ lib/RT/Attachment_Overlay.pm 2003-11-25 17:08:38.000000000 +0100
@@ -318,10 +318,11 @@
# If we somehow fail to do the decode, at least push out the raw bits
eval {return( Encode::decode_utf8($content))} || return ($content);
@@ -127,3 +121,15 @@
}
return $content;
}
+Index: lib/RT/User_Overlay.pm
+--- lib/RT/User_Overlay.pm.orig 2003-11-18 01:31:14.000000000 +0100
++++ lib/RT/User_Overlay.pm 2003-11-25 17:08:38.000000000 +0100
+@@ -279,7 +279,7 @@
+ #If the create failed.
+ unless ($id) {
+ $RT::Handle->Rollback();
+- $RT::Logger->error("Could not create a new user - " .join('-'. %args));
++ $RT::Logger->error("Could not create a new user - " .join('-', %args));
+
+ return ( 0, $self->loc('Could not create user') );
+ }
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
