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

Implemented 'show top groups' flag

Browse Source 
SVN revision: 945
This commit is contained in:
ritt
2004-07-08 19:48:09 +00:00
parent 5a6faddd77
commit ebd6de08a4
2 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/config.html
+10 -1
View File
@@ -335,7 +335,8 @@ groups. Instead, one has to append the top group name to the URL, such as
<b><code>http://your.host:8080/engineering</code></b> or
<b><code>http://your.host:8080/administration</code></b>. If someone does not know the
top group name, one cannot see the list of logbooks there, so the groups become completely
independent of each other.<p>
independent of each other. If this feature is not wanted, it can be disabled by setting
<code><b>Show top groups = 1</b></code>.<p>
<hr>
@@ -1662,6 +1663,14 @@ Same as before, but gets added after the previous entry.
Same as before, but for editing entries.
<p>
<li><b><code>Show top groups = 0|1</code></b>
<br>
When using top groups, the root of the elogd server is not accessible any more, to avoid
cases where one group can "see" the logbooks of the other groups. If this feature is
unwanted, the flag <code><b>Show top groups</b></code> can be set to <code><b>1</b></code>,
in which case a list of available top groups is shown.
<p>
</ul><p>
src/elogd.c
+59 -3
View File
@@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG
$Log$
Revision 1.374 2004/07/08 19:48:09 midas
Implemented 'show top groups' flag
Revision 1.373 2004/07/08 11:31:33 midas
Fixed compiler warning
@@ -16669,6 +16672,54 @@ void show_logbook_node(LBLIST plb, LBLIST pparent, int level, int btop)
/*------------------------------------------------------------------*/
void show_top_selection_page()
{
int i;
char str[NAME_LENGTH], name[NAME_LENGTH], name_enc[NAME_LENGTH];
LBLIST phier;
/* if selection page protected, check password */
if (getcfg("global", "password file", str) &&
getcfg("global", "protect selection page", str) && atoi(str) == 1)
if (!check_user_password(NULL, getparam("unm"), getparam("upwd"), ""))
return;
if (getcfg("global", "Page Title", str)) {
strip_html(str);
show_html_header(NULL, TRUE, str, TRUE);
} else
show_html_header(NULL, TRUE, "ELOG Logbook Selection", TRUE);
rsprintf("<body>\n\n");
rsprintf("<table class=\"selframe\" cellspacing=0 align=center>\n");
rsprintf("<tr><td class=\"dlgtitle\">\n");
if (getcfg("global", "Welcome title", str)) {
rsputs(str);
} else {
rsprintf("%s.<BR>\n", loc("Several logbooks groups are defined on this host"));
rsprintf("%s:\n", loc("Please select one to list the logbooks in that group"));
}
rsprintf("</td></tr>\n");
phier = get_logbook_hierarchy();
for (i = 0; i < phier->n_members; i++)
if (phier->member[i]->is_top) {
rsprintf("<tr><td class=\"sellogbook\">");
strlcpy(name, phier->member[i]->name, sizeof(name));
strlcpy(name_enc, name, sizeof(name_enc));
url_encode(name_enc, sizeof(name_enc));
rsprintf("<a href=\"../%s/\">%s</a>", name_enc, name);
rsprintf("</td></tr>\n");
}
free_logbook_hierarchy(phier);
rsprintf("</table></body>\n");
rsprintf("</html>\r\n\r\n");
}
/*------------------------------------------------------------------*/
void show_selection_page()
{
int i, j, show_title;
@@ -16711,9 +16762,14 @@ void show_selection_page()
return;
}
/* top group present and no top group in URL -> abort connection */
if (exist_top_group() && getcfg_topgroup() == NULL)
return;
/* top group present and no top group in URL */
if (exist_top_group() && getcfg_topgroup() == NULL) {
if (getcfg("global", "show top groups", str) && atoi(str) == 1) {
show_top_selection_page();
return;
} else
return; /* abort connection */
}
/* if selection page protected, check password */
if (getcfg("global", "password file", str) &&