Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-12 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added option 'Title image'

Browse Source 
SVN revision: 558
This commit is contained in:
Stefan Ritt 2003-06-23 11:22:42 +00:00
parent 772d0201bf
commit 7a62f689e6
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
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.118 2003/06/23 11:22:42 midas
Added option 'Title image'
Revision 1.117 2003/06/18 14:26:11 midas Revision 1.117 2003/06/18 14:26:11 midas
Added option 'Use lock' Added option 'Use lock'
@ -4711,7 +4714,10 @@ LBLIST clb, flb, nlb, lbl;
if (getcfg(logbook, "Title image URL", str)) if (getcfg(logbook, "Title image URL", str))
rsprintf("<a href=\"%s\">\n", str); rsprintf("<a href=\"%s\">\n", str);
rsprintf("<img border=0 src=\"elog.gif\" alt=\"ELOG logo\">"); if (getcfg(logbook, "Title image", str))
rsprintf(str);
else
rsprintf("<img border=0 src=\"elog.gif\" alt=\"ELOG logo\">");
if (getcfg(logbook, "Title image URL", str)) if (getcfg(logbook, "Title image URL", str))
rsprintf("</a>\n"); rsprintf("</a>\n");
@ -6540,7 +6546,7 @@ int i, fh, size, self_register;
sprintf(mail_text+strlen(mail_text), "\r\n\r\n"); sprintf(mail_text+strlen(mail_text), "\r\n\r\n");
if (lbs) if (lbs)
sprintf(mail_text+strlen(mail_text), "%s : %s\r\n", loc("Logbook"), lbs->name_enc); sprintf(mail_text+strlen(mail_text), "%s : %s\r\n", loc("Logbook"), lbs->name);
else else
sprintf(mail_text+strlen(mail_text), "%s : %s\r\n", loc("Host"), host_name); sprintf(mail_text+strlen(mail_text), "%s : %s\r\n", loc("Host"), host_name);
@ -10028,7 +10034,7 @@ void copy_to(LOGBOOK *lbs, int src_id, char *dest_logbook, int move, int orig_id
{ {
int size, i, n, n_done, n_done_reply, 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, msg_str[32], in_reply_to[80], reply_to[256],
attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256], attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256],
*buffer, list[MAX_N_ATTR][NAME_LENGTH]; *buffer, list[MAX_N_ATTR][NAME_LENGTH];
LOGBOOK *lbs_dest; LOGBOOK *lbs_dest;
@ -10045,6 +10051,8 @@ LOGBOOK *lbs_dest;
else else
n = atoi(getparam("nsel")); n = atoi(getparam("nsel"));
text = malloc(TEXT_SIZE);
n_done = n_done_reply = 0; n_done = n_done_reply = 0;
for (index=0 ; index<n ; index++) for (index=0 ; index<n ; index++)
{ {
@ -10060,7 +10068,7 @@ LOGBOOK *lbs_dest;
} }
/* get message */ /* get message */
size = sizeof(text); size = TEXT_SIZE;
status = el_retrieve(lbs, source_id, date, attr_list, attrib, lbs->n_attr, status = el_retrieve(lbs, source_id, date, attr_list, attrib, lbs->n_attr,
text, &size, in_reply_to, reply_to, text, &size, in_reply_to, reply_to,
attachment, encoding, locked_by); attachment, encoding, locked_by);
@ -10070,6 +10078,7 @@ LOGBOOK *lbs_dest;
sprintf(msg_str, "%d", source_id); sprintf(msg_str, "%d", source_id);
sprintf(str, loc("Message %s cannot be read from logbook \"%s\""), msg_str, lbs->name); sprintf(str, loc("Message %s cannot be read from logbook \"%s\""), msg_str, lbs->name);
show_error(str); show_error(str);
free(text);
return; return;
} }
@ -10079,7 +10088,7 @@ LOGBOOK *lbs_dest;
while (atoi(in_reply_to) > 0) while (atoi(in_reply_to) > 0)
{ {
source_id = atoi(in_reply_to); source_id = atoi(in_reply_to);
size = sizeof(text); size = TEXT_SIZE;
status = el_retrieve(lbs, source_id, date, attr_list, attrib, lbs->n_attr, status = el_retrieve(lbs, source_id, date, attr_list, attrib, lbs->n_attr,
text, &size, in_reply_to, reply_to, text, &size, in_reply_to, reply_to,
attachment, encoding, locked_by); attachment, encoding, locked_by);
@ -10089,6 +10098,7 @@ LOGBOOK *lbs_dest;
sprintf(msg_str, "%d", source_id); sprintf(msg_str, "%d", source_id);
sprintf(str, loc("Message %s cannot be read from logbook \"%s\""), msg_str, lbs->name); sprintf(str, loc("Message %s cannot be read from logbook \"%s\""), msg_str, lbs->name);
show_error(str); show_error(str);
free(text);
return; return;
} }
} }
@ -10109,7 +10119,6 @@ LOGBOOK *lbs_dest;
size = TELL(fh); size = TELL(fh);
lseek(fh, 0, SEEK_SET); lseek(fh, 0, SEEK_SET);
buffer = malloc(size); buffer = malloc(size);
if (buffer) if (buffer)
@ -10149,6 +10158,7 @@ LOGBOOK *lbs_dest;
strcat(str, "\n<p>"); strcat(str, "\n<p>");
strcat(str, loc("Please check that it exists and elogd has write access")); strcat(str, loc("Please check that it exists and elogd has write access"));
show_error(str); show_error(str);
free(text);
return; return;
} }
@ -10177,6 +10187,8 @@ LOGBOOK *lbs_dest;
} }
} }
free(text);
if (orig_id) if (orig_id)
return; return;
@ -10463,6 +10475,10 @@ BOOL first;
/* display menu item */ /* display menu item */
strcpy(cmd, menu_item[i]); strcpy(cmd, menu_item[i]);
/* only display allowed commands */
if (!is_user_allowed(lbs, cmd))
continue;
if (equal_ustring(cmd, "Copy to") || if (equal_ustring(cmd, "Copy to") ||
equal_ustring(cmd, "Move to")) equal_ustring(cmd, "Move to"))
{ {
@ -12989,6 +13005,9 @@ int net_buffer_size;
*strchr(referer, '?') = 0; *strchr(referer, '?') = 0;
for (p=referer+strlen(referer)-1 ; p>referer && *p != '/' ; p--) for (p=referer+strlen(referer)-1 ; p>referer && *p != '/' ; p--)
*p = 0; *p = 0;
if (strchr(referer, ' '))
url_encode(referer, sizeof(referer));
} }
/* extract browser */ /* extract browser */