ELOG/elog
0
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented 'guest list display'

Browse Source 
SVN revision: 839
This commit is contained in:
ritt
2004-03-19 15:11:20 +00:00
parent 9e95bed154
commit e06564770e
3 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/config.html
+8
View File
@@ -876,6 +876,14 @@ message body is controlled by the <b><code>Display mode</code></b> and
an additional colums with the logbook name of each entry is added in front.
<p>
<LI><b><code>Guest List display = &lt;list&gt;</code></b>
<br>
Same as <code><b>List display</b></code>, but for guest access (user level
access with password, but not logged in). Please see also <code><b>Guest
display</b></code>.
<p>
<LI><b><code>Thread display = &lt;string&gt;</code></b>
<br>
Optional way to specify the line contents in the threaded search result. Following
doc/wishlist.html
+1 -1
View File
@@ -32,7 +32,7 @@ starting at the items with the most votes. You can vote for a feature, or sugges
<table border=1>
<tr><th>Feature<th>Votes</tr>
<tr><td>Implement groups of users<td>3</tr>
<tr><td>Implement groups of users<td>4</tr>
<tr><td>Use "and" and "or" operands in queries<td>3</tr>
<tr><td>Password expiration<td>1</tr>
<tr><td>Account expiration<td>1</tr>
src/elogd.c
+21 -33
View File
@@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG
$Log$
Revision 1.303 2004/03/19 15:11:20 midas
Implemented 'guest list display'
Revision 1.302 2004/03/19 11:12:00 midas
Implemented 'extendable options' for MOptions
@@ -12660,10 +12663,26 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
rsprintf("<tr><td><table class=\"listframe\" width=\"100%%\" cellspacing=0>\n");
size = printable ? 2 : 3;
show_text = TRUE;
list[0] = 0;
if (!getcfg(lbs->name, "List display", list)) /* new 2.3.10 format */
getcfg(lbs->name, "Display search", list); /* old 2.3.9 format */
getcfg(lbs->name, "List display", list);
/* evaluate Guest display list */
if (getcfg(lbs->name, "Password file", str) &&
getcfg(lbs->name, "Guest list display", str) &&
!isparam("unm")) {
strcpy(list, str);
n = strbreak(list, (char (*)[NAME_LENGTH])gattr, MAX_N_ATTR, ",");
for (j=0 ; j<n ; j++)
if (strieq(gattr+j*NAME_LENGTH, "text"))
break;
if (j == n)
show_text = FALSE;
}
if (list[0]) {
n_attr_disp = strbreak(list, disp_attr, MAX_N_ATTR, ",");
@@ -12690,37 +12709,6 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
}
}
/* evaluate Guest display list */
if (getcfg(lbs->name, "Password file", str) &&
getcfg(lbs->name, "Guest display", str) &&
!isparam("unm")) {
n = strbreak(str, (char (*)[NAME_LENGTH])gattr, MAX_N_ATTR, ",");
for (i=0 ; i<n_attr_disp ; i++) {
for (j=0 ; j<n ; j++)
if (strieq(gattr+NAME_LENGTH*j, disp_attr[i]))
break;
if (j == n &&
!strieq(disp_attr[i], loc("Logbook")) &&
!strieq(disp_attr[i], loc("ID")) &&
!strieq(disp_attr[i], loc("Date"))) {
memcpy(disp_attr[i], disp_attr[i+1], (n_attr_disp-i-1)*NAME_LENGTH);
n_attr_disp--;
i--;
}
}
for (j=0 ; j<n ; j++)
if (strieq(gattr+j*NAME_LENGTH, "text"))
break;
if (j == n)
show_text = FALSE;
}
if (threaded) {
} else {
rsprintf("<tr>\n");