Updated config.xml in bigbluebutton-client

Corey-Wang · Jun 10, 2010 · 55bee72 · 55bee72
1 parent 695f980
commit 55bee72
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/bbb-api-examples/PHP/demo1.php b/bbb-api-examples/PHP/demo1.php
@@ -20,7 +20,7 @@
 
 */
 
-require('bbb_api.inc.php');
+require('bbb_api.php');
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -33,15 +33,18 @@
 <?
 if ($_REQUEST['action'] == 'create' && trim($_REQUEST['username']))
 {
+         $sIP = $_SERVER['SERVER_ADDR'];
+         $serverIP = 'http://'.$sIP.'/bigbluebutton/';
    /*
 	* Got an action=create
 	*
 	* Request a URL to join a meeting called "Demo Meeting"
 	* Pass null for welcome message to use the default message (see defaultWelcomeMessage in bigbluebutton.properties)
 	*
 	*/
-
-    $joinURL = getJoinURL($_REQUEST['username'], "Demo Meeting", null);
+    $joinURL = new BigBlueButton( $_REQUEST['username'], "Demo Meeting", null, "mp", "ap", $SALT, $sIP );
+    $joinURL->createMeeting( $_REQUEST['username'], "Demo Meeting", null, "mp", "ap", $SALT, $sIP );
+    //$joinURL = getJoinURL($_REQUEST['username'], "Demo Meeting", null);
     if (substr($joinURL, 0, 7) == 'http://')
     {
     	?>
@@ -81,4 +84,4 @@
 include('demo_footer.php');
 ?>
 </body>
-</html>
+</html>
diff --git a/bigbluebutton-client/src/conf/config.xml b/bigbluebutton-client/src/conf/config.xml
@@ -41,21 +41,21 @@
 			uri="rtmp://192.168.0.172/video"
 			onUserJoinedEvent="START"
 			onUserLogoutEvent="STOP"	
-			loadNextModule="PresentModule"
+			loadNextModule="HighlighterModule"
 		/>
 
 		<module name="HighlighterModule" url="HighlighterModule.swf" 
 			uri="rtmp://192.168.0.172/bigbluebutton" 
 			onUserJoinedEvent="START" 
 			onUserLogoutEvent="STOP"
+			loadNextModule="PresentModule"
 		/>
 
 		<module name="PresentModule" url="PresentModule.swf" 
 			uri="rtmp://192.168.0.172/bigbluebutton" 
 			host="http://192.168.0.172" 
 			onUserJoinedEvent="START" 
 			onUserLogoutEvent="STOP"
-			loadNextModule="HighlighterModule"
 		/>
 
 		<!-- new module in development: 

diff --git a/bigbluebutton-client/src/conf/config.xml.template b/bigbluebutton-client/src/conf/config.xml.template
@@ -40,21 +40,21 @@
 			uri="rtmp://HOST/video"
 			onUserJoinedEvent="START"
 			onUserLogoutEvent="STOP"	
-			loadNextModule="PresentModule"
+			loadNextModule="HighlighterModule"
 		/>
 		
 		<module name="HighlighterModule" url="HighlighterModule-VERSION.swf" 
 			uri="rtmp://HOST/bigbluebutton" 
 			onUserJoinedEvent="START" 
 			onUserLogoutEvent="STOP"
+			loadNextModule="PresentModule"
 		/>
 		
 		<module name="PresentModule" url="PresentModule-VERSION.swf" 
 			uri="rtmp://HOST/bigbluebutton" 
 			host="http://HOST" 
 			onUserJoinedEvent="START" 
 			onUserLogoutEvent="STOP"
-			loadNextModule="HighlighterModule"
 		/>
 
 		<!-- new module in development: