Fixes: #77

Fixes: #82
Fixes: #85
Fixes: #87
--- Bugfix sip protocol
Special thanks for help Diederik de Groot

Sccp_manager.class.php

@@ -758,6 +758,9 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
                 $ver_id = ' on found active model !';
                 foreach ($models as $data) {
                     $ver_id = $this->createSccpDeviceXML($data['name']);
+                    if ($ver_id == -1) {
+                        return array('status' => false, 'message' => 'Error Create Configuration Divice :' . $data['name']);
+                    }
                 };
 
                 if ($this->sccpvalues['siptftp']['data'] == 'on') { // Check SIP Support Enabled
@@ -1283,7 +1286,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
         $save_buttons = $this->getPhoneButtons($get_settings, $name_dev, $hw_type);
         $this->dbinterface->write("sccpbuttons", $save_buttons, $update_hw, '', $name_dev);
         $this->createSccpDeviceXML($name_dev);
-
         if ($hw_id == 'new') {
             $this->srvinterface->sccpDeviceReset($name_dev);
         } else {
@@ -1925,6 +1927,10 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
                             $dev_line_data = $this->sipconfigs->get_db_sip_TableData('DeviceById', array('id' => $tmp_line[1]));
                             $f_linetype = ($dev_line_data['dial'] == 'PJSIP') ? 'pjsip' : 'sip';
                             $dev_line_data['sbind'] = $tmp_bind[$f_linetype];
+                            if ((!$this->array_key_exists_recursive('udp', $tmp_bind[$f_linetype])) && (!$this->array_key_exists_recursive('tcp', $tmp_bind[$f_linetype]))) {
+                                return -1;
+                            }
+
                             if (!empty($dev_line_data)) {
                                 $data_value['siplines'][] = $dev_line_data;
                             }
@@ -2056,9 +2062,9 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
                         break;
                     case "localnet":
                     case "permit":
-                        $content =$value['data'];
+                        $content = $value['data'];
                         if (strpos($content, 'internal') !== false) {
-                           $content = str_replace(';0.0.0.0/0.0.0.0','',$value['data']);
+                            $content = str_replace(';0.0.0.0/0.0.0.0', '', $value['data']);
                         }
                         $this->sccp_conf_init['general'][$key] = explode(';', $content);
                         break;
@@ -2096,7 +2102,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
             );
         }
         // ----- It is a very bad idea to add an external configuration file "sccp_custom.conf" !!!!
-        
+
         $this->cnf_wr->writeConfig('sccp.conf', $this->sccp_conf_init);
     }
 
@@ -2182,7 +2188,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
             // Old Req get all hints
             $tmp_data = $this->srvinterface->sccp_list_all_hints();
             foreach ($tmp_data as $value) {
-                $res[$value] = array('key' => $value, 'exten' => $this-> before('@', $value), 'label' => $value);
+                $res[$value] = array('key' => $value, 'exten' => $this->before('@', $value), 'label' => $value);
             }
         }
 
@@ -2283,6 +2289,18 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
         return substr($inthat, 0, strpos($inthat, $thing));
     }
 
+    private function array_key_exists_recursive($key, $arr) {
+        if (array_key_exists($key, $arr)) {
+            return true;
+        }
+        foreach ($arr as $currentKey => $value) {
+            if (is_array($value)) {
+                return $this->array_key_exists_recursive($key, $value);
+            }
+        }
+        return false;
+    }
+
     private function strpos_array($haystack, $needles) {
         if (is_array($needles)) {
             foreach ($needles as $str) {

Sccp_manager.inc/sipconfigs.class.php

@@ -90,7 +90,11 @@ class sipconfigs
                         if ($f_data['ip'] == "127.0.0.1") {
                             continue;
                         }
-                        $result[$f_protocol][$f_data['ip']]=$f_port;
+                        if (empty($result[$f_protocol][$f_data['ip']])) {
+                            $result[$f_protocol][$f_data['ip']]= $f_port;
+                        } else {
+                            $result[$f_protocol][$f_data['ip']]= array_merge($result[$f_protocol][$f_data['ip']],$f_port);
+                        }
                         $result[$f_protocol][$f_data['ip']]['ip']=$f_data['ip'];
                     }
                 } else {

Sccp_manager.inc/xmlinterface.class.php

@@ -536,7 +536,6 @@ class xmlinterface
                 $bind_proto = (isset($value['tcp'])) ? 'tcp' : 'udp';
             }
         }
-
         if (file_exists($xml_template)) {
             $xml_work = simplexml_load_file($xml_template);