Fossil SCM
Merge enhancements from trunk.
Commit
94262a8c3236b2f81a79caf7812da8f7294424c57cf79972855508e64149b53e
Parent
c35fe945d2b3a2f…
5 files changed
+2
+2
+1
+12
-8
+12
-8
+2
| --- src/login.c | ||
| +++ src/login.c | ||
| @@ -1240,10 +1240,11 @@ | ||
| 1240 | 1240 | case '3': p->WrForum = 1; |
| 1241 | 1241 | case '2': p->RdForum = 1; break; |
| 1242 | 1242 | |
| 1243 | 1243 | case '7': p->EmailAlert = 1; break; |
| 1244 | 1244 | case 'A': p->Announce = 1; break; |
| 1245 | + case 'D': p->Debug = 1; break; | |
| 1245 | 1246 | |
| 1246 | 1247 | /* The "u" privileges is a little different. It recursively |
| 1247 | 1248 | ** inherits all privileges of the user named "reader" */ |
| 1248 | 1249 | case 'u': { |
| 1249 | 1250 | if( (flags & LOGIN_IGNORE_UV)==0 ){ |
| @@ -1320,10 +1321,11 @@ | ||
| 1320 | 1321 | case '4': rc = p->WrTForum; break; |
| 1321 | 1322 | case '5': rc = p->ModForum; break; |
| 1322 | 1323 | case '6': rc = p->AdminForum;break; |
| 1323 | 1324 | case '7': rc = p->EmailAlert;break; |
| 1324 | 1325 | case 'A': rc = p->Announce; break; |
| 1326 | + case 'D': rc = p->Debug; break; | |
| 1325 | 1327 | default: rc = 0; break; |
| 1326 | 1328 | } |
| 1327 | 1329 | } |
| 1328 | 1330 | return rc; |
| 1329 | 1331 | } |
| 1330 | 1332 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -1240,10 +1240,11 @@ | |
| 1240 | case '3': p->WrForum = 1; |
| 1241 | case '2': p->RdForum = 1; break; |
| 1242 | |
| 1243 | case '7': p->EmailAlert = 1; break; |
| 1244 | case 'A': p->Announce = 1; break; |
| 1245 | |
| 1246 | /* The "u" privileges is a little different. It recursively |
| 1247 | ** inherits all privileges of the user named "reader" */ |
| 1248 | case 'u': { |
| 1249 | if( (flags & LOGIN_IGNORE_UV)==0 ){ |
| @@ -1320,10 +1321,11 @@ | |
| 1320 | case '4': rc = p->WrTForum; break; |
| 1321 | case '5': rc = p->ModForum; break; |
| 1322 | case '6': rc = p->AdminForum;break; |
| 1323 | case '7': rc = p->EmailAlert;break; |
| 1324 | case 'A': rc = p->Announce; break; |
| 1325 | default: rc = 0; break; |
| 1326 | } |
| 1327 | } |
| 1328 | return rc; |
| 1329 | } |
| 1330 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -1240,10 +1240,11 @@ | |
| 1240 | case '3': p->WrForum = 1; |
| 1241 | case '2': p->RdForum = 1; break; |
| 1242 | |
| 1243 | case '7': p->EmailAlert = 1; break; |
| 1244 | case 'A': p->Announce = 1; break; |
| 1245 | case 'D': p->Debug = 1; break; |
| 1246 | |
| 1247 | /* The "u" privileges is a little different. It recursively |
| 1248 | ** inherits all privileges of the user named "reader" */ |
| 1249 | case 'u': { |
| 1250 | if( (flags & LOGIN_IGNORE_UV)==0 ){ |
| @@ -1320,10 +1321,11 @@ | |
| 1321 | case '4': rc = p->WrTForum; break; |
| 1322 | case '5': rc = p->ModForum; break; |
| 1323 | case '6': rc = p->AdminForum;break; |
| 1324 | case '7': rc = p->EmailAlert;break; |
| 1325 | case 'A': rc = p->Announce; break; |
| 1326 | case 'D': rc = p->Debug; break; |
| 1327 | default: rc = 0; break; |
| 1328 | } |
| 1329 | } |
| 1330 | return rc; |
| 1331 | } |
| 1332 |
+2
| --- src/login.c | ||
| +++ src/login.c | ||
| @@ -1240,10 +1240,11 @@ | ||
| 1240 | 1240 | case '3': p->WrForum = 1; |
| 1241 | 1241 | case '2': p->RdForum = 1; break; |
| 1242 | 1242 | |
| 1243 | 1243 | case '7': p->EmailAlert = 1; break; |
| 1244 | 1244 | case 'A': p->Announce = 1; break; |
| 1245 | + case 'D': p->Debug = 1; break; | |
| 1245 | 1246 | |
| 1246 | 1247 | /* The "u" privileges is a little different. It recursively |
| 1247 | 1248 | ** inherits all privileges of the user named "reader" */ |
| 1248 | 1249 | case 'u': { |
| 1249 | 1250 | if( (flags & LOGIN_IGNORE_UV)==0 ){ |
| @@ -1320,10 +1321,11 @@ | ||
| 1320 | 1321 | case '4': rc = p->WrTForum; break; |
| 1321 | 1322 | case '5': rc = p->ModForum; break; |
| 1322 | 1323 | case '6': rc = p->AdminForum;break; |
| 1323 | 1324 | case '7': rc = p->EmailAlert;break; |
| 1324 | 1325 | case 'A': rc = p->Announce; break; |
| 1326 | + case 'D': rc = p->Debug; break; | |
| 1325 | 1327 | default: rc = 0; break; |
| 1326 | 1328 | } |
| 1327 | 1329 | } |
| 1328 | 1330 | return rc; |
| 1329 | 1331 | } |
| 1330 | 1332 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -1240,10 +1240,11 @@ | |
| 1240 | case '3': p->WrForum = 1; |
| 1241 | case '2': p->RdForum = 1; break; |
| 1242 | |
| 1243 | case '7': p->EmailAlert = 1; break; |
| 1244 | case 'A': p->Announce = 1; break; |
| 1245 | |
| 1246 | /* The "u" privileges is a little different. It recursively |
| 1247 | ** inherits all privileges of the user named "reader" */ |
| 1248 | case 'u': { |
| 1249 | if( (flags & LOGIN_IGNORE_UV)==0 ){ |
| @@ -1320,10 +1321,11 @@ | |
| 1320 | case '4': rc = p->WrTForum; break; |
| 1321 | case '5': rc = p->ModForum; break; |
| 1322 | case '6': rc = p->AdminForum;break; |
| 1323 | case '7': rc = p->EmailAlert;break; |
| 1324 | case 'A': rc = p->Announce; break; |
| 1325 | default: rc = 0; break; |
| 1326 | } |
| 1327 | } |
| 1328 | return rc; |
| 1329 | } |
| 1330 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -1240,10 +1240,11 @@ | |
| 1240 | case '3': p->WrForum = 1; |
| 1241 | case '2': p->RdForum = 1; break; |
| 1242 | |
| 1243 | case '7': p->EmailAlert = 1; break; |
| 1244 | case 'A': p->Announce = 1; break; |
| 1245 | case 'D': p->Debug = 1; break; |
| 1246 | |
| 1247 | /* The "u" privileges is a little different. It recursively |
| 1248 | ** inherits all privileges of the user named "reader" */ |
| 1249 | case 'u': { |
| 1250 | if( (flags & LOGIN_IGNORE_UV)==0 ){ |
| @@ -1320,10 +1321,11 @@ | |
| 1321 | case '4': rc = p->WrTForum; break; |
| 1322 | case '5': rc = p->ModForum; break; |
| 1323 | case '6': rc = p->AdminForum;break; |
| 1324 | case '7': rc = p->EmailAlert;break; |
| 1325 | case 'A': rc = p->Announce; break; |
| 1326 | case 'D': rc = p->Debug; break; |
| 1327 | default: rc = 0; break; |
| 1328 | } |
| 1329 | } |
| 1330 | return rc; |
| 1331 | } |
| 1332 |
+1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -93,10 +93,11 @@ | ||
| 93 | 93 | char WrTForum; /* 4: Post to forums not subject to moderation */ |
| 94 | 94 | char ModForum; /* 5: Moderate (approve or reject) forum posts */ |
| 95 | 95 | char AdminForum; /* 6: Edit forum posts by other users */ |
| 96 | 96 | char EmailAlert; /* 7: Sign up for email notifications */ |
| 97 | 97 | char Announce; /* A: Send announcements */ |
| 98 | + char Debug; /* D: show extra Fossil debugging features */ | |
| 98 | 99 | }; |
| 99 | 100 | |
| 100 | 101 | #ifdef FOSSIL_ENABLE_TCL |
| 101 | 102 | /* |
| 102 | 103 | ** All Tcl related context information is in this structure. This structure |
| 103 | 104 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -93,10 +93,11 @@ | |
| 93 | char WrTForum; /* 4: Post to forums not subject to moderation */ |
| 94 | char ModForum; /* 5: Moderate (approve or reject) forum posts */ |
| 95 | char AdminForum; /* 6: Edit forum posts by other users */ |
| 96 | char EmailAlert; /* 7: Sign up for email notifications */ |
| 97 | char Announce; /* A: Send announcements */ |
| 98 | }; |
| 99 | |
| 100 | #ifdef FOSSIL_ENABLE_TCL |
| 101 | /* |
| 102 | ** All Tcl related context information is in this structure. This structure |
| 103 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -93,10 +93,11 @@ | |
| 93 | char WrTForum; /* 4: Post to forums not subject to moderation */ |
| 94 | char ModForum; /* 5: Moderate (approve or reject) forum posts */ |
| 95 | char AdminForum; /* 6: Edit forum posts by other users */ |
| 96 | char EmailAlert; /* 7: Sign up for email notifications */ |
| 97 | char Announce; /* A: Send announcements */ |
| 98 | char Debug; /* D: show extra Fossil debugging features */ |
| 99 | }; |
| 100 | |
| 101 | #ifdef FOSSIL_ENABLE_TCL |
| 102 | /* |
| 103 | ** All Tcl related context information is in this structure. This structure |
| 104 |
+12
-8
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -372,10 +372,12 @@ | ||
| 372 | 372 | @ Forum administrator |
| 373 | 373 | @ <tr><th valign="top">7</th> |
| 374 | 374 | @ <td><i>Email-Alerts:</i> Sign up for email nofications</td></tr> |
| 375 | 375 | @ <tr><th valign="top">A</th> |
| 376 | 376 | @ <td><i>Announce:</i> Send announcements</td></tr> |
| 377 | + @ <tr><th valign="top">D</th> | |
| 378 | + @ <td><i>Debug:</i> Enable debugging features</td></tr> | |
| 377 | 379 | @ </table> |
| 378 | 380 | } |
| 379 | 381 | |
| 380 | 382 | /* |
| 381 | 383 | ** WEBPAGE: setup_ulist_notes |
| @@ -724,15 +726,15 @@ | ||
| 724 | 726 | @ <label><input type="checkbox" name="ao"%s(oa['o']) /> |
| 725 | 727 | @ Check-Out%s(B('o'))</label><br /> |
| 726 | 728 | @ <label><input type="checkbox" name="ah"%s(oa['h']) /> |
| 727 | 729 | @ Hyperlinks%s(B('h'))</label><br /> |
| 728 | 730 | @ <label><input type="checkbox" name="ab"%s(oa['b']) /> |
| 729 | - @ Attachments%s(B('b'))</label> | |
| 730 | - | |
| 731 | - @ </td><td><td width="40"></td><td valign="top"> | |
| 731 | + @ Attachments%s(B('b'))</label><br> | |
| 732 | 732 | @ <label><input type="checkbox" name="ag"%s(oa['g']) /> |
| 733 | 733 | @ Clone%s(B('g'))</label><br /> |
| 734 | + | |
| 735 | + @ </td><td><td width="40"></td><td valign="top"> | |
| 734 | 736 | @ <label><input type="checkbox" name="aj"%s(oa['j']) /> |
| 735 | 737 | @ Read Wiki%s(B('j'))</label><br> |
| 736 | 738 | @ <label><input type="checkbox" name="af"%s(oa['f']) /> |
| 737 | 739 | @ New Wiki%s(B('f'))</label><br /> |
| 738 | 740 | @ <label><input type="checkbox" name="am"%s(oa['m']) /> |
| @@ -748,17 +750,17 @@ | ||
| 748 | 750 | @ <label><input type="checkbox" name="ac"%s(oa['c']) /> |
| 749 | 751 | @ Append To Ticket%s(B('c'))</label><br> |
| 750 | 752 | @ <label><input type="checkbox" name="aw"%s(oa['w']) /> |
| 751 | 753 | @ Write Tickets%s(B('w'))</label><br /> |
| 752 | 754 | @ <label><input type="checkbox" name="aq"%s(oa['q']) /> |
| 753 | - @ Moderate Tickets%s(B('q'))</label> | |
| 754 | - | |
| 755 | - @ </td><td><td width="40"></td><td valign="top"> | |
| 755 | + @ Moderate Tickets%s(B('q'))</label><br> | |
| 756 | 756 | @ <label><input type="checkbox" name="at"%s(oa['t']) /> |
| 757 | 757 | @ Ticket Report%s(B('t'))</label><br /> |
| 758 | 758 | @ <label><input type="checkbox" name="ax"%s(oa['x']) /> |
| 759 | - @ Private%s(B('x'))</label><br /> | |
| 759 | + @ Private%s(B('x'))</label> | |
| 760 | + | |
| 761 | + @ </td><td><td width="40"></td><td valign="top"> | |
| 760 | 762 | @ <label><input type="checkbox" name="ay"%s(oa['y']) /> |
| 761 | 763 | @ Write Unversioned%s(B('y'))</label><br /> |
| 762 | 764 | @ <label><input type="checkbox" name="az"%s(oa['z']) /> |
| 763 | 765 | @ Download Zip%s(B('z'))</label><br /> |
| 764 | 766 | @ <label><input type="checkbox" name="a2"%s(oa['2']) /> |
| @@ -772,11 +774,13 @@ | ||
| 772 | 774 | @ <label><input type="checkbox" name="a6"%s(oa['6']) /> |
| 773 | 775 | @ Supervise Forum%s(B('6'))</label><br> |
| 774 | 776 | @ <label><input type="checkbox" name="a7"%s(oa['7']) /> |
| 775 | 777 | @ Email Alerts%s(B('7'))</label><br> |
| 776 | 778 | @ <label><input type="checkbox" name="aA"%s(oa['A']) /> |
| 777 | - @ Send Announcements%s(B('A'))</label> | |
| 779 | + @ Send Announcements%s(B('A'))</label><br> | |
| 780 | + @ <label><input type="checkbox" name="aD"%s(oa['D']) /> | |
| 781 | + @ Enable Debug%s(B('D'))</label> | |
| 778 | 782 | @ </td></tr> |
| 779 | 783 | @ </table> |
| 780 | 784 | @ </td> |
| 781 | 785 | @ </tr> |
| 782 | 786 | @ <tr> |
| 783 | 787 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -372,10 +372,12 @@ | |
| 372 | @ Forum administrator |
| 373 | @ <tr><th valign="top">7</th> |
| 374 | @ <td><i>Email-Alerts:</i> Sign up for email nofications</td></tr> |
| 375 | @ <tr><th valign="top">A</th> |
| 376 | @ <td><i>Announce:</i> Send announcements</td></tr> |
| 377 | @ </table> |
| 378 | } |
| 379 | |
| 380 | /* |
| 381 | ** WEBPAGE: setup_ulist_notes |
| @@ -724,15 +726,15 @@ | |
| 724 | @ <label><input type="checkbox" name="ao"%s(oa['o']) /> |
| 725 | @ Check-Out%s(B('o'))</label><br /> |
| 726 | @ <label><input type="checkbox" name="ah"%s(oa['h']) /> |
| 727 | @ Hyperlinks%s(B('h'))</label><br /> |
| 728 | @ <label><input type="checkbox" name="ab"%s(oa['b']) /> |
| 729 | @ Attachments%s(B('b'))</label> |
| 730 | |
| 731 | @ </td><td><td width="40"></td><td valign="top"> |
| 732 | @ <label><input type="checkbox" name="ag"%s(oa['g']) /> |
| 733 | @ Clone%s(B('g'))</label><br /> |
| 734 | @ <label><input type="checkbox" name="aj"%s(oa['j']) /> |
| 735 | @ Read Wiki%s(B('j'))</label><br> |
| 736 | @ <label><input type="checkbox" name="af"%s(oa['f']) /> |
| 737 | @ New Wiki%s(B('f'))</label><br /> |
| 738 | @ <label><input type="checkbox" name="am"%s(oa['m']) /> |
| @@ -748,17 +750,17 @@ | |
| 748 | @ <label><input type="checkbox" name="ac"%s(oa['c']) /> |
| 749 | @ Append To Ticket%s(B('c'))</label><br> |
| 750 | @ <label><input type="checkbox" name="aw"%s(oa['w']) /> |
| 751 | @ Write Tickets%s(B('w'))</label><br /> |
| 752 | @ <label><input type="checkbox" name="aq"%s(oa['q']) /> |
| 753 | @ Moderate Tickets%s(B('q'))</label> |
| 754 | |
| 755 | @ </td><td><td width="40"></td><td valign="top"> |
| 756 | @ <label><input type="checkbox" name="at"%s(oa['t']) /> |
| 757 | @ Ticket Report%s(B('t'))</label><br /> |
| 758 | @ <label><input type="checkbox" name="ax"%s(oa['x']) /> |
| 759 | @ Private%s(B('x'))</label><br /> |
| 760 | @ <label><input type="checkbox" name="ay"%s(oa['y']) /> |
| 761 | @ Write Unversioned%s(B('y'))</label><br /> |
| 762 | @ <label><input type="checkbox" name="az"%s(oa['z']) /> |
| 763 | @ Download Zip%s(B('z'))</label><br /> |
| 764 | @ <label><input type="checkbox" name="a2"%s(oa['2']) /> |
| @@ -772,11 +774,13 @@ | |
| 772 | @ <label><input type="checkbox" name="a6"%s(oa['6']) /> |
| 773 | @ Supervise Forum%s(B('6'))</label><br> |
| 774 | @ <label><input type="checkbox" name="a7"%s(oa['7']) /> |
| 775 | @ Email Alerts%s(B('7'))</label><br> |
| 776 | @ <label><input type="checkbox" name="aA"%s(oa['A']) /> |
| 777 | @ Send Announcements%s(B('A'))</label> |
| 778 | @ </td></tr> |
| 779 | @ </table> |
| 780 | @ </td> |
| 781 | @ </tr> |
| 782 | @ <tr> |
| 783 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -372,10 +372,12 @@ | |
| 372 | @ Forum administrator |
| 373 | @ <tr><th valign="top">7</th> |
| 374 | @ <td><i>Email-Alerts:</i> Sign up for email nofications</td></tr> |
| 375 | @ <tr><th valign="top">A</th> |
| 376 | @ <td><i>Announce:</i> Send announcements</td></tr> |
| 377 | @ <tr><th valign="top">D</th> |
| 378 | @ <td><i>Debug:</i> Enable debugging features</td></tr> |
| 379 | @ </table> |
| 380 | } |
| 381 | |
| 382 | /* |
| 383 | ** WEBPAGE: setup_ulist_notes |
| @@ -724,15 +726,15 @@ | |
| 726 | @ <label><input type="checkbox" name="ao"%s(oa['o']) /> |
| 727 | @ Check-Out%s(B('o'))</label><br /> |
| 728 | @ <label><input type="checkbox" name="ah"%s(oa['h']) /> |
| 729 | @ Hyperlinks%s(B('h'))</label><br /> |
| 730 | @ <label><input type="checkbox" name="ab"%s(oa['b']) /> |
| 731 | @ Attachments%s(B('b'))</label><br> |
| 732 | @ <label><input type="checkbox" name="ag"%s(oa['g']) /> |
| 733 | @ Clone%s(B('g'))</label><br /> |
| 734 | |
| 735 | @ </td><td><td width="40"></td><td valign="top"> |
| 736 | @ <label><input type="checkbox" name="aj"%s(oa['j']) /> |
| 737 | @ Read Wiki%s(B('j'))</label><br> |
| 738 | @ <label><input type="checkbox" name="af"%s(oa['f']) /> |
| 739 | @ New Wiki%s(B('f'))</label><br /> |
| 740 | @ <label><input type="checkbox" name="am"%s(oa['m']) /> |
| @@ -748,17 +750,17 @@ | |
| 750 | @ <label><input type="checkbox" name="ac"%s(oa['c']) /> |
| 751 | @ Append To Ticket%s(B('c'))</label><br> |
| 752 | @ <label><input type="checkbox" name="aw"%s(oa['w']) /> |
| 753 | @ Write Tickets%s(B('w'))</label><br /> |
| 754 | @ <label><input type="checkbox" name="aq"%s(oa['q']) /> |
| 755 | @ Moderate Tickets%s(B('q'))</label><br> |
| 756 | @ <label><input type="checkbox" name="at"%s(oa['t']) /> |
| 757 | @ Ticket Report%s(B('t'))</label><br /> |
| 758 | @ <label><input type="checkbox" name="ax"%s(oa['x']) /> |
| 759 | @ Private%s(B('x'))</label> |
| 760 | |
| 761 | @ </td><td><td width="40"></td><td valign="top"> |
| 762 | @ <label><input type="checkbox" name="ay"%s(oa['y']) /> |
| 763 | @ Write Unversioned%s(B('y'))</label><br /> |
| 764 | @ <label><input type="checkbox" name="az"%s(oa['z']) /> |
| 765 | @ Download Zip%s(B('z'))</label><br /> |
| 766 | @ <label><input type="checkbox" name="a2"%s(oa['2']) /> |
| @@ -772,11 +774,13 @@ | |
| 774 | @ <label><input type="checkbox" name="a6"%s(oa['6']) /> |
| 775 | @ Supervise Forum%s(B('6'))</label><br> |
| 776 | @ <label><input type="checkbox" name="a7"%s(oa['7']) /> |
| 777 | @ Email Alerts%s(B('7'))</label><br> |
| 778 | @ <label><input type="checkbox" name="aA"%s(oa['A']) /> |
| 779 | @ Send Announcements%s(B('A'))</label><br> |
| 780 | @ <label><input type="checkbox" name="aD"%s(oa['D']) /> |
| 781 | @ Enable Debug%s(B('D'))</label> |
| 782 | @ </td></tr> |
| 783 | @ </table> |
| 784 | @ </td> |
| 785 | @ </tr> |
| 786 | @ <tr> |
| 787 |
+12
-8
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -372,10 +372,12 @@ | ||
| 372 | 372 | @ Forum administrator |
| 373 | 373 | @ <tr><th valign="top">7</th> |
| 374 | 374 | @ <td><i>Email-Alerts:</i> Sign up for email nofications</td></tr> |
| 375 | 375 | @ <tr><th valign="top">A</th> |
| 376 | 376 | @ <td><i>Announce:</i> Send announcements</td></tr> |
| 377 | + @ <tr><th valign="top">D</th> | |
| 378 | + @ <td><i>Debug:</i> Enable debugging features</td></tr> | |
| 377 | 379 | @ </table> |
| 378 | 380 | } |
| 379 | 381 | |
| 380 | 382 | /* |
| 381 | 383 | ** WEBPAGE: setup_ulist_notes |
| @@ -724,15 +726,15 @@ | ||
| 724 | 726 | @ <label><input type="checkbox" name="ao"%s(oa['o']) /> |
| 725 | 727 | @ Check-Out%s(B('o'))</label><br /> |
| 726 | 728 | @ <label><input type="checkbox" name="ah"%s(oa['h']) /> |
| 727 | 729 | @ Hyperlinks%s(B('h'))</label><br /> |
| 728 | 730 | @ <label><input type="checkbox" name="ab"%s(oa['b']) /> |
| 729 | - @ Attachments%s(B('b'))</label> | |
| 730 | - | |
| 731 | - @ </td><td><td width="40"></td><td valign="top"> | |
| 731 | + @ Attachments%s(B('b'))</label><br> | |
| 732 | 732 | @ <label><input type="checkbox" name="ag"%s(oa['g']) /> |
| 733 | 733 | @ Clone%s(B('g'))</label><br /> |
| 734 | + | |
| 735 | + @ </td><td><td width="40"></td><td valign="top"> | |
| 734 | 736 | @ <label><input type="checkbox" name="aj"%s(oa['j']) /> |
| 735 | 737 | @ Read Wiki%s(B('j'))</label><br> |
| 736 | 738 | @ <label><input type="checkbox" name="af"%s(oa['f']) /> |
| 737 | 739 | @ New Wiki%s(B('f'))</label><br /> |
| 738 | 740 | @ <label><input type="checkbox" name="am"%s(oa['m']) /> |
| @@ -748,17 +750,17 @@ | ||
| 748 | 750 | @ <label><input type="checkbox" name="ac"%s(oa['c']) /> |
| 749 | 751 | @ Append To Ticket%s(B('c'))</label><br> |
| 750 | 752 | @ <label><input type="checkbox" name="aw"%s(oa['w']) /> |
| 751 | 753 | @ Write Tickets%s(B('w'))</label><br /> |
| 752 | 754 | @ <label><input type="checkbox" name="aq"%s(oa['q']) /> |
| 753 | - @ Moderate Tickets%s(B('q'))</label> | |
| 754 | - | |
| 755 | - @ </td><td><td width="40"></td><td valign="top"> | |
| 755 | + @ Moderate Tickets%s(B('q'))</label><br> | |
| 756 | 756 | @ <label><input type="checkbox" name="at"%s(oa['t']) /> |
| 757 | 757 | @ Ticket Report%s(B('t'))</label><br /> |
| 758 | 758 | @ <label><input type="checkbox" name="ax"%s(oa['x']) /> |
| 759 | - @ Private%s(B('x'))</label><br /> | |
| 759 | + @ Private%s(B('x'))</label> | |
| 760 | + | |
| 761 | + @ </td><td><td width="40"></td><td valign="top"> | |
| 760 | 762 | @ <label><input type="checkbox" name="ay"%s(oa['y']) /> |
| 761 | 763 | @ Write Unversioned%s(B('y'))</label><br /> |
| 762 | 764 | @ <label><input type="checkbox" name="az"%s(oa['z']) /> |
| 763 | 765 | @ Download Zip%s(B('z'))</label><br /> |
| 764 | 766 | @ <label><input type="checkbox" name="a2"%s(oa['2']) /> |
| @@ -772,11 +774,13 @@ | ||
| 772 | 774 | @ <label><input type="checkbox" name="a6"%s(oa['6']) /> |
| 773 | 775 | @ Supervise Forum%s(B('6'))</label><br> |
| 774 | 776 | @ <label><input type="checkbox" name="a7"%s(oa['7']) /> |
| 775 | 777 | @ Email Alerts%s(B('7'))</label><br> |
| 776 | 778 | @ <label><input type="checkbox" name="aA"%s(oa['A']) /> |
| 777 | - @ Send Announcements%s(B('A'))</label> | |
| 779 | + @ Send Announcements%s(B('A'))</label><br> | |
| 780 | + @ <label><input type="checkbox" name="aD"%s(oa['D']) /> | |
| 781 | + @ Enable Debug%s(B('D'))</label> | |
| 778 | 782 | @ </td></tr> |
| 779 | 783 | @ </table> |
| 780 | 784 | @ </td> |
| 781 | 785 | @ </tr> |
| 782 | 786 | @ <tr> |
| 783 | 787 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -372,10 +372,12 @@ | |
| 372 | @ Forum administrator |
| 373 | @ <tr><th valign="top">7</th> |
| 374 | @ <td><i>Email-Alerts:</i> Sign up for email nofications</td></tr> |
| 375 | @ <tr><th valign="top">A</th> |
| 376 | @ <td><i>Announce:</i> Send announcements</td></tr> |
| 377 | @ </table> |
| 378 | } |
| 379 | |
| 380 | /* |
| 381 | ** WEBPAGE: setup_ulist_notes |
| @@ -724,15 +726,15 @@ | |
| 724 | @ <label><input type="checkbox" name="ao"%s(oa['o']) /> |
| 725 | @ Check-Out%s(B('o'))</label><br /> |
| 726 | @ <label><input type="checkbox" name="ah"%s(oa['h']) /> |
| 727 | @ Hyperlinks%s(B('h'))</label><br /> |
| 728 | @ <label><input type="checkbox" name="ab"%s(oa['b']) /> |
| 729 | @ Attachments%s(B('b'))</label> |
| 730 | |
| 731 | @ </td><td><td width="40"></td><td valign="top"> |
| 732 | @ <label><input type="checkbox" name="ag"%s(oa['g']) /> |
| 733 | @ Clone%s(B('g'))</label><br /> |
| 734 | @ <label><input type="checkbox" name="aj"%s(oa['j']) /> |
| 735 | @ Read Wiki%s(B('j'))</label><br> |
| 736 | @ <label><input type="checkbox" name="af"%s(oa['f']) /> |
| 737 | @ New Wiki%s(B('f'))</label><br /> |
| 738 | @ <label><input type="checkbox" name="am"%s(oa['m']) /> |
| @@ -748,17 +750,17 @@ | |
| 748 | @ <label><input type="checkbox" name="ac"%s(oa['c']) /> |
| 749 | @ Append To Ticket%s(B('c'))</label><br> |
| 750 | @ <label><input type="checkbox" name="aw"%s(oa['w']) /> |
| 751 | @ Write Tickets%s(B('w'))</label><br /> |
| 752 | @ <label><input type="checkbox" name="aq"%s(oa['q']) /> |
| 753 | @ Moderate Tickets%s(B('q'))</label> |
| 754 | |
| 755 | @ </td><td><td width="40"></td><td valign="top"> |
| 756 | @ <label><input type="checkbox" name="at"%s(oa['t']) /> |
| 757 | @ Ticket Report%s(B('t'))</label><br /> |
| 758 | @ <label><input type="checkbox" name="ax"%s(oa['x']) /> |
| 759 | @ Private%s(B('x'))</label><br /> |
| 760 | @ <label><input type="checkbox" name="ay"%s(oa['y']) /> |
| 761 | @ Write Unversioned%s(B('y'))</label><br /> |
| 762 | @ <label><input type="checkbox" name="az"%s(oa['z']) /> |
| 763 | @ Download Zip%s(B('z'))</label><br /> |
| 764 | @ <label><input type="checkbox" name="a2"%s(oa['2']) /> |
| @@ -772,11 +774,13 @@ | |
| 772 | @ <label><input type="checkbox" name="a6"%s(oa['6']) /> |
| 773 | @ Supervise Forum%s(B('6'))</label><br> |
| 774 | @ <label><input type="checkbox" name="a7"%s(oa['7']) /> |
| 775 | @ Email Alerts%s(B('7'))</label><br> |
| 776 | @ <label><input type="checkbox" name="aA"%s(oa['A']) /> |
| 777 | @ Send Announcements%s(B('A'))</label> |
| 778 | @ </td></tr> |
| 779 | @ </table> |
| 780 | @ </td> |
| 781 | @ </tr> |
| 782 | @ <tr> |
| 783 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -372,10 +372,12 @@ | |
| 372 | @ Forum administrator |
| 373 | @ <tr><th valign="top">7</th> |
| 374 | @ <td><i>Email-Alerts:</i> Sign up for email nofications</td></tr> |
| 375 | @ <tr><th valign="top">A</th> |
| 376 | @ <td><i>Announce:</i> Send announcements</td></tr> |
| 377 | @ <tr><th valign="top">D</th> |
| 378 | @ <td><i>Debug:</i> Enable debugging features</td></tr> |
| 379 | @ </table> |
| 380 | } |
| 381 | |
| 382 | /* |
| 383 | ** WEBPAGE: setup_ulist_notes |
| @@ -724,15 +726,15 @@ | |
| 726 | @ <label><input type="checkbox" name="ao"%s(oa['o']) /> |
| 727 | @ Check-Out%s(B('o'))</label><br /> |
| 728 | @ <label><input type="checkbox" name="ah"%s(oa['h']) /> |
| 729 | @ Hyperlinks%s(B('h'))</label><br /> |
| 730 | @ <label><input type="checkbox" name="ab"%s(oa['b']) /> |
| 731 | @ Attachments%s(B('b'))</label><br> |
| 732 | @ <label><input type="checkbox" name="ag"%s(oa['g']) /> |
| 733 | @ Clone%s(B('g'))</label><br /> |
| 734 | |
| 735 | @ </td><td><td width="40"></td><td valign="top"> |
| 736 | @ <label><input type="checkbox" name="aj"%s(oa['j']) /> |
| 737 | @ Read Wiki%s(B('j'))</label><br> |
| 738 | @ <label><input type="checkbox" name="af"%s(oa['f']) /> |
| 739 | @ New Wiki%s(B('f'))</label><br /> |
| 740 | @ <label><input type="checkbox" name="am"%s(oa['m']) /> |
| @@ -748,17 +750,17 @@ | |
| 750 | @ <label><input type="checkbox" name="ac"%s(oa['c']) /> |
| 751 | @ Append To Ticket%s(B('c'))</label><br> |
| 752 | @ <label><input type="checkbox" name="aw"%s(oa['w']) /> |
| 753 | @ Write Tickets%s(B('w'))</label><br /> |
| 754 | @ <label><input type="checkbox" name="aq"%s(oa['q']) /> |
| 755 | @ Moderate Tickets%s(B('q'))</label><br> |
| 756 | @ <label><input type="checkbox" name="at"%s(oa['t']) /> |
| 757 | @ Ticket Report%s(B('t'))</label><br /> |
| 758 | @ <label><input type="checkbox" name="ax"%s(oa['x']) /> |
| 759 | @ Private%s(B('x'))</label> |
| 760 | |
| 761 | @ </td><td><td width="40"></td><td valign="top"> |
| 762 | @ <label><input type="checkbox" name="ay"%s(oa['y']) /> |
| 763 | @ Write Unversioned%s(B('y'))</label><br /> |
| 764 | @ <label><input type="checkbox" name="az"%s(oa['z']) /> |
| 765 | @ Download Zip%s(B('z'))</label><br /> |
| 766 | @ <label><input type="checkbox" name="a2"%s(oa['2']) /> |
| @@ -772,11 +774,13 @@ | |
| 774 | @ <label><input type="checkbox" name="a6"%s(oa['6']) /> |
| 775 | @ Supervise Forum%s(B('6'))</label><br> |
| 776 | @ <label><input type="checkbox" name="a7"%s(oa['7']) /> |
| 777 | @ Email Alerts%s(B('7'))</label><br> |
| 778 | @ <label><input type="checkbox" name="aA"%s(oa['A']) /> |
| 779 | @ Send Announcements%s(B('A'))</label><br> |
| 780 | @ <label><input type="checkbox" name="aD"%s(oa['D']) /> |
| 781 | @ Enable Debug%s(B('D'))</label> |
| 782 | @ </td></tr> |
| 783 | @ </table> |
| 784 | @ </td> |
| 785 | @ </tr> |
| 786 | @ <tr> |
| 787 |