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:   27-Sep-2006 12:29:33
  Branch: HEAD                             Handle: 2006092711293300

  Modified files:
    openpkg-src/cvstrac     cvstrac.patch

  Log:
    allow ticket owners to append additional remarks even if they do not
    have write capabilities to tickets in general

  Summary:
    Revision    Changes     Path
    1.12        +32 -12     openpkg-src/cvstrac/cvstrac.patch
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/cvstrac/cvstrac.patch
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 cvstrac.patch
  --- openpkg-src/cvstrac/cvstrac.patch 27 Sep 2006 09:56:07 -0000      1.11
  +++ openpkg-src/cvstrac/cvstrac.patch 27 Sep 2006 10:29:33 -0000      1.12
  @@ -1,6 +1,6 @@
   Index: attach.c
   --- attach.c.orig    2006-05-26 16:20:28 +0200
  -+++ attach.c 2006-09-27 11:52:46 +0200
  ++++ attach.c 2006-09-27 12:10:04 +0200
   @@ -210,17 +210,20 @@
    }
    
  @@ -35,7 +35,7 @@
      if( !got ){
   Index: browse.c
   --- browse.c.orig    2006-05-26 16:20:28 +0200
  -+++ browse.c 2006-09-27 11:52:46 +0200
  ++++ browse.c 2006-09-27 12:10:04 +0200
   @@ -503,6 +503,13 @@
    ){
      int set = (zFld==zField[0]);
  @@ -180,7 +180,7 @@
      }
   Index: cgi.c
   --- cgi.c.orig       2006-05-26 16:20:28 +0200
  -+++ cgi.c    2006-09-27 11:52:46 +0200
  ++++ cgi.c    2006-09-27 12:10:04 +0200
   @@ -382,7 +382,7 @@
                continue;
              }
  @@ -192,7 +192,7 @@
        }
   Index: common.c
   --- common.c.orig    2006-05-26 16:20:28 +0200
  -+++ common.c 2006-09-27 11:52:46 +0200
  ++++ common.c 2006-09-27 12:10:04 +0200
   @@ -394,7 +394,10 @@
        }
        @ </small>
  @@ -207,7 +207,7 @@
      }
   Index: db.c
   --- db.c.orig        2006-05-26 16:20:28 +0200
  -+++ db.c     2006-09-27 11:54:15 +0200
  ++++ db.c     2006-09-27 12:10:04 +0200
   @@ -602,7 +602,7 @@
      }
      if( argc>1 && g.nAux<MX_AUX ){
  @@ -248,7 +248,7 @@
            db_err( strerror(errno), 0,
   Index: search.c
   --- search.c.orig    2006-05-26 16:20:28 +0200
  -+++ search.c 2006-09-27 11:54:45 +0200
  ++++ search.c 2006-09-27 12:10:04 +0200
   @@ -97,7 +97,7 @@
          score = 0;
          for(k=1; k<argc; k++){
  @@ -269,7 +269,7 @@
      /*
   Index: setup.c
   --- setup.c.orig     2006-05-26 16:20:28 +0200
  -+++ setup.c  2006-09-27 11:52:46 +0200
  ++++ setup.c  2006-09-27 12:10:04 +0200
   @@ -499,7 +499,7 @@
      @ <form action="%s(g.zPath)" method="POST">
      @ Select a user to whom new tickets will be assigned by default:</p><p>
  @@ -281,7 +281,7 @@
      @
   Index: throttle.c
   --- throttle.c.orig  2006-05-26 16:20:28 +0200
  -+++ throttle.c       2006-09-27 11:52:46 +0200
  ++++ throttle.c       2006-09-27 12:10:04 +0200
   @@ -165,7 +165,7 @@
        }
    
  @@ -293,7 +293,7 @@
        lockout();
   Index: ticket.c
   --- ticket.c.orig    2006-05-26 16:20:28 +0200
  -+++ ticket.c 2006-09-27 11:52:46 +0200
  ++++ ticket.c 2006-09-27 12:20:35 +0200
   @@ -388,7 +388,7 @@
        @ <tr>
        @   <td align="right"><nobr>
  @@ -345,7 +345,27 @@
      cgi_v_optionmenu(0, "a", aParm[4].zNew, azUsers);
      @ </nobr>
      @ &nbsp;&nbsp;&nbsp;
  -@@ -1475,6 +1485,10 @@
  +@@ -1442,16 +1452,18 @@
  +   int doSubmit;
  +   const char *zText;
  +   const char *zTn;
  ++  const char *zOwner;
  +   char *zErrMsg = 0;
  +   char *zTktTitle;
  + 
  +   login_check_credentials();
  +-  if( !g.okWrite ){ login_needed(); return; }
  +   throttle(1,1);
  +   tn = rn = 0;
  +   zTn = PD("tn","");
  +   sscanf(zTn, "%d,%d", &tn, &rn);
  +   if( tn<=0 ){ cgi_redirect("index"); return; }
  ++  zOwner = db_short_query("SELECT owner FROM ticket WHERE tn=%d", tn);
  ++  if( !g.okWrite && !(zOwner != NULL && strcmp(zOwner, g.zUser) == 0) ){ 
login_needed(); return; }
  +   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 = "";
  @@ -358,7 +378,7 @@
          db_execute(
   Index: timeline.c
   --- timeline.c.orig  2006-05-26 16:20:28 +0200
  -+++ timeline.c       2006-09-27 11:52:46 +0200
  ++++ timeline.c       2006-09-27 12:10:04 +0200
   @@ -1105,6 +1105,9 @@
      z = db_short_query("SELECT date FROM chng WHERE cn=%d",cn);
      if( z ) cgi_modified_since(atoi(z));
  @@ -371,7 +391,7 @@
      */
   Index: wiki.c
   --- wiki.c.orig      2006-05-26 16:20:28 +0200
  -+++ wiki.c   2006-09-27 11:52:46 +0200
  ++++ wiki.c   2006-09-27 12:10:04 +0200
   @@ -310,12 +310,17 @@
    
    char *format_user(const char* zUser){
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to