From d92d1e06b59f9c1390cefc076dd7201e09bd3195 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Wed, 23 Jan 2013 14:48:47 +0000
Subject: [PATCH] Record the conference call using the option from conference
 center.

---
 app/conferences_active/app_config.php            |  5 -----
 .../conference_interactive_inc.php               | 16 +++-------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/app/conferences_active/app_config.php b/app/conferences_active/app_config.php
index f4cee62542..2fe66293f0 100644
--- a/app/conferences_active/app_config.php
+++ b/app/conferences_active/app_config.php
@@ -42,11 +42,6 @@
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['permissions'][1]['name'] = 'conferences_active_record';
-		$apps[$x]['permissions'][1]['groups'][] = 'user';
-		$apps[$x]['permissions'][1]['groups'][] = 'admin';
-		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
-
 		$apps[$x]['permissions'][2]['name'] = 'conferences_active_lock';
 		$apps[$x]['permissions'][2]['groups'][] = 'user';
 		$apps[$x]['permissions'][2]['groups'][] = 'admin';
diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php
index ba6a698f1b..d39a9b1c45 100644
--- a/app/conferences_active/conference_interactive_inc.php
+++ b/app/conferences_active/conference_interactive_inc.php
@@ -143,21 +143,11 @@ else {
 			$recording_name = $session_uuid.".mp3";
 		}
 
-		if (permission_exists('conferences_active_record')) {
-			if ($recording == "true") {
-				echo "	<a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&uuid=".$session_uuid."&data=norecord');\">".$text['button-stop-rec']."</a>&nbsp;\n";
-			}
-			else {
-				echo "	<a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&uuid=".$session_uuid."&data=record');\">".$text['button-start-rec']."</a>&nbsp;\n";
-			}
+		if ($recording == "true") {
+			echo "	".$text['label-recording']." &nbsp;";
 		}
 		else {
-			if ($recording == "true") {
-				echo "	".$text['label-recording']." &nbsp;";
-			}
-			else {
-				echo "	".$text['label-not-recording']." &nbsp;";
-			}
+			echo "	".$text['label-not-recording']." &nbsp;";
 		}
 		if (permission_exists('conferences_active_lock')) {
 			if ($locked == "true") {