Index: /modules/branches/2.1/conferences/install.sql
===================================================================
--- /modules/branches/2.1/conferences/install.sql (revision 1081)
+++ /modules/branches/2.1/conferences/install.sql (revision 1081)
@@ -0,0 +1,4 @@
+
+CREATE TABLE IF NOT EXISTS `meetme` ( `exten` VARCHAR( 50 ) NOT NULL , `options` VARCHAR( 15 ) , `userpin` VARCHAR( 50 ) , `adminpin` VARCHAR( 50 ) , `description` VARCHAR( 50 ) , `joinmsg` VARCHAR( 255 ) );
+
+
Index: /modules/branches/2.1/conferences/module.xml
===================================================================
--- /modules/branches/2.1/conferences/module.xml (revision 1388)
+++ /modules/branches/2.1/conferences/module.xml (revision 1388)
@@ -0,0 +1,12 @@
+<module>
+	<rawname>conferences</rawname>
+	<name>Conferences</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Module</category>
+	<menuitems>
+		<conferences>Conferences</conferences>
+	</menuitems>
+	<location>release/conferences-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/Conferences</info>
+</module>
Index: /modules/branches/2.1/conferences/functions.inc.php
===================================================================
--- /modules/branches/2.1/conferences/functions.inc.php (revision 1433)
+++ /modules/branches/2.1/conferences/functions.inc.php (revision 1433)
@@ -0,0 +1,148 @@
+<?php /* $Id$ */
+
+// extend extensions class.
+// This example is about as simple as it gets
+class conferences_conf {
+	// return the filename to write
+	function get_filename() {
+		return "meetme_additional.conf";
+	}
+	function addMeetme($room, $pin) {
+		$this->_meetmes[$room] = $pin;
+	}
+	// return the output that goes in the file
+	function generateConf() {
+		$output = "";
+		if (is_array($this->_meetmes)) {
+			foreach (array_keys($this->_meetmes) as $meetme) {
+				$output .= 'conf => '.$meetme."|".$this->_meetmes[$meetme]."\n";
+			}
+		}
+		return $output;
+	}
+}
+
+// returns a associative arrays with keys 'destination' and 'description'
+function conferences_destinations() {
+	//get the list of meetmes
+	$results = conferences_list();
+
+	// return an associative array with destination and description
+	if (isset($results)) {
+		foreach($results as $result){
+				$extens[] = array('destination' => 'ext-meetme,'.$result['0'].',1', 'description' => $result['1']." <".$result['0'].">");
+		}
+	return $extens;
+	} else {
+	return null;
+	}
+}
+
+
+/* 	Generates dialplan for conferences
+	We call this with retrieve_conf
+*/
+function conferences_get_config($engine) {
+	global $ext;  // is this the best way to pass this?
+	global $conferences_conf;
+	switch($engine) {
+		case "asterisk":
+			$ext->addInclude('from-internal-additional','ext-meetme');
+			$contextname = 'ext-meetme';
+			if(is_array($conflist = conferences_list())) {
+				foreach($conflist as $item) {
+					$room = conferences_get(ltrim($item['0']));
+					
+					$roomnum = ltrim($item['0']);
+					$roomoptions = $room['options'];
+					$roomuserpin = $room['userpin'];
+					$roomadminpin = $room['adminpin'];
+					if (function_exists('recordings_list'))
+						$roomjoinmsg = recordings_get($room['joinmsg']);
+					
+					// entry point
+					$ext->add($contextname, $roomnum, '', new ext_setvar('MEETME_ROOMNUM',$roomnum));
+					$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));
+					
+					// Deal with PINs -- if exist
+					if ($roomuserpin != '' || $roomadminpin != '') {
+						$ext->add($contextname, $roomnum, 'READPIN', new ext_read('PIN','enter-conf-pin-number'));
+						
+						// userpin -- must do always, otherwise if there is just an adminpin
+						// there would be no way to get to the conference !
+						$ext->add($contextname, $roomnum, '', new ext_gotoif('$[foo${PIN} = foo'.$roomuserpin.']','USER'));
+
+						// admin pin -- exists
+						if ($roomadminpin != '') {
+							$ext->add($contextname, $roomnum, '', new ext_gotoif('$[${PIN} = '.$roomadminpin.']','ADMIN'));
+						}
+
+						// pin invalid
+						$ext->add($contextname, $roomnum, '', new ext_playback('conf-invalidpin'));
+						$ext->add($contextname, $roomnum, '', new ext_goto('READPIN'));
+						
+						// admin mode -- only valid if there is an admin pin
+						if ($roomadminpin != '') {
+							$ext->add($contextname, $roomnum, 'ADMIN', new ext_setvar('MEETME_OPTS','aA'.$roomoptions));
+							if (isset($roomjoinmsg)) {  // play joining message if one defined
+								$ext->add($contextname, $roomnum, '', new ext_playback($roomjoinmsg['filename']));
+							}
+							$ext->add($contextname, $roomnum, '', new ext_goto('STARTMEETME,1'));							
+						}
+					}
+					
+					// user mode
+					$ext->add($contextname, $roomnum, 'USER', new ext_setvar('MEETME_OPTS',$roomoptions));
+					if (isset($roomjoinmsg)) {  // play joining message if one defined
+						$ext->add($contextname, $roomnum, '', new ext_playback($roomjoinmsg['filename']));
+					}
+					$ext->add($contextname, $roomnum, '', new ext_goto('STARTMEETME,1'));
+					
+					// add meetme config
+					$conferences_conf->addMeetme($room['exten'],$room['userpin']);
+				}
+			}
+
+			// Start the conference
+			$ext->add($contextname, 'STARTMEETME', '', new ext_meetme('${MEETME_ROOMNUM}','${MEETME_OPTS}','${PIN}'));
+			$ext->add($contextname, 'STARTMEETME', '', new ext_hangup(''));
+			
+			// hangup for whole context
+			$ext->add($contextname, 'h', '', new ext_hangup(''));			
+		break;
+	}
+}
+
+//get the existing meetme extensions
+function conferences_list() {
+	$results = sql("SELECT exten,description FROM meetme ORDER BY exten","getAll",DB_FETCHMODE_ASSOC);
+	foreach($results as $result){
+		// check to see if we are in-range for the current AMP User.
+		if (isset($result['exten']) && checkRange($result['exten'])){
+			// return this item's dialplan destination, and the description
+			$extens[] = array($result['exten'],$result['description']);
+		}
+	}
+	if (isset($extens)) {
+		return $extens;
+	} else {
+		return null;
+	}
+}
+
+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);
+	return $results;
+}
+
+function conferences_del($account){
+	$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\")");
+}
+?>
Index: /modules/branches/2.1/conferences/uninstall.sql
===================================================================
--- /modules/branches/2.1/conferences/uninstall.sql (revision 842)
+++ /modules/branches/2.1/conferences/uninstall.sql (revision 842)
@@ -0,0 +1,2 @@
+
+DROP TABLE IF EXISTS meetme;
Index: /modules/branches/2.1/conferences/page.conferences.php
===================================================================
--- /modules/branches/2.1/conferences/page.conferences.php (revision 1246)
+++ /modules/branches/2.1/conferences/page.conferences.php (revision 1246)
@@ -0,0 +1,277 @@
+<?php /* $Id$ */
+//Copyright (C) 2004 Coalescent Systems Inc. (info@coalescentsystems.ca)
+//
+//This program is free software; you can redistribute it and/or
+//modify it under the terms of the GNU General Public License
+//as published by the Free Software Foundation; either version 2
+//of the License, or (at your option) any later version.
+//
+//This program is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+
+isset($_REQUEST['action'])?$action = $_REQUEST['action']:$action='';
+//the extension we are currently displaying
+isset($_REQUEST['extdisplay'])?$extdisplay=$_REQUEST['extdisplay']:$extdisplay='';
+$dispnum = "conferences"; //used for switch on config.php
+
+//check if the extension is within range for this user
+if (isset($account) && !checkRange($account)){
+	echo "<script>javascript:alert('"._("Warning! Extension")." $account "._("is not allowed for your account.")."');</script>";
+} else {
+	
+	//if submitting form, update database
+	switch ($action) {
+		case "add":
+			conferences_add($_REQUEST['account'],$_REQUEST['name'],$_REQUEST['userpin'],$_REQUEST['adminpin'],$_REQUEST['options'],$_REQUEST['joinmsg']);
+			needreload();
+		break;
+		case "delete":
+			conferences_del($extdisplay);
+			needreload();
+		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']);
+			needreload();
+		break;
+	}
+}
+
+//get meetme rooms
+//this function needs to be available to other modules (those that use goto destinations)
+//therefore we put it in globalfunctions.php
+$meetmes = conferences_list();
+?>
+
+</div>
+
+<!-- right side menu -->
+<div class="rnav">
+    <li><a id="<?php echo ($extdisplay=='' ? 'current':'') ?>" href="config.php?display=<?php echo urlencode($dispnum)?>"><?php echo _("Add Conference")?></a></li>
+<?php
+if (isset($meetmes)) {
+	foreach ($meetmes as $meetme) {
+		echo "<li><a id=\"".($extdisplay==$meetme[0] ? 'current':'')."\" href=\"config.php?display=".urlencode($dispnum)."&extdisplay=".urlencode($meetme[0])."\">{$meetme[0]}:{$meetme[1]}</a></li>";
+	}
+}
+?>
+</div>
+
+
+<div class="content">
+<?php
+if ($action == 'delete') {
+	echo '<br><h3>'._("Conference").' '.$extdisplay.' '._("deleted").'!</h3><br><br><br><br><br><br><br><br>';
+} else {
+	if ($extdisplay){ 
+		//get details for this meetme
+		$thisMeetme = conferences_get($extdisplay);
+		//create variables
+		extract($thisMeetme);
+	}
+
+	$delURL = $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'].'&action=delete';
+?>
+
+	
+<?php		if ($extdisplay){ ?>
+	<h2><?php echo _("Conference:")." ". $extdisplay; ?></h2>
+	<p><a href="<?php echo $delURL ?>"><?php echo _("Delete Conference")?> <?php echo $extdisplay; ?></a></p>
+<?php		} else { ?>
+	<h2><?php echo _("Add Conference"); ?></h2>
+<?php		}
+?>
+	<form autocomplete="off" name="editMM" action="<?php $_SERVER['PHP_SELF'] ?>" method="post" onsubmit="return checkConf();">
+	<input type="hidden" name="display" value="<?php echo $dispnum?>">
+	<input type="hidden" name="action" value="<?php echo ($extdisplay ? 'edit' : 'add') ?>">
+	<table>
+	<tr><td colspan="2"><h5><?php echo ($extdisplay ? _("Edit Conference") : _("Add Conference")) ?><hr></h5></td></tr>
+	<tr>
+<?php		if ($extdisplay){ ?>
+		<input type="hidden" name="account" value="<?php echo $extdisplay; ?>">
+<?php		} else { ?>
+		<td><a href="#" class="info"><?php echo _("conference number:")?><span><?php echo _("Use this number to dial into the conference.")?></span></a></td>
+		<td><input type="text" name="account" value=""></td>
+<?php		} ?>
+	</tr>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("conference name:")?><span><?php echo _("Give this conference a brief name to help you identify it.")?></span></a></td>
+		<td><input type="text" name="name" value="<?php echo (isset($description) ? $description : ''); ?>"></td>
+	</tr>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("user PIN:")?><span><?php echo _("You can require callers to enter a password before they can enter this conference.<br><br>This setting is optional.<br><br>If either PIN is entered, the user will be prompted to enter a PIN.")?></span></a></td>
+		<td><input size="8" type="text" name="userpin" value="<?php echo (isset($userpin) ? $userpin : ''); ?>"></td>
+	</tr>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("admin PIN:")?><span><?php echo _("Enter a PIN number for the admin user.<br><br>This setting is optional unless the 'leader wait' option is in use, then this PIN will identify the leader.")?></span></a></td>
+		<td><input size="8" type="text" name="adminpin" value="<?php echo (isset($adminpin) ? $adminpin : ''); ?>"></td>
+	</tr>
+
+	<?php
+	$options = (isset($options) ? $options : "");
+	?>
+	<input type="hidden" name="options" value="<?php echo $options; ?>">
+	
+	<tr><td colspan="2"><br><h5><?php echo _("Conference Options")?><hr></h5></td></tr>
+<?php if(function_exists('recordings_list')) { //only include if recordings is enabled?>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("join message:")?><span><?php echo _("Message to be played to the caller before joining the conference.<br><br>To add additional recordings please use the \"System Recordings\" MENU to the left")?></span></a></td>
+		<td>
+			<select name="joinmsg"/>
+			<?php
+				$tresults = recordings_list();
+				$default = (isset($joinmsg) ? $joinmsg : '');
+				echo '<option value="">'._("None");
+				if (isset($tresults[0])) {
+					foreach ($tresults as $tresult) {
+						echo '<option value="'.$tresult[0].'"'.($tresult[0] == $default ? ' SELECTED' : '').'>'.$tresult[1];
+					}
+				}
+			?>		
+			</select>		
+		</td>
+	</tr>
+<?php }	else { ?>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("join message:")?><span><?php echo _("Message to be played to the caller before joining the conference.<br><br>You must install and enable the \"Systems Recordings\" Module to edit this option")?></span></a></td>
+		<td>
+			<?php
+				$default = (isset($joinmsg) ? $joinmsg : '');
+			?>
+			<input type="hidden" name="joinmsg" value="<?php echo $default; ?>"><?php echo ($default != '' ? $default : 'None'); ?>
+		</td>
+	</tr>
+<?php } ?>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("leader wait:")?><span><?php echo _("wait until the conference leader (admin user) arrives before starting the conference")?></span></a></td>
+		<td>
+			<select name="opt#w">
+			<?php
+				$optselect = strpos($options, "w");
+				echo '<option value=""' . ($optselect === false ? ' SELECTED' : '') . '>'._("No") . '</option>';
+				echo '<option value="w"'. ($optselect !== false ? ' SELECTED' : '') . '>'._("Yes"). '</option>';
+			?>		
+			</select>		
+		</td>
+	</tr>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("quiet mode:")?><span><?php echo _("quiet mode (do not play enter/leave sounds)")?></span></a></td>
+		<td>
+			<select name="opt#q">
+			<?php
+				$optselect = strpos($options, "q");
+				echo '<option value=""' . ($optselect === false ? ' SELECTED' : '') . '>'._("No") . '</option>';
+				echo '<option value="q"'. ($optselect !== false ? ' SELECTED' : '') . '>'._("Yes"). '</option>';
+			?>		
+			</select>		
+		</td>
+	</tr>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("user count:")?><span><?php echo _("announce user(s) count on joining conference")?></span></a></td>
+		<td>
+			<select name="opt#c">
+			<?php
+				$optselect = strpos($options, "c");
+				echo '<option value=""' . ($optselect === false ? ' SELECTED' : '') . '>'._("No") . '</option>';
+				echo '<option value="c"'. ($optselect !== false ? ' SELECTED' : '') . '>'._("Yes"). '</option>';
+			?>		
+			</select>		
+		</td>
+	</tr>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("user join/leave:")?><span><?php echo _("announce user join/leave")?></span></a></td>
+		<td>
+			<select name="opt#i">
+			<?php
+				$optselect = strpos($options, "i");
+				echo '<option value=""' . ($optselect === false ? ' SELECTED' : '') . '>'._("No") . '</option>';
+				echo '<option value="i"'. ($optselect !== false ? ' SELECTED' : '') . '>'._("Yes"). '</option>';
+			?>		
+			</select>		
+		</td>
+	</tr>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("music on hold:")?><span><?php echo _("enable music on hold when the conference has a single caller")?></span></a></td>
+		<td>
+			<select name="opt#M">
+			<?php
+				$optselect = strpos($options, "M");
+				echo '<option value=""' . ($optselect === false ? ' SELECTED' : '') . '>'._("No") . '</option>';
+				echo '<option value="M"'. ($optselect !== false ? ' SELECTED' : '') . '>'._("Yes"). '</option>';
+			?>		
+			</select>		
+		</td>
+	</tr>
+	<tr>
+		<td><a href="#" class="info"><?php echo _("allow menu:")?><span><?php echo _("present menu (user or admin) when '*' is received ('send' to menu)")?></span></a></td>
+		<td>
+			<select name="opt#s">
+			<?php
+				$optselect = strpos($options, "s");
+				echo '<option value=""' . ($optselect === false ? ' SELECTED' : '') . '>'._("No") . '</option>';
+				echo '<option value="s"'. ($optselect !== false ? ' SELECTED' : '') . '>'._("Yes"). '</option>';
+			?>		
+			</select>		
+		</td>
+	</tr>
+
+	
+	<tr>
+		<td colspan="2"><br><h6><input name="Submit" type="submit" value="<?php echo _("Submit Changes")?>"></h6></td>		
+	</tr>
+	</table>
+<script language="javascript">
+<!--
+
+var theForm = document.editMM;
+
+if (theForm.account.value == "") {
+	theForm.account.focus();
+} else {
+	theForm.name.focus();
+}
+
+function checkConf()
+{
+	var msgInvalidConfNumb = "<?php echo _('Please enter a valid Conference Number'); ?>";
+	var msgInvalidConfName = "<?php echo _('Please enter a valid Conference Name'); ?>";
+	var msgNeedAdminPIN = "<?php echo _('You must set an admin PIN for the Conference Leader when selecting the leader wait option'); ?>";
+	
+	defaultEmptyOK = false;
+	if (!isInteger(theForm.account.value))
+		return warnInvalid(theForm.account, msgInvalidConfNumb);
+		
+	if (!isAlphanumeric(theForm.name.value))
+		return warnInvalid(theForm.name, msgInvalidConfName);
+		
+	// update $options
+	var theOptionsFld = theForm.options;
+	theOptionsFld.value = "";
+	for (var i = 0; i < theForm.elements.length; i++)
+	{
+		var theEle = theForm.elements[i];
+		var theEleName = theEle.name;
+		if (theEleName.indexOf("#") > 1)
+		{
+			var arr = theEleName.split("#");
+			if (arr[0] == "opt")
+				theOptionsFld.value += theEle.value;
+		}
+	}
+
+	// not possible to have a 'leader' conference with no adminpin
+	if (theForm.options.value.indexOf("w") > -1 && theForm.adminpin.value == "")
+		return warnInvalid(theForm.adminpin, msgNeedAdminPIN);
+		
+	return true;
+}
+
+//-->
+</script>
+	</form>
+<?php		
+} //end if action == delGRP
+?>