From f7d6b9a1482c5b841409e6a535af3bbc9876426a Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Wed, 27 Feb 2013 11:06:44 +0000
Subject: [PATCH] When the conference call is record is selected then play an
 announcement for an active call. Add a permission for showing the active
 conference video column.

---
 .../conference_room_edit.php                  | 14 ++++++++++++++
 app/conference_centers/conference_rooms.php   | 19 +++++++++++++++++--
 app/conferences_active/app_config.php         |  5 +++++
 .../conference_interactive_inc.php            | 16 ++++++++++------
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index d80f2faeae..523f208972 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -93,6 +93,20 @@ function get_meeting_pin($length, $meeting_uuid) {
 	}
 }
 
+//record announcment
+	if ($record == "true") {
+		//prepare the values
+			$default_language = 'en';
+			$default_dialect = 'us';
+			$default_voice = 'callie';
+			$switch_cmd = "conference ".$meeting_uuid."-".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
+		//connect to event socket
+			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+			if ($fp) {
+				$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+			}
+	}
+
 //generate the pins
 	$sql = "select conference_center_pin_length from v_conference_centers ";
 	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index c067e2c4b0..3c7d256dd9 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -54,6 +54,21 @@ else {
 			$mute = check_str($_GET["mute"]);
 			$sounds = check_str($_GET["sounds"]);
 			$enabled = check_str($_GET["enabled"]);
+			$meeting_uuid = check_str($_GET["meeting_uuid"]);
+
+		//record announcment
+			if ($record == "true") {
+				//prepare the values
+					$default_language = 'en';
+					$default_dialect = 'us';
+					$default_voice = 'callie';
+					$switch_cmd = "conference ".$meeting_uuid."-".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
+				//connect to event socket
+					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+					if ($fp) {
+						$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+					}
+			}
 
 		//update the conference room
 			$sql = "update v_conference_rooms set ";
@@ -219,10 +234,10 @@ else {
 				//echo "	<td valign='middle' class='".$row_style[$c]."'>".$row['profile']."&nbsp;</td>\n";
 				echo "	<td valign='middle' class='".$row_style[$c]."'>";
 				if ($row['record'] == "true") {
-					echo "		<a href=\"?conference_room_uuid=".$row['conference_room_uuid']."&record=false\">".$text['label-true']."</a>";
+					echo "		<a href=\"?conference_room_uuid=".$row['conference_room_uuid']."&record=false&meeting_uuid=".$meeting_uuid."\">".$text['label-true']."</a>";
 				}
 				else {
-					echo "		<a href=\"?conference_room_uuid=".$row['conference_room_uuid']."&record=true\">".$text['label-false']."</a>";
+					echo "		<a href=\"?conference_room_uuid=".$row['conference_room_uuid']."&record=true&meeting_uuid=".$meeting_uuid."\">".$text['label-false']."</a>";
 				}
 				echo "		&nbsp;\n";
 				echo "	</td>\n";
diff --git a/app/conferences_active/app_config.php b/app/conferences_active/app_config.php
index 4b68554bff..0de7f5a5be 100644
--- a/app/conferences_active/app_config.php
+++ b/app/conferences_active/app_config.php
@@ -78,6 +78,11 @@
 		$apps[$x]['permissions'][8]['groups'][] = 'admin';
 		$apps[$x]['permissions'][8]['groups'][] = 'superadmin';
 
+		$apps[$x]['permissions'][8]['name'] = 'conferences_active_video';
+		$apps[$x]['permissions'][8]['groups'][] = 'user';
+		$apps[$x]['permissions'][8]['groups'][] = 'admin';
+		$apps[$x]['permissions'][8]['groups'][] = 'superadmin';
+
 		$apps[$x]['permissions'][9]['name'] = 'conferences_active_advanced_view';
 		$apps[$x]['permissions'][9]['groups'][] = 'admin';
 		$apps[$x]['permissions'][9]['groups'][] = 'superadmin';
diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php
index cacd200719..f34f4206be 100644
--- a/app/conferences_active/conference_interactive_inc.php
+++ b/app/conferences_active/conference_interactive_inc.php
@@ -159,7 +159,9 @@ else {
 		echo "<th>".$text['label-speak']."</th>\n";
 		echo "<th>".$text['label-talking']."</th>\n";
 		echo "<th>".$text['label-last-talk']."</th>\n";
-		echo "<th>".$text['label-video']."</th>\n";
+		if (permission_exists('conferences_active_video')) {
+			echo "<th>".$text['label-video']."</th>\n";
+		}
 		echo "<th>".$text['label-floor']."</th>\n";
 		echo "<th>".$text['label-tool']."</th>\n";
 		echo "</tr>\n";
@@ -217,11 +219,13 @@ else {
 					echo "<td valign='top' class='".$row_style[$c]."'>".$text['label-no']."</td>\n";
 				}
 				echo "<td valign='top' class='".$row_style[$c]."'>$last_talking_formatted</td>\n";
-				if ($flag_has_video == "true") {
-					echo "<td valign='top' class='".$row_style[$c]."'>".$text['label-yes']."</td>\n";
-				}
-				else {
-					echo "<td valign='top' class='".$row_style[$c]."'>".$text['label-no']."</td>\n";
+				if (permission_exists('conferences_active_video')) {
+					if ($flag_has_video == "true") {
+						echo "<td valign='top' class='".$row_style[$c]."'>".$text['label-yes']."</td>\n";
+					}
+					else {
+						echo "<td valign='top' class='".$row_style[$c]."'>".$text['label-no']."</td>\n";
+					}
 				}
 				if ($flag_has_floor == "true") {
 					echo "<td valign='top' class='".$row_style[$c]."'>".$text['label-yes']."</td>\n";