Changeset 7840

Timestamp:

06/20/09 10:09:44 (1 year ago)

Author:

p_lindheimer

Message:

don't allow video codecs if videosupport is disabled and don't set jitter buffer settings if not enabled

Files:

• modules/branches/2.6/sipsettings/functions.inc.php (modified) (3 diffs)

modules/branches/2.6/sipsettings/functions.inc.php

@@ -120 +120 @@
-
-            case CODEC:
+              $codecs[$var['keyword']] = $var['data'];
+            break;
+
-            case VIDEO_CODEC:
-
+video_
-            break;
-
@@ -142 +145 @@
-        unset($codecs);
-
+        if ($interim_settings['videosupport'] == 'yes') {
+          foreach ($video_codecs as $codec => $enabled) {
+            if ($enabled == '1') {
+              $core_conf->addSipGeneral('allow',$codec);
+            }
+          }
+        }
+        unset($video_codecs);
+
-        /* next figure out what we need to write out (deal with things like nat combos, etc. */
-
-        $nat_mode = $interim_settings['nat_mode'];
+        $jbenable = $interim_settings['jbenable'];
-        foreach ($interim_settings as $key => $value) {
-          switch ($key) {
@@ -165 +178 @@
-              if ($nat_mode == 'externip' && $key != '') {
-                $sip_settings[] = array('externip', $value);
+              }
+            break;
+
+            case 'jbforce':
+            case 'jpimpl':
+            case 'jbmaxsize':
+            case 'jbresyncthreshold':
+            case 'jblog':
+              if ($jbenable == 'yes' && $key != '') {
+                $sip_settings[] = array($key, $value);
-              }
-            break;