[Hw4mdl-svn] SF.net SVN: hw4mdl:[263] trunk
Brought to you by:
jhlinder,
trollinger
Menu
▾
▴
[Hw4mdl-svn] SF.net SVN: hw4mdl:[263] trunk
|
From: <tro...@us...> - 2008-11-12 20:44:00
|
Revision: 263
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=263&view=rev
Author: trollinger
Date: 2008-11-12 20:43:51 +0000 (Wed, 12 Nov 2008)
Log Message:
-----------
update trunk to 3.3.1
Modified Paths:
--------------
trunk/pom.xml
trunk/src/main/php/integrations_common/php/common/WimbaCommons.php
trunk/src/main/php/integrations_common/php/common/WimbaUI.php
trunk/src/main/php/integrations_common/php/lc/LCAction.php
trunk/src/main/php/integrations_common/php/lc/lcapi.php
trunk/src/main/php/integrations_common/php/vt/WimbaVoicetools.php
trunk/src/main/php/integrations_common/php/vt/WimbaVoicetoolsAPI.php
trunk/src/main/php/integrations_common/web/js/lib/prototype/prototype.js
trunk/src/main/php/integrations_common/web/js/wimba_ajax.js
trunk/src/main/php/mod/liveclassroom/db/upgrade.php
trunk/src/main/php/mod/liveclassroom/generateXmlMainPanel.php
trunk/src/main/php/mod/liveclassroom/generateXmlSettingsPanel.php
trunk/src/main/php/mod/liveclassroom/index.php
trunk/src/main/php/mod/liveclassroom/lib.php
trunk/src/main/php/mod/liveclassroom/manageAction.php
trunk/src/main/php/mod/liveclassroom/mod.html
trunk/src/main/php/mod/liveclassroom/version.php
trunk/src/main/php/mod/liveclassroom/view.php
trunk/src/main/php/mod/liveclassroom/welcome.php
trunk/src/main/php/mod/voiceauthoring/index.php
trunk/src/main/php/mod/voiceauthoring/lib.php
trunk/src/main/php/mod/voiceauthoring/mod.html
trunk/src/main/php/mod/voiceauthoring/version.php
trunk/src/main/php/mod/voiceauthoring/view.php
trunk/src/main/php/mod/voiceauthoring/voiceauthoring.php
trunk/src/main/php/mod/voiceemail/block.php
trunk/src/main/php/mod/voiceemail/index.php
trunk/src/main/php/mod/voiceemail/lib.php
trunk/src/main/php/mod/voiceemail/listAvailableRecipients.php
trunk/src/main/php/mod/voiceemail/mod.html
trunk/src/main/php/mod/voiceemail/version.php
trunk/src/main/php/mod/voiceemail/view.php
trunk/src/main/php/mod/voicetools/config.html
trunk/src/main/php/mod/voicetools/db/upgrade.php
trunk/src/main/php/mod/voicetools/mod.html
trunk/src/main/php/mod/voicetools_generic/generateXmlMainPanel.php
trunk/src/main/php/mod/voicetools_generic/generateXmlSettingsPanel.php
trunk/src/main/php/mod/voicetools_generic/index.php
trunk/src/main/php/mod/voicetools_generic/lib.php
trunk/src/main/php/mod/voicetools_generic/manageAction.php
trunk/src/main/php/mod/voicetools_generic/mod.html
trunk/src/main/php/mod/voicetools_generic/version.php
trunk/src/main/php/mod/voicetools_generic/view.php
trunk/src/main/php/mod/voicetools_generic/welcome.php
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-10-29 18:08:49 UTC (rev 262)
+++ trunk/pom.xml 2008-11-12 20:43:51 UTC (rev 263)
@@ -2,8 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>wimba.integrations.moodle.vt-lc</groupId>
<artifactId>wimba-moodle</artifactId>
- <name>Wimba moodle</name>
- <version>3.3.0</version>
+ <version>3.3.1-SNAPSHOT</version>
<!-- The following blocks "repositories" and "profiles" should be present in all our pom.xml -->
<!-- artifactory (FR) location -->
@@ -249,9 +248,27 @@
</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">
+ <filterset>
+ <filter token="MODULE_NAME" value="voicetools" />
+ <filter token="SHORT_NAME" value="voicetools" />
+ <filter token="COMPLETE_NAME" value="Wimba Voice" />
+ </filterset>
+ </copy>
+ <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" >
+ <filterset>
+ <filter token="MODULE_NAME" value="voicetools" />
+ <filter token="SHORT_NAME" value="voicetools" />
+ <filter token="COMPLETE_NAME" value="Wimba Voice" />
+ </filterset>
+ </copy>
+ <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">
+ <filterset>
+ <filter token="MODULE_NAME" value="voicetools" />
+ <filter token="SHORT_NAME" value="voicetools" />
+ <filter token="COMPLETE_NAME" value="Wimba Voice" />
+ </filterset>
+ </copy>
<copy todir="${project.build.directory}/generated-sources/mod/voicetools/lib/web" overwrite="true">
<fileset dir="${basedir}/src/main/php/integrations_common/web">
@@ -311,4 +328,4 @@
</site>
</distributionManagement>
- </project>
\ No newline at end of file
+ </project>
Modified: trunk/src/main/php/integrations_common/php/common/WimbaCommons.php
===================================================================
--- trunk/src/main/php/integrations_common/php/common/WimbaCommons.php 2008-10-29 18:08:49 UTC (rev 262)
+++ trunk/src/main/php/integrations_common/php/common/WimbaCommons.php 2008-11-12 20:43:51 UTC (rev 263)
@@ -43,7 +43,7 @@
$this->timeOfLoad = time();
$signature="";
$this->request=$parameters;
- if (($this->timeOfLoad - $parameters["time"] <= 10) && ($this->timeOfLoad - $parameters["time"] >= 0))
+ if (($this->timeOfLoad - $parameters["time"] <= 1800) && ($this->timeOfLoad - $parameters["time"] >= 0))
{//30 min
ksort($parameters);
foreach ($parameters as $key => $value)
Modified: trunk/src/main/php/integrations_common/php/common/WimbaUI.php
===================================================================
--- trunk/src/main/php/integrations_common/php/common/WimbaUI.php 2008-10-29 18:08:49 UTC (rev 262)
+++ trunk/src/main/php/integrations_common/php/common/WimbaUI.php 2008-11-12 20:43:51 UTC (rev 263)
@@ -335,7 +335,7 @@
}
else
{//problem to get the vt resource
- wimba_add_log(WIMBA_INFO,WV,"No resource have been created yet");
+ wimba_add_log(WIMBA_INFO,@MODULE_NAME@_LOGS,"No resource have been created yet");
$this->xml->setError(get_string("error_connection_vt", "@MODULE_NAME@"));
}
@@ -909,7 +909,7 @@
$this->xml->addSimpleLineElement("label",
get_string("settings_enabled_student_eboard", 'liveclassroom'));
- if($this->isLectureRoom === true)
+ if($this->isLectureRoom)
{
$this->xml->createLine("subPart","lectureRoom");
}
@@ -938,7 +938,7 @@
"label",
get_string("settings_enabled_breakoutrooms", 'liveclassroom'));
- if($this->isLectureRoom === true)
+ if($this->isLectureRoom)
{
$this->xml->createLine("subPart","lectureRoom");
}
@@ -972,7 +972,7 @@
"label",
get_string("settings_enabled_students_breakoutrooms", 'liveclassroom'));
- if($this->isLectureRoom === true)
+ if($this->isLectureRoom)
{
$this->xml->createLine("","lectureRoom");
}
@@ -1202,7 +1202,7 @@
}
else
{
- if ($this->isLectureRoom == false || isset( $this->currentObject ) && $this->currentObject->isArchive())
+ if ($this->isLectureRoom === false || isset( $this->currentObject ) && $this->currentObject->isArchive())
{
$this->xml->createPanelSettings(
get_string("tab_title_chat", 'liveclassroom'),
@@ -1972,7 +1972,7 @@
{
$optionsMonth = $this->createSelectMonth();
}
- if ($this->startSelect == false || $this->currentObject == null)
+ if ($this->startSelect === false || $this->currentObject == null)
{
$this->xml->createOptionElement(
"start_month",
@@ -1999,7 +1999,7 @@
{
$optionsDay = $this->createSelectDay();
}
- if ($this->startSelect == false || $this->currentObject == null)
+ if ($this->startSelect === false || $this->currentObject == null)
{
$this->xml->createOptionElement(
"start_day",
@@ -2025,7 +2025,7 @@
{
$optionsYear = $this->createSelectYear();
}
- if ($this->startSelect == false || $this->currentObject == null)
+ if ($this->startSelect === false || $this->currentObject == null)
{
$this->xml->createOptionElement(
"start_year",
@@ -2051,7 +2051,7 @@
{
$optionsHour = $this->createSelectHour();
}
- if ($this->startSelect == false || $this->currentObject == null)
+ if ($this->startSelect === false || $this->currentObject == null)
{
$this->xml->createOptionElement(
"start_hr",
@@ -2078,7 +2078,7 @@
{
$optionsMinute = $this->createSelectMin();
}
- if ($this->startSelect == false || $this->currentObject == null)
+ if ($this->startSelect === false || $this->currentObject == null)
{
$this->xml->createOptionElement(
"start_min",
@@ -2133,7 +2133,7 @@
{
$optionsMonth = $this->createSelectMonth();
}
- if ($this->endSelect == false || $this->currentObject == null)
+ if ($this->endSelect === false || $this->currentObject == null)
{
$this->xml->createOptionElement(
"end_month",
@@ -2160,7 +2160,7 @@
{
$optionsDay = $this->createSelectDay();
}
- if ($this->endSelect == false || $this->currentObject == null)
+ if ($this->endSelect === false || $this->currentObject == null)
{
$this->xml->createOptionElement(
"end_day",
@@ -2187,7 +2187,7 @@
{
$optionsYear = $this->createSelectYear();
}
- if ($this->endSelect == false || $this->currentObject == null)
+ if ($this->endSelect === false || $this->currentObject == null)
{
$this->xml->createOptionElement(
"end_year",
@@ -2214,7 +2214,7 @@
{
$optionsHour = $this->createSelectHour();
}
- if ($this->endSelect == false || $this->currentObject == null)
+ if ($this->endSelect === false || $this->currentObject == null)
{
$this->xml->createOptionElement(
"end_hr",
@@ -2242,7 +2242,7 @@
$optionsMinute = $this->createSelectMin();
}
- if ($this->endSelect == false || $this->currentObject == null)
+ if ($this->endSelect === false || $this->currentObject == null)
{
$this->xml->createOptionElement(
"end_min",
@@ -2594,7 +2594,7 @@
$liveclassroom = array ();
$archives = array ();
$rooms = $this->api->getRooms($this->session->getcourseId() . "_T");
- if ($rooms==false)
+ if ($rooms === false)
{
return false;
}
@@ -2604,7 +2604,7 @@
$id = $room->getRoomId();
$name = $room->getLongname();
$preview = $room->isPreview();
- if ($room->isArchive() == 1)
+ if ($room->isArchive())
{
$archive = new XmlArchive(
$id,
@@ -2622,7 +2622,7 @@
else
{
- if ($this->session->isInstructor() || !$this->session->isInstructor() && !$preview == 1)
+ if ($this->session->isInstructor() || !$this->session->isInstructor() && $preview == 0)
{
$xmlRoom = new XmlRoom(
$id,
@@ -2701,9 +2701,9 @@
if( $list != false)
{
$vtResources = voicetools_api_get_resources($list["rid"]);
- if ( $vtResources == false ) // problem
+ if ( $vtResources === false ) // problem
{
- wimba_add_log(WIMBA_ERROR,WV,"Problem to get the list of resources from the wv server");
+ wimba_add_log(WIMBA_ERROR,@MODULE_NAME@_LOGS,"Problem to get the list of resources from the @MODULE_NAME@_LOGS server");
return false;
}
else
@@ -2713,7 +2713,7 @@
}
else//error to get the database content
{
- wimba_add_log(WIMBA_ERROR,WV,"Problem to get the list of resources from the databse");
+ wimba_add_log(WIMBA_ERROR,@MODULE_NAME@_LOGS,"Problem to get the list of resources from the databse");
return false;
}
@@ -2757,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)
{
$xmlResource->setType($resource->getType());
$resources[$resource->getTitle() . $resource->getRid()] = $xmlResource;
Modified: trunk/src/main/php/integrations_common/php/lc/LCAction.php
===================================================================
--- trunk/src/main/php/integrations_common/php/lc/LCAction.php 2008-10-29 18:08:49 UTC (rev 262)
+++ trunk/src/main/php/integrations_common/php/lc/LCAction.php 2008-11-12 20:43:51 UTC (rev 263)
@@ -232,7 +232,7 @@
$this->api->lcapi_remove_user_role($roomId, "Guest", "Student");
}
- $error=$this->api->lcapi_get_error();
+ $error = $this->api->lcapi_get_error();
if( ! empty($error) )
{
return "error";
@@ -400,6 +400,11 @@
}
return $version;
}
+
+ function getRoomName($roomId)
+ {
+ return $this->api->lcapi_get_room_name($roomId);
+ }
}
Modified: trunk/src/main/php/integrations_common/php/lc/lcapi.php
===================================================================
--- trunk/src/main/php/integrations_common/php/lc/lcapi.php 2008-10-29 18:08:49 UTC (rev 262)
+++ trunk/src/main/php/integrations_common/php/lc/lcapi.php 2008-11-12 20:43:51 UTC (rev 263)
@@ -116,13 +116,13 @@
var $prefix;
var $error=null;
// static $tstamp = null;
- function LCApi($server, $login, $password,$prefix, $tmppath = "")
+ function LCApi($server, $login, $password,$prefix_api, $tmppath = "")
{
$this->_lcapi_config->server = $server;
$this->_lcapi_config->login = $login;
$this->_lcapi_config->password = $password;
$this->_lcapi_config->tmppath = $tmppath;
- $this->prefix = $prefix;
+ $this->prefix = $prefix_api;
}
function getServer()
@@ -680,7 +680,7 @@
}
}
- wimba_add_log(WIMBA_DEBUG,WC,__FUNCTION__ . ": retrieved Rooms for $userid and roomid '$roomid': " . print_r($rooms, true));
+ wimba_add_log(WIMBA_DEBUG,WC,__FUNCTION__ . ": retrieved Rooms for $userid : " . print_r($rooms, true));
return $rooms;
}
/**
Modified: trunk/src/main/php/integrations_common/php/vt/WimbaVoicetools.php
===================================================================
--- trunk/src/main/php/integrations_common/php/vt/WimbaVoicetools.php 2008-10-29 18:08:49 UTC (rev 262)
+++ trunk/src/main/php/integrations_common/php/vt/WimbaVoicetools.php 2008-11-12 20:43:51 UTC (rev 263)
@@ -1430,7 +1430,7 @@
function getUser()
{
$this->nameSetPair[0] = null;
- // $this->nameValuePair = new HWVoiceBoardApi.vbWebService.NameValuePair[hparams.Count];
+ // $this->nameValuePair = new H@MODULE_NAME@_LOGSoiceBoardApi.vbWebService.NameValuePair[hparams.Count];
$i = 0;
if ($this->hparams != null)
{
@@ -1512,7 +1512,7 @@
function getMessage()
{
$this->nameSetPair[0] = null;
- // $this->nameValuePair = new HWVoiceBoardApi.vbWebService.NameValuePair[hparams.Count];
+ // $this->nameValuePair = new H@MODULE_NAME@_LOGSoiceBoardApi.vbWebService.NameValuePair[hparams.Count];
$i = 0;
if ($this->hparams != null)
{
Modified: trunk/src/main/php/integrations_common/php/vt/WimbaVoicetoolsAPI.php
===================================================================
--- trunk/src/main/php/integrations_common/php/vt/WimbaVoicetoolsAPI.php 2008-10-29 18:08:49 UTC (rev 262)
+++ trunk/src/main/php/integrations_common/php/vt/WimbaVoicetoolsAPI.php 2008-11-12 20:43:51 UTC (rev 263)
@@ -26,7 +26,7 @@
* *
******************************************************************************/
-/* $Id: WimbaVoicetoolsAPI.php 68873 2008-10-16 00:17:37Z thomasr $ */
+/* $Id: WimbaVoicetoolsAPI.php 70152 2008-11-11 16:30:32Z thomasr $ */
error_reporting(E_ALL);
global $CFG;
// WebService Client.
@@ -86,7 +86,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
return false;
}
// Set the parameters to send to the WebService
@@ -96,7 +96,7 @@
if ($soapclient->fault)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return false;
}
else
@@ -105,7 +105,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return false;
}
}
@@ -113,11 +113,11 @@
if ($resource->error == "error")
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . " : Resource not created because " . $resource->error_message);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Resource not created because " . $resource->error_message);
return false;
}
- wimba_add_log (WIMBA_DEBUG, WV, __FUNCTION__ . " : Resource Created");
+ wimba_add_log (WIMBA_DEBUG, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Resource Created");
return $resource;
}
@@ -138,7 +138,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
return false;
}
$resourceArray = array ($CFG->voicetools_adminusername, $CFG->voicetools_adminpassword, $resource_data);
@@ -147,7 +147,7 @@
if ($soapclient->fault)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return false;
}
else
@@ -156,7 +156,7 @@
$err = $soapclient->getError();
if ($err) {
// Display the error
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return false;
}
}
@@ -165,11 +165,11 @@
if ($resource->error == "error")
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . " : Resource not modified because " . $resource->error_message);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Resource not modified because " . $resource->error_message);
return false;
}
- wimba_add_log (WIMBA_DEBUG, WV, __FUNCTION__ . " : Resource Modified");
+ wimba_add_log (WIMBA_DEBUG, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Resource Modified");
return $resource;
}
@@ -182,7 +182,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
return false;
}
$resource = array ($CFG->voicetools_adminusername, $CFG->voicetools_adminpassword, $rid, $mid);
@@ -191,7 +191,7 @@
if ($soapclient->fault)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return false;
}
else
@@ -200,7 +200,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return false;
}
}
@@ -233,7 +233,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
return false;
}
$resource = array ($CFG->voicetools_adminusername, $CFG->voicetools_adminpassword, $rid);
@@ -242,7 +242,7 @@
if ($soapclient->fault)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return false;
}
else
@@ -252,7 +252,7 @@
if ($err)
{
// Display the error
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return false;
}
}
@@ -261,11 +261,11 @@
if ($resource->error == "error")
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . " : Resource not deleted because " . $resource->error_message);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Resource not deleted because " . $resource->error_message);
return false;
}
- wimba_add_log (WIMBA_DEBUG, WV, __FUNCTION__ . " : Resource Deleted");
+ wimba_add_log (WIMBA_DEBUG, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Resource Deleted");
return $resource;
}
@@ -286,7 +286,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
return false;
}
$resource = array ($CFG->voicetools_adminusername, $CFG->voicetools_adminpassword, $rid);
@@ -321,7 +321,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
return false;
}
$resource = array ($CFG->voicetools_adminusername, $CFG->voicetools_adminpassword, $rid);
@@ -330,7 +330,7 @@
if ($soapclient->fault)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return false;
}
else
@@ -340,7 +340,7 @@
if ($err)
{
// Display the error
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return false;
}
}
@@ -348,11 +348,11 @@
$resource = new vtResource($result);
if ($resource->error == "error")
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . " : Impossible to get the resource (rid=" . $rid . ") because " . $resource->error_message);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Impossible to get the resource (rid=" . $rid . ") because " . $resource->error_message);
return false;
}
- wimba_add_log (WIMBA_DEBUG, WV, __FUNCTION__ . " : No problem to get the resource " . $rid);
+ wimba_add_log (WIMBA_DEBUG, @MODULE_NAME@_LOGS, __FUNCTION__ . " : No problem to get the resource " . $rid);
return $resource;
}
@@ -373,7 +373,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
return false;
}
@@ -382,7 +382,7 @@
$result = $soapclient->call(VT_API_GET_RESOURCES, $resource);
if ($soapclient->fault) {
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return false;
}
else
@@ -392,7 +392,7 @@
if ($err)
{
// Display the error
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return false;
}
}
@@ -400,11 +400,11 @@
if ($resources->error == "error")
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . " : Impossible to get the resources " . "because " . $resources->error_message);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Impossible to get the resources " . "because " . $resources->error_message);
return false;
}
- wimba_add_log (WIMBA_DEBUG, WV, __FUNCTION__ . " : No problem to get the resources " . print_r($ridtable,true));
+ wimba_add_log (WIMBA_DEBUG, @MODULE_NAME@_LOGS, __FUNCTION__ . " : No problem to get the resources " . print_r($ridtable,true));
return $resources;
}
@@ -425,7 +425,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element');
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element');
return false;
}
@@ -433,7 +433,7 @@
$result = $soapclient->call(VT_API_CREATE_SESSION, $resource);
if ($soapclient->fault)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return false;
}
else
@@ -442,7 +442,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return false;
}
}
@@ -450,11 +450,11 @@
$session = new vtSessionInfo($result);
if ($session->error == "error")
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . " : Impossible to create the session because " . $resources->error_message);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Impossible to create the session because " . $resources->error_message);
return false;
}
- wimba_add_log (WIMBA_DEBUG, WV, __FUNCTION__ . " : Session created ");
+ wimba_add_log (WIMBA_DEBUG, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Session created ");
return $session;
}
@@ -475,14 +475,14 @@
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element');
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element');
return $err;
}
$resource = array ($login, $password, $url);
$result = $soapclient->call(VT_API_ALLOWEDDOCBASE, $resource);
if ($soapclient->fault) {
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return $soapclient->fault;
}
else
@@ -490,7 +490,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return $err;
}
}
@@ -509,7 +509,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element');
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element');
return false;
}
@@ -519,7 +519,7 @@
if ($soapclient->fault)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return false;
}
else
@@ -528,7 +528,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return false;
}
}
@@ -576,7 +576,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element');
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element');
return false;
}
@@ -586,7 +586,7 @@
if ($soapclient->fault)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return false;
}
else
@@ -595,7 +595,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return false;
}
}
@@ -623,12 +623,12 @@
{
if (empty($result)) {
// error ("Empty result after call to ".VT_API_SERVICES);
- wimba_add_log(WIMBA_ERROR,WV,"voicetool_api_check_result: Empty result after call to " . VT_API_SERVICES);
+ wimba_add_log(WIMBA_ERROR,@MODULE_NAME@_LOGS,"voicetool_api_check_result: Empty result after call to " . VT_API_SERVICES);
return false;
}
if (voicetools_api_get_status_code($result) != 'ok') {
- wimba_add_log(WIMBA_ERROR,WV,"voicetool_api_check_result: " . voicetools_api_get_error_message($result));
+ wimba_add_log(WIMBA_ERROR,@MODULE_NAME@_LOGS,"voicetool_api_check_result: " . voicetools_api_get_error_message($result));
return false;
}
return true;
@@ -687,7 +687,7 @@
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
return false;
}
@@ -704,7 +704,7 @@
if ($soapclient->fault)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
return false;
}
else
@@ -713,7 +713,7 @@
$err = $soapclient->getError();
if ($err)
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . ' : error with the web service : ' . $err);
return false;
}
}
@@ -721,11 +721,11 @@
if ($resource->error == "error")
{
- wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . " : Resource not created because " . $resource->error_message);
+ wimba_add_log (WIMBA_ERROR, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Resource not created because " . $resource->error_message);
return false;
}
- wimba_add_log (WIMBA_DEBUG, WV, __FUNCTION__ . " : Resource Created");
+ wimba_add_log (WIMBA_DEBUG, @MODULE_NAME@_LOGS, __FUNCTION__ . " : Resource Created");
return $resource;
}
Modified: trunk/src/main/php/integrations_common/web/js/lib/prototype/prototype.js
===================================================================
--- trunk/src/main/php/integrations_common/web/js/lib/prototype/prototype.js 2008-10-29 18:08:49 UTC (rev 262)
+++ trunk/src/main/php/integrations_common/web/js/lib/prototype/prototype.js 2008-11-12 20:43:51 UTC (rev 263)
@@ -1,4221 +1,4221 @@
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
