Move the default templates into an en subdirectory. This should clean up the

template directory structure a bit.

diff --git a/etc/templates/faxrcvd-error.txt b/etc/templates/faxrcvd-error.txt
deleted file mode 100644 (file)
index bc861e6..0000000
--- a/etc/templates/faxrcvd-error.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-From: FAX Agent <$FROMADDR>
-To: $SENDTO
-Subject: Fax received from "$SENDER"
-Content-type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: Quoted-Printable
-
-$FILE (ftp://$HOSTNAME:$PORT/$FILE):                                  
-          Sender: $SENDER
-           Pages: $PAGES
-         Quality: $QUALITY
-            Size: $PAGE
-        Received: $RECEIVED
- Time To Receive: $TIMETORECV
-     Signal Rate: $SIGNALRATE
-     Data Format: $DATAFORMAT
-   Error Correct: $ERRCORRECT
-         CallID1: $CALLID1
-         CallID2: $CALLID2
-     Received On: $DEVICE
-          CommID: $COMMID (ftp://$HOSTNAME:$PORT/log/c$COMMID)      
-
-Errors were received:
-$SESSION_LOG

diff --git a/etc/templates/faxrcvd-failure.txt b/etc/templates/faxrcvd-failure.txt
deleted file mode 100644 (file)
index 6227b1f..0000000
--- a/etc/templates/faxrcvd-failure.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-From: FAX Agent <$FROMADDR>
-To: $TOADDR
-Subject: Fax received from "$SENDER"
-Content-type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: Quoted-Printable
-
-Fax not received.
-
-       $MSG
-
-Session log follows:
-$SESSION_LOG

diff --git a/etc/templates/faxrcvd-notify-error.txt b/etc/templates/faxrcvd-notify-error.txt
deleted file mode 100644 (file)
index faf5a7b..0000000
--- a/etc/templates/faxrcvd-notify-error.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-From: FAX Agent <$FROMADDR>
-To: $TOADDR
-Subject: Fax received with errors from "$SENDER"
-Content-type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: Quoted-Printable
-
-$FILE (ftp://$HOSTNAME:$PORT/$FILE):                                  
-          Sender: $SENDER
-           Pages: $PAGES
-         Quality: $QUALITY
-            Size: $PAGE
-        Received: $RECEIVED
- Time To Receive: $TIMETORECV
-     Signal Rate: $SIGNALRATE
-     Data Format: $DATAFORMAT
-   Error Correct: $ERRCORRECT
-         CallID1: $CALLID1
-         CallID2: $CALLID2
-     Received On: $DEVICE
-          CommID: $COMMID (ftp://$HOSTNAME:$PORT/log/c$COMMID)      
-
-
-Session log:
-$SESSION_LOG

diff --git a/etc/templates/faxrcvd-notify-success.txt b/etc/templates/faxrcvd-notify-success.txt
deleted file mode 100644 (file)
index 0d4da19..0000000
--- a/etc/templates/faxrcvd-notify-success.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-From: FAX Agent <$FROMADDR>
-To: $TOADDR
-Subject: Fax received from "$SENDER"
-Content-type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: Quoted-Printable
-
-$FILE (ftp://$HOSTNAME:$PORT/$FILE):
-          Sender: $SENDER
-           Pages: $PAGES
-         Quality: $QUALITY
-            Size: $PAGE
-        Received: $RECEIVED
- Time To Receive: $TIMETORECV
-     Signal Rate: $SIGNALRATE
-     Data Format: $DATAFORMAT
-   Error Correct: $ERRCORRECT
-         CallID1: $CALLID1
-         CallID2: $CALLID2
-     Received On: $DEVICE
-          CommID: $COMMID (ftp://$HOSTNAME:$PORT/log/c$COMMID) 

diff --git a/etc/templates/faxrcvd-success.txt b/etc/templates/faxrcvd-success.txt
deleted file mode 100644 (file)
index e69ed47..0000000
--- a/etc/templates/faxrcvd-success.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-From: FAX Agent <$FROMADDR>
-To: $SENDTO
-Subject: Fax received from "$SENDER"
-Content-type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: Quoted-Printable
-
-$FILE (ftp://$HOSTNAME:$PORT/$FILE):                                  
-          Sender: $SENDER
-           Pages: $PAGES
-         Quality: $QUALITY
-            Size: $PAGE
-        Received: $RECEIVED
- Time To Receive: $TIMETORECV
-     Signal Rate: $SIGNALRATE
-     Data Format: $DATAFORMAT
-   Error Correct: $ERRCORRECT
-         CallID1: $CALLID1
-         CallID2: $CALLID2
-     Received On: $DEVICE
-          CommID: $COMMID (ftp://$HOSTNAME:$PORT/log/c$COMMID)      

diff --git a/etc/templates/notify-blocked.txt b/etc/templates/notify-blocked.txt
deleted file mode 100644 (file)
index d21061a..0000000
--- a/etc/templates/notify-blocked.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-To: $SENDTO
-Subject: facsimile to $DESTINATION blocked
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your job to $number is delayed in the scheduling queues because:
-
-$faxstatus
-
-The job will be processed as soon as possible.

diff --git a/etc/templates/notify-done-page.txt b/etc/templates/notify-done-page.txt
deleted file mode 100644 (file)
index 23e03bd..0000000
--- a/etc/templates/notify-done-page.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-To: $SENDTO
-Subject: pager to $DESTINATION completed
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your page to $number was completed successfully.
-          Dialogs: $tottries (exchanges with remote device)
-            Calls: $totdials (total phone calls placed)
-            Modem: $modem
-   Submitted From: $client
-            JobID: $jobid
-          GroupID: $groupid
-           CommID: c$commid
-
-Processing time was $JTIME.
-
-  Additional information:
-
-$faxstatus
-
-    ---- Transcript of session follows ----
-
-$SESSION_LOG

diff --git a/etc/templates/notify-done.txt b/etc/templates/notify-done.txt
deleted file mode 100644 (file)
index 684e9ab..0000000
--- a/etc/templates/notify-done.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-To: $SENDTO
-Subject: facsimile to $DESTINATION completed
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your job to $number was completed successfully.
-            Pages: $npages
-         Receiver: $csi
-          Quality: $resolution
-       Page Width: $pagewidth (mm)
-      Page Length: $pagelength
-      Signal Rate: $signalrate
-      Data Format: $dataformat
- Remote Equipment: $equipment
-   Remote Station: $station
-          Dialogs: $tottries (exchanges with remote device)
-            Calls: $totdials (total phone calls placed)
-            Modem: $modem
-   Submitted From: $client
-            JobID: $jobid
-          GroupID: $groupid
-           CommID: c$commid
-
-Processing time was $JTIME.
-
-  Additional information:
-
-$faxstatus
-
-    ---- Transcript of session follows ----
-
-$SESSION_LOG

diff --git a/etc/templates/notify-failed-page.txt b/etc/templates/notify-failed-page.txt
deleted file mode 100644 (file)
index fe0e256..0000000
--- a/etc/templates/notify-failed-page.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-To: $SENDTO
-Subject: pager to $DESTINATION failed
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your job to $number failed because:
-
-$faxstatus
-
-
-    ---- Transcript of session follows ----
-
-$SESSION_LOG
-
-------- Unsent job status -------
-      Destination: $number
-            JobID: $jobid
-          GroupID: $groupid
-           CommID: $commid
-            Modem: $modem
-   Submitted From: $client
-           Status: $faxstatus
-          Dialogs: $tottries
-            Dials: $ndials
-            Calls: $totdials

diff --git a/etc/templates/notify-failed.txt b/etc/templates/notify-failed.txt
deleted file mode 100644 (file)
index 8c394da..0000000
--- a/etc/templates/notify-failed.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-To: $SENDTO
-Subject: facsimile to $DESTINATION failed
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your job to $number failed because:
-
-$faxstatus
-
-
-    ---- Transcript of session follows ----
-
-$SESSION_LOG
-
-------- Unsent job status -------
-      Destination: $number
-            JobID: $jobid
-          GroupID: $groupid
-           Sender: $sender
-         Mailaddr: $mailaddr
-           CommID: $commid
-            Modem: $modem
-   Submitted From: $client
-       Page Width: $pagewidth  (mm)
-      Page Length: $pagelength (mm)
-       Resolution: $resolution (lpi)
-           Status: $faxstatus
-          Dialogs: $tottries
-            Dials: $ndials
-            Calls: $totdials
-            Pages: $npages
-         TotPages: $totpages
-         Attempts: $ntries
-           Dirnum: $dirnum

diff --git a/etc/templates/notify-format_failed.txt b/etc/templates/notify-format_failed.txt
deleted file mode 100644 (file)
index b0e790f..0000000
--- a/etc/templates/notify-format_failed.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-To: $SENDTO
-Subject: facsimile to $DESTINATION failed
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your job to $number was not sent because document conversion
-failed.  The output from the converter program was:
-
-$faxstatus
-
-Check any PostScript documents for non-standard fonts and invalid constructs
-
-------- Unsent job status -------
-      Destination: $number
-            JobID: $jobid
-          GroupID: $groupid
-           Sender: $sender
-         Mailaddr: $mailaddr
-           CommID: $commid
-            Modem: $modem
-   Submitted From: $client
-       Page Width: $pagewidth  (mm)
-      Page Length: $pagelength (mm)
-       Resolution: $resolution (lpi)
-           Status: $faxstatus
-          Dialogs: $tottries
-            Dials: $ndials
-            Calls: $totdials
-            Pages: $npages
-         TotPages: $totpages
-         Attempts: $ntries
-           Dirnum: $dirnum

diff --git a/etc/templates/notify-killed.txt b/etc/templates/notify-killed.txt
deleted file mode 100644 (file)
index 1c4c48a..0000000
--- a/etc/templates/notify-killed.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-To: $SENDTO
-Subject: facsimile to $DESTINATION removed from queue
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-You job to $number was deleted from the queue.
-
-------- Unsent job status -------
-      Destination: $number
-            JobID: $jobid
-          GroupID: $groupid
-           Sender: $sender
-         Mailaddr: $mailaddr
-           CommID: $commid
-            Modem: $modem
-   Submitted From: $client
-       Page Width: $pagewidth  (mm)
-      Page Length: $pagelength (mm)
-       Resolution: $resolution (lpi)
-           Status: $faxstatus
-          Dialogs: $tottries
-            Dials: $ndials
-            Calls: $totdials
-            Pages: $npages
-         TotPages: $totpages
-         Attempts: $ntries
-           Dirnum: $dirnum

diff --git a/etc/templates/notify-no_formatter.txt b/etc/templates/notify-no_formatter.txt
deleted file mode 100644 (file)
index bf5ae15..0000000
--- a/etc/templates/notify-no_formatter.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-To: $SENDTO
-Subject: facsimile to $DESTINATION failed
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
- 
-Your job to $number failed because the document conversion script was
-not found.
-
-------- Unsent job status -------
-      Destination: $number
-            JobID: $jobid
-          GroupID: $groupid
-           Sender: $sender
-         Mailaddr: $mailaddr
-           CommID: $commid
-            Modem: $modem
-   Submitted From: $client
-       Page Width: $pagewidth  (mm)
-      Page Length: $pagelength (mm)
-       Resolution: $resolution (lpi)
-           Status: $faxstatus
-          Dialogs: $tottries
-            Dials: $ndials
-            Calls: $totdials
-            Pages: $npages
-         TotPages: $totpages
-         Attempts: $ntries
-           Dirnum: $dirnum

diff --git a/etc/templates/notify-poll_failed.txt b/etc/templates/notify-poll_failed.txt
deleted file mode 100644 (file)
index 0a98e56..0000000
--- a/etc/templates/notify-poll_failed.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-To: $SENDTO
-Subject: Notice about facsimile
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your polling request to $number could not be completed because 
-an unspecified problem occurred.
-
-Processing time was $JTIME.

diff --git a/etc/templates/notify-poll_no_document.txt b/etc/templates/notify-poll_no_document.txt
deleted file mode 100644 (file)
index ba77f91..0000000
--- a/etc/templates/notify-poll_no_document.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-To: $SENDTO
-Subject: Notice about facsimile
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your polling request to $number could not be completed because 
-no document was available for retrieval.
-
-Processing time was $JTIME.

diff --git a/etc/templates/notify-poll_rejected.txt b/etc/templates/notify-poll_rejected.txt
deleted file mode 100644 (file)
index 7e8a4f7..0000000
--- a/etc/templates/notify-poll_rejected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-To: $SENDTO
-Subject: Notice about facsimile
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your polling request to $number could not be completed because 
-the remote side rejected your request.
-
-Processing time was $JTIME.

diff --git a/etc/templates/notify-reject.txt b/etc/templates/notify-reject.txt
deleted file mode 100644 (file)
index 1256bbc..0000000
--- a/etc/templates/notify-reject.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-To: $SENDTO
-Subject: facsimile to $DESTINATION failed
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your job to $number was rejected because:
-
-$faxstatus
-
-------- Unsent job status -------
-      Destination: $number
-            JobID: $jobid
-          GroupID: $groupid
-           Sender: $sender
-         Mailaddr: $mailaddr
-           CommID: $commid
-            Modem: $modem
-   Submitted From: $client
-       Page Width: $pagewidth  (mm)
-      Page Length: $pagelength (mm)
-       Resolution: $resolution (lpi)
-           Status: $faxstatus
-          Dialogs: $tottries
-            Dials: $ndials
-            Calls: $totdials
-            Pages: $npages
-         TotPages: $totpages
-         Attempts: $ntries
-           Dirnum: $dirnum

diff --git a/etc/templates/notify-removed.txt b/etc/templates/notify-removed.txt
deleted file mode 100644 (file)
index b4006f3..0000000
--- a/etc/templates/notify-removed.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-To: $SENDTO
-Subject: facsimile to $DESTINATION removed from queue
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your job to $number was deleted from the queue.

diff --git a/etc/templates/notify-requeued.txt b/etc/templates/notify-requeued.txt
deleted file mode 100644 (file)
index 5802514..0000000
--- a/etc/templates/notify-requeued.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-To: $SENDTO
-Subject: facsimile to $DESTINATION was requeued
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your job to $number was not sent because:
-
-$faxstatus
-
-The job will be retried at $NEXT

diff --git a/etc/templates/notify-timedout.txt b/etc/templates/notify-timedout.txt
deleted file mode 100644 (file)
index 75803ea..0000000
--- a/etc/templates/notify-timedout.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-To: $SENDTO
-Subject: facsimile to $DESTINATION failed
-From: $FROMADDR
-Content-type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: Quoted-Printable
-
-Your job to $number could not be completed before the appointed
-deadline.
-
-------- Unsent job status -------
-      Destination: $number
-            JobID: $jobid
-          GroupID: $groupid
-           Sender: $sender
-         Mailaddr: $mailaddr
-           CommID: $commid
-            Modem: $modem
-   Submitted From: $client
-       Page Width: $pagewidth  (mm)
-      Page Length: $pagelength (mm)
-       Resolution: $resolution (lpi)
-           Status: $faxstatus
-          Dialogs: $tottries
-            Dials: $ndials
-            Calls: $totdials
-            Pages: $npages
-         TotPages: $totpages
-         Attempts: $ntries
-           Dirnum: $dirnum

diff --git a/util/common-functions.sh.in b/util/common-functions.sh.in
index c717ac4dd4443b3266f7f938404d6911629788fa..f896c31d244b570fb79d96b377e8a3682dff6956 100644 (file)
--- a/util/common-functions.sh.in
+++ b/util/common-functions.sh.in
@@ -456,3 +456,8 @@ CleanupPrivateTmp ()
 }
 
 
+# And some common variables for things using our functions
+if [ -z "$TEMPLATE" ]
+then
+       TEMPLATE=en
+fi