[svn-commits] russell: branch 1.6.2 r256020 - in /branches/1.6.2: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Apr  2 18:56:45 2010
New Revision: 256020

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=256020
Log:
Merged revisions 256019 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r256019 | russell | 2010-04-02 18:55:57 -0500 (Fri, 02 Apr 2010) | 10 lines
  
  Export MEETMEBOOKID and fix pin-less conferences with realtime conferences
  
  (closes issue #16866)
  Reported by: DEA
  Patches:
        rt-meetme-options.txt uploaded by DEA (license 3)
  Tested by: DEA
  
  Review: https://reviewboard.asterisk.org/r/582/
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_meetme.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=256020&r1=256019&r2=256020
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Fri Apr  2 18:56:45 2010
@@ -3362,6 +3362,11 @@
 		/* Return the number of seconds the user was in the conf */
 		snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime));
 		pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
+
+		/* Return the RealTime bookid for CDR linking */
+		if (rt_schedule) {
+			pbx_builtin_setvar_helper(chan, "MEETMEBOOKID", conf->bookid);
+		}
 	}
 	ast_free(user);
 	AST_LIST_UNLOCK(&confs);
@@ -3934,6 +3939,14 @@
 					/* No pin required */
 					allowretry = 0;
 
+					/* For RealTime conferences without a pin 
+					 * should still support loading options
+					 */
+					if (!ast_strlen_zero(cnf->useropts)) {
+						char *opts = ast_strdupa(cnf->useropts);
+						ast_app_parse_options(meetme_opts, &confflags, optargs, opts);
+					}
+
 					/* Run the conference */
 					res = conf_run(chan, cnf, confflags.flags, optargs);
 				}