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

Fixed status message for copy/move

Browse Source 
SVN revision: 429
This commit is contained in:
Stefan Ritt 2003-03-05 20:29:21 +00:00
parent de1ab8cb78
commit eb32ebac49
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
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.39 2003/03/05 20:29:21 midas
Fixed status message for copy/move
Revision 1.38 2003/03/05 07:39:26 midas Revision 1.38 2003/03/05 07:39:26 midas
Only re-read elogd.cfg if changed, using stat() Only re-read elogd.cfg if changed, using stat()
@ -8150,7 +8153,7 @@ LOGBOOK *lbs_cur;
/*---- header ----*/ /*---- header ----*/
show_standard_header(lbs, FALSE, loc("ELOG Entries"), NULL); show_standard_header(lbs, TRUE, loc("ELOG Entries"), NULL);
/*---- title ----*/ /*---- title ----*/
@ -8612,11 +8615,6 @@ LOGBOOK *lbs_cur;
if (n_msg == 0) if (n_msg == 0)
rsprintf("<tr><td class=\"errormsg\">%s</td></tr>", loc("No entries found")); rsprintf("<tr><td class=\"errormsg\">%s</td></tr>", loc("No entries found"));
/*---- select navigation ----*/
if (atoi(getparam("select")) == 1)
show_select_navigation(lbs);
/*---- page navigation ----*/ /*---- page navigation ----*/
if (!printable) if (!printable)
@ -9080,7 +9078,7 @@ int i, j, n, missing, first, index, mindex, suppress, message_id, resubmit_or
void copy_to(LOGBOOK *lbs, int src_id, char *dest_logbook, int move, int orig_id) void copy_to(LOGBOOK *lbs, int src_id, char *dest_logbook, int move, int orig_id)
{ {
int size, i, n, n_done, n_reply, index, status, fh, source_id, message_id; int size, i, n, n_done, n_done_reply, n_reply, index, status, fh, source_id, message_id;
char str[256], file_name[MAX_PATH_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH]; char str[256], file_name[MAX_PATH_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH];
char date[80], text[TEXT_SIZE], msg_str[32], in_reply_to[80], reply_to[256], char date[80], text[TEXT_SIZE], msg_str[32], in_reply_to[80], reply_to[256],
attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], *buffer, attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], *buffer,
@ -9099,7 +9097,7 @@ LOGBOOK *lbs_dest;
else else
n = atoi(getparam("nsel")); n = atoi(getparam("nsel"));
n_done = 0; n_done = n_done_reply = 0;
for (index=0 ; index<n ; index++) for (index=0 ; index<n ; index++)
{ {
if (src_id) if (src_id)
@ -9215,6 +9213,8 @@ LOGBOOK *lbs_dest;
copy_to(lbs, atoi(list[i]), dest_logbook, move, message_id); copy_to(lbs, atoi(list[i]), dest_logbook, move, message_id);
} }
n_done_reply += n_reply;
/* delete original message for move */ /* delete original message for move */
if (move && orig_id == 0) if (move && orig_id == 0)
{ {
@ -9239,21 +9239,31 @@ LOGBOOK *lbs_dest;
rsprintf("<table class=\"dlgframe\" cellspacing=0 align=center>"); rsprintf("<table class=\"dlgframe\" cellspacing=0 align=center>");
rsprintf("<tr><td colspan=2 class=\"dlgtitle\">\n"); rsprintf("<tr><td colspan=2 class=\"dlgtitle\">\n");
if (n>1) if (n_done == 0)
{ rsprintf(loc("No message selected"));
if (n_done == 0)
rsprintf(loc("No message selected"));
else if (move)
rsprintf(loc("%d messages moved successfully from \"%s\" to \"%s\""), n_done, lbs->name, lbs_dest->name);
else
rsprintf(loc("%d messages copied successfully from \"%s\" to \"%s\""), n_done, lbs->name, lbs_dest->name);
}
else else
{ {
if (move) if (n_done == 1)
rsprintf(loc("Message moved successfully from \"%s\" to \"%s\""), lbs->name, lbs_dest->name); rsprintf(loc("One message"));
else else
rsprintf(loc("Message copied successfully from \"%s\" to \"%s\""), lbs->name, lbs_dest->name); rsprintf(loc("%d messages"), n_done);
if (n_done_reply)
{
rsprintf(" ");
if (n_done == 1)
rsprintf(loc("and its replies"));
else
rsprintf(loc("and their replies"));
}
rsprintf(" ");
if (move)
rsprintf(loc("moved successfully from \"%s\" to \"%s\""), lbs->name, lbs_dest->name);
else
rsprintf(loc("copied successfully from \"%s\" to \"%s\""), lbs->name, lbs_dest->name);
} }
rsprintf("</b></tr>\n"); rsprintf("</b></tr>\n");