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

Added 'use email heading edit'

Browse Source 
SVN revision: 743
This commit is contained in:
Stefan Ritt 2004-02-04 09:23:18 +00:00
parent bdda2272e8
commit 52862c9566
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/config.html
View File

@ -1250,6 +1250,7 @@ individual logbook sections, one has to log in to each logbook separately.<p>
<LI><b><code>Use Email Subject = &lt;string&gt;</code></b> <LI><b><code>Use Email Subject = &lt;string&gt;</code></b>
<LI><b><code>Use Email From = &lt;string&gt;</code></b> <LI><b><code>Use Email From = &lt;string&gt;</code></b>
<LI><b><code>Use Email Heading = &lt;string&gt;</code></b> <LI><b><code>Use Email Heading = &lt;string&gt;</code></b>
<LI><b><code>Use Email Heading Edit = &lt;string&gt;</code></b>
<LI><b><code>Omit Email To = 0|1</code></b> <LI><b><code>Omit Email To = 0|1</code></b>
<LI><b><code>Suppress Email to users = 0|1</code></b> <LI><b><code>Suppress Email to users = 0|1</code></b>
@ -1280,7 +1281,9 @@ used as the email subject. The text can contain <b><code>$&lt;attribute&gt;
attribute. For a full list of possible substitutions, see the attribute. For a full list of possible substitutions, see the
"<I>Subst &lt;attribute&gt;</I>" option. The <b><code>Use Email Heading "<I>Subst &lt;attribute&gt;</I>" option. The <b><code>Use Email Heading
= &lt;string&gt;</code></b> specifies the text for the email heading line. = &lt;string&gt;</code></b> specifies the text for the email heading line.
Default is <i>"A new entry has been submitted/updated on [host]"</i>.<p> Default is <i>"A new entry has been submitted on [host]"</i>. The option
<b><code>Use Email Heading Edit = &lt;string&gt;</code></b> works the same
way for updated (edited) entries.<p>
The option <b><code>Use Email From = &lt;string&gt; The option <b><code>Use Email From = &lt;string&gt;
</code></b> is used for the "<I>From:</I>" field in the email. Please note that more and </code></b> is used for the "<I>From:</I>" field in the email. Please note that more and

10
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.234 2004/02/04 09:21:37 midas
Added 'use email heading edit'
Revision 1.233 2004/02/04 08:25:06 midas Revision 1.233 2004/02/04 08:25:06 midas
Only [global] admin user sees 'synchronize all logbooks' Only [global] admin user sees 'synchronize all logbooks'
@ -11964,7 +11967,13 @@ int compose_email(LOGBOOK * lbs, char *mail_to, int message_id,
if (flags & 1) { if (flags & 1) {
if (getcfg(lbs->name, "Use Email heading", str)) { if (getcfg(lbs->name, "Use Email heading", str)) {
if (old_mail) {
if (!getcfg(lbs->name, "Use Email heading edit", str))
getcfg(lbs->name, "Use Email heading", str);
}
sprintf(mail_text + strlen(mail_text), str); sprintf(mail_text + strlen(mail_text), str);
} else { } else {
if (old_mail) if (old_mail)
sprintf(mail_text + strlen(mail_text), sprintf(mail_text + strlen(mail_text),
@ -14126,7 +14135,6 @@ void show_selection_page()
} }
} }
phier = get_logbook_hierarchy(); phier = get_logbook_hierarchy();
show_title = 0; show_title = 0;