Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed 'find menu' to 'list menu'

Browse Source 
SVN revision: 1402
This commit is contained in:
Stefan Ritt 2005-06-17 20:45:40 +00:00
parent 952284cfb1
commit bfb010c5f4
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/config.html
View File

@ -112,7 +112,7 @@ specified by the <b><code>Subdir</b></code> option.
The language setting determines the language of the <code><b>elogd</b></code> output. Not The language setting determines the language of the <code><b>elogd</b></code> output. Not
affected by this setting are the configuration file options and the commands specified with the affected by this setting are the configuration file options and the commands specified with the
optional <code><b>Menu commands</b></code> and <code><b>Find menu commands</b></code>, which optional <code><b>Menu commands</b></code> and <code><b>List menu commands</b></code>, which
have to be specified in English and are translated automatically by elogd. The attribute names have to be specified in English and are translated automatically by elogd. The attribute names
are unaffected by the language setting and have to be translated manually.<br><br> are unaffected by the language setting and have to be translated manually.<br><br>
@ -570,7 +570,7 @@ the current logbook are shown as a possible destination. With the configurations
it is possible to specify a list of destination logbooks, separated by commata. This can it is possible to specify a list of destination logbooks, separated by commata. This can
make sense if only certain logbooks make sense as destinations.<p> make sense if only certain logbooks make sense as destinations.<p>
<li><b><code>Find Menu commands = &lt;list&gt;</code></b> <li><b><code>List Menu commands = &lt;list&gt;</code></b>
<br> <br>
This option specifies the menu commands displayed on top of the listing page. This option specifies the menu commands displayed on top of the listing page.
Although all commands from a above are possible, Although all commands from a above are possible,
@ -603,11 +603,11 @@ Guest menu commands = List, Find, Login, Help
Note that the presence of this option opens user access also to the find result or elog Note that the presence of this option opens user access also to the find result or elog
listing page, which usually contains some config command. So it is useful to combine listing page, which usually contains some config command. So it is useful to combine
the <b><code>Guest menu commands</b></code> option with the following the <b><code>Guest menu commands</b></code> option with the following
<b><code>Guest Find Menu commands</b></code> option to restrict the access to the <b><code>Guest List Menu commands</b></code> option to restrict the access to the
find result page as well. find result page as well.
<p> <p>
<li><b><code>Guest Find Menu commands = &lt;list&gt;</code></b> <li><b><code>Guest List Menu commands = &lt;list&gt;</code></b>
</br> </br>
Same as <b>Guest Menu commands</b> but for the find result page.<p> Same as <b>Guest Menu commands</b> but for the find result page.<p>
@ -633,9 +633,9 @@ if someone is logged in (using the option "Password file"). The <code><b>list</b
consists of comma separated attributes, including the word <i>text</i>, if one consists of comma separated attributes, including the word <i>text</i>, if one
wants to display the entry body text for guests.<p> wants to display the entry body text for guests.<p>
<li><b><code>Find Menu text = &lt;file&gt;</code></b> <li><b><code>List Menu text = &lt;file&gt;</code></b>
</br> </br>
The same for the find result page. One example would be following text to The same for the list page. One example would be following text to
switch between the different display modi:<br> switch between the different display modi:<br>
<pre> <pre>

27
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.684 2005/06/17 20:45:40 ritt
Changed 'find menu' to 'list menu'
Revision 1.683 2005/06/17 20:31:41 ritt Revision 1.683 2005/06/17 20:31:41 ritt
Fixed bug with user activation and global password files Fixed bug with user activation and global password files
@ -15582,11 +15585,17 @@ BOOL is_command_allowed(LOGBOOK * lbs, char *command)
} }
} }
/* check find menu commands */ /* check list menu commands */
str[0] = 0; str[0] = 0;
if (!getcfg(lbs->name, "Guest Find Menu commands", str, sizeof(str)) if (!getcfg(lbs->name, "Guest List Menu commands", str, sizeof(str))
|| *getparam("unm") != 0) || *getparam("unm") != 0)
getcfg(lbs->name, "Find Menu commands", str, sizeof(str)); getcfg(lbs->name, "list menu commands", str, sizeof(str));
if (!str[0]) {
if (!getcfg(lbs->name, "Guest Find Menu commands", str, sizeof(str))
|| *getparam("unm") != 0)
getcfg(lbs->name, "Find Menu commands", str, sizeof(str));
}
if (str[0]) if (str[0])
strlcat(menu_str, str, sizeof(menu_str)); strlcat(menu_str, str, sizeof(menu_str));
@ -17162,6 +17171,12 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf
|| *getparam("unm") != 0) || *getparam("unm") != 0)
getcfg(lbs->name, "Find menu commands", menu_str, sizeof(menu_str)); getcfg(lbs->name, "Find menu commands", menu_str, sizeof(menu_str));
if (!menu_str[0]) {
if (!getcfg(lbs->name, "Guest list menu commands", menu_str, sizeof(menu_str))
|| *getparam("unm") != 0)
getcfg(lbs->name, "list menu commands", menu_str, sizeof(menu_str));
}
/* default menu commands */ /* default menu commands */
if (menu_str[0] == 0) { if (menu_str[0] == 0) {
strcpy(menu_str, "New, Find, Select, CSV Import, "); strcpy(menu_str, "New, Find, Select, CSV Import, ");
@ -17224,9 +17239,11 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf
rsprintf("</span></td></tr>\n\n"); rsprintf("</span></td></tr>\n\n");
} }
/*---- find menu text ----*/ /*---- list menu text ----*/
if (getcfg(lbs->name, "find menu text", str, sizeof(str)) && !printable) { if ((getcfg(lbs->name, "find menu text", str, sizeof(str)) ||
getcfg(lbs->name, "list menu text", str, sizeof(str)))
&& !printable) {
FILE *f; FILE *f;
char file_name[256], *buf; char file_name[256], *buf;