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

Release 2.6.3-1

Browse Source 
SVN revision: 1762
This commit is contained in:
Stefan Ritt 2006-11-28 11:20:58 +00:00
parent 88a7cd6648
commit 6fecf28c41
17 changed files with 100 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
doc/ChangeLog
View File

@ -1,3 +1,44 @@
Version 2.6.3, released Nov. 28th, 2006
=======================================
- Fixed wrong directory for synchronization MD5 files
- Implemented "Tooltip <attribute option>"
- Implemented "muserlist"
- Fixed wrong display of smileys with uppercase characters
- Implemented "useremail" attribute type
- Moved menu bar to bottom on "new user page"
- Fixed wrong DST calculation in my_timezone
- Implemented "all display limit"
- Applied patch from Ulf Harnhammer to fix incorrect handling of *printf() calls
- Prevent crash if logbook "global<xxx>" is accessed and a logbook "global<xxx>" is defined in config file
- Skip comment lines in config file starting with '#' or ';' correctly
- Mention that password file must reside in logbook directory
- Skip "entries per page" in CSV, XML and RAW export
- Fixed wrong timezone under MacOSX
- Fixed wrong date display in threaded mode
- Improved performance of rsputs_elcode somehow
- Fixed problem with activating user accounts under non-english languages
- Improved error output if password file cannot be opened
- Fixed wrong "Suppress email notification" with conditional attributes
- Added czech translation
- Display activation message
- Changed ?) smiley to ?-)
- Implemented "suppress email on edit"
- Implemented 'allowed encoding' option
- Changed location of bottom/top text files
- Fixed wrong truncation of email recipient
- Added 'preset on duplicate'
- Do attribute substitution in email recipients
- Display proper error message if config file cannot be read
- Added 'preview attachments' and 'main tab url'
- Added "Main tab URL"
- Preview attachments in edit form if not turned off via "Preview attachments = 0"
- moved password file, log file etc. to logbook directory
- improved shell substitution speed
- Changed eek.png to astonished.png
- Fixed bug with multiple conditions which was introduced in SVN 1696
- Fixed inline image insertion in Internet Explorer
Version 2.6.2, released July 11th, 2006
=======================================

2
doc/index.html
View File

@ -25,7 +25,7 @@
&nbsp;[<a class="nav" href="#links">Links</a>]&nbsp; *&nbsp;</div>
<P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt&#64;psi.ch">
Stefan Ritt</a></P>
<div class="version">Current version is : 2.6.2</div>
<div class="version">Current version is : 2.6.3</div>
<hr>
<a name="whatis">
<div class="section">&nbsp; What is ELOG ? &nbsp;</div>

1
resources/eloglang.brazilian
View File

@ -130,7 +130,6 @@ Requested = Requerido
ELOG user config = Configuração do usuário do ELOG
Select user = Selecione o usuário
User [%s] has been deleted = Usuário [%s] foi removido
Enable email notifications = Permite notificações por email
Remove user = Remover usuário
New user = Novo usuário
No Email address registered with user name <i>"%s"</i> = Não há endereço de email registrado com esse nome de usuário <i>"%s"</i>

1
resources/eloglang.bulgarian
View File

@ -92,7 +92,6 @@ ELOG user config =
Select user = Избиране на потребител
Login name = Име за влизане
Full name = Пълно име
Enable email notifications = Àêòèâèðàíå íà óâåäîìÿâàíåòî ÷ðåç åë.ïîùà
All entries = Всички записи
Entries = Записи
ELOG password recovery = Възстановяване на парола на ELOG

1
resources/eloglang.czech
View File

@ -131,7 +131,6 @@ Display = Zobraz
entries per page = položek na stránku
Toggle all = Odeber vše
Selected entries = Označené položky
Enable email notifications = Povol oznámení příchodu Emailu
A old entry has been updated on %s = Položka %s byla obnovena
Collapse = Sbalit
Expand = Rozbalit

1
resources/eloglang.danish
View File

@ -131,7 +131,6 @@ Display = Vis
entries per page = Indlæg per side
Toggle all = Vis alle
Selected entries = Vælg Indlæg
Enable email notifications = Aktiver email notificering
A old entry has been updated on %s = Et ældre indlæg af %s er ændret
Collapse = Fold Sammen
Expand = Fold Ud

2
resources/eloglang.dutch
View File

@ -132,7 +132,6 @@ Display = Toon
entries per page = berichten per pagina
Toggle all = Toon alles
Selected entries = Geselecteerde berichten
Enable email notifications=Automatisch e-mail aankondiging
A old entry has been updated on %s = Een ouder bericht is op %s gewijzigd
Collapse = Samenvatten
Expand = Uitbreiden
@ -404,7 +403,6 @@ File not found at URL "%s" = Kan bestand niet gevonden bij URL "%s"
Entry size too large for email notification =
Please specify a valid email address =
Cannot send email notification to "%s" =
Enable email notifications =
text =
From =
Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" =

1
resources/eloglang.french
View File

@ -130,7 +130,6 @@ Display = Afficher
entries per page = entrées par page
Toggle all = Basculer tout
Selected entries = Entrées sélectionnées
Enable email notifications = Notifications automatiques par mél.
A old entry has been updated on %s = Une entrée existante a été mise à jour dans le registre %s
Collapse = Réduire
Expand = Développer

1
resources/eloglang.german
View File

@ -131,7 +131,6 @@ Display = Zeige
entries per page = Einträge pro Seite
Toggle all = Alle umschalten
Selected entries = Ausgewählte Einträge
Enable email notifications = Email-Benachrichtigung ermöglichen
A old entry has been updated on %s = Ein alter Eintrag wurde von %s geändert
Collapse = eingeklappt
Expand = erweitert

1
resources/eloglang.italian
View File

@ -131,7 +131,6 @@ Display = Mostra
entries per page = elementi per pagina
Toggle all = Inverti
Selected entries = Elementi selezionati
Enable email notifications = Attiva la notifica per e-mail
A old entry has been updated on %s = Un vecchio elemento è stato aggiornato su %s
Collapse = Restringi
Expand = Espandi

1
resources/eloglang.japanese
View File

@ -92,7 +92,6 @@ Requested =
ELOG user config = ELOGユーザー設定
Select user = ユーザーを選択
User [%s] has been deleted = ユーザー[%s]が削除されました
Enable email notifications = 電子メール通知を行なう
Change password = パスワードを変更
Remove user = ユーザーを削除
New user = 新規ユーザー

1
resources/eloglang.spanish
View File

@ -130,7 +130,6 @@ Requested = Pedido
ELOG user config = Configuracion de usuario ELOG
Select user = Elegir usuario
User [%s] has been deleted = El usuario [%s] ha sido borrado
Enable email notifications = Habilitar notificacion por email
Remove user = Eliminar usuario
New user = Nuevo usuario
No Email address registered with user name <i>"%s"</i> = No se encuentra registrado un usuario con direccion de email <i>"%s"</i>

1
resources/eloglang.swedish
View File

@ -120,7 +120,6 @@ Display = Visa
entries per page = poster per sida
Toggle all = Visa alla
Selected entries = Välj post
Enable email notifications = Aktivera sändning av e-post
Collapse = Kollapsa
Expand = Expandera
Full = Fullständig

1
resources/eloglang.turkish
View File

@ -134,7 +134,6 @@ Display = G
entries per page = her bir sayfadaki girdiler
Toggle all = Hepsini iþaretle/temizle
Selected entries = Seçilmiþ girdiler
Enable email notifications = E-posta bildirimlerini açýn
A old entry has been updated on %s = %s'deki eski bir girdi güncellendi
Collapse = Topla
Expand = Aç

1
resources/eloglang.zh_CN-GB2312
View File

@ -132,7 +132,6 @@ Display =
entries per page = 记录每页
Toggle all = 反向选择全部
Selected entries = 已选记录
Enable email notifications = 打开电子邮件通报
A old entry has been updated on %s = %s 里的一条旧记录已经被更新
Collapse = 折叠
Expand = 展开

1
resources/eloglang.zh_CN-UTF8
View File

@ -132,7 +132,6 @@ Display = 显示
entries per page = 记录每页
Toggle all = 反向选择全部
Selected entries = 已选记录
Enable email notifications = 打开电子邮件通报
A old entry has been updated on %s = %s 里的一条旧记录已经被更新
Collapse = 折叠
Expand = 展开

115
src/elogd.c
View File

@ -10,7 +10,7 @@
\********************************************************************/
/* Version of ELOG */
#define VERSION "2.6.2"
#define VERSION "2.6.3"
char svn_revision[] = "$Id$";
/* ELOG identification */
@ -5618,27 +5618,27 @@ typedef struct {
PATTERN_LIST pattern_list[] = {
/* smileys */
{":))", "<img alt=\"Happy\" title=\"Happy\" src=\"%sicons/happy.png\">"},
{":))", "<img alt=\"Happy\" title=\"Happy\" src=\"%sicons/happy.png\">"},
{":-))", "<img alt=\"Happy\" title=\"Happy\" src=\"%sicons/happy.png\">"},
{":)", "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"},
{":-)", "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"},
{":(", "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"},
{":-(", "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"},
{";)", "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"},
{";-)", "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"},
{":d", "<img alt=\"Big grin\" title=\"Big grin\" src=\"%sicons/biggrin.png\">"},
{"?-)", "<img alt=\"Confused\" title=\"Confused\" src=\"%sicons/confused.png\">"},
{";(", "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"},
{";-(", "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"},
{":]", "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"},
{":-]", "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"},
{":o", "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"},
{":-o", "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"},
{"8-)", "<img alt=\"Cool\" title=\"Cool\" src=\"%sicons/cool.png\">"},
{"8o", "<img alt=\"Astonished\" title=\"Astonished\" src=\"%sicons/astonished.png\">"},
{"x-(", "<img alt=\"Mad\" title=\"Mad\" src=\"%sicons/mad.png\">"},
{":p", "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"},
{":-p", "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"},
{":)", "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"},
{":-)", "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"},
{":(", "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"},
{":-(", "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"},
{";)", "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"},
{";-)", "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"},
{":d", "<img alt=\"Big grin\" title=\"Big grin\" src=\"%sicons/biggrin.png\">"},
{"?-)", "<img alt=\"Confused\" title=\"Confused\" src=\"%sicons/confused.png\">"},
{";(", "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"},
{";-(", "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"},
{":]", "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"},
{":-]", "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"},
{":o", "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"},
{":-o", "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"},
{"8-)", "<img alt=\"Cool\" title=\"Cool\" src=\"%sicons/cool.png\">"},
{"8o", "<img alt=\"Astonished\" title=\"Astonished\" src=\"%sicons/astonished.png\">"},
{"x-(", "<img alt=\"Mad\" title=\"Mad\" src=\"%sicons/mad.png\">"},
{":p", "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"},
{":-p", "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"},
/* formatting */
{"[b]", "<b>"},
@ -5719,8 +5719,8 @@ void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str)
m = 0;
/* make lower case copy of str */
lstr = xmalloc(strlen(str)+1);
for (pd=lstr, p=(char *)str ; *p ; p++,pd++)
lstr = xmalloc(strlen(str) + 1);
for (pd = lstr, p = (char *) str; *p; p++, pd++)
*pd = tolower(*p);
*pd = 0;
@ -7242,7 +7242,7 @@ void show_standard_title(char *logbook, char *text, int printable)
rsprintf("<tr><td class=\"tabs\">\n");
if (level == 0 && getcfg("global", "main tab", str, sizeof(str))
&& !getcfg_topgroup()) {
&& !getcfg_topgroup()) {
if (getcfg("global", "main tab url", url, sizeof(url)))
rsprintf("<span class=\"ltab\"><a href=\"%s\">%s</a></span>\n", url, str);
else
@ -7250,7 +7250,7 @@ void show_standard_title(char *logbook, char *text, int printable)
}
if (level == 1 && getcfg("global", "main tab", str, sizeof(str))
&& getcfg_topgroup()) {
&& getcfg_topgroup()) {
if (getcfg("global", "main tab url", url, sizeof(url)))
rsprintf("<span class=\"ltab\"><a href=\"%s/\">%s</a></span>\n", url, str);
else
@ -8535,7 +8535,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
/* remove any leading directory, to accept only files in the logbook directory ! */
if (strchr(att[0], DIR_SEPARATOR)) {
strlcpy(str, att[0], sizeof(str));
strlcpy(att[0], strrchr(str, DIR_SEPARATOR)+1, 256);
strlcpy(att[0], strrchr(str, DIR_SEPARATOR) + 1, 256);
}
}
@ -8709,8 +8709,8 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
sprintf(str, "Preset %s", attr_list[index]);
if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0) {
if ((!bedit && !breply && !bduplicate) || /* don't subst on edit or reply */
(breedit && i == 2)) { /* subst on reedit only if preset is under condition */
if ((!bedit && !breply && !bduplicate) || /* don't subst on edit or reply */
(breedit && i == 2)) { /* subst on reedit only if preset is under condition */
/* do not format date for date attributes */
i = build_subst_list(lbs, slist, svalue, attrib,
@ -8732,7 +8732,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
sprintf(str, "Preset on reply %s", attr_list[index]);
if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0 && breply) {
if (!breedit || (breedit && i == 2)) { /* subst on reedit only if preset is under condition */
if (!breedit || (breedit && i == 2)) { /* subst on reedit only if preset is under condition */
/* do not format date for date attributes */
i = build_subst_list(lbs, slist, svalue, attrib,
@ -8754,7 +8754,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
sprintf(str, "Preset on duplicate %s", attr_list[index]);
if ((i = getcfg(lbs->name, str, preset, sizeof(preset))) > 0 && bduplicate) {
if (!breedit || (breedit && i == 2)) { /* subst on reedit only if preset is under condition */
if (!breedit || (breedit && i == 2)) { /* subst on reedit only if preset is under condition */
/* do not format date for date attributes */
i = build_subst_list(lbs, slist, svalue, attrib,
@ -8774,7 +8774,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
}
}
} else // if (_condition[0])
} else // if (_condition[0])
n_attr = lbs->n_attr;
@ -9464,12 +9464,12 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
if (j < n_moptions)
rsprintf
("<input type=checkbox id=\"%s\" name=\"%s\" value=\"%s\" checked onChange=\"mod();\">\n",
str, str, full_name);
("<input type=checkbox id=\"%s\" name=\"%s\" value=\"%s\" checked onChange=\"mod();\">\n",
str, str, full_name);
else
rsprintf
("<input type=checkbox id=\"%s\" name=\"%s\" value=\"%s\" onChange=\"mod();\">\n",
str, str, full_name);
("<input type=checkbox id=\"%s\" name=\"%s\" value=\"%s\" onChange=\"mod();\">\n",
str, str, full_name);
rsprintf("<label for=\"%s\">%s</label>\n", str, full_name);
rsprintf("</span>\n");
@ -10114,7 +10114,8 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
allowed_encoding = 3;
if (allowed_encoding < 1 || allowed_encoding > 7) {
rsprintf("<h1>Invalid \"Allowed encoding\" in configuration file, value must be between 1 and 7</h1>\n");
rsprintf
("<h1>Invalid \"Allowed encoding\" in configuration file, value must be between 1 and 7</h1>\n");
rsprintf("</table><!-- show_standard_title -->\n");
show_bottom_text(lbs);
rsprintf("</form></body></html>\r\n");
@ -10135,9 +10136,9 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("<input type=radio id=\"ELCode\" name=\"encoding\" value=\"ELCode\" checked>");
else
rsprintf
("<input type=radio id=\"ELCode\" name=\"encoding\" value=\"ELCode\" onclick=\"cond_submit()\">");
("<input type=radio id=\"ELCode\" name=\"encoding\" value=\"ELCode\" onclick=\"cond_submit()\">");
rsprintf
("<label for=\"ELCode\"><a target=\"_blank\" href=\"?cmd=HelpELCode\">ELCode</a>&nbsp;&nbsp;</label>\n");
("<label for=\"ELCode\"><a target=\"_blank\" href=\"?cmd=HelpELCode\">ELCode</a>&nbsp;&nbsp;</label>\n");
}
if (allowed_encoding & 1) {
@ -10145,7 +10146,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("<input type=radio id=\"plain\" name=\"encoding\" value=\"plain\" checked>");
else
rsprintf
("<input type=radio id=\"plain\" name=\"encoding\" value=\"plain\" onclick=\"cond_submit()\">");
("<input type=radio id=\"plain\" name=\"encoding\" value=\"plain\" onclick=\"cond_submit()\">");
rsprintf("<label for=\"plain\">plain&nbsp;&nbsp;</label>\n");
}
@ -10154,7 +10155,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("<input type=radio id=\"HTML\" name=\"encoding\" value=\"HTML\" checked>");
else
rsprintf
("<input type=radio id=\"HTML\" name=\"encoding\" value=\"HTML\" onclick=\"cond_submit()\">");
("<input type=radio id=\"HTML\" name=\"encoding\" value=\"HTML\" onclick=\"cond_submit()\">");
rsprintf("<label for=\"HTML\">HTML&nbsp;&nbsp;</label>\n");
}
}
@ -10266,7 +10267,8 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("<input type=hidden name=\"%s\" value=\"%s\">\n", str, att[index]);
rsprintf("%s\n", att[index] + 14);
rsprintf("&nbsp;&nbsp;<input type=\"submit\" name=\"delatt%d\" value=\"%s\" ", index, loc("Delete"));
rsprintf("&nbsp;&nbsp;<input type=\"submit\" name=\"delatt%d\" value=\"%s\" ", index,
loc("Delete"));
rsprintf("onClick=\"return mark_submit();\">");
strlcpy(file_name, lbs->data_dir, sizeof(file_name));
@ -10287,7 +10289,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
strcpy(str, att[index]);
str[13] = 0;
strcpy(file_enc, att[index] + 14);
url_encode(file_enc, sizeof(file_enc)); /* for file names with special characters like "+" */
url_encode(file_enc, sizeof(file_enc)); /* for file names with special characters like "+" */
sprintf(ref, "%s/%s", str, file_enc);
if (is_image(att[index])) {
@ -10384,7 +10386,7 @@ void show_find_form(LOGBOOK * lbs)
{
int i, j;
char str[NAME_LENGTH], mode[NAME_LENGTH], comment[NAME_LENGTH], option[NAME_LENGTH],
login_name[256], full_name[256];
login_name[256], full_name[256];
/*---- header ----*/
@ -11829,7 +11831,7 @@ void show_config_page(LOGBOOK * lbs)
sprintf(str, " <b>%s &lt;%s&gt;</b>", getparam("new_user_name"), getparam("new_user_email"));
rsprintf(loc("Activation notice has been sent to %s"), str);
rsprintf("</tr>\n");
}
}
/*---- menu buttons ----*/
@ -16389,7 +16391,7 @@ void show_page_filters(LOGBOOK * lbs, int n_msg, int page_n, BOOL mode_commands,
/*------------------------------------------------------------------*/
void show_page_navigation(LOGBOOK *lbs, int n_msg, int page_n, int n_page)
void show_page_navigation(LOGBOOK * lbs, int n_msg, int page_n, int n_page)
{
int i, num_pages, skip, max_n_msg;
char ref[256], str[256];
@ -17275,7 +17277,7 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
}
if (attr_flags[i] & AF_MUSERLIST) {
for (j = 0; j < MAX_N_LIST ; j++) {
for (j = 0; j < MAX_N_LIST; j++) {
sprintf(str, "%s_%d", attr_list[i], j);
if (isparam(str)) {
filtering = TRUE;
@ -17408,7 +17410,7 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
/* OR of any of the values */
searched = found = FALSE;
for (j = 0; j < MAX_N_LIST ; j++) {
for (j = 0; j < MAX_N_LIST; j++) {
sprintf(str, "%s_%d", attr_list[i], j);
if (isparam(str)) {
searched = TRUE;
@ -17912,7 +17914,7 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
disp_filter = TRUE;
}
if (attr_flags[i] & (AF_MULTI | AF_MUSERLIST)) {
for (j = 0; j < MAX_N_LIST ; j++) {
for (j = 0; j < MAX_N_LIST; j++) {
sprintf(str, "%s_%d", attr_list[i], j);
if (isparam(str))
disp_filter = TRUE;
@ -18060,7 +18062,7 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
line[0] = 0;
for (j = 0; j < MAX_N_LIST ; j++) {
for (j = 0; j < MAX_N_LIST; j++) {
sprintf(iattr, "%s_%d", attr_list[i], j);
if (isparam(iattr)) {
if (line[0])
@ -19925,7 +19927,7 @@ void submit_elog(LOGBOOK * lbs)
if (mindex == MAX_N_LIST)
mindex = 0;
else
index--; /* repeat this loop */
index--; /* repeat this loop */
} else
strcpy(str2, ua);
@ -19970,7 +19972,7 @@ void submit_elog(LOGBOOK * lbs)
}
if (!getcfg(lbs->name, "Suppress Email to users", str, sizeof(str))
|| atoi(str) == 0) {
|| atoi(str) == 0) {
/* go through password file */
for (index = 0;; index++) {
if (!enum_user_line(lbs, index, user, sizeof(user)))
@ -20007,10 +20009,10 @@ void submit_elog(LOGBOOK * lbs)
if (strlen(mail_to) > 0) {
if (strlen(mail_to) > 4 && mail_to[strlen(mail_to) - 4] == ',')
mail_to[strlen(mail_to) - 4] = 0; /* strip last ',\r\n\t' */
mail_to[strlen(mail_to) - 4] = 0; /* strip last ',\r\n\t' */
if (strlen(rcpt_to) > 1 && mail_to[strlen(rcpt_to) - 1] == ',')
rcpt_to[strlen(rcpt_to) - 1] = 0; /* strip last ',' */
rcpt_to[strlen(rcpt_to) - 1] = 0; /* strip last ',' */
if (compose_email
(lbs, rcpt_to, mail_to, message_id, attrib, mail_param, isparam("edit_id"), att_file,
isparam("encoding") ? getparam("encoding") : "plain") == 0)
@ -22991,8 +22993,7 @@ void interprete(char *lbook, char *path)
if (!check_user_password(lbs,
isparam("unm") ? getparam("unm") : "",
isparam("upwd") ? getparam("upwd") : "",
_cmdline))
isparam("upwd") ? getparam("upwd") : "", _cmdline))
return;
}
}
@ -25854,8 +25855,8 @@ int main(int argc, char *argv[])
strcpy(logbook_dir, "logbooks");
/* strip trailing dir separator */
if (logbook_dir[strlen(logbook_dir)-1] == DIR_SEPARATOR)
logbook_dir[strlen(logbook_dir)-1] = 0;
if (logbook_dir[strlen(logbook_dir) - 1] == DIR_SEPARATOR)
logbook_dir[strlen(logbook_dir) - 1] = 0;
/* check for directories */
if (logbook_dir[0] && stat(logbook_dir, &finfo) < 0) {