[Hw4mdl-svn] SF.net SVN: hw4mdl:[260] branches/3.3_trunk
Brought to you by:
jhlinder,
trollinger
Menu
▾
▴
[Hw4mdl-svn] SF.net SVN: hw4mdl:[260] branches/3.3_trunk
|
From: <tro...@us...> - 2008-10-29 17:55:52
|
Revision: 260
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=260&view=rev
Author: trollinger
Date: 2008-10-29 17:55:46 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
update the branch with the last version of the code
Modified Paths:
--------------
branches/3.3_trunk/pom.xml
branches/3.3_trunk/src/main/php/blocks/bvoiceemail/block_bvoiceemail.php
branches/3.3_trunk/src/main/php/blocks/bvoiceemail/config_instance.html
branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/block_bvoicerecorder.php
branches/3.3_trunk/src/main/php/integrations_common/php/common/DatabaseManagement.php
branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaCommons.php
branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaLib.php
branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaUI.php
branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaXml.php
branches/3.3_trunk/src/main/php/integrations_common/php/lc/LCAction.php
branches/3.3_trunk/src/main/php/integrations_common/php/lc/LCRoom.php
branches/3.3_trunk/src/main/php/integrations_common/php/lc/LCUser.php
branches/3.3_trunk/src/main/php/integrations_common/php/lc/PrefixUtil.php
branches/3.3_trunk/src/main/php/integrations_common/php/lc/lcapi.php
branches/3.3_trunk/src/main/php/integrations_common/php/vt/VtAction.php
branches/3.3_trunk/src/main/php/integrations_common/php/vt/WimbaVoicetoolsAPI.php
branches/3.3_trunk/src/main/php/integrations_common/web/js/verifForm.js
branches/3.3_trunk/src/main/php/integrations_common/web/js/wimba_ajax.js
branches/3.3_trunk/src/main/php/integrations_common/web/js/wimba_commons.js
branches/3.3_trunk/src/main/php/integrations_common/web/js/xsl/wimba.xsl
branches/3.3_trunk/src/main/php/mod/liveclassroom/backuplib.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/config.html
branches/3.3_trunk/src/main/php/mod/liveclassroom/css/StyleSheet.css
branches/3.3_trunk/src/main/php/mod/liveclassroom/db/install.xml
branches/3.3_trunk/src/main/php/mod/liveclassroom/generateXmlMainPanel.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/generateXmlSettingsPanel.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/icon.gif
branches/3.3_trunk/src/main/php/mod/liveclassroom/index.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/lang/en_utf8/liveclassroom.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/lib.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/manageAction.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/mod.html
branches/3.3_trunk/src/main/php/mod/liveclassroom/reports.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/restorelib.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/version.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/view.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/welcome.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/backuplib.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/css/StyleSheet.css
branches/3.3_trunk/src/main/php/mod/voiceauthoring/db/install.xml
branches/3.3_trunk/src/main/php/mod/voiceauthoring/displayPlayer.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/icon.gif
branches/3.3_trunk/src/main/php/mod/voiceauthoring/index.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/lang/en_utf8/voiceauthoring.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/lib.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/manageActionBlock.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/mod.html
branches/3.3_trunk/src/main/php/mod/voiceauthoring/restorelib.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/version.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/view.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/voiceauthoring.php
branches/3.3_trunk/src/main/php/mod/voiceemail/block.php
branches/3.3_trunk/src/main/php/mod/voiceemail/block_config.php
branches/3.3_trunk/src/main/php/mod/voiceemail/css/StyleSheet.css
branches/3.3_trunk/src/main/php/mod/voiceemail/db/install.xml
branches/3.3_trunk/src/main/php/mod/voiceemail/db/postgres7.php
branches/3.3_trunk/src/main/php/mod/voiceemail/icon.gif
branches/3.3_trunk/src/main/php/mod/voiceemail/index.php
branches/3.3_trunk/src/main/php/mod/voiceemail/lang/en_utf8/voiceemail.php
branches/3.3_trunk/src/main/php/mod/voiceemail/lib.php
branches/3.3_trunk/src/main/php/mod/voiceemail/manageActionBlock.php
branches/3.3_trunk/src/main/php/mod/voiceemail/mod.html
branches/3.3_trunk/src/main/php/mod/voiceemail/version.php
branches/3.3_trunk/src/main/php/mod/voiceemail/view.php
branches/3.3_trunk/src/main/php/mod/voicetools/config.html
branches/3.3_trunk/src/main/php/mod/voicetools/css/StyleSheet.css
branches/3.3_trunk/src/main/php/mod/voicetools/db/mysql.sql
branches/3.3_trunk/src/main/php/mod/voicetools/db/postgres7.sql
branches/3.3_trunk/src/main/php/mod/voicetools/db/upgrade.php
branches/3.3_trunk/src/main/php/mod/voicetools/lang/en_utf8/voicetools.php
branches/3.3_trunk/src/main/php/mod/voicetools/testConfig.php
branches/3.3_trunk/src/main/php/mod/voicetools/version.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/css/StyleSheet.css
branches/3.3_trunk/src/main/php/mod/voicetools_generic/db/install.xml
branches/3.3_trunk/src/main/php/mod/voicetools_generic/db/mysql.sql
branches/3.3_trunk/src/main/php/mod/voicetools_generic/db/postgres7.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/generateXmlMainPanel.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/generateXmlSettingsPanel.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/index.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/lang/english_bundle.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/lib.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/mod.html
branches/3.3_trunk/src/main/php/mod/voicetools_generic/version.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/view.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/welcome.php
Added Paths:
-----------
branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/block_bvoiceemail.php
branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/config_instance.html
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/buttons/
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/buttons/flat/
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/buttons/flat/close/
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/buttons/flat/close/x_round-16_14.png
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/items/Wlogo-W_only-60.png
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/items/listitem-available_selected.jpg
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/items/listitem-info.png
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/items/listitem-information-16_12.png
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/items/listitem-unavailable_selected.jpg
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/items/phone_32.png
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/items/speaker-18.gif
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/items/wheel-24.gif
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/items/wimba_sound.png
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/items/x_round-16_14.png
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/module_tab/
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/module_tab/module_tab-left.png
branches/3.3_trunk/src/main/php/integrations_common/web/pictures/module_tab/module_tab-right.png
branches/3.3_trunk/src/main/php/mod/liveclassroom/db/access.php
branches/3.3_trunk/src/main/php/mod/liveclassroom/db/upgrade.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/block_config.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/displayActivityName.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/displayWysiwyg.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/enableVA.php
branches/3.3_trunk/src/main/php/mod/voiceauthoring/error.php
branches/3.3_trunk/src/main/php/mod/voiceemail/backuplib.php
branches/3.3_trunk/src/main/php/mod/voiceemail/restorelib.php
branches/3.3_trunk/src/main/php/mod/voicetools/defaults.php
branches/3.3_trunk/src/main/php/mod/voicetools/icon.gif
branches/3.3_trunk/src/main/php/mod/voicetools/lib.php
branches/3.3_trunk/src/main/php/mod/voicetools/mod.html
branches/3.3_trunk/src/main/php/mod/voicetools_generic/backuplib.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/restorelib.php
branches/3.3_trunk/src/main/php/mod/voicetools_generic/voiceboard.png
branches/3.3_trunk/src/main/php/mod/voicetools_generic/voicepodcaster.png
branches/3.3_trunk/src/main/php/mod/voicetools_generic/voicepresentation.png
branches/3.3_trunk/wysiwyg/
branches/3.3_trunk/wysiwyg/images/
branches/3.3_trunk/wysiwyg/images/wimba.gif
branches/3.3_trunk/wysiwyg/images/wimba_sound.png
branches/3.3_trunk/wysiwyg/lib/
branches/3.3_trunk/wysiwyg/lib/editor/
branches/3.3_trunk/wysiwyg/lib/editor/htmlarea/
branches/3.3_trunk/wysiwyg/lib/editor/htmlarea/htmlarea.php
branches/3.3_trunk/wysiwyg/lib/weblib.php
branches/3.3_trunk/wysiwyg/popups/
branches/3.3_trunk/wysiwyg/popups/insert_wimba.php
branches/3.3_trunk/wysiwyg/wimba.patch
Modified: branches/3.3_trunk/pom.xml
===================================================================
--- branches/3.3_trunk/pom.xml 2008-09-03 00:51:27 UTC (rev 259)
+++ branches/3.3_trunk/pom.xml 2008-10-29 17:55:46 UTC (rev 260)
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>wimba.integrations.moodle.vt-lc</groupId>
<artifactId>wimba-moodle</artifactId>
<name>Wimba moodle</name>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3.0</version>
<!-- The following blocks "repositories" and "profiles" should be present in all our pom.xml -->
<!-- artifactory (FR) location -->
@@ -27,9 +26,8 @@
</repository>
</repositories>
</profile>
- </profiles>
+ </profiles>
-
<build>
<plugins>
<plugin>
@@ -43,181 +41,160 @@
<copy todir="${project.build.directory}/generated-sources/mod/voiceboard" overwrite="true">
<fileset dir="${basedir}/src/main/php/mod/voicetools_generic">
<exclude name="**/*bundle*" />
- <exclude name="**/*help*" />
+ <exclude name="**/*help*" />
</fileset>
<filterset>
-
- <filter token="MODULE_NAME" value="voiceboard"/>
- <filter token="SHORT_NAME" value="board"/>
- <filter token="COMPLETE_NAME" value="Voice Board"/>
+ <filter token="MODULE_NAME" value="voiceboard" />
+ <filter token="SHORT_NAME" value="board" />
+ <filter token="COMPLETE_NAME" value="Voice Board" />
</filterset>
</copy>
-
+
<copy todir="${project.build.directory}/generated-sources/mod/voicepodcaster" overwrite="true">
<fileset dir="${basedir}/src/main/php/mod/voicetools_generic">
<exclude name="**/*bundle*" />
- <exclude name="**/*help*" />
+ <exclude name="**/*help*" />
</fileset>
<filterset>
- <filter token="MODULE_NAME" value="voicepodcaster"/>
- <filter token="SHORT_NAME" value="pc"/>
- <filter token="COMPLETE_NAME" value="Voice Podcaster"/>
+ <filter token="MODULE_NAME" value="voicepodcaster" />
+ <filter token="SHORT_NAME" value="pc" />
+ <filter token="COMPLETE_NAME" value="Voice Podcaster" />
</filterset>
</copy>
-
+
<copy todir="${project.build.directory}/generated-sources/mod/voicepresentation" overwrite="true">
<fileset dir="${basedir}/src/main/php/mod/voicetools_generic">
<exclude name="**/*bundle*" />
- <exclude name="**/*help*" />
+ <exclude name="**/*help*" />
</fileset>
<filterset>
- <filter token="MODULE_NAME" value="voicepresentation"/>
- <filter token="SHORT_NAME" value="presentation"/>
- <filter token="COMPLETE_NAME" value="Voice Presentation"/>
+ <filter token="MODULE_NAME" value="voicepresentation" />
+ <filter token="SHORT_NAME" value="presentation" />
+ <filter token="COMPLETE_NAME" value="Voice Presentation" />
</filterset>
</copy>
-
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/en/voiceboard.php">
+
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/en/voiceboard.php">
<filterset>
- <filter token="MODULE_NAME" value="voiceboard"/>
- <filter token="SHORT_NAME" value="board"/>
- <filter token="COMPLETE_NAME" value="Voice Board"/>
+ <filter token="MODULE_NAME" value="voiceboard" />
+ <filter token="SHORT_NAME" value="board" />
+ <filter token="COMPLETE_NAME" value="Voice Board" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/en_utf8/voiceboard.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/en_utf8/voiceboard.php">
<filterset>
- <filter token="MODULE_NAME" value="voiceboard"/>
- <filter token="SHORT_NAME" value="board"/>
- <filter token="COMPLETE_NAME" value="Voice Board"/>
+ <filter token="MODULE_NAME" value="voiceboard" />
+ <filter token="SHORT_NAME" value="board" />
+ <filter token="COMPLETE_NAME" value="Voice Board" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/en/voicepodcaster.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/en/voicepodcaster.php">
<filterset>
- <filter token="MODULE_NAME" value="voicepodcaster"/>
- <filter token="SHORT_NAME" value="pc"/>
- <filter token="COMPLETE_NAME" value="Voice Podcaster"/>
+ <filter token="MODULE_NAME" value="voicepodcaster" />
+ <filter token="SHORT_NAME" value="pc" />
+ <filter token="COMPLETE_NAME" value="Voice Podcaster" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/en_utf8/voicepodcaster.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/en_utf8/voicepodcaster.php">
<filterset>
- <filter token="MODULE_NAME" value="voicepodcaster"/>
- <filter token="SHORT_NAME" value="pc"/>
- <filter token="COMPLETE_NAME" value="Voice Podcaster"/>
+ <filter token="MODULE_NAME" value="voicepodcaster" />
+ <filter token="SHORT_NAME" value="pc" />
+ <filter token="COMPLETE_NAME" value="Voice Podcaster" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/en/voicepresentation.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/en/voicepresentation.php">
<filterset>
- <filter token="MODULE_NAME" value="voicepresentation"/>
- <filter token="SHORT_NAME" value="presentation"/>
- <filter token="COMPLETE_NAME" value="Voice Presentation"/>
+ <filter token="MODULE_NAME" value="voicepresentation" />
+ <filter token="SHORT_NAME" value="presentation" />
+ <filter token="COMPLETE_NAME" value="Voice Presentation" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/en_utf8/voicepresentation.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/en_utf8/voicepresentation.php">
<filterset>
- <filter token="MODULE_NAME" value="voicepresentation"/>
- <filter token="SHORT_NAME" value="presentation"/>
- <filter token="COMPLETE_NAME" value="Voice Presentation"/>
+ <filter token="MODULE_NAME" value="voicepresentation" />
+ <filter token="SHORT_NAME" value="presentation" />
+ <filter token="COMPLETE_NAME" value="Voice Presentation" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/fr/voiceboard.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/fr/voiceboard.php">
<filterset>
- <filter token="MODULE_NAME" value="voiceboard"/>
- <filter token="SHORT_NAME" value="board"/>
- <filter token="COMPLETE_NAME" value="Voice Board"/>
+ <filter token="MODULE_NAME" value="voiceboard" />
+ <filter token="SHORT_NAME" value="board" />
+ <filter token="COMPLETE_NAME" value="Voice Board" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/fr_utf8/voiceboard.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/fr_utf8/voiceboard.php">
<filterset>
- <filter token="MODULE_NAME" value="voiceboard"/>
- <filter token="SHORT_NAME" value="board"/>
- <filter token="COMPLETE_NAME" value="Voice Board"/>
+ <filter token="MODULE_NAME" value="voiceboard" />
+ <filter token="SHORT_NAME" value="board" />
+ <filter token="COMPLETE_NAME" value="Voice Board" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/fr/voicepodcaster.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/fr/voicepodcaster.php">
<filterset>
- <filter token="MODULE_NAME" value="voicepodcaster"/>
- <filter token="SHORT_NAME" value="pc"/>
- <filter token="COMPLETE_NAME" value="Voice Podcaster"/>
+ <filter token="MODULE_NAME" value="voicepodcaster" />
+ <filter token="SHORT_NAME" value="pc" />
+ <filter token="COMPLETE_NAME" value="Voice Podcaster" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/fr_utf8/voicepodcaster.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/fr_utf8/voicepodcaster.php">
<filterset>
- <filter token="MODULE_NAME" value="voicepodcaster"/>
- <filter token="SHORT_NAME" value="pc"/>
- <filter token="COMPLETE_NAME" value="Voice Podcaster"/>
+ <filter token="MODULE_NAME" value="voicepodcaster" />
+ <filter token="SHORT_NAME" value="pc" />
+ <filter token="COMPLETE_NAME" value="Voice Podcaster" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/fr/voicepresentation.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/fr/voicepresentation.php">
<filterset>
- <filter token="MODULE_NAME" value="voicepresentation"/>
- <filter token="SHORT_NAME" value="presentation"/>
- <filter token="COMPLETE_NAME" value="Voice Presentation"/>
+ <filter token="MODULE_NAME" value="voicepresentation" />
+ <filter token="SHORT_NAME" value="presentation" />
+ <filter token="COMPLETE_NAME" value="Voice Presentation" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php"
- tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/fr_utf8/voicepresentation.php">
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_bundle.php" tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/fr_utf8/voicepresentation.php">
<filterset>
- <filter token="MODULE_NAME" value="voicepresentation"/>
- <filter token="SHORT_NAME" value="presentation"/>
- <filter token="COMPLETE_NAME" value="Voice Presentation"/>
+ <filter token="MODULE_NAME" value="voicepresentation" />
+ <filter token="SHORT_NAME" value="presentation" />
+ <filter token="COMPLETE_NAME" value="Voice Presentation" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/fr/help/voiceboard/mods.html"/>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/fr_utf8/help/voiceboard/mods.html"/>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/fr/help/voicepodcaster/mods.html"/>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/fr_utf8/help/voicepodcaster/mods.html"/>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/fr/help/voicepresentation/mods.html"/>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/fr_utf8/help/voicepresentation/mods.html"/>
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html" tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/fr/help/voiceboard/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html" tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/fr_utf8/help/voiceboard/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html" tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/fr/help/voicepodcaster/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html" tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/fr_utf8/help/voicepodcaster/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html" tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/fr/help/voicepresentation/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/french_help.html" tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/fr_utf8/help/voicepresentation/mods.html" />
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/en/help/voiceboard/mods.html"/>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/en_utf8/help/voiceboard/mods.html"/>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/en/help/voicepodcaster/mods.html"/>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/en_utf8/help/voicepodcaster/mods.html"/>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/en/help/voicepresentation/mods.html"/>
- <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html"
- tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/en_utf8/help/voicepresentation/mods.html"/>
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html" tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/en/help/voiceboard/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html" tofile="${project.build.directory}/generated-sources/mod/voiceboard/lang/en_utf8/help/voiceboard/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html" tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/en/help/voicepodcaster/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html" tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/lang/en_utf8/help/voicepodcaster/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html" tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/en/help/voicepresentation/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/lang/english_help.html" tofile="${project.build.directory}/generated-sources/mod/voicepresentation/lang/en_utf8/help/voicepresentation/mods.html" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/voicepresentation.png" tofile="${project.build.directory}/generated-sources/mod/voicepresentation/icon.gif" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/voiceboard.png" tofile="${project.build.directory}/generated-sources/mod/voiceboard/icon.gif" />
+ <copy file="${basedir}/src/main/php/mod/voicetools_generic/voicepodcaster.png" tofile="${project.build.directory}/generated-sources/mod/voicepodcaster/icon.gif" />
+
<copy todir="${project.build.directory}/generated-sources/mod/voicepodcaster/lib" overwrite="true">
<fileset dir="${basedir}/src/main/php/integrations_common">
</fileset>
<filterset>
- <filter token="MODULE_NAME" value="voicepodcaster"/>
- <filter token="SHORT_NAME" value="pc"/>
- <filter token="COMPLETE_NAME" value="Voice Podcaster"/>
+ <filter token="MODULE_NAME" value="voicepodcaster" />
+ <filter token="SHORT_NAME" value="pc" />
+ <filter token="COMPLETE_NAME" value="Voice Podcaster" />
</filterset>
</copy>
@@ -225,9 +202,9 @@
<fileset dir="${basedir}/src/main/php/integrations_common">
</fileset>
<filterset>
- <filter token="MODULE_NAME" value="voicepresentation"/>
- <filter token="SHORT_NAME" value="presentation"/>
- <filter token="COMPLETE_NAME" value="Voice Presentation"/>
+ <filter token="MODULE_NAME" value="voicepresentation" />
+ <filter token="SHORT_NAME" value="presentation" />
+ <filter token="COMPLETE_NAME" value="Voice Presentation" />
</filterset>
</copy>
@@ -235,9 +212,9 @@
<fileset dir="${basedir}/src/main/php/integrations_common">
</fileset>
<filterset>
- <filter token="MODULE_NAME" value="voiceboard"/>
- <filter token="SHORT_NAME" value="board"/>
- <filter token="COMPLETE_NAME" value="Voice Board"/>
+ <filter token="MODULE_NAME" value="voiceboard" />
+ <filter token="SHORT_NAME" value="board" />
+ <filter token="COMPLETE_NAME" value="Voice Board" />
</filterset>
</copy>
@@ -245,9 +222,9 @@
<fileset dir="${basedir}/src/main/php/integrations_common">
</fileset>
<filterset>
- <filter token="MODULE_NAME" value="liveclassroom"/>
- <filter token="SHORT_NAME" value="lc"/>
- <filter token="COMPLETE_NAME" value="Wimba Classroom"/>
+ <filter token="MODULE_NAME" value="liveclassroom" />
+ <filter token="SHORT_NAME" value="lc" />
+ <filter token="COMPLETE_NAME" value="Wimba Classroom" />
</filterset>
</copy>
@@ -255,9 +232,9 @@
<fileset dir="${basedir}/src/main/php/integrations_common">
</fileset>
<filterset>
- <filter token="MODULE_NAME" value="voiceemail"/>
- <filter token="SHORT_NAME" value="vmail"/>
- <filter token="COMPLETE_NAME" value="Voice Email"/>
+ <filter token="MODULE_NAME" value="voiceemail" />
+ <filter token="SHORT_NAME" value="vmail" />
+ <filter token="COMPLETE_NAME" value="Voice Email" />
</filterset>
</copy>
@@ -265,19 +242,16 @@
<fileset dir="${basedir}/src/main/php/integrations_common">
</fileset>
<filterset>
- <filter token="MODULE_NAME" value="voiceauthoring"/>
- <filter token="SHORT_NAME" value="recorder"/>
- <filter token="COMPLETE_NAME" value="Voice Authoring"/>
+ <filter token="MODULE_NAME" value="voiceauthoring" />
+ <filter token="SHORT_NAME" value="recorder" />
+ <filter token="COMPLETE_NAME" value="Voice Authoring" />
</filterset>
</copy>
- <copy file="${basedir}/src/main/php/integrations_common/php/vt/WimbaVoicetoolsAPI.php"
- tofile="${project.build.directory}/generated-sources/mod/voicetools/lib/php/vt/WimbaVoicetoolsAPI.php"/>
- <copy file="${basedir}/src/main/php/integrations_common/php/vt/WimbaVoicetools.php"
- tofile="${project.build.directory}/generated-sources/mod/voicetools/lib/php/vt/WimbaVoicetools.php"/>
- <copy file="${basedir}/src/main/php/integrations_common/php/common/WimbaLib.php"
- tofile="${project.build.directory}/generated-sources/mod/voicetools/lib/php/common/WimbaLib.php"/>
+ <copy file="${basedir}/src/main/php/integrations_common/php/vt/WimbaVoicetoolsAPI.php" tofile="${project.build.directory}/generated-sources/mod/voicetools/lib/php/vt/WimbaVoicetoolsAPI.php" />
+ <copy file="${basedir}/src/main/php/integrations_common/php/vt/WimbaVoicetools.php" tofile="${project.build.directory}/generated-sources/mod/voicetools/lib/php/vt/WimbaVoicetools.php" />
+ <copy file="${basedir}/src/main/php/integrations_common/php/common/WimbaLib.php" tofile="${project.build.directory}/generated-sources/mod/voicetools/lib/php/common/WimbaLib.php" />
<copy todir="${project.build.directory}/generated-sources/mod/voicetools/lib/web" overwrite="true">
<fileset dir="${basedir}/src/main/php/integrations_common/web">
Modified: branches/3.3_trunk/src/main/php/blocks/bvoiceemail/block_bvoiceemail.php
===================================================================
--- branches/3.3_trunk/src/main/php/blocks/bvoiceemail/block_bvoiceemail.php 2008-09-03 00:51:27 UTC (rev 259)
+++ branches/3.3_trunk/src/main/php/blocks/bvoiceemail/block_bvoiceemail.php 2008-10-29 17:55:46 UTC (rev 260)
@@ -41,7 +41,7 @@
}
function instance_allow_multiple() {
- return false;
+ return true;
}
Modified: branches/3.3_trunk/src/main/php/blocks/bvoiceemail/config_instance.html
===================================================================
--- branches/3.3_trunk/src/main/php/blocks/bvoiceemail/config_instance.html 2008-09-03 00:51:27 UTC (rev 259)
+++ branches/3.3_trunk/src/main/php/blocks/bvoiceemail/config_instance.html 2008-10-29 17:55:46 UTC (rev 260)
@@ -2,8 +2,8 @@
global $COURSE;
?>
+<div align="center">
+<iframe width="750px" align="center" height="300px" src="<?php echo $CFG->wwwroot;?>/mod/voiceemail/block_config.php?course_id=<?php echo $COURSE->id?>&block_id=<?php echo $this->instance->id?>" style="overflow:hidden" FRAMEBORDER="0"></iframe>
+</div>
-<iframe width="900px" height="300px" src="<?php echo $CFG->wwwroot;?>/mod/voiceemail/block_config.php?course_id=<?php echo $COURSE->id?>&block_id=<?php echo $this->instance->id?>" style="overflow:hidden" FRAMEBORDER="0"></iframe>
-
-
Added: branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/block_bvoiceemail.php
===================================================================
--- branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/block_bvoiceemail.php (rev 0)
+++ branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/block_bvoiceemail.php 2008-10-29 17:55:46 UTC (rev 260)
@@ -0,0 +1,58 @@
+<?PHP
+
+require_once($CFG->libdir.'/datalib.php');
+
+class block_bvoiceemail extends block_base {
+
+ function init() {
+ $this->title = "Voice E-Mail";
+ $this->version = 2004111200;
+ }
+
+ function preferred_width() {
+ return 220;
+ }
+
+ function applicable_formats() {
+
+ return array('site-index' => false,
+ 'course-view' => true
+ );
+
+ }
+
+ function get_content() {
+
+ global $CFG, $USER, $COURSE;
+ if ($this->content !== NULL) {
+ return $this->content;
+ }
+
+ $this->content = new stdClass;
+ $this->content->text = '';
+ $this->content->footer = '';
+ $this->content->text .= '<table>';
+ $this->content->text .= '<tr><td align="center">';
+ $this->content->text .= '<iframe src='.$CFG->wwwroot.'/mod/voiceemail/block.php?course_id='. $COURSE->id.'&block_id='.$this->instance->id.' name="frameWidget" style="overflow:hidden" FRAMEBORDER=0 width="220px" height="150px"></iframe>';
+ $this->content->text .= '</td></tr>';
+ $this->content->text .= '</table>';
+
+ return $this->content;
+ }
+
+ function instance_allow_multiple() {
+ return false;
+ }
+
+
+ function instance_allow_config() {
+ return true;
+ }
+ function has_config() {
+ return true;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Modified: branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/block_bvoicerecorder.php
===================================================================
--- branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/block_bvoicerecorder.php 2008-09-03 00:51:27 UTC (rev 259)
+++ branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/block_bvoicerecorder.php 2008-10-29 17:55:46 UTC (rev 260)
@@ -1,23 +1,31 @@
<?PHP
+
require_once($CFG->libdir.'/datalib.php');
+
class block_bvoicerecorder extends block_base {
function init() {
+
$this->title = "Voice Authoring";
- $this->version = 2004111200;
+ $this->version = 2008111200;
}
+
+ function specialization() {
+ $block_info = get_record("voiceauthoring_block","bid",$this->instance->id);
+ $this->title = isset($block_info->title) ? format_string($block_info->title) : format_string("Voice Authoring");
+ }
function preferred_width() {
- return 220;
+ return 215 ;
}
function applicable_formats() {
-
- return array('site-index' => false,
- 'course-view' => true
- );
+
+ return array('site-index' => false,
+ 'course-view' => true
+ );
}
@@ -36,14 +44,13 @@
$this->content->text = '';
$this->content->footer = '';
$this->content->text .= '<table>';
- $this->content->text .= '<tr><td align="center">';
- $this->content->text .= '<iframe src='.$CFG->wwwroot.'/mod/voiceauthoring/
- voiceauthoring.php?course_id='. $COURSE->id.
+ $this->content->text .= '<tr><td align="center">';
+ $this->content->text .= '<iframe src='.$CFG->wwwroot.'/mod/voiceauthoring/voiceauthoring.php?course_id='.$COURSE->id.
'&block_id='.$this->instance->id.
- 'name="frameWidget" style="overflow:hidden"
- FRAMEBORDER=0 width="220px" height="220px"></iframe>';
-
- $this->content->text .= '</td></tr>';
+ 'name="frameWidget" style="overflow:hidden;margin-top:-10px"
+ FRAMEBORDER=0 width="215px" height="150px"></iframe>';
+
+ $this->content->text .= '</td></tr>';
$this->content->text .= '</table>';
@@ -65,4 +72,5 @@
}
-?>
\ No newline at end of file
+?>
+
Added: branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/config_instance.html
===================================================================
--- branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/config_instance.html (rev 0)
+++ branches/3.3_trunk/src/main/php/blocks/bvoicerecorder/config_instance.html 2008-10-29 17:55:46 UTC (rev 260)
@@ -0,0 +1,9 @@
+<?php
+global $COURSE;
+
+?>
+<div align="center">
+<iframe width="750px" align="center" height="300px" src="<?php echo $CFG->wwwroot;?>/mod/voiceauthoring/block_config.php?course_id=<?php echo $COURSE->id?>&block_id=<?php echo $this->instance->id?>" style="overflow:hidden" FRAMEBORDER="0"></iframe>
+</div>
+
+
Modified: branches/3.3_trunk/src/main/php/integrations_common/php/common/DatabaseManagement.php
===================================================================
--- branches/3.3_trunk/src/main/php/integrations_common/php/common/DatabaseManagement.php 2008-09-03 00:51:27 UTC (rev 259)
+++ branches/3.3_trunk/src/main/php/integrations_common/php/common/DatabaseManagement.php 2008-10-29 17:55:46 UTC (rev 260)
@@ -63,7 +63,7 @@
return @MODULE_NAME@_store_new_element($voicetools);
}
-function storeVmailResource($rid,$course_id, $block_id='-1')
+function storeVmailResource($rid,$course_id, $block_id='0')
{
$voicetools = new Object();
@@ -169,4 +169,9 @@
return $preview;
}
+
+
+
+
+
?>
\ No newline at end of file
Modified: branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaCommons.php
===================================================================
--- branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaCommons.php 2008-09-03 00:51:27 UTC (rev 259)
+++ branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaCommons.php 2008-10-29 17:55:46 UTC (rev 260)
@@ -43,7 +43,7 @@
$this->timeOfLoad = time();
$signature="";
$this->request=$parameters;
- if (($this->timeOfLoad - $parameters["time"] <= 1800) && ($this->timeOfLoad - $parameters["time"] >= 0))
+ if (($this->timeOfLoad - $parameters["time"] <= 10) && ($this->timeOfLoad - $parameters["time"] >= 0))
{//30 min
ksort($parameters);
foreach ($parameters as $key => $value)
Modified: branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaLib.php
===================================================================
--- branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaLib.php 2008-09-03 00:51:27 UTC (rev 259)
+++ branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaLib.php 2008-10-29 17:55:46 UTC (rev 260)
@@ -14,8 +14,8 @@
return array(
array("value" => "enc_course_id", "type" => PARAM_INT, "default_value" => null),
array("value" => "enc_email", "type" => PARAM_CLEAN, "default_value" => null),
- array("value" => "enc_firstname", "type" => PARAM_ALPHANUM, "default_value" => null),
- array("value" => "enc_lastname", "type" => PARAM_ALPHANUM, "default_value" => null),
+ array("value" => "enc_firstname", "type" => PARAM_CLEAN, "default_value" => null),
+ array("value" => "enc_lastname", "type" => PARAM_CLEAN, "default_value" => null),
array("value" => "enc_role", "type" => PARAM_ALPHA, "default_value" => null),
array("value" => "time", "type" => PARAM_INT, "default_value" => null),
array("value" => "signature", "type" => PARAM_ALPHANUM, "default_value" => null),
@@ -26,7 +26,7 @@
array("value" => "resource_id", "type" => PARAM_CLEAN, "default_value" => "0"),
array("value" => "error", "type" => PARAM_CLEAN, "default_value" => ""),
array("value" => "messageAction", "type" => PARAM_CLEAN, "default_value" => ""),
- array("value" => "messageProduct", "type" => PARAM_CLEAN, "default_value" => "")
+ array("value" => "messageProduct", "type" => PARAM_CLEAN, "default_value" => ""),
);
}
@@ -37,7 +37,7 @@
array("value" => "description", "type" => PARAM_CLEAN, "default_value" => ""),
array("value" => "led", "type" => PARAM_ALPHA, "default_value" => "instructor"),
array("value" => "hms_two_way_enabled", "type" => PARAM_BOOL, "default_value" => "0"),
- array("value" => "enable_student_video_on_startup", "type" => PARAM_BOOL, "default_value" => "10"),
+ array("value" => "enable_student_video_on_startup", "type" => PARAM_BOOL, "default_value" => "0"),
array("value" => "hms_simulcast_restricted", "type" => PARAM_BOOL, "default_value" => "0"),
array("value" => "video_bandwidth", "type" => PARAM_CLEAN, "default_value" => "medium"),
array("value" => "status_appear", "type" => PARAM_BOOL, "default_value" => "0"),
@@ -45,7 +45,7 @@
array("value" => "archiveEnabled", "type" => PARAM_BOOL, "default_value" => "0"),
array("value" => "enabled_student_eboard", "type" => PARAM_BOOL, "default_value" => "0"),
array("value" => "enabled_students_breakoutrooms", "type" => PARAM_BOOL, "default_value" => "0"),
- array("value" => "enabled_students_mainrooms", "type" => PARAM_BOOL, "default_value" => "0"),
+ array("value" => "enabled_students_mainrooms", "type" => PARAM_BOOL, "default_value" => "0"),
array("value" => "enabled_status", "type" => PARAM_BOOL, "default_value" => "0"),
array("value" => "appshareEnabled", "type" => PARAM_BOOL, "default_value" => "0"),
array("value" => "pptEnabled", "type" => PARAM_BOOL, "default_value" => "0"),
Modified: branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaUI.php
===================================================================
--- branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaUI.php 2008-09-03 00:51:27 UTC (rev 259)
+++ branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaUI.php 2008-10-29 17:55:46 UTC (rev 260)
@@ -335,7 +335,7 @@
}
else
{//problem to get the vt resource
- wimba_add_log(WIMBA_INFO,WV,"No xxxxxxx have been created yet");
+ wimba_add_log(WIMBA_INFO,WV,"No resource have been created yet");
$this->xml->setError(get_string("error_connection_vt", "@MODULE_NAME@"));
}
@@ -909,13 +909,13 @@
$this->xml->addSimpleLineElement("label",
get_string("settings_enabled_student_eboard", 'liveclassroom'));
- if($this->isLectureRoom)
+ if($this->isLectureRoom === true)
{
$this->xml->createLine("subPart","lectureRoom");
}
else
{
- $this->xml->createLine("subPart HideElement","lectureRoom");
+ $this->xml->createLine("subPart hideElement","lectureRoom");
}
$this->xml->addSimpleLineElement("label",
@@ -938,13 +938,13 @@
"label",
get_string("settings_enabled_breakoutrooms", 'liveclassroom'));
- if($this->isLectureRoom)
+ if($this->isLectureRoom === true)
{
$this->xml->createLine("subPart","lectureRoom");
}
else
{
- $this->xml->createLine("subPart HideElement","lectureRoom");
+ $this->xml->createLine("subPart hideElement","lectureRoom");
}
$parameters = array (
@@ -972,13 +972,13 @@
"label",
get_string("settings_enabled_students_breakoutrooms", 'liveclassroom'));
- if($this->isLectureRoom)
+ if($this->isLectureRoom === true)
{
$this->xml->createLine("","lectureRoom");
}
else
{
- $this->xml->createLine("HideElement","lectureRoom");
+ $this->xml->createLine("hideElement","lectureRoom");
}
$parameters = array (
@@ -1013,7 +1013,7 @@
}
else
{
- $this->xml->createLine("HideElement","lectureRoom");
+ $this->xml->createLine("hideElement","lectureRoom");
}
$this->xml->addSimpleLineElement(
@@ -1455,7 +1455,7 @@
$parameters = array (
"type" => "button",
"value" => get_string("settings_advanced_room_settings_button",'liveclassroom'),
- "onclick" => "openRoomSettings('doAction.php')"
+ "onclick" => "openRoomSettings('manageAction.php')"
);
$this->xml->addInputElement($parameters);
@@ -1588,7 +1588,8 @@
"type" => "checkbox",
"value" => "true",
"id" => "show_compose",
- "name" => "show_compose"
+ "name" => "show_compose",
+ "class" =>"AlignRight"
);
if (!isset ($this->currentObject))
{
@@ -1861,7 +1862,7 @@
"name" => "show_reply",
"class" => "Padding_50px"
);
- if (isset ($this->currentObject) && $this->currentObjectOptions->getShowReply() == 'true')
+ if (!isset ($this->currentObject) || $this->currentObjectOptions->getShowReply() == 'true')
{
$parameters['checked'] = "true";
}
@@ -2756,7 +2757,7 @@
$this->session->url_params . "&time=" . time() . "&action=launch");
$xmlResource->setTooltipAvailability(get_string("tooltipVT_" . $preview . "_student", '@MODULE_NAME@'));
- if ($this->session->isInstructor() || !$this->session->isInstructor() && $preview == true)
+ if ($this->session->isInstructor() || !$this->session->isInstructor() && $preview === true)
{
$xmlResource->setType($resource->getType());
$resources[$resource->getTitle() . $resource->getRid()] = $xmlResource;
Modified: branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaXml.php
===================================================================
--- branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaXml.php 2008-09-03 00:51:27 UTC (rev 259)
+++ branches/3.3_trunk/src/main/php/integrations_common/php/common/WimbaXml.php 2008-10-29 17:55:46 UTC (rev 260)
@@ -28,7 +28,8 @@
/* $Id: $ */
-class WimbaXml{
+class WimbaXml
+{
var $xmldoc;
var $part=array(); //contains the different part of the UI
var $linePart=array();
@@ -277,7 +278,7 @@
$elementBrowser->append_child($this->xmldoc->create_text_node($browser));
$disable = $this->xmldoc->create_element("disabled");
- $disable->append_child($this->xmldoc->create_text_node($disabled));
+ $disable->append_child($this->xmldoc->create_text_node($disable));
$hbinstructorview = $this->xmldoc->create_element("instructorView");
$hbinstructorview->append_child($this->xmldoc->create_text_node(get_string('instructorview', 'voiceboard')));
$hbstudentview = $this->xmldoc->create_element("studentView");
Modified: branches/3.3_trunk/src/main/php/integrations_common/php/lc/LCAction.php
===================================================================
--- branches/3.3_trunk/src/main/php/integrations_common/php/lc/LCAction.php 2008-09-03 00:51:27 UTC (rev 259)
+++ branches/3.3_trunk/src/main/php/integrations_common/php/lc/LCAction.php 2008-10-29 17:55:46 UTC (rev 260)
@@ -27,23 +27,29 @@
******************************************************************************/
require_once ("LCUser.php");
+require_once("PrefixUtil.php");
class LCAction {
var $session = null;
var $api = null;
+ var $prefixUtil =null;
var $server = "";
var $adminName = "";
var $adminPass = "";
var $courseId = "";
var $login = "";
var $prefix = "";
+
function LCAction($session, $server, $login, $password, $path, $courseId = "")
{
$this->session = $session;
-
- $this->api = LCApi::getInstance($server, $login, $password, $path);
+
+ $this->prefixUtil = new PrefixUtil();
+ $this->prefix = $this->prefixUtil->getPrefix($login);
+
+ $this->api = LCApi::getInstance($server, $login, $password,$this->prefix, $path);
if (isset ($this->session))
{
$this->courseId = $this->session->getCourseId();
@@ -53,8 +59,9 @@
$this->courseId = $courseId;
}
$this->server = $server;
- $this->prefix = getPrefix($login);
- $this->createFirstTime();
+
+ //create the user of the course
+ $this->createFirstTime();
}
@@ -74,17 +81,16 @@
function createFirstTime()
{
- if ($this->api->lcapi_get_users($this->getStudentUserid()) == false)
+ if ($this->api->lcapi_get_users($this->getStudentUserid()) === false)
{
// create the two users
$this->api->lcapi_create_user($this->getStudentUserid());
+ }
+
+ if ($this->api->lcapi_get_users($this->getTeacherUserid()) === false)
+ {
+ // create the two users
$this->api->lcapi_create_user($this->getTeacherUserid());
- // teacher is the lead of the presentation
- // $this->createSimpleRoom("Main Room", true, $this->courseId);
- // teachers and students have the same rigth
- // $this->createSimpleRoom("Group 1", false, $this->courseId);
- // $this->createSimpleRoom("Group 2", false, $this->courseId);
- // $this->createSimpleRoom("Group 3", false, $this->courseId);
}
}
@@ -240,7 +246,7 @@
function createSimpleRoom($longname, $lecture, $courseId)
{
// room
- $id = $this->prefix . $courseId . rand();
+ $id = $courseId . rand();
$room = new LCRoom();
$room->setArguments($id, null, $longname, null, "0", "0");
@@ -266,6 +272,7 @@
}
function getRoom($roomid)
{
+ $this->prefixUtil->trimPrefix($roomid,$this->prefix);
return $this->api->lcapi_get_room_info($roomid);
}
@@ -344,33 +351,57 @@
$this->api->lcapi_modify_room($roomId, $room->getAttributes());
}
- function cloneRoom($course_id,$roomId, $UserData = "0", $isStudentAdmin, $preview )
+ function removeRole($roomId,$userId,$typeRole)
{
- $newId=$roomId."_".rand()."_c";
+ $roomId = $this->prefixUtil->trimPrefix($roomId,$this->prefix);
+ $this->api->lcapi_remove_user_role($roomId,$userId,$typeRole);
+ }
+ function cloneRoom($course_id,$roomId, $userData = "0", $isStudentAdmin, $preview )
+ {
+ $newId = "c".rand();
+ $oldIdWithoutPrefix = $this->prefixUtil->trimPrefix($roomId,$this->prefix);
+
if( $userData=="1" )
{
- $this->api->lcapi_clone_class($roomId, $newId);
+ $this->api->lcapi_clone_class($oldIdWithoutPrefix, $newId);
}
else
{
- $this->api->lcapi_clone_class($roomId, $newId,"1");
+ $this->api->lcapi_clone_class($oldIdWithoutPrefix, $newId,"1");
}
- $this->setRoomPreview($newId,$preview);
+
+ if(empty($preview))//preview is empty for the available room
+ {
+ $preview = "0";
+ }
+
+ $this->setRoomPreview($newId,$preview);
- if ($isStudentAdmin == "true")
- { // instructor lead the presentation
- $this->api->lcapi_add_user_role($newId, $this->getStudentUserid(), "Student");
- $this->api->lcapi_add_user_role($newId, $this->getTeacherUserid(), "ClassAdmin");
- }
- else
- {
- $this->api->lcapi_add_user_role($newId, $this->getStudentUserid(), "Instructor");
- $this->api->lcapi_add_user_role($newId, $this->getTeacherUserid(), "ClassAdmin");
- }
- return $newId;
+ if ($isStudentAdmin == "true")
+ { // instructor lead the presentation
+ $this->api->lcapi_add_user_role($newId, $course_id."_S", "Student");
+ $this->api->lcapi_add_user_role($newId, $course_id."_T", "ClassAdmin");
+ }
+ else
+ {
+ $this->api->lcapi_add_user_role($newId, $course_id."_S", "Instructor");
+ $this->api->lcapi_add_user_role($newId, $course_id."_T", "ClassAdmin");
+ }
+ return $newId;
}
+ function getVersion()
+ {
+ $config=$this->api->lcapi_get_status();
+ $version=$config["horizon_version"];
+ if(empty($version))
+ {
+ $version="Unknown";
+ }
+ return $version;
+ }
}
+
?>
Modified: branches/3.3_trunk/src/main/php/integrations_common/php/lc/LCRoom.php
===================================================================
--- branch...
[truncated message content] |
