Differences From:

File src/setup.c part of check-in [5ab6f985b9] - Fix a typo in a hard-coded web page. Ticket fe5b460867a187cd32a12e04db62392871c4c38b by drh on 2009-03-21 16:21:43. [view]

To:

File src/setup.c part of check-in [355ee47555] - Add the new "reader" role, analogous to "developer". by drh on 2009-03-31 16:47:41. [view]

@@ -173,8 +173,11 @@
      @ <tr><td valign="top"><b>s</b></td>
      @   <td><i>Setup/Super-user:</i> Setup and configure this website</td></tr>
      @ <tr><td valign="top"><b>t</b></td>
      @   <td><i>Tkt-Report:</i> Create new bug summary reports</td></tr>
+     @ <tr><td valign="top"><b>u</b></td>
+     @   <td><i>Developer:</i> Inherit privileges of
+     @   user <tt>reader</tt></td></tr>
      @ <tr><td valign="top"><b>v</b></td>
      @   <td><i>Developer:</i> Inherit privileges of
      @   user <tt>developer</tt></td></tr>
      @ <tr><td valign="top"><b>w</b></td>
@@ -229,9 +232,9 @@
 void user_edit(void){
   const char *zId, *zLogin, *zInfo, *zCap, *zPw;
   char *oaa, *oas, *oar, *oaw, *oan, *oai, *oaj, *oao, *oap;
   char *oak, *oad, *oac, *oaf, *oam, *oah, *oag, *oae;
-  char *oat, *oav, *oaz;
+  char *oat, *oau, *oav, *oaz;
   const char *inherit[128];
   int doWrite;
   int uid;
   int higherUser = 0;  /* True if user being edited is SETUP and the */
@@ -283,8 +286,9 @@
     int am = P("am")!=0;
     int ah = P("ah")!=0;
     int ag = P("ag")!=0;
     int at = P("at")!=0;
+    int au = P("au")!=0;
     int av = P("av")!=0;
     int az = P("az")!=0;
     if( aa ){ zCap[i++] = 'a'; }
     if( ac ){ zCap[i++] = 'c'; }
@@ -302,8 +306,9 @@
     if( ap ){ zCap[i++] = 'p'; }
     if( ar ){ zCap[i++] = 'r'; }
     if( as ){ zCap[i++] = 's'; }
     if( at ){ zCap[i++] = 't'; }
+    if( au ){ zCap[i++] = 'u'; }
     if( av ){ zCap[i++] = 'v'; }
     if( aw ){ zCap[i++] = 'w'; }
     if( az ){ zCap[i++] = 'z'; }
 
@@ -340,9 +345,9 @@
   zInfo = "";
   zCap = "";
   zPw = "";
   oaa = oac = oad = oae = oaf = oag = oah = oai = oaj = oak = oam =
-        oan = oao = oap = oar = oas = oat = oav = oaw = oaz = "";
+        oan = oao = oap = oar = oas = oat = oau = oav = oaw = oaz = "";
   if( uid ){
     zLogin = db_text("", "SELECT login FROM user WHERE uid=%d", uid);
     zInfo = db_text("", "SELECT info FROM user WHERE uid=%d", uid);
     zCap = db_text("", "SELECT cap FROM user WHERE uid=%d", uid);
@@ -363,8 +368,9 @@
     if( strchr(zCap, 'p') ) oap = " checked";
     if( strchr(zCap, 'r') ) oar = " checked";
     if( strchr(zCap, 's') ) oas = " checked";
     if( strchr(zCap, 't') ) oat = " checked";
+    if( strchr(zCap, 'u') ) oau = " checked";
     if( strchr(zCap, 'v') ) oav = " checked";
     if( strchr(zCap, 'w') ) oaw = " checked";
     if( strchr(zCap, 'z') ) oaz = " checked";
   }
@@ -375,8 +381,16 @@
     char *z1, *z2;
     z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='developer'");
     while( z1 && *z1 ){
       inherit[0x7f & *(z1++)] = "<font color=\"red\">&bull;</font>";
+    }
+    free(z2);
+  }
+  if( strcmp(zLogin, "reader") ){
+    char *z1, *z2;
+    z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='reader'");
+    while( z1 && *z1 ){
+      inherit[0x7f & *(z1++)] = "<font color=\"black\">&bull;</font>";
     }
     free(z2);
   }
   if( strcmp(zLogin, "anonymous") ){
@@ -437,8 +451,9 @@
   @    <input type="checkbox" name="ap"%s(oap)>%s(B('p'))Password</input><br>
   @    <input type="checkbox" name="ai"%s(oai)>%s(B('i'))Check-In</input><br>
   @    <input type="checkbox" name="ao"%s(oao)>%s(B('o'))Check-Out</input><br>
   @    <input type="checkbox" name="ah"%s(oah)>%s(B('h'))History</input><br>
+  @    <input type="checkbox" name="au"%s(oau)>%s(B('u'))Reader</input><br>
   @    <input type="checkbox" name="av"%s(oav)>%s(B('v'))Developer</input><br>
   @    <input type="checkbox" name="ag"%s(oag)>%s(B('g'))Clone</input><br>
   @    <input type="checkbox" name="aj"%s(oaj)>%s(B('j'))Read Wiki</input><br>
   @    <input type="checkbox" name="af"%s(oaf)>%s(B('f'))New Wiki</input><br>
@@ -502,8 +517,14 @@
   @ <li><p>
   @ The "<font color="red"><big>&bull;</big></font>" mark indicates
   @ the privileges of "developer" that are inherited by all users with
   @ the <b>Developer</b> privilege.
+  @ </p></li>
+  @
+  @ <li><p>
+  @ The "<font color="black"><big>&bull;</big></font>" mark indicates
+  @ the privileges of "reader" that are inherited by all users with
+  @ the <b>Reader</b> privilege.
   @ </p></li>
   @
   @ <li><p>
   @ The <b>Delete</b> privilege give the user the ability to erase
@@ -591,9 +612,11 @@
   @ <li><p>
   @ The "<b>developer</b>" user is intended as a template for trusted users
   @ with check-in privileges.  When adding new trusted users, simply
   @ select the <b>Developer</b> privilege to cause the new user to inherit
-  @ all privileges of the "developer" user.
+  @ all privileges of the "developer" user.  Similarly, the "<b>reader</b>"
+  @ user is a template for users who are allowed more access than anonymous,
+  @ but less than a developer.
   @ </li></p>
   @ </ul>
   @ </form>
   style_footer();