--- Add support for setting "setvar=xxx=xxx" entries

--- Writing sccp.conf also check/create sccp_custom.conf #87 --- Fix the getCodec function. #85 --- Switching around the general deny/permit order. #82 --- Thank Josh2893 for the templet #77 Special thanks for help Diederik de Groot
PhantomVl · Nov 11, 2020 · ab6b453 · ab6b453
1 parent 932aae5
commit ab6b453
Show file tree

Hide file tree

Showing 7 changed files with 379 additions and 12 deletions.
diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php
@@ -75,6 +75,11 @@
  *  - Add Warning Information on Server Info Page
  *  - ADD Reload Line
  *  - Add Call Map (show Current call Information)
+ * ---TODO ---
+ * <vendorConfig>
+ *  <autoSelectLineEnable>0</autoSelectLineEnable>
+ * <autoCallSelect>0</autoCallSelect>
+ * </vendorConfig>
  */
 
 namespace FreePBX\modules;
@@ -530,7 +535,12 @@ public function phoneShowPage() {
                             "page" => 'views/server.codec.php'
                         );
                     }
-
+                    if ($this->sccpvalues['sccp_compatible']['data'] >= '433') {
+                        $this->pagedata["advanced"] = array(
+                            "name" => _("Device SCCP Advanced"),
+                            "page" => 'views/form.devadvanced.php'
+                        );
+                    }
                     break;
                 case "cisco-sip":
                     $this->pagedata = array(
@@ -974,6 +984,9 @@ public function ajaxHandler() {
                                     $dev_addon = null;
                                 }
                                 $dev_schema = $this->getSccpModelInformation('byciscoid', false, "all", array('model' => $dev_data['SCCP_Vendor']['model_id']));
+                                if (empty($dev_schema)) {
+                                    $dev_schema[0]['model'] = "ERROR in Model Schema";
+                                }
                                 $result[] = array('name' => $id_name, 'mac' => $id_name, 'button' => '---', 'type' => $dev_schema[0]['model'], 'new_hw' => 'Y',
                                     'description' => '*NEW* ' . $dev_ids['descr'], 'status' => '*NEW* ' . $dev_ids['status'], 'address' => $dev_ids['address'],
                                     'addon' => $dev_addon);
@@ -1530,11 +1543,10 @@ public function getCodecs($type, $showDefaults = false) {
                 break;
         }
         foreach ($allCodecs as $c => $v) {
-            if (array_search($c, $Sccp_Codec) != null) {
+            if (in_array($c, $Sccp_Codec)) {
                 $allSupported[$c] = $v;
             }
         }
-
         if (empty($lcodecs) || (!is_array($lcodecs))) {
             if (empty($allSupported)) {
                 $lcodecs = $allCodecs;
@@ -1548,7 +1560,6 @@ public function getCodecs($type, $showDefaults = false) {
                 }
             }
         }
-
         if ($showDefaults) {
             foreach ($allSupported as $c => $v) {
                 if (!isset($codecs[$c])) {
@@ -2041,9 +2052,15 @@ function createDefaultSccpConfig() {
                     case "allow":
                     case "disallow":
                     case "deny":
+                        $this->sccp_conf_init['general'][$key] = explode(';', $value['data']);
+                        break;
                     case "localnet":
                     case "permit":
-                        $this->sccp_conf_init['general'][$key] = explode(';', $value['data']);
+                        $content =$value['data'];
+                        if (strpos($content, 'internal') !== false) {
+                           $content = str_replace(';0.0.0.0/0.0.0.0','',$value['data']);
+                        }
+                        $this->sccp_conf_init['general'][$key] = explode(';', $content);
                         break;
                     case "devlang":
                         $lang_data = $this->extconfigs->getextConfig('sccp_lang', $value['data']);
@@ -2056,12 +2073,30 @@ function createDefaultSccpConfig() {
                     case "sccp_compatible":
                         break;
                     default:
-                        $this->sccp_conf_init['general'][$key] = $value['data'];
+                        if (!empty($value['data'])) {
+                            $this->sccp_conf_init['general'][$key] = $value['data'];
+                        }
                 }
             }
         }
         // [Namesoftkeyset]
         // type=softkeyset
+        // 
+        // ----- It is a very bad idea to add an external configuration file "sccp_custom.conf" !!!!
+        // This will add problems when solving problems caused by unexpected solutions from users.
+        //
+        if (file_exists($this->sccppath["asterisk"] . "/sccp_custom.conf")) {
+            $this->sccp_conf_init['HEADER'] = array(
+                ";                                                                                ;",
+                ";  It is a very bad idea to add an external configuration file !!!!              ;",
+                ";  This will add problems when solving problems caused by unexpected solutions   ;",
+                ";  from users.                                                                   ;",
+                ";--------------------------------------------------------------------------------;",
+                "#include sccp_custom.conf"
+            );
+        }
+        // ----- 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);
     }