[Bug 287] RFE: More options available for the tagline generation

Adds %%r to display Receiver
Patrice added - Lee documented. Thanks fellas!

diff --git a/faxd/TagLine.c++ b/faxd/TagLine.c++
index 487c4f3d376a741a55fcfcc13b52558c98ceb50c..ca00a9e48fffbd1e8209209b8ea0627e5581280b 100644 (file)
--- a/faxd/TagLine.c++
+++ b/faxd/TagLine.c++
@@ -68,6 +68,7 @@ FaxModem::setupTagLine(const FaxRequest& req, const fxStr& tagLineFmt)
        case 'l': insert(tagLine, l, server.getLocalIdentifier()); break;
        case 'm': insert(tagLine, l, req.mailaddr); break;
        case 'n': insert(tagLine, l, server.getModemNumber()); break;
+       case 'r': insert(tagLine, l, req.receiver); break;
        case 's': insert(tagLine, l, req.sender); break;
        case 't': insert(tagLine, l,
                        fxStr((int)(req.totpages-req.npages), "%u")); break;

diff --git a/man/hylafax-config.4f b/man/hylafax-config.4f
index 4f40a63eafe63df959f1dd1206ea24206985e7e4..170baa6f1c52972409c4cc118a4e6480d499cb42 100644 (file)
--- a/man/hylafax-config.4f
+++ b/man/hylafax-config.4f
@@ -1194,6 +1194,7 @@ may be used as well as the following server-implemented codes:
 %%n    canonicalized \fBFAXNumber\fP
 %%p    current page number of session
 %%P    current page number of job
+%%r    receiver's name
 %%s    sender's name
 %%t    total pages in session
 %%T    total pages in job