From 50ab051a4948e558a234c46362426aaef4e682ae Mon Sep 17 00:00:00 2001
From: paulc <paulc@acf43c95-373e-0410-b603-e72c3f656dc1>
Date: Tue, 19 Apr 2011 12:30:56 +0000
Subject: [PATCH] Added possibility of second PBX operation on specific number
 of users in new conference. Secondary PBX operations can be stored in the
 pbxassist's parameter store.

git-svn-id: http://yate.null.ro/svn/yate/trunk@4324 acf43c95-373e-0410-b603-e72c3f656dc1
---
 modules/server/pbxassist.cpp | 42 +++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/modules/server/pbxassist.cpp b/modules/server/pbxassist.cpp
index d9d4793d..359e7cc4 100644
--- a/modules/server/pbxassist.cpp
+++ b/modules/server/pbxassist.cpp
@@ -81,7 +81,9 @@ private:
     bool operTransfer(Message& msg);
     bool operDoTransfer(Message& msg);
     bool operForTransfer(Message& msg);
+    // post conference operations
     void postConference(Message& msg, int users, bool created);
+    void postConference(Message& msg, const String& name, int users);
 };
 
 class YPBX_API PBXList : public ChanAssistList
@@ -1155,31 +1157,27 @@ bool PBXAssist::operForTransfer(Message& msg)
 void PBXAssist::postConference(Message& msg, int users, bool created)
 {
     if (created) {
-	String oper = msg.getValue("opercreate");
-	if (oper) {
-	    Message* m = new Message(msg);
-	    m->setParam("operation",oper);
-	    m->setParam("pbxstate",state());
-	    m->setParam("room",m_room);
-	    m->setParam("users",String(users));
-	    m->userData(msg.userData());
-	    Engine::enqueue(m);
-	}
+	postConference(msg,"opercreate",users);
+	postConference(msg,"opercreate" + String(users),users);
     }
     if (users <= 0)
 	return;
-    String oper("operusers");
-    oper << users;
-    oper = msg.getValue(oper);
-    if (oper) {
-	Message* m = new Message(msg);
-	m->setParam("operation",oper);
-	m->setParam("pbxstate",state());
-	m->setParam("room",m_room);
-	m->setParam("users",String(users));
-	m->userData(msg.userData());
-	Engine::enqueue(m);
-    }
+    postConference(msg,"operusers" + String(users),users);
+}
+
+// Try to execute a single secondary operation
+void PBXAssist::postConference(Message& msg, const String& name, int users)
+{
+    const char* oper = msg.getValue(name,m_keep.getValue(name));
+    if (TelEngine::null(oper))
+	return;
+    Message* m = new Message(msg);
+    m->setParam("operation",oper);
+    m->setParam("pbxstate",state());
+    m->setParam("room",m_room);
+    m->setParam("users",String(users));
+    m->userData(msg.userData());
+    Engine::enqueue(m);
 }
 
 // Hangup handler, do any cleanups needed