Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1334083&r1=1334082&r2=1334083&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Fri May 4 17:45:23 2012 @@ -642,9 +642,16 @@ if (canvas.thishib.loaderVar != null) { canvas.thishib.loaderVar.setProgress(); } - if (value != null && value.length > 0) { - //if ($debug) Debug.write("Give exclusive audio keycode is: ", value[0].conf_value); - canvas.setAttribute('GIVE_EXCLUSIVE_AUDIO_KEY', value[0].conf_value); + if ($debug) Debug.write("getGeneralOptions: ", value.length, value); + if (value != null) { + if (value.length > 0) { + //if ($debug) Debug.write("Give exclusive audio keycode is: ", value[0].conf_value); + canvas.setAttribute('GIVE_EXCLUSIVE_AUDIO_KEY', value[0].conf_value); + } + if (value.length > 1) { + if ($debug) Debug.write("red5sip.enable is: ", value[1].conf_value); + canvas.setAttribute('RED5_SIP_ENABLE', value[1].conf_value); + } } else { if ($debug) Debug.warn("xmlcrm.getGeneralOptions empty!"); }
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1334083&r1=1334082&r2=1334083&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Fri May 4 17:45:23 2012 @@ -448,6 +448,13 @@ and some more references to temp-objects <!--F12--> <attribute name="GIVE_EXCLUSIVE_AUDIO_KEY" value="123"/> +<!-- + Indicates if the Red5 SIP Integration is enabled or not and + if the SIP Dialer is shown in the conference menu + --> +<attribute name="RED5_SIP_ENABLE" value="no" type="string" /> + + <attribute name="currentNC" value="null" /> </library> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx?rev=1334083&r1=1334082&r2=1334083&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx Fri May 4 17:45:23 2012 @@ -28,7 +28,7 @@ <view x="4" resource="warning_icon_rsc" y="26" /> <labelText fontsize="10" y="24" - x="30" width="500" labelid="1065" multiline="true" /> + x="30" width="600" labelid="1065" multiline="true" /> <labelCheckbox x="10" y="100" fontsize="11" name="_includeFileOption" text="Include uploaded files and recordings in backup" > Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1334083&r1=1334082&r2=1334083&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx (original) +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx Fri May 4 17:45:23 2012 @@ -247,9 +247,11 @@ <horizontalDropDownSpacer /> <conferencDropDownMenuItem labelid="42" command="cmd_checkPollVoted" enabled="true"/> - <horizontalDropDownSpacer /> + <horizontalDropDownSpacer + visible="$once{ (canvas.RED5_SIP_ENABLE == 'yes') ? true : false }" /> <conferencDropDownMenuItem labelid="1447" command="cmd_showSipDialer" - enabled="true"/> + visible="$once{ (canvas.RED5_SIP_ENABLE == 'yes') ? true : false }" + enabled="$once{ (canvas.RED5_SIP_ENABLE == 'yes') ? true : false }"/> <horizontalDropDownSpacer /> <conferencDropDownMenuItem labelid="1126" command="cmd_editWhiteboardDefault" enabled="true"/> Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java?rev=1334083&r1=1334082&r2=1334083&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java Fri May 4 17:45:23 2012 @@ -737,6 +737,7 @@ public class MainService implements IPen List<Configuration> cList = new LinkedList<Configuration>(); cList.add(cfgManagement.getConfKey(3, "exclusive.audio.keycode")); + cList.add(cfgManagement.getConfKey(3, "red5sip.enable")); return cList;
