From a4bb89c87466b0bad4e57e3e82e960b32516c071 Mon Sep 17 00:00:00 2001
From: Stefan Sayer <stefan.sayer@googlemail.com>
Date: Tue, 17 Feb 2009 21:16:35 +0000
Subject: [PATCH] added ignore_pin config option

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1284 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 apps/webconference/WebConference.cpp      | 7 ++++++-
 apps/webconference/etc/webconference.conf | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/webconference/WebConference.cpp b/apps/webconference/WebConference.cpp
index 7c34c1e1..3fa3e387 100644
--- a/apps/webconference/WebConference.cpp
+++ b/apps/webconference/WebConference.cpp
@@ -69,6 +69,7 @@ string WebConferenceFactory::MasterPassword;
 int WebConferenceFactory::ParticipantExpiredDelay;
 int WebConferenceFactory::RoomExpiredDelay;
 int WebConferenceFactory::RoomSweepInterval;
+bool WebConferenceFactory::ignore_pin = false;
 
 int WebConferenceFactory::onLoad()
 {
@@ -170,6 +171,9 @@ int WebConferenceFactory::onLoad()
     // default: 10s
     ParticipantExpiredDelay = cfg.getParameterInt("participants_expire_delay", 10);
   }
+  ignore_pin = cfg.getParameter("ignore_pin")=="yes";
+  DBG("Ignore PINs  enabled: %s\n", ignore_pin?"yes":"no");
+
 
   if (cfg.getParameter("rooms_expire") == "no") { 
     RoomExpiredDelay = -1;
@@ -220,7 +224,8 @@ ConferenceRoom* WebConferenceFactory::getRoom(const string& room,
     rooms[room].adminpin = adminpin;   
     res = &rooms[room];
   } else {
-    if (!it->second.adminpin.empty() && 
+    if ((!ignore_pin) &&
+	(!it->second.adminpin.empty()) && 
 	(it->second.adminpin != adminpin)) {
       // wrong pin
     } else {
diff --git a/apps/webconference/etc/webconference.conf b/apps/webconference/etc/webconference.conf
index 11aa6b1f..46c0dff7 100644
--- a/apps/webconference/etc/webconference.conf
+++ b/apps/webconference/etc/webconference.conf
@@ -41,6 +41,15 @@ direct_room_strip=6
 #
 # master_password=verysecret
 
+# ignore_pin sets whether room admin PINs are checked when 
+# accessing rooms. If you are for example trust anyone who
+# can access the interface, this could be set to "yes" to allow
+# all to look into all conference rooms.
+# 
+# default: no
+#
+# ignore_pin=yes
+
 #
 #
 # feedback and statistics