diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-01-12 20:01:48 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-01-12 20:01:48 +0000 |
| commit | 1da70637a5d6992e33c4a6e0c17dd18ba6476b2a (patch) | |
| tree | 33745dfdb03ba3830a05bb366ca1b0ce9059afd3 | |
| parent | 88ef4d09ad6a6dbb50719c04528b138752dee345 (diff) | |
Merge two improvement suggestions from Wolfram Schlich
git-svn-id: file:///home/lennart/svn/public/ivam2/trunk@36 dbf6933d-3bce-0310-9bcc-ed052ba35b35
| -rwxr-xr-x | clients/ivam-newmessage | 10 | ||||
| -rw-r--r-- | clients/ivamVoiceBox.py | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/clients/ivam-newmessage b/clients/ivam-newmessage index 9fb3042..13b187e 100755 --- a/clients/ivam-newmessage +++ b/clients/ivam-newmessage @@ -29,8 +29,12 @@ EMAIL=root DATE=$(date) +[ "x$CALLERMSN" = "x0" ] && CALLERMSN=unknown + ( - BOUND="$$-`date +%s`-ivam" + ATTACHMENT="ivam-message.$(date +%Y%m%d-%H%M%S).from-${CALLERMSN}.to-${RINGMSN}.ogg" + + BOUND="$$-$(date +%s)-ivam" cat <<EOF To: $EMAIL @@ -47,7 +51,7 @@ A new voice message has been received: Caller number: $CALLERMSN Local number: $RINGMSN - File: $1 + File: $ATTACHMENT Date: $DATE Length: ${SEC_LENGTH}s @@ -59,7 +63,7 @@ to the last recorded message. --$BOUND Content-Type: application/ogg; charset=unknown-8bit -Content-Disposition: attachment; filename="voice-message.ogg" +Content-Disposition: attachment; filename="$ATTACHMENT" Content-Transfer-Encoding: base64 EOF diff --git a/clients/ivamVoiceBox.py b/clients/ivamVoiceBox.py index 75601b9..68eff9c 100644 --- a/clients/ivamVoiceBox.py +++ b/clients/ivamVoiceBox.py @@ -142,9 +142,7 @@ class VoiceBox(ivamApi.Processor): pass elif self.currentState == self.STATE_EMPTY: - - # Silence ... - pass + c.hangup(); def onDtmfEvent(self, c, event): |