OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Sep-2006 20:23:29
Branch: HEAD Handle: 2006092919232900
Modified files:
openpkg-src/cvstrac cvstrac.patch
Log:
remove our undisclosure patches again as this attempt showed not
enough success
Summary:
Revision Changes Path
1.17 +0 -76 openpkg-src/cvstrac/cvstrac.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvstrac/cvstrac.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 cvstrac.patch
--- openpkg-src/cvstrac/cvstrac.patch 29 Sep 2006 18:17:11 -0000 1.16
+++ openpkg-src/cvstrac/cvstrac.patch 29 Sep 2006 18:23:29 -0000 1.17
@@ -338,30 +338,6 @@
az = db_query("SELECT '', '' UNION ALL "
"SELECT name, value FROM enums WHERE type='subsys'");
if( az[0] && az[1] && az[2] ){
-@@ -823,7 +825,11 @@
- @ </tr>
- @ <tr>
- @ <td align="right">Assigned To:</td>
-+ if( strchr(az[10], '@') && g.isAnon ){
-+ @ <td bgcolor="%h(BG3)" class="bkgnd3"><i>undisclosed</i> </td>
-+ } else {
- @ <td bgcolor="%h(BG3)" class="bkgnd3"><b>%h(az[6]) </b></td>
-+ }
- @ <td> </td>
- @ <td align="right">Derived From:</td>
- @ <td bgcolor="%h(BG3)" class="bkgnd3"><b>
-@@ -838,7 +844,11 @@
- @ </tr>
- @ <tr>
- @ <td align="right">Creator:</td>
-+ if( strchr(az[10], '@') && !g.okWrite ){
-+ @ <td bgcolor="%h(BG3)" class="bkgnd3"><i>undisclosed</i> </td>
-+ } else {
- @ <td bgcolor="%h(BG3)" class="bkgnd3"><b>%h(az[10]) </b></td>
-+ }
- if( g.okWrite && !g.isAnon ){
- @ <td> </td>
- @ <td align="right">Contact:</td>
@@ -1323,7 +1333,7 @@
@ <nobr>
@ Assigned To:
@@ -391,37 +367,6 @@
bprintf(zPage,sizeof(zPage),"%d",tn);
doPreview = P("pre")!=0;
doSubmit = P("submit")!=0;
-@@ -1475,6 +1487,10 @@
- strftime(zDate, sizeof(zDate), "%Y-%b-%d %H:%M:%S", pTm);
- if( isspace(zText[0]) && isspace(zText[1]) ) zSpacer = "\n\n";
- if( zOrig[0]==0 ) zHLine = "";
-+ if ( strchr(g.zUser,'@') )
-+ zNew = mprintf("%s_%s:_%s%s",
-+ zHLine, zDate, zSpacer, zText);
-+ else
- zNew = mprintf("%s_%s by %s:_%s%s",
- zHLine, zDate, g.zUser, zSpacer, zText);
- db_execute(
-@@ -1586,6 +1602,9 @@
- @ Change <i>%h(zField)</i> from "%h(zOld)" to "%h(zNew)"
- }
-
-+ if (strchr(zUser, '@') && g.isAnon)
-+ @ by <i>undisclosed</i> on %h(zDate)
-+ else
- @ by %h(zUser) on %h(zDate)
-
- if( isLast && ok_to_undo_change(date, zUser) ){
-@@ -1764,6 +1783,9 @@
- common_header("Ticket #%d History", tn);
- @ <h2>Ticket %d(tn) History: %h(az[0])</h2>
- @ <ol>
-+ if (strchr(az[2], '@') && g.isAnon)
-+ @ <li>Created %h(zDate) by <i>undisclosed</i></li>
-+ else
- @ <li>Created %h(zDate) by %h(az[2])</li>
-
- /* Grab various types of ticket activities from the db.
Index: timeline.c
--- timeline.c.orig 2006-05-26 16:20:28 +0200
+++ timeline.c 2006-09-28 17:43:45 +0200
@@ -435,24 +380,3 @@
/* patchsets are raw output based one what are supposed to be unchanging
file
** revisions.
*/
-Index: wiki.c
---- wiki.c.orig 2006-05-26 16:20:28 +0200
-+++ wiki.c 2006-09-28 17:43:45 +0200
-@@ -310,12 +310,17 @@
-
- char *format_user(const char* zUser){
- if( zUser!=0 ){
-+ if( strchr(zUser, '@') && !g.okWrite ){
-+ return mprintf("<i>undisclosed</i>");
-+ }
-+ else {
- if( g.okRdWiki && is_user_page(zUser) ){
- return mprintf("<a href=\"wiki?p=%t\">%h</a>", zUser, zUser);
- }else{
- return mprintf("%h",zUser);
- }
- }
-+ }
- return 0;
- }
-
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
