X-Git-Url: https://git.cweiske.de/auerswald-callnotifier.git/blobdiff_plain/8e42bcadf70dffd3e6cdf52c5582ce7fd0dce868..b1fe50cb5391273bc40902660ceee038d846ca35:/src/callnotifier/CallMonitor.php

diff --git a/src/callnotifier/CallMonitor.php b/src/callnotifier/CallMonitor.php
index 29ee5a2..b8f904d 100644
--- a/src/callnotifier/CallMonitor.php
+++ b/src/callnotifier/CallMonitor.php
@@ -49,7 +49,7 @@ class CallMonitor
             $call->type = CallMonitor_Call::OUTGOING;
         }
 
-        $this->handleParams($call, $msg);
+        $this->handleParams($msg, $call, $callId);
     }
 
 
@@ -59,9 +59,29 @@ class CallMonitor
 
         switch ($msg->type) {
         case EDSS1_Message::INFORMATION:
-            $this->handleParams($call, $msg);
+            $this->handleParams($msg, $call, $callId);
             break;
-        case EDSS1_Message::CALL_PROCEEDING:
+        case EDSS1_Message::ALERTING:
+            if ($call->type == CallMonitor_Call::OUTGOING) {
+                /**
+                 * There may be two alerts: One from the telephone to the
+                 * switchboard, and one from the switchboard to the target.
+                 *
+                 * The alert from the switchboard to the target call is
+                 * sent first, so we can remove the call from the telephone
+                 * to the switchboard.
+                 */
+                $bFound = false;
+                foreach ($this->currentCalls as $otherCallId => $otherCall) {
+                    if ($otherCallId != $callId && $otherCall->to == $call->to) {
+                        $bFound = true;
+                        break;
+                    }
+                }
+                if ($bFound) {
+                    unset($this->currentCalls[$otherCallId]);
+                }
+            }
             $this->log->log('startingCall', array('call' => $call));
             break;
 
@@ -74,19 +94,43 @@ class CallMonitor
         }
     }
 
-    protected function handleParams($call, $msg)
+    protected function handleParams($msg, $call, $callId)
     {
         foreach ($msg->parameters as $param) {
             switch ($param->type) {
             case EDSS1_Parameter::CALLING_PARTY_NUMBER:
-                $call->from = $param->number;
+                $call->from = $this->getFullNumber(
+                    $param->number, $param->numberType
+                );
                 break;
             case EDSS1_Parameter::CALLED_PARTY_NUMBER:
-                $call->to = $param->number;
+                $call->to = $this->getFullNumber(
+                    $param->number, $param->numberType
+                );
+                if ($call->type == CallMonitor_Call::INCOMING
+                    && $param->numberType != EDSS1_Parameter_Names::NUMBER_SUBSCRIBER
+                ) {
+                    //only keep incoming calls that arrive at the switchboard,
+                    // not the ones from the switchboard to the telephones
+                    unset($this->currentCalls[$callId]);
+                }
                 break;
+            case EDSS1_Parameter::KEYPAD:
+                if ($call->to === null) {
+                    $call->to = $param->data;
+                }
             }
         }
     }
+
+
+    protected function getFullNumber($number, $type)
+    {
+        if ($type == EDSS1_Parameter_Names::NUMBER_NATIONAL) {
+            return '0' . $number;
+        }
+        return $number;
+    }
 }
 
 ?>