use alerting instead of call_proceeding to detect starting call

[auerswald-callnotifier.git] / src / callnotifier / CallMonitor.php

diff --git a/src/callnotifier/CallMonitor.php b/src/callnotifier/CallMonitor.php
index 9abdba80c959cf61b8ab65c38f699ded6aa5389b..682008a0bebcac921e550aea4d54c55a80cffcd5 100644 (file)
--- a/src/callnotifier/CallMonitor.php
+++ b/src/callnotifier/CallMonitor.php
@@ -43,16 +43,13 @@ class CallMonitor
     {
         $call = $this->currentCalls[$callId];
         $call->start = time();
-        foreach ($msg->parameters as $param) {
-            switch ($param->type) {
-            case EDSS1_Parameter::CALLING_PARTY_NUMBER:
-                $call->from = $param->number;
-                break;
-            case EDSS1_Parameter::CALLED_PARTY_NUMBER:
-                $call->to = $param->number;
-                break;
-            }
+        if ($msg->tei == 127) {
+            $call->type = CallMonitor_Call::INCOMING;
+        } else {
+            $call->type = CallMonitor_Call::OUTGOING;
         }
+
+        $this->handleParams($call, $msg);
     }
 
 
@@ -61,8 +58,11 @@ class CallMonitor
         $call = $this->currentCalls[$callId];
 
         switch ($msg->type) {
-        case EDSS1_Message::CALL_PROCEEDING:
-            $this->log->log('incomingCall', array('call' => $call));
+        case EDSS1_Message::INFORMATION:
+            $this->handleParams($call, $msg);
+            break;
+        case EDSS1_Message::ALERTING:
+            $this->log->log('startingCall', array('call' => $call));
             break;
 
         case EDSS1_Message::RELEASE:
@@ -73,6 +73,20 @@ class CallMonitor
             break;
         }
     }
+
+    protected function handleParams($call, $msg)
+    {
+        foreach ($msg->parameters as $param) {
+            switch ($param->type) {
+            case EDSS1_Parameter::CALLING_PARTY_NUMBER:
+                $call->from = $param->number;
+                break;
+            case EDSS1_Parameter::CALLED_PARTY_NUMBER:
+                $call->to = $param->number;
+                break;
+            }
+        }
+    }
 }
 
 ?>