Set language of a conference

Here is a patch that allows you to set the language of a conference.
You just have to create a setlanguage varchar column in your meetme table and to apply the patch!!

Only in /var/www/voip/admin/modules/conferences: .functions.inc.php.swp
Only in /var/www/voip/admin/modules/conferences: .page.conferences.php.swp
diff -u /var/www/voip/admin/modules/conferences/functions.inc.php /var/www/voip/admin/modules/conferences/functions.inc.php
--- /var/www/voip/admin/modules/conferences/functions.inc.php	2007-06-01 00:33:31.000000000 +0200
+++ /var/www/voip/admin/modules/conferences/functions.inc.php	2007-10-31 15:44:17.000000000 +0100
@@ -1,4 +1,4 @@
-<?php /* $Id: functions.inc.php 3991 2007-05-31 22:33:35Z p_lindheimer $ */
+<?php /* $Id: functions.inc.php 5165 2007-10-27 02:01:53Z p_lindheimer $ */
 
 // extend extensions class.
 // This example is about as simple as it gets
@@ -52,6 +52,7 @@
 			if(is_array($conflist = conferences_list())) {
 				
 				// Start the conference
+				$ext->add($contextname, 'STARTMEETME', '', new ext_macro('user-callerid'));
 				$ext->add($contextname, 'STARTMEETME', '', new ext_meetme('${MEETME_ROOMNUM}','${MEETME_OPTS}','${PIN}'));
 				$ext->add($contextname, 'STARTMEETME', '', new ext_hangup(''));
 				
@@ -63,12 +64,14 @@
 					
 					$roomnum = ltrim($item['0']);
 					$roomoptions = $room['options'];
+					$roomlanguage = $room['setlanguage'];
 					$roomuserpin = $room['userpin'];
 					$roomadminpin = $room['adminpin'];
 					$roomjoinmsg = (isset($room['joinmsg'])?$room['joinmsg']:'');
 					
 					// entry point
 					$ext->add($contextname, $roomnum, '', new ext_setvar('MEETME_ROOMNUM',$roomnum));
+					$ext->add($contextname, $roomnum, '', new ext_setvar('LANGUAGE()',$roomlanguage));
 					$ext->add($contextname, $roomnum, '', new ext_gotoif('$["${DIALSTATUS}" = "ANSWER"]',($roomuserpin == '' && $roomadminpin == '' ? 'USER' : 'READPIN')));			
 					$ext->add($contextname, $roomnum, '', new ext_answer(''));
 					$ext->add($contextname, $roomnum, '', new ext_wait(1));
@@ -138,7 +141,7 @@
 
 function conferences_get($account){
 	//get all the variables for the meetme
-	$results = sql("SELECT exten,options,userpin,adminpin,description,joinmsg FROM meetme WHERE exten = '$account'","getRow",DB_FETCHMODE_ASSOC);
+	$results = sql("SELECT exten,options,setlanguage,userpin,adminpin,description,joinmsg FROM meetme WHERE exten = '$account'","getRow",DB_FETCHMODE_ASSOC);
 	return $results;
 }
 
@@ -146,7 +149,7 @@
 	$results = sql("DELETE FROM meetme WHERE exten = \"$account\"","query");
 }
 
-function conferences_add($account,$name,$userpin,$adminpin,$options,$joinmsg=null){
-	$results = sql("INSERT INTO meetme (exten,description,userpin,adminpin,options,joinmsg) values (\"$account\",\"$name\",\"$userpin\",\"$adminpin\",\"$options\",\"$joinmsg\")");
+function conferences_add($account,$name,$userpin,$adminpin,$options,$joinmsg=null,$setlanguage){
+	$results = sql("INSERT INTO meetme (exten,description,userpin,adminpin,options,joinmsg,setlanguage) values (\"$account\",\"$name\",\"$userpin\",\"$adminpin\",\"$options\",\"$joinmsg\",\"$setlanguage\")");
 }
 ?>
Common subdirectories: /var/www/voip/admin/modules/conferences/i18n and /var/www/voip/admin/modules/conferences/i18n
diff -u /var/www/voip/admin/modules/conferences/module.xml /var/www/voip/admin/modules/conferences/module.xml
--- /var/www/voip/admin/modules/conferences/module.xml	2007-08-09 04:21:13.000000000 +0200
+++ /var/www/voip/admin/modules/conferences/module.xml	2007-10-27 04:07:54.000000000 +0200
@@ -1,11 +1,12 @@
 <module>
 	<rawname>conferences</rawname>
 	<name>Conferences</name>
-	<version>1.2.1.1</version>
+	<version>1.2.1.2</version>
 	<type>setup</type>
 	<category>Internal Options &amp; Configuration</category>
 	<description>Allow creation of conference rooms (meet-me) where multiple people can talk together.</description>
 	<changelog>
+		*1.2.1.2* add call to Macro(user-callerid) to get proper CID in Meetme Conference
 		*1.2.1.1* bump for rc1
 		*1.2.1* changed syntax error in meetme_additional.conf form '|' to ',' separator
 		*1.2* Fixed raising asterisk error on empty dialstatus #1708
@@ -16,6 +17,6 @@
 	<menuitems>
 		<conferences>Conferences</conferences>
 	</menuitems>
-	<location>release/2.3/conferences-1.2.1.tgz</location>
-	<md5sum>7b62fe196c3714cb439b7d4ece7f04d4</md5sum>
+	<location>release/2.3/conferences-1.2.1.1.tgz</location>
+	<md5sum>05412df86906ea4abd4e165fe652e2fc</md5sum>
 </module>
diff -u conferences-init/page.conferences.php /var/www/voip/admin/modules/conferences/page.conferences.php
--- conferences-init/page.conferences.php	2006-12-02 19:59:53.000000000 +0100
+++ /var/www/voip/admin/modules/conferences/page.conferences.php	2007-10-31 16:00:53.000000000 +0100
@@ -25,7 +25,7 @@
 	//if submitting form, update database
 	switch ($action) {
 		case "add":
-			conferences_add($_REQUEST['account'],$_REQUEST['name'],$_REQUEST['userpin'],$_REQUEST['adminpin'],$_REQUEST['options'],$_REQUEST['joinmsg']);
+			conferences_add($_REQUEST['account'],$_REQUEST['name'],$_REQUEST['userpin'],$_REQUEST['adminpin'],$_REQUEST['options'],$_REQUEST['joinmsg'],$_REQUEST['setlanguage']);
 			needreload();
 			redirect_standard();
 		break;
@@ -36,7 +36,7 @@
 		break;
 		case "edit":  //just delete and re-add
 			conferences_del($_REQUEST['account']);
-			conferences_add($_REQUEST['account'],$_REQUEST['name'],$_REQUEST['userpin'],$_REQUEST['adminpin'],$_REQUEST['options'],$_REQUEST['joinmsg']);
+			conferences_add($_REQUEST['account'],$_REQUEST['name'],$_REQUEST['userpin'],$_REQUEST['adminpin'],$_REQUEST['options'],$_REQUEST['joinmsg'],$_REQUEST['setlanguage']);
 			needreload();
 			redirect_standard('extdisplay');
 		break;
@@ -113,6 +113,14 @@
 		<td><input size="8" type="text" name="adminpin" value="<?php echo (isset($adminpin) ? $adminpin : ''); ?>"></td>
 	</tr>
 
+	<tr>
+		<td><a href="#" class="info"><?php echo _("setlanguage:")?><span><?php echo _("Set the language of the conference.<br><br>Please enter the code of the language set: en,fr,... .")?></span></a></td>
+		<td><input size="8" type="text" name="setlanguage" value="<?php echo (isset($setlanguage) ? $setlanguage : ''); ?>"></td>
+	</tr>
+
+
+
+
 	<?php
 	$options = (isset($options) ? $options : "");
 	?>