Changeset 10628 for modules/branches/2.7

Timestamp:

11/29/10 13:07:38 (2 years ago)

Author:

p_lindheimer

Message:

fixes #4660 add admin code to meetme_additional.conf to get around Asterisk bug introduced in https://issues.asterisk.org/view.php?id=17908 though we probably should already have been putting it in anyhow

Files:

• modules/branches/2.7/conferences/functions.inc.php (modified) (2 diffs)
• modules/branches/2.7/conferences/module.xml (modified) (2 diffs)

modules/branches/2.7/conferences/functions.inc.php

@@ -8 +8 @@
-    return "meetme_additional.conf";
-  }
- function addMeetme($room, $pin
-   $this->_meetmes[$room] = $pin
+  function addMeetme($room, $userpin, $adminpin=''
+    $this->_meetmes[$room] = $userpin.($adminpin != '' ? ','.$adminpin : '')
-  }
-  // return the output that goes in the file
@@ -180 +180 @@
-          
-          // add meetme config
-         $conferences_conf->addMeetme($room['exten'],$room['user
+          $conferences_conf->addMeetme($room['exten'],$room['userpin'],$room['admin
-        }
-      }

modules/branches/2.7/conferences/module.xml

@@ -2 +2 @@
-  <rawname>conferences</rawname>
-  <name>Conferences</name>
-1
+2
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -9 +9 @@
-  <description>Allow creation of conference rooms (meet-me) where multiple people can talk together.</description>
-  <changelog>
+    *2.7.0.2* #4660
-    *2.7.0.1* spelling fixes, localization updates
-    *2.7.0.0* #4051, #3967 add MoH class choice require MoH module 2.7.0.0+