|
From: <tro...@us...> - 2008-01-17 21:18:31
|
Revision: 228
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=228&view=rev
Author: trollinger
Date: 2008-01-17 13:18:29 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
the path of the pictures and the xsl is not static anymore
Modified Paths:
--------------
branches/team/Thomas/integrations_common/php/common/WimbaUI.php
branches/team/Thomas/integrations_common/web/js/ajax.js
branches/team/Thomas/integrations_common/web/js/constants.js
branches/team/Thomas/integrations_common/web/js/hwCommons.js
branches/team/Thomas/integrations_common/web/js/xsl/wimba.xsl
Removed Paths:
-------------
branches/team/Thomas/integrations_common/web/js/manageXml.js
Modified: branches/team/Thomas/integrations_common/php/common/WimbaUI.php
===================================================================
--- branches/team/Thomas/integrations_common/php/common/WimbaUI.php 2008-01-17 21:12:04 UTC (rev 227)
+++ branches/team/Thomas/integrations_common/php/common/WimbaUI.php 2008-01-17 21:18:29 UTC (rev 228)
@@ -94,25 +94,25 @@
HEADER
*********/
if($this->session->isInstructor()){
- $this->xml->addHeaderElement("pictures/items/headerbar-logo.png", "false", "true");
+ $this->xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "false", "true");
}else{
- $this->xml->addHeaderElement("pictures/items/headerbar-logo.png", "false", "false");
+ $this->xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "false", "false");
}
/********
MENU
*********/
- $this->xml->addButtonElement("all", "all", "disabled", "pictures/buttons/toolbar-launch", get_string('toolbar_launch', 'liveclassroom'), "javascript:LaunchElement('doAction.php','liveclassroom');");
+ $this->xml->addButtonElement("all", "all", "disabled", "lib/web/pictures/buttons/toolbar-launch", get_string('toolbar_launch', 'liveclassroom'), "javascript:LaunchElement('doAction.php','liveclassroom');");
if($this->session->isInstructor()){
- $this->xml->addButtonElement("instructor", "all", "disabled", 'pictures/buttons/toolbar-activities', get_string('toolbar_activity', 'liveclassroom'), "doOpenAddActivity('../../course/mod.php','section=0&sesskey=" . sesskey() . "&add=liveclassroom')");
+ $this->xml->addButtonElement("instructor", "all", "disabled", 'lib/web/pictures/buttons/toolbar-activities', get_string('toolbar_activity', 'liveclassroom'), "doOpenAddActivity('../../course/mod.php','section=0&sesskey=" . sesskey() . "&add=liveclassroom')");
- $this->xml->addButtonElement("instructor", "all", "enabled", "pictures/buttons/toolbar-new", get_string('toolbar_new', 'liveclassroom'), "javascript:loadNewSettings('generateSettings.php','create','liveclassroom' ,'liveclassroom','all')");
+ $this->xml->addButtonElement("instructor", "all", "enabled", "lib/web/pictures/buttons/toolbar-new", get_string('toolbar_new', 'liveclassroom'), "javascript:loadNewSettings('generateSettings.php','create','liveclassroom' ,'liveclassroom','all')");
$this->xml->addSpaceElement("20px", "instructor");
- $this->xml->addButtonElement("instructor", "all", "disabled", "pictures/buttons/toolbar-content", get_string('toolbar_content', 'liveclassroom'), "javascript:openContent('doAction.php');");
- $this->xml->addButtonElement("instructor", "all", "disabled", "pictures/buttons/toolbar-poll", get_string('toolbar_reports', 'liveclassroom'), "javascript:openReport('doAction.php');");
+ $this->xml->addButtonElement("instructor", "all", "disabled", "lib/web/pictures/buttons/toolbar-content", get_string('toolbar_content', 'liveclassroom'), "javascript:openContent('doAction.php');");
+ $this->xml->addButtonElement("instructor", "all", "disabled", "lib/web/pictures/buttons/toolbar-poll", get_string('toolbar_reports', 'liveclassroom'), "javascript:openReport('doAction.php');");
$this->xml->addSpaceElement("10px", "instructor");
- $this->xml->addButtonElement("instructor", "all", "disabled", "pictures/buttons/toolbar-settings", get_string('toolbar_settings', 'liveclassroom'), "javascript:editSettings('generateSettings.php','all');");
- $this->xml->addButtonElement("instructor", "all", "disabled", "pictures/buttons/toolbar-delete", get_string('toolbar_delete', 'liveclassroom'), "javascript:deleteResource('doAction.php');");
+ $this->xml->addButtonElement("instructor", "all", "disabled", "lib/web/pictures/buttons/toolbar-settings", get_string('toolbar_settings', 'liveclassroom'), "javascript:editSettings('generateSettings.php','all');");
+ $this->xml->addButtonElement("instructor", "all", "disabled", "lib/web/pictures/buttons/toolbar-delete", get_string('toolbar_delete', 'liveclassroom'), "javascript:deleteResource('doAction.php');");
$this->xml->addSpaceElement("50px", "instructor");
}else{
$this->xml->addSpaceElement("300px", "instructor");
@@ -157,21 +157,21 @@
HEADER
*********/
if($this->session->isInstructor()){
- $this->xml->addHeaderElement("pictures/items/headerbar-logo.png", "false", "true");
+ $this->xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "false", "true");
}else{
- $this->xml->addHeaderElement("pictures/items/headerbar-logo.png", "false", "false");
+ $this->xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "false", "false");
}
/********
MENU
*********/
- $this->xml->addButtonElement("all", "all", "disabled", "pictures/buttons/toolbar-launch", get_string('toolbar_launch', 'voicetools'), "javascript:LaunchElement('manageAction.php','voicetools');");
+ $this->xml->addButtonElement("all", "all", "disabled", "lib/web/pictures/buttons/toolbar-launch", get_string('toolbar_launch', 'voicetools'), "javascript:LaunchElement('manageAction.php','voicetools');");
if($this->session->isInstructor()){
- $this->xml->addButtonElement("instructor", "all", "disabled", 'pictures/buttons/toolbar-activities', get_string('toolbar_activity', 'voicetools'), "doOpenAddActivity('../../course/mod.php','section=0&sesskey=" . sesskey() . "&add=voicetools')");
- $this->xml->addButtonElement("instructor", "all", "enabled", "pictures/buttons/toolbar-new", get_string('toolbar_new', 'voicetools'), "javascript:launchAjaxRequest('getXmlChoicePage.php','create' ,'true','all')");
+ $this->xml->addButtonElement("instructor", "all", "disabled", 'lib/web/pictures/buttons/toolbar-activities', get_string('toolbar_activity', 'voicetools'), "doOpenAddActivity('../../course/mod.php','section=0&sesskey=" . sesskey() . "&add=voicetools')");
+ $this->xml->addButtonElement("instructor", "all", "enabled", "lib/web/pictures/buttons/toolbar-new", get_string('toolbar_new', 'voicetools'), "javascript:launchAjaxRequest('getXmlChoicePage.php','create' ,'true','all')");
$this->xml->addSpaceElement("150px", "instructor");
- $this->xml->addButtonElement("instructor", "all", "disabled", "pictures/buttons/toolbar-settings", get_string('toolbar_settings', 'voicetools'), "javascript:editSettings('getXmlNewPanel.php','all');");
- $this->xml->addButtonElement("instructor", "all", "disabled", "pictures/buttons/toolbar-delete", get_string('toolbar_delete', 'voicetools'), "javascript:deleteResource('manageAction.php');");
+ $this->xml->addButtonElement("instructor", "all", "disabled", "lib/web/pictures/buttons/toolbar-settings", get_string('toolbar_settings', 'voicetools'), "javascript:editSettings('getXmlNewPanel.php','all');");
+ $this->xml->addButtonElement("instructor", "all", "disabled", "lib/web/pictures/buttons/toolbar-delete", get_string('toolbar_delete', 'voicetools'), "javascript:deleteResource('manageAction.php');");
$this->xml->addSpaceElement("50px", "instructor");
}else{
$this->xml->addSpaceElement("300px", "instructor");
@@ -281,7 +281,7 @@
/********
HEADER
*********/
- $this->xml->addHeaderElement("pictures/items/headerbar-logo.png", "true", "true");
+ $this->xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "true", "true");
if($update=="update"){
@@ -320,7 +320,7 @@
}
function getVTSettingsView($update, $createWorkflow) {
- //list_dir("pictures",$pictures);//list the directory
+ //list_dir("lib/web/pictures",$lib/web/pictures);//list the directory
/********
SESSION
*********/
@@ -328,7 +328,7 @@
/********
HEADER
*********/
- $this->xml->addHeaderElement("pictures/items/headerbar-logo.png", "true", "true");
+ $this->xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "true", "true");
if($update=="update"){
$this->xml->addContextElement(get_string("contextbar_settings", "voicetools"), get_string("general_" . $this->product, "voicetools"), $this->currentObject->getTitle(), "");
Modified: branches/team/Thomas/integrations_common/web/js/ajax.js
===================================================================
--- branches/team/Thomas/integrations_common/web/js/ajax.js 2008-01-17 21:12:04 UTC (rev 227)
+++ branches/team/Thomas/integrations_common/web/js/ajax.js 2008-01-17 21:18:29 UTC (rev 228)
@@ -23,7 +23,12 @@
* *
******************************************************************************/
+function initPath(xsl,pictures){
+ pathXsl=xsl;
+ pathPictures=pictures;
+}
+
/*
* Get the parameters passed with the GET Method and put them into a
* javascript array
@@ -156,12 +161,12 @@
if (action != null) {
url += "?action=" + action;
}
-
-
- transform(url,"js/xsl/wimba.xsl","first",div,nextAction)
+ transform(url,"first",div,nextAction)
}
+
+
/*
* Create the context of the Ajax request and execute it
*
@@ -185,7 +190,8 @@
url += "&createWorkflow=" + createWorkflow;
}
isFilter = false;
- transform(url,"js/xsl/wimba.xsl","",div)
+
+ transform(url,"",div)
if (init == true) {
currentId = "";
@@ -215,7 +221,7 @@
xmlSource = dom;
if (xslData == null) { //get the stylesheet
dojo.io.bind({
- url:"js/xsl/wimba.xsl",
+ url:pathXsl,
mimetype:"application/xml",
load:function (type, data, evt) {
xslData = data;
@@ -264,7 +270,7 @@
* For Safari: we used he dojo framework to get the xml,xsl by Ajax and the google library
* (Google AJAXSLT) to execute the xslt transformation because it is not supported natively
*/
-function transform(urlXml, stylesheet,TypeParams, div,nextAction) {
+function transform(urlXml,TypeParams, div,nextAction) {
if(window.ActiveXObject){//ie
@@ -290,7 +296,7 @@
var xslDoc = new ActiveXObject("Microsoft.XMLDOM")
xslDoc.async = false
- xslDoc.load("js/xsl/wimba.xsl");
+ xslDoc.load(pathXsl);
xsltTransformation(sourceDoc,xslDoc,div,nextAction);
@@ -309,10 +315,11 @@
xmlSource = data;
//get the stylesheet
dojo.io.bind({
- url:stylesheet,
+ url:pathXsl,
mimetype:"application/xml",
load:function (type, data, evt) {
//do the xslt transformatio
+
xsltTransformation(xmlSource,data,div,nextAction)
},
@@ -339,7 +346,7 @@
xmlSource = dom;
dojo.io.bind({
- url:"js/xsl/wimba.xsl",
+ url:pathXsl,
mimetype:"application/xml",
load:function (type, data, evt) {
//do the xslt transformatio
@@ -386,6 +393,8 @@
}else if (window.XSLTProcessor){//firefox
var processor = new XSLTProcessor();
+ processor.setParameter(null, 'pathPictures', pathPictures);
+
processor.importStylesheet(xsl);
document.getElementById(div).innerHTML="";
var resultDocument = processor.transformToFragment(xml, document);
@@ -544,3 +553,5 @@
return params;
}
+
+
Modified: branches/team/Thomas/integrations_common/web/js/constants.js
===================================================================
--- branches/team/Thomas/integrations_common/web/js/constants.js 2008-01-17 21:12:04 UTC (rev 227)
+++ branches/team/Thomas/integrations_common/web/js/constants.js 2008-01-17 21:18:29 UTC (rev 228)
@@ -50,9 +50,9 @@
// xml
var objDom;
var objDomTree;
-var stylesheet="js/xsl/wimba.xsl";
+var xsl="";
+var pathPictures="";
-
var myDOM;
var xmlDoc;
var xslData=null;
Modified: branches/team/Thomas/integrations_common/web/js/hwCommons.js
===================================================================
--- branches/team/Thomas/integrations_common/web/js/hwCommons.js 2008-01-17 21:12:04 UTC (rev 227)
+++ branches/team/Thomas/integrations_common/web/js/hwCommons.js 2008-01-17 21:18:29 UTC (rev 228)
@@ -94,7 +94,7 @@
if(archiveMatched>0){//change the pciture
var pictureId = elements[roomLinked].id + "_ExpandPicture";
- changePicture(pictureId, "pictures/items/listitem-show.png");
+ changePicture(pictureId, pathPictures+"listitem-show.png");
}
elements[roomLinked].setAttribute("stateSearch", "");//change the status of the element to manage the display
elements[roomLinked].style.display = display;
@@ -136,10 +136,10 @@
//management of the picture to expand the archives
if(archiveMatched>0){
var pictureId = elements[roomLinked].id + "_ExpandPicture";
- changePicture(pictureId, "pictures/items/listitem-hide.png");
+ changePicture(pictureId, pathPictures+"listitem-hide.png");
}else{
var pictureId = elements[roomLinked].id + "_ExpandPicture";
- changePicture(pictureId, "pictures/items/space-16px.png");
+ changePicture(pictureId, pathPictures+"space-16px.png");
}
}
} else {
@@ -160,7 +160,7 @@
elements[roomLinked].style.display = display;
elements[roomLinked].setAttribute("stateSearch", "");
var pictureId = elements[roomLinked].id + "_ExpandPicture";
- changePicture(pictureId, "pictures/items/listitem-hide.png");
+ changePicture(pictureId, pathPictures+"listitem-hide.png");
}else{
elements[roomLinked].style.display = "none";
elements[roomLinked].setAttribute("stateSearch", "ignore");
@@ -189,15 +189,15 @@
if (currentId != "" && currentId != id) {
document.getElementById(currentId).style.backgroundColor = "white";
if(document.getElementById(currentId).getAttribute("typeProduct")=="archive"){
- document.getElementById(currentId+"_archive_subitem").src="pictures/items/listitem-subitem.jpg";
- document.getElementById(currentId+"_archive_icon").src="pictures/items/listitem-archiveicon.jpg";
+ document.getElementById(currentId+"_archive_subitem").src=pathPictures+"listitem-subitem.jpg";
+ document.getElementById(currentId+"_archive_icon").src=pathPictures+"listitem-archiveicon.jpg";
}
}
if (lineCurrentId != id) {
document.getElementById(id).style.backgroundColor = "#c3dbf7";
if(type=="archive"){
- document.getElementById(id+"_archive_subitem").src="pictures/items/listitem-subitem-selected.jpg";
- document.getElementById(id+"_archive_icon").src="pictures/items/listitem-archiveicon-selected.jpg";
+ document.getElementById(id+"_archive_subitem").src=pathPictures+"listitem-subitem-selected.jpg";
+ document.getElementById(id+"_archive_icon").src=pathPictures+"listitem-archiveicon-selected.jpg";
}
}
@@ -234,13 +234,13 @@
}
}
if(archiveAvailable==true){
- changePicture(id + "_ExpandPicture", "pictures/items/listitem-hide.png");
+ changePicture(id + "_ExpandPicture", pathPictures+"listitem-hide.png");
div.style.height="";
document.getElementById(nameMore).innerHTML = "<label class='moreRoom' onclick='RemoveAllDiv(\"" + name + "\",\"" + nameMore + "\",\"" + (listRoomsArchives.length-numHide) + "\")'>Show Top 5...</label>";
expandState=1;
}
else{
- changePicture(id + "_ExpandPicture", "pictures/items/listitem-show.png");
+ changePicture(id + "_ExpandPicture", pathPictures+"listitem-show.png");
if(expandState!=1)
document.getElementById(nameMore).innerHTML = "<label class='moreRoom' onclick='displayAllDiv(\"" + name + "\",\"" + nameMore + "\",\"" + (listRoomsArchives.length-numHide) + "\")'>"+(listRoomsArchives.length-numHide-5)+" more...</label>";
else
@@ -345,7 +345,7 @@
elements[i].style.display = "none";
if(elements[i + 1] != null && elements[i + 1].getAttribute("typeProduct") == "archive"){//this room contains archives
document.getElementById(elements[linkedRoom].id + "_ExpandPicture").style.visibility="visible";
- changePicture(document.getElementById(elements[linkedRoom].id + "_ExpandPicture"), "pictures/items/listitem-show.png");
+ changePicture(document.getElementById(elements[linkedRoom].id + "_ExpandPicture"), pathPictures+"listitem-show.png");
while (elements[i + 1].getAttribute("typeProduct") == "archive") {
elements[i + 1].className = "archiveHide";
elements[i + 1].setAttribute("stateStudentView", "ignore");
@@ -370,7 +370,7 @@
}
if(archiveMatched==0){//hide the element which allow the expand/collapse
document.getElementById(elements[linkedRoom].id + "_ExpandPicture").style.visibility="hidden";
- changePicture(document.getElementById(elements[linkedRoom].id + "_ExpandPicture"), "pictures/items/listitem-show.png");
+ changePicture(document.getElementById(elements[linkedRoom].id + "_ExpandPicture"), pathPictures+"listitem-show.png");
}
}
@@ -387,7 +387,7 @@
elements[i].style.display = display;
if(elements[i+1]!=null && elements[i+1].getAttribute("typeProduct") == "archive"){
document.getElementById(elements[i].id + "_ExpandPicture").style.visibility="visible";
- changePicture(document.getElementById(elements[i].id + "_ExpandPicture"), "pictures/items/listitem-show.png");
+ changePicture(document.getElementById(elements[i].id + "_ExpandPicture"), pathPictures+"listitem-show.png");
}
} else {
@@ -480,19 +480,19 @@
if(document.getElementById("collapsePictureliveclassroom")) {
- changePicture("collapsePictureliveclassroom", "pictures/items/category-expanded.png");
+ changePicture("collapsePictureliveclassroom", pathPictures+"/items/category-expanded.png");
document.getElementById("div_liveclassroom").setAttribute("state", "expand");
}
if(document.getElementById("collapsePictureboard")) {
- changePicture("collapsePictureboard", "pictures/items/category-expanded.png");
+ changePicture("collapsePictureboard", pathPictures+"/items/category-expanded.png");
document.getElementById("div_board").setAttribute("state", "expand");
}
if(document.getElementById("collapsePicturepresentation")) {
- changePicture("collapsePicturepresentation", "pictures/items/category-expanded.png");
+ changePicture("collapsePicturepresentation", pathPictures+"/items/category-expanded.png");
document.getElementById("div_presentation").setAttribute("state", "expand");
}
if(document.getElementById("collapsePicturepc")) {
- changePicture("collapsePicturepc", "pictures/items/category-expanded.png");
+ changePicture("collapsePicturepc", pathPictures+"/items/category-expanded.png");
document.getElementById("div_pc").setAttribute("state", "expand");
}
@@ -576,7 +576,7 @@
if (divProduct.getAttribute("state") == "expand") {
divProduct.style.display = "none";
divProductMore.style.display = "none";
- changePicture(pictureId, "pictures/items/category-collapsed.png");
+ changePicture(pictureId, pathPictures+"/items/category-collapsed.png");
divProduct.setAttribute("state", "collapse");
} else {
divProduct.style.display = "block";
@@ -585,7 +585,7 @@
} else {
divProductMore.style.display = "none";
}
- changePicture(pictureId, "pictures/items/category-expanded.png");
+ changePicture(pictureId, pathPictures+"/items/category-expanded.png");
divProduct.setAttribute("state", "expand");
}
}
Deleted: branches/team/Thomas/integrations_common/web/js/manageXml.js
===================================================================
--- branches/team/Thomas/integrations_common/web/js/manageXml.js 2008-01-17 21:12:04 UTC (rev 227)
+++ branches/team/Thomas/integrations_common/web/js/manageXml.js 2008-01-17 21:18:29 UTC (rev 228)
@@ -1,1338 +0,0 @@
-/******************************************************************************
- * *
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
- * *
- * COPYRIGHT: *
- * This software is the property of Horizon Wimba. *
- * You can redistribute it and/or modify it under the terms of *
- * the GNU General Public License as published by the *
- * Free Software Foundation. *
- * *
- * WARRANTIES: *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with the Horizon Wimba Moodle Integration; *
- * if not, write to the Free Software Foundation, Inc., *
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
- * *
- * Author: Hugues Pisapia *
- * *
- ******************************************************************************/
-
-function manageXml(search, divToReload, displayMessage)
-{
- var display = "";
- var message = false;
- if(divToReload == "all")
- {
- display += "<form method=post name=myform>"
- display += initDisplay();
-
- }
- // session management
- var information = objDomTree.getElements("information");
-
- if(information != "")
- createSession(information);
-
- // Get windows Element
- var windows = objDomTree.getElements("windows");
- // get the different part of the windows
- var windowsElements = windows[0].getElements("windowsElement");
-
- for(var i = 0; i < windowsElements.length;i ++ )
- {
- var type = windowsElements[i].getElements("type")[0].getText();
-
- switch(type)
- {
- case "headerBar" :
- if(divToReload == "all" )
- {
- display += openDiv("headerBar", "headerBar");
- display += displayHeaderBar(windowsElements[i].getElements("windowsElementParameters"));
- display += closeDiv();
- }
- else if(divToReload == "headerBar")
- {
-
- display += displayHeaderBar(windowsElements[i].getElements("windowsElementParameters"));
-
- }
- break;
- case "toolBar" :
- if(divToReload == "all")
- {
- display += openDiv("toolBar", "toolBar")
- display += displayToolBar(windowsElements[i].getElements("windowsElementParameters"), search);
- display += closeDiv();
- }
- else if(divToReload == "toolBar")
- {
- display += displayToolBar(windowsElements[i].getElements("windowsElementParameters"), search);
-
- }
-
- break;
- case "filterBar" :
- if(divToReload == "all")
- {
- display += openDiv("filterBar", "filterBar")
- display += displayFilterBar(windowsElements[i].getElements("windowsElementParameters"));
- display += closeDiv();
- }
- else if(divToReload == "filterBar")
- {
-
- display += displayFilterBar(windowsElements[i].getElements("windowsElementParameters"));
-
- }
-
- break;
- case "message" :
- message = true;
- if(divToReload == "all")
- {
- display += openDiv("messageBar", "messageBar")
- display += displayMessageBar(windowsElements[i].getElements("windowsElementParameters"));
- display += closeDiv();
- }
- else if(divToReload == "messageBar")
- {
-
- display += displayMessageBar(windowsElements[i].getElements("windowsElementParameters"));
-
- }
-
- break;
- case "error" :
- if(divToReload == "all")
- {
- display += openDiv("messageBar", "messageBar")
- display += displayMessageBar(windowsElements[i].getElements("windowsElementParameters"));
- display += closeDiv();
- }
- else if(divToReload == "messageBar")
- {
-
- display += displayMessageBar(windowsElements[i].getElements("windowsElementParameters"));
-
- }
- break;
- case "list" ://list of element(room,board,presentation)
- if(divToReload == "all")
- {
- display += openDiv("list", "list")
- display += displayList(windowsElements[i].getElements("windowsElementParameters"), search);
- display += closeDiv();
- }
- else if(divToReload == "list")
- {
-
- display += displayList(windowsElements[i].getElements("windowsElementParameters"), search);
-
- }
-
- break;
- case "settings" :
- if(divToReload == "all" )
- {
- display += openDiv("settings", "settings")
- display += displaySettings(windowsElements[i].getElements("windowsElementParameters"));
- display += closeDiv();
- }
- else if(divToReload == "settings")
- {
- display += displaySettings(windowsElements[i].getElements("windowsElementParameters"));
-
-
- }
- break;
- case "contextBar" :
- if(divToReload == "all")
- {
- display += openDiv("contextBar", "contextBar")
- display += displayContextBar(windowsElements[i].getElements("windowsElementParameters"));
- display += closeDiv();
- }
- else if(divToReload == "contextBar")
- {
-
- display += displayContextBar(windowsElements[i].getElements("windowsElementParameters"));
-
- }
- break;
- case "validationBar" :
- if(divToReload == "all" )
- {
- display += openDiv("validationBar", "validationBar")
- display += displayValidationBar(windowsElements[i].getElements("windowsElementParameters"));
- display += closeDiv();
-
- display += "</form>"
- }
- else if(divToReload == "validationBar")
- {
- display += displayValidationBar(windowsElements[i].getElements("windowsElementParameters"));
- display += "</form>"
-
- }
- break;
- case "productChoice" :
- if(divToReload == "all")
- {
- display += openDiv("productChoice", "productChoice")
- display += displayProductChoice(windowsElements[i].getElements("windowsElementParameters"));
- display += closeDiv();
- }
- else if(divToReload == "productChoice")
- {
-
- display += displayProductChoice(windowsElements[i].getElements("windowsElementParameters"));
-
- }
- break;
-
- }
-
- }
- display += closeDisplay();
- document.getElementById(divToReload).innerHTML = display;
- if(navigator.appName.indexOf("Explorer") > - 1 && parseFloat(navigator.appVersion) < 5.5)
- {
- correctPNG();
- }
- if(divToReload == "all" || divToReload == "list")
- {
- gestionDisplay();
- document.getElementById("search").focus();
- }
-
- // manage the display of the information message
- if(displayMessage == true && message == true)
- {
- if(document.getElementById("list") != null)
- document.getElementById("list").className="listMinHeigth"
- }
- else if(displayMessage == false)
- {
- if(document.getElementById("list") != null)
- document.getElementById("list").className="list"
- if(document.getElementById("messageBar") != null)
- document.getElementById("messageBar").style.display = "none"
- }
- else
- {
- if(document.getElementById("list") != null)
- document.getElementById("list").className="list"
- if(document.getElementById("messageBar") != null)
- document.getElementById("messageBar").style.display = "none"
- }
-}
-
-
-
-
-function displayMessageBar(elementParameters)
-{
- var display = "";
- var messageInformations = elementParameters[0].getElements("message")
-
- switch(messageInformations[0].getElements("type")[0].getText())
- {
- case "message" :
- display = "<table style='background-color:#ffff99' width=100%><tr><td laign=right><img src='pictures/items/messagelabel-info.png'></td><td>" + messageInformations[0].getElements("value")[0].getText() + "</td></tr></table>"
-
- break;
- case "error" ://display the error windows
-
- display += "<table width='100%' height='32' border='0' align='center' cellpadding='0' cellspacing='0' background='headerbar.png'>"
- display += "<tr><td>"
- display += "<div id='headerBar' class='headerBar'>"
- display += " <table cellpadding='0' cellspacing='0' id='TABLE1' style='padding-left:5px'>"
- display += "<tbody>"
- display += "<tr><td>"
- display += "<img src='pictures/items/headerbar-logo.png'>"
- display += "</td> "
- display += "<td align='right' valign='middle'>"
- display += "<select id='view' onchange='ChangeView()'>"
- display += "<option value='normal'>Instructor View</option>"
- display += "<option value='student'>Student View</option>"
- display += "</select>"
- display += "</td></table></div>"
- display += "</tr><tr><td><div id='contextBar' class='contextBar'>"
- display += "<table cellspacing='0' cellpadding='0'>"
- display += "<tr>"
- display += "<td align=left><label class='roomNameForSettings'>Error</label></td>"
- display += "</tr>"
- display += "</table></div>"
- display += "</td>"
- display += "</tr>";
- display += "</tr><tr><td>"
- display += "<div id='error_frame' align='center'>"
- display += "<table width='100%' border='0' cellpadding='0' height='254px'>"
- display += "<tr>"
- display += "<td width='10%'></td>"
- display += "<td valign='middle'><img src='pictures/items/warning.png' alt='' width='60' height='60' border='0'></td>"
- display += "<td width='20'></td>"
- display += "<td valign='middle' >"
- display += "<div id='error_title'>Error"
- display += "<div id='error_body'>"
- display += "<p>" + messageInformations[0].getElements("value")[0].getText() + "</p>"
- display += "</div>"
- display += "</td>"
- display += "</tr>"
- display += "</table>"
- display += "</div>"
- display += "</td>"
- display += "</tr>";
- display += "</tbody>"
- display += "</table>"
- break;
- }
-
- return display;
-}
-
-function displayHeaderBar(elementParameters)
-{
- var display = "";
- var headerBarInformations = elementParameters[0].getElements("headerBarInformations")
- display = "<table cellspacing=0 cellpadding=0>"
- display += "<tr>"
- display += "<td><img height='32px' width='80px' src='"+headerBarInformations[0].getElements("pictureUrl")[0].getText()+"' /></td>"
- display += "<td align='right' valign='middle'>"
- if(session["role"] == "Instructor")
- {
- display += "<select id='view' onchange='ChangeView()'>"
- display += "<option value='normal'>"+headerBarInformations[0].getElements("instructorView")[0].getText()+"</option>"
-
- if(studentView == true)
- display += "<option value='student' selected>"+headerBarInformations[0].getElements("studentView")[0].getText()+"</option>"
- else
- display += "<option value='student'>"+headerBarInformations[0].getElements("studentView")[0].getText()+"</option>"
- display += "</select>"
- }
- display += "</td>"
- display += "</tr>"
- display += "</table>"
- return display;
-
-}
-
-// Manage The toolBar
-function displayToolBar(elementParameters, search)
-{
- var display = "";
- var toolbar = elementParameters[0].getElements("menuElements");
- var menuElements = toolbar[0].getElements("menuElement");
- display += "<table cellspacing=0 cellpadding=0 >"
- display += "<tr id='menu'>"
- for(var i = 0; i < menuElements.length; i ++ )
- {
- if(menuElements[i].getElements("type")[0].getText() == "button"){
- display += displayToolBarButton(menuElements[i].getElements("typeOfProduct")[0].getText(), menuElements[i].getElements("availibility")[0].getText(), menuElements[i].getElements("typeOfUser")[0].getText(), menuElements[i].getElements("pictureUrl")[0].getText(), menuElements[i].getElements("value")[0].getText(), menuElements[i].getElements("action")) ;
- }
- else if(menuElements[i].getElements("type")[0].getText() == "separator"){
- display += displayToolBarSeparator(search);
- }
- else if(menuElements[i].getElements("type")[0].getText() == "search"){
- display += displayToolBarSearch(search);
- }
- else if(menuElements[i].getElements("type")[0].getText() == "variableSpace"){
- display += displaySearch(search);
- }
- else if(menuElements[i].getElements("type")[0].getText() == "fixSpace"){
- display += displaySpace();
- }
- }
- display += "</tr></table>";
- return display;
-}
-
-function displayToolBarButton(product, availibility, typeOfUser, pictureUrl, value, action)
-{
- var display = "";
- var actionString = ""
- if(session["role"] == "Student")
- studentView = true;
- var actionString = action[0].getElements("name")[0].getText() + "(";
- var actionParam = action[0].getElements("parameters");
- var actionParameters = actionParam[0].getElements("parameter");
- for(var j = 0; j < actionParameters.length;j ++ )
- {
- if(j == (actionParameters.length - 1))//last param
- actionString += "\'"+actionParameters[j].getText()+"\' ";
- else
- actionString += "\'"+ actionParameters[j].getText()+"\',";
- }
- actionString += ")";
- var actionDelete = "";
- if( typeOfUser == "all" || (typeOfUser == "instructor" && studentView == false))//check the context to display
- {
- if(availibility == "true" || currentId != "")
- {
- if(product="all" || currentTool == "all")
- {
- if(value == "Delete")//add a validation for the bouton delete
- {
- actionDelete = "onclick=\"javascript : return confirmDelete(); \""
- }
- display += "<td align='center' class='button_enabled' " + actionDelete + ">"
- display += "<a href=\"javascript:"+actionString+";\">"
- display += "<img src='"+pictureUrl+".png' style='text-decoration:none;height:26px' border=0 id='"+value+"' name='"+value+"_icon' ><br style='text-decoration:none;' />"
- display += value ;
- display += "</a></td> "
- }
- else if(currentTool == product)
- {
- if(value == "Delete")//add a validation for the bouton delete
- {
- actionDelete = "onclick=\"javascript : return confirmDelete(); \""
- }
- display += "<td align='center' class='button_enabled' " + actionDelete + ">"
- display += "<a href=\"javascript:"+actionString+";\">"
- display += "<img src='"+pictureUrl+".png' style='text-decoration:none;height:26px' border=0 id='"+value+"' name='"+value+"_icon' ><br style='text-decoration:none;' />"
- display += value ;
- display += "</a></td> "
- }
- else if(currentTool != product )//button not valid for the tool available
- {
- display += "<td align='center' class='empty_space'> </td>"
- }
- else//bouton available but disabled
- {
- display += "<td align='center' class='button_disabled' " + actionDelete + ">"
- display += "<img src='"+pictureUrl+"-disabled.png' border=0 id='"+value+"' name='"+value+"_icon' height='24' width='24'><br />"
- display += value ;
- display += "</td> "
- }
- }
- else
- {
-
- if(currentTool == product || product == "all" || currentTool == "all")
- {
- display += "<td align='center' class='button_disabled' " + actionDelete + " >"
- display += "<img src='"+pictureUrl+"-disabled.png' border=0 id='"+value+"' name='"+value+"_icon' height='24' width='24'><br />"
- display += value ;
- display += "</td> "
- }
- else
- {
- display += "<td align='center' class='empty_space'> </td>"
- }
- }
-
- }
- else
- {
- // the button is unavalaible for this user
- display += "<td align='center' class='empty_space'> </td>"
- }
- display += "<td class='separator_space'> </td> "
- return display;
-}
-
-
-function displayToolBarSearch(search)
-{
- var display = "";
- if(navigator.userAgent.indexOf("Safari") != - 1 )
- {
- display += "<td align='right' width=120px>"
- display += "<table border=0 class='search' cellspacing=0 cellpadding=0 style=border:none >"
- display += "<tr>"
- display += "<td align='right'>"
- display += "<input name='search' id='search' type='search' style='border:0; width: 105px;' "
- display += "onkeyup='javascript:manageXml(search.value,\"list\",false);' onClick='javascript:initSearch(search.value);' value='"+search+"' />"
- display += "</td>"
- display += "</tr>"
- display += "</table>"
- display += "</td>"
- }
- else
- {
- display += "<td align='right' width=115px>"
- display += "<table border=0 class='search' cellspacing=0 cellpadding=0 style=border:none>"
- display += "<tr>"
- display += "<td align='right' width=26px style='background-image: url(pictures/items/headerbar-searchfield-left.png); background-repeat:no-repeat;'>"
- display += "</td>"
- display += "<td align='right' height=26px style='background-image: url(pictures/items/headerbar-searchfield-middle.png); '>"
- display += "<input name='search' id='search' type='search' style='border:0; width: 50px;' "
- display += "onkeyup='javascript:manageXml(search.value,\"list\",false);' onClick='javascript:initSearch(search.value);' value='"+search+"' />"
- display += "</td>"
- display += "<td align=left width=26px style='background-image: url(pictures/items/headerbar-searchfield-right.png); background-repeat:no-repeat;'>"
- display += "<div id='croix' style='display:none'> "
- display += "<img onmouseover='overCroix(this)' Onclick='clickCroix();launchDisplay();' Onmouseout='overCroix(this)' src='pictures/x_normal.gif' align='middle' style='border:none ' />"
- display += "</div>"
- display += "</td>"
- display += "<td width=5px></td>"
- display += "</tr>"
- display += "</table>"
- display += "</td>"
- }
-
- return display;
-}
-
-function displayToolBarSeparator()
-{
- var display = "";
- display += "<td width='1px'><img src='pictures/items/toolbar-separator.png' height='44px' width='1px' /></td> ";
- display += "<td width='12px'></td> "
- return display;
-}
-
-
-// Manage the filterBar
-
-function displayFilterBar(elementParameters)
-{
- var display = "";
- var filterBar = elementParameters[0].getElements("filters");
- var filterElements = filterBar[0].getElements("filter");
- display += "<table cellspacing='0' cellpadding='0' width=100% >"
- display += "<tr>"
- for(var i = 0; i < filterElements.length; i ++ )
- {
- display += "<td class='filterSpace'>"
- display += displayfilter(filterElements[i].getElements("value")[0].getText(), filterElements[i].getElements("name")[0].getText(), filterElements[i].getElements("action")[0].getText(), filterElements[i].getElements("availibility")[0].getText());
- display += "</td>"
- }
- display += "</tr></table>";
- return display;
-}
-
-function displayfilter(value, name, action, availibility)
-{
- var display = "";
- display += "<table align='center' cellpadding='0' cellspacing='0' heigth='24px'>";
- display += "<tr heigth='24px' class='filter'>";
-
- if(currentFilter == name)//filter enabled
- {
- display += "<td class='filter_left_enabled' width=8px id='"+name+"_left'></td>";
- display += "<td class='filter_middle_enabled' id='"+name+"_center' class='filter_selected' onclick=" + action + " onmouseover=\"onFilter('"+name+"')\" onmouseout=\"outFilter('"+name+"')\">";
- display += value;
- display += "</td>";
- display += "<td class='filter_right_enabled' width=8px id='"+name+"_right'></td>";
-
- }
- else
- {
- display += "<td width=8px id='"+name+"_left' ></td>";
- display += "<td id='"+name+"_center' class='filter_enabled' onclick=" + action + " onmouseover=\"onFilter('"+name+"')\" onmouseout=\"outFilter('"+name+"')\">";
- display += value;
- display += "</td>";
- display += "<td width=8px id='"+name+"_right'></td>";
- }
- display += "</tr>";
- display += "</table>";
- return display;
-}
-
-
-// ManageList
-function displayList(elementParameters, search)
-{
- // clear the global variable
- numberMainLectureRoom = 0;
- numberDiscussionRoom = 0;
- numberVoiceBoard = 0;
- numberVoicePresentation = 0;
-
- var parts = new Array();//one part=one tool
- var numberProducts = new Array();
- var breakout = "";
-
- var numberArchive = 0;
- var number = 0;
- var roomId;
- var mysearch = new String(search);
-
- // get the list of products
- var list = elementParameters[0].getElements("products");
- var listProducts = list[0].getElements("listProducts");
-
- // get the different informations for each product
- var products = listProducts[0].getElements("productInformations");
- var start = 0;
- //creation of the product separator
- for(i = 0; i < products.length; i ++ )
- {
- var positionOfDiv = products[i].getElements("position")[0].getText();
- if(currentFilter == "all" || currentDiv == positionOfDiv)
- {
- var cssStyle = products[i].getElements("style")[0].getText();
- var value = products[i].getElements("value")[0].getText();
- // string display
- parts[eval(parseInt(positionOfDiv))] = openDivProduct(positionOfDiv, cssStyle, value)
- }
- if(start > parseInt(positionOfDiv) || start == 0)//if liveclassroom disabled start=2
- start = parseInt(positionOfDiv);
- }
- var content = list[0].getElements("listElements");
- //add the element to the list
- if(content != "")
- {
- var listElements = content[0].getElements("listElement");
- var positionDiscussionRoom = 0;
- var positionMainLecture = 0;
- var orphanedMainLecture = "";
- var orphanedDiscussion = "";
- if(session["role"] == "Student")
- studentView = true;
- for(i = 0; i < listElements.length; i ++ )
- {
- var parameters = listElements[i].getElements("listElementParameters");
-
- var results = parameters[0].getElements("nameDisplay")[0].getText().toLowerCase().match(mysearch.toLowerCase())
- if(search == null || results != null)
- {
- if(studentView == false || ((studentView == true) && parameters[0].getElements("preview")[0].getText() == "available"))
- {
-
- switch(parameters[0].getElements("typeOfElement")[0].getText())
- {
- case LC_MAINLECTURE :
- if(currentFilter == "all" || currentDiv == parameters[0].getElements("position")[0].getText())
- {
- parts[parameters[0].getElements("position")[0].getText()] = parts[parameters[0].getElements("position")[0].getText()] + addRoomElement(LC_MAINLECTURE, parameters);
- numberMainLectureRoom ++ ;
- positionMainLecture = parameters[0].getElements("position")[0].getText();
- }
- break;
- case LC_DISCUSSION :
- if(currentFilter == "all" || currentDiv == parameters[0].getElements("position")[0].getText())
- {
- parts[parameters[0].getElements("position")[0].getText()] = parts[parameters[0].getElements("position")[0].getText()] + addRoomElement("Discussion", parameters);
- numberDiscussionRoom ++ ;
- positionDiscussionRoom = parameters[0].getElements("position")[0].getText();
- }
- break;
- case VB_PRODUCT :
- parts[parameters[0].getElements("position")[0].getText()] = parts[parameters[0].getElements("position")[0].getText()] + addBoardElement(VB_PRODUCT, parameters);
- numberVoiceBoard ++ ;
-
- break;
- case VP_PRODUCT :
- parts[parameters[0].getElements("position")[0].getText()] = parts[parameters[0].getElements("position")[0].getText()] + addBoardElement(VP_PRODUCT, parameters);
- numberVoicePresentation ++ ;
-
- break;
- case "orphanedArchive" :
- if(parameters[0].getElements("type")[0].getText() == LC_DISCUSSION)
- {
- orphanedDiscussion = orphanedDiscussion + addOrphanedElement(parameters);
- numberDiscussionRoom ++ ;
- }
- else if(parameters[0].getElements("type")[0].getText() == LC_MAINLECTURE)
- {
- orphanedMainLecture = orphanedMainLecture + addOrphanedElement(parameters);
- numberMainLectureRoom ++ ;
- }
- break;
- }
- }
- }
- }
- }
- var display = "";
- display += "<table border='0' align='center' cellpadding='0' cellspacing='0' width=100% >";
- //create the complete list
- for(i = start; i < parts.length; i ++ )
- {
- if(currentFilter == "all" || currentDiv == i)
- {
- display += "<tr><td>";
- if(positionMainLecture == i)
- parts[i] = parts[i].toString() + orphanedMainLecture;
- if(positionDiscussionRoom == i)
- parts[i] = parts[i].toString() + orphanedDiscussion;
-
- parts[i] = parts[i].toString() + closeDivProduct(i);
- parts[i] += "<div id='div"+i+"More' class='hide'></div>"
- display += parts[i];
- display += "</td></tr>";
- display += "<tr><td><div id='div"+i+"Space'><table><tr><td height=5px></td></tr></table></div></td></tr>"
- }
- }
- display += "</table>";
- return display;
-}
-
-
-function openDivProduct(name, cssStyle, value)
-{
- var display = "";
- display += "<div id='div"+name+"Title' class='separateProduct'>";
- display += "<table cellpadding='0' cellspacing='0' width='100%'>";
- display += "<tr class='productTitle'>";
- display += "<td class='lineTitle' onclick='javascript:hideDiv(\"div"+name+"\",\""+name+"toggleimgorphaned\")'>";
- display += "<img width=16px height=16px src='pictures/items/category-expanded.png' id='"+name+"toggleimgorphaned' border='0'>";
- display += "</td>";
- display += "<td class='shortShift' align=left width=100%>" + value + "</td>";
- display += "</tr>";
- display += "<tr><td colspan=3>"
- display += "<div id='div"+name+"' style='display:block;overflow:hidden'>";
- display += "<table width='100%' cellspacing='0' cellpadding='1' border='0' class='divProduct'>";
- return display
-}
-
-
-function addOrphanedElement(parameters)
-{
- var display = "";
- display += "<tr id=" + parameters[0].getElements("id")[0].getText() + " height=16px Onclick=\"OneClick('"+parameters[0].getElements("id")[0].getText()+"', '"+LC_PRODUCT+"', 'archive')\" Ondblclick=\"javascript : startHorizon('"+parameters[0].getElements("id")[0].getText()+"', null, null, null, null, 'hzA="+session["authToken"]+"')\" class='archive'>"
- display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.png\" border=\"0\" /></td>";
- display += "<td width=16px align=\"left\"><img src=\"pictures/items/space-16x16px.png\" border=\"0\" /></td>";
- display += "<td width='300px' <label onmousemove='javascript:ShowToolTip(event,\""+parameters[0].getElements("nameDisplay")[0].getText()+"\",\""+parameters[0].getElements("preview")[0].getText()+"\")' onmouseout='javascript:HideToolTip()'>" + parameters[0].getElements("nameDisplay")[0].getText() + "</label></td>";
- display += "<td class='shiftAvailability' align=right><img width=16px height=16px src=\"pictures/items/listitem-"+parameters[0].getElements("preview")[0].getText()+".png\"/></td>";
- display += "</tr>";
- return display;
-}
-
-
-function addBoardElement(type, parameters)
-{
- var display = "";
- display += displayBoard(type, parameters[0].getElements("preview")[0].getText(), parameters[0].getElements("nameDisplay")[0].getText(), parameters[0].getElements("rid")[0].getText(), parameters[0].getElements("nid")[0].getText());
- return display;
-
-}
-
-function displayBoard(type, availibility, title, rid, nid)
-{
- var display = "";
- display += "<tr id='"+rid+"' height=16px Onclick=\"OneClick('"+rid+"', '"+VT_PRODUCT+"', '"+type+"', '"+nid+"')\" Ondblclick=\"javascript : dclick('"+rid+"')\" class='room'>"
- display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-"+type+"icon.png\" border=\"0\" /></td>";
- display += "<td width=16px align=\"left\" Ondblclick=''></td>";
- display += "<td width='300px' ><label onmousemove='javascript:ShowToolTip(event,\""+title+"\",\""+availibility+"\")' onmouseout='javascript:HideToolTip()'>" + title + "</label></td>";
- display += "<td class='shiftAvailability' align=right><img src=\"pictures/items/listitem-"+availibility+".png\"/></td>";
- display += "</tr>";
- return display;
-}
-
-function addRoomElement(type, parameters)
-{
- var display = "";
- var archives;
- if(parameters[0].getElements("archives") != "")
- archives = parameters[0].getElements("archives");
- if(archives != null )
- {
- if(studentView == false || parameters[0].getElements("closedArchive")[0].getText() == "false")
- display = displayRoom(type, parameters[0].getElements("preview")[0].getText(), parameters[0].getElements("nameDisplay")[0].getText(), parameters[0].getElements("id")[0].getText(), "pictures/items/listitem-show.png", archives)
- else
- display = displayRoom(type, parameters[0].getElements("preview")[0].getText(), parameters[0].getElements("nameDisplay")[0].getText(), parameters[0].getElements("id")[0].getText(), "pictures/items/space-16x16px.png", archives)
- }
- else
- {
- display = displayRoom(type, parameters[0].getElements("preview")[0].getText(), parameters[0].getElements("nameDisplay")[0].getText(), parameters[0].getElements("id")[0].getText(), "pictures/items/space-16x16px.png", archives)
-
- }
- return display;
-}
-
-function displayRoom(type, availibility, longname, roomId, archive, archives)
-{
-
- var display = "";
- display += "<tr id=" + roomId + " height=16px class='room'>"
- display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"', '"+LC_PRODUCT+"', '"+type+"')\" width=16px align=\"left\"><img width=16px height=16px src=\"pictures/items/listitem-liveclassroomicon.png\" border=\"0\" /></td>";
- display += "<td align=\"left\"Onclick=\"javascript : hideArchive('"+type+"', '"+roomId+"hide', 'toggleimg"+roomId+"hide', '"+roomId+"')\" width=16px><img width=16px height=16px src='"+archive+"' id=\"toggleimg"+roomId+"hide\" border=\"0\" /></td>";
- display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"', '"+LC_PRODUCT+"', '"+type+"')\" width=300px ><label onmousemove='javascript:ShowToolTip(event,\""+longname+"\",\""+availibility+"\")' onmouseout='javascript:HideToolTip()'>" + longname + "</label></td>";
- display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"', '"+LC_PRODUCT+"', '"+type+"')\" class='shiftAvailability' align=right ><img width=16px height=16px src=\"pictures/items/listitem-"+availibility+".png\"/></td>";
- display += "</tr>";
- if(archives != null)
- {
- display += displayArchive(roomId, archives);
- }
- return display;
-}
-
-function displayArchive(roomId, archives)
-{
- var closeArchive = 0;
- var archive = archives[0].getElements("archive");
- if(archive != "")
- {
- var display = "<tr><td colspan=5 style='padding:0px 0px 0px 0px'><div id='"+roomId+"hide' class='hide' >";
- display += " <table width=100% cellspacing=0 cellpadding=1 border=0>";
- for(var i = 0; i < archive.length; i ++ )
- {
- //closed archive not available for student
- if(studentView == false || (studentView == true && archive[i].getElements("preview")[0].getText() == "available"))
- {
-
- display += "<tr id=" + archive[i].getElements("id")[0].getText() + " height=16px Onclick=\"OneClick('"+archive[i].getElements("id")[0].getText()+"', '"+LC_PRODUCT+"')\" Ondblclick=\"javascript : startHorizon('"+archive[i].getElements("id")[0].getText()+"', null, null, null, null, 'hzA="+session["authToken"]+"')\" class='archive'>"
- display += "<td width=16px align=\"left\"><img width=16px height=16px src=\"pictures/items/listitem-liveclassroomicon.jpg\" border=\"0\" /></td>";
- display += "<td width=16px align=\"left\"><img width=16px height=16px src=\"pictures/items/listitem-subitem.jpg\" border=\"0\" /></td>";
- display += "<td width='300px'><label onmousemove='javascript:ShowToolTip(event,\""+archive[i].getElements("nameDisplay")[0].getText()+"\",\""+archive[i].getElements("preview")[0].getText()+"\")' onmouseout='javascript:HideToolTip()'>" + archive[i].getElements("nameDisplay")[0].getText() + "</label></td>";
- display += "<td class='shiftAvailability' align=right><img width=16px height=16px src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".jpg\"/></td>";
- display += "</tr>";
- }
- else
- {
- closeArchive ++ ;
- }
- }
- display += "</table></div></td></tr>";
- }
- numberArchive[roomId] = archive.length - closeArchive;
- if(closeArchive == archive.length)
- {
- // no open archive for student
- // changePicture("toggleimg" + roomId + "hide", "pictures/items/listitem-subitem.png");
-
- }
- return display;
-
-}
-
-
-function displayProductChoice(elementParameters)
-{
- var display = "";
- var informations = elementParameters[0].getElements("productInformations");
- var action = informations[0].getElements("action");
-
- var actionJavascript = "" + action[0].getElements("name")[0].getText() + "(";
-
- var actionParam = action[0].getElements("parameters");
- var actionParameters = actionParam[0].getElements("parameter");
- for(var j = 0; j < actionParameters.length;j ++ )
- {
- if(j == (actionParameters.length - 1))
- actionJavascript += "\""+ actionParameters[j].getText()+"\" ";
- else
- actionJavascript += "\""+ actionParameters[j].getText()+"\",";
- }
- actionJavascript += ")";
- var height = "75px";
-
-
- if(currentTool == VT_PRODUCT)//change the heigth to have two product
- height = "116px"
- display += "<table cellspacing='0' cellpadding='0' align=center width=100% border='0' height=" + height + " >";
- display += "<tr onclick='"+actionJavascript+"'>";
- display += "<td align=center width=130px><img src='"+informations[0].getElements("pictureUrl")[0].getText()+"' /><br><label>" + informations[0].getElements("value")[0].getText() + "</label></td>"
- display += "<td>" + informations[0].getElements("description")[0].getText() + "</td>";
- display += "</tr>";
- display += "</table>";
- return display;
-
-}
-
-function displaySettings(elementParameters)
-{
-
- var display = "";
- display += "<table cellspacing='0' cellpadding='0' width='100%' border='0' ><tr><td style='padding:0px 0px 0px 0px'>"
- var displayPanelTitle = "";
- var displayPanel = "";
- var panelsSettings = elementParameters[0].getElements("panelsSettings");
- var panelSettings = panelsSettings[0].getElements("panelSettings");
- for(var i = 0; i < panelSettings.length; i ++ )
- {
- var panelInformations = panelSettings[i].getElements("panelInformations");
- var panelContent = panelSettings[i].getElements("panelContent");
- displayPanelTitle += DisplayTab(panelInformations);
- displayPanel += DisplayDivSettings(panelInformations, panelContent);
- }
- display += DisplayTabtitle(displayPanelTitle);
- display += displayPanel;
- return display;
-}
-
-function DisplayTabtitle(alltab)
-{
- var display = "";
- display += "<div cellspacing='0' cellpadding='0' id='' class=tabBackground>";
- display += "<table cellspacing='0' cellpadding='0' border='0' width=100%>";
- display += "<tr>";
- display += "<td width='2px' style='border-bottom: #818181 1px solid; height: 18px;'> </td>";
- display += alltab;
- display += "<td style='border-bottom: #818181 1px solid; height: 18px;' align='center'> </td>";
- display += "</tr>";
- display += "</table>";
- display += "</div>";
- return display;
-}
-
-
-function DisplayTab(panelInformations)
-{
- var display = "";
- var context = new String(panelInformations[0].getElements("contextDisplay")[0].getText());
- if(context.indexOf("all") != - 1 || context.indexOf(typeSelect) != - 1)
- display += "<td onclick='onTab("+panelInformations[0].getElements("position")[0].getText()+")' id='tab"+panelInformations[0].getElements("position")[0].getText()+"' class='"+panelInformations[0].getElements("styleEnabled")[0].getText()+"' ";
- else//the tab is not available for this type of element
- display += "<td class='"+panelInformations[0].getElements("styleDisabled")[0].getText()+"' ";
- display += "align='center'>";
- display += panelInformations[0].getElements("name")[0].getText() + "</td>";
- display += "<td width='2px' style='border-bottom: #818181 1px solid; height: 18px;'> </td>";
- return display;
-}
-
-function DisplayDivSettings(panelInformations, panelContent)
-{
- var display = "";
- display += "<tr><td class=settingsPadding>";
- for(var j = 0; j < panelContent.length; j ++ )
- {
- var line = panelContent[j].getElements("panelLine");
- display += "<div style='display:"+panelInformations[j].getElements("display")[0].getText()+";' id='span"+panelInformations[j].getElements("position")[0].getText()+"' class=tab>";
- display += "<table cellspacing='5px' cellpadding='0px' align='center' border='0' width=100%>";
- for(var i = 0; i < line.length; i ++ )
- {
- if(line[i].getElements("style")[0].getText() == "hide" )
- {
- display +...
[truncated message content] |
|
From: <tro...@us...> - 2008-01-22 23:00:17
|
Revision: 231
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=231&view=rev
Author: trollinger
Date: 2008-01-22 15:00:11 -0800 (Tue, 22 Jan 2008)
Log Message:
-----------
Update the lib and pictures path
Cleaning
Modified Paths:
--------------
branches/team/Thomas/integrations_common/php/common/WimbaCommons.php
branches/team/Thomas/integrations_common/php/common/WimbaLib.php
branches/team/Thomas/integrations_common/php/common/WimbaUI.php
branches/team/Thomas/integrations_common/php/common/WimbaXml.php
branches/team/Thomas/integrations_common/php/vt/WimbaVoicetools.php
branches/team/Thomas/integrations_common/web/js/ajax.js
Modified: branches/team/Thomas/integrations_common/php/common/WimbaCommons.php
===================================================================
--- branches/team/Thomas/integrations_common/php/common/WimbaCommons.php 2008-01-22 22:59:37 UTC (rev 230)
+++ branches/team/Thomas/integrations_common/php/common/WimbaCommons.php 2008-01-22 23:00:11 UTC (rev 231)
@@ -84,8 +84,8 @@
function getCourseId(){
- if(isset($this->hparams["courseId"]))
- return $this->hparams["courseId"];
+ if(isset($this->hparams["course_id"]))
+ return $this->hparams["course_id"];
else
return null;
}
@@ -169,492 +169,7 @@
}
-class vtAction{
- var $params;
- function vtAction($params){
- $this->params=$params;
- }
- /**************
- VOICE BOARD
- *****************/
- /*
- * This function creates a voice board on the vt server
- * params : elements of the form
- */
- function createBoard(){
- $ressource = new vtResource(NULL);
- $audio = new vtAudioFormat(NULL);
- $options = new VtOptions(NULL);
- // Info
- $ressource->setType("board"); //Voice Baord
- if (isset($this->params["description"]))
- {
- $ressource->setDescription(stripslashes($this->params["description"]));
- }
-
- if (isset($this->params["longname"]))
- {
-
- $ressource->setTitle(stripslashes($this->params["longname"]));
- }
-
- if ($this->params["led"] == "student")
- {
-
- $options->setFilter("false");
- if (isset($this->params["show_compose"]))
- {
- $options->setShowCompose("true");
- }
- else{
- $options->setShowCompose("false");
- }
- }
- else
- {
- $options->setFilter("true");
- $options->setShowCompose("false");
- }
-
- //Media
-
- if(isset($this->params["audio_format"]))
- {
- $audio->setName($this->params["audio_format"]);
- }
- //message length
- if(isset($this->params["max_length"]))
- {
- $options->setMaxLength($this->params["max_length"]);
- }
-
- //Features
-
- //short message titles
- if(isset($this->params["short_title"]))
- {
- $options->setShortTitle("true");
- }
- else
- {
- $options->setShortTitle("false");
- }
- //chronological order
- if(isset($this->params["chrono_order"]))
- {
- $options->setChronoOrder("true");
- }
- else
- {
- $options->setChronoOrder("false");
- }
-
- //forward message
- if(isset($this->params["show_forward"]))
- {
- $options->setShowForward("true");
- }
- else
- {
- $options->setShowForward("false");
- }
-
-
- $options->setAudioFormat($audio);
- $ressource->setOptions($options);
- //create the resource on the vt server
- $result = voicetools_api_create_resource($ressource->getResource());
- if(VTAPI_DEBUG) {
- error_log (__FUNCTION__ ." : Board Created , rid=".$result->getRid(), TRUE);
- }
-
- return $result;
-
- }
- /*
- * This function modifies a voice board on the vt server
- * params : elements of the form
- */
- function modifyBoard($id){
-
- $ressource = new vtResource(NULL);
- $audio = new vtAudioFormat(NULL);
- $options = new VtOptions(NULL);
- // Info
- $ressource->setType("board"); //Voice Baord
- if (isset($this->params["description"]))
- {
- $ressource->setDescription(stripslashes($this->params["description"]));
- }
-
-
- if (isset($this->params["longname"]))
- {
- $ressource->setTitle(stripslashes($this->params["longname"]));
- }
-
- if ($this->params["led"] == "student")
- {
-
- $options->setFilter("false");
- if (isset($this->params["show_compose"]))
- {
- $options->setShowCompose("true");
- }
- else{
- $options->setShowCompose("false");
- }
- }
- else
- {
- $options->setFilter("true");
- $options->setShowCompose("false");
- }
-
- //Media
-
- if(isset($this->params["audio_format"]))
- {
- $audio->setName($this->params["audio_format"]);
- }
- //message length
- if(isset($this->params["max_length"]))
- {
- $options->setMaxLength($this->params["max_length"]);
- }
-
- //Features
-
- //short message titles
- if(isset($this->params["short_title"]))
- {
- $options->setShortTitle("true");
- }
- else
- {
- $options->setShortTitle("false");
- }
- //chronological order
- if(isset($this->params["chrono_order"]))
- {
- $options->setChronoOrder("true");
- }
- else
- {
- $options->setChronoOrder("false");
- }
-
- //forward message
- if(isset($this->params["show_forward"]))
- {
- $options->setShowForward("true");
- }
- else
- {
- $options->setShowForward("false");
- }
-
-
- $options->setAudioFormat($audio);
- $ressource->setOptions($options);
- //update
- $ressource->setRid($id);
-
- //create the resource on the vt server
- $result = voicetools_api_modify_resource($ressource->getResource());
- return $result;
-
- }
-
- /****************
- VOICE PRESENTATION
- ****************/
- /*
- * This function creates a voice presentation the vt server
- * params : elements of the form(constructor)
- */
- function createPresentation(){
-
- $ressource = new vtResource(NULL);
- $audio = new vtAudioFormat(NULL);
- $options = new VtOptions(NULL);
- // Info
- $ressource->setType("presentation"); //Voice Baord
- if (isset($this->params["description"]))
- {
- $ressource->setDescription(stripslashes($this->params["description"]));
- }
-
- if (isset($this->params["longname"]))
- {
- $ressource->setTitle(stripslashes($this->params["longname"]));
- }
-
- if(isset($this->params["filter"]))
- {
- $options->setFilter("true");
- }
- else
- {
- $options->setFilter("false");
- }
- //slides comments private
- if(isset($this->params["show_reply"]))
- {
- $options->setShowReply("true");
- }
- else
- {
- $options->setShowReply("false");
- }
-
- //Media
- if(isset($this->params["audio_format"]))
- {
- $audio->setName($this->params["audio_format"]);
- }
- //message length
- if(isset($this->params["max_length"]))
- {
- $options->setMaxLength($this->params["max_length"]);
- }
-
-
- $options->setAudioFormat($audio);
- $ressource->setOptions($options);
-
- //create the resource on the vt server
- $result = voicetools_api_create_resource($ressource->getResource());
- return $result;
- }
-
- /*
- * This function modifies a voice presentation the vt server
- * params : elements of the form(constructor)
- */
- function modifyPresentation($id){
-
- $ressource = new vtResource(NULL);
- $audio = new vtAudioFormat(NULL);
- $options = new VtOptions(NULL);
- // Info
- $ressource->setType("presentation"); //Voice Presentation
- if (isset($this->params["description"]))
- {
- $ressource->setDescription(stripslashes($this->params["description"]));
- }
-
- if (isset($this->params["longname"]))
- {
- $ressource->setTitle(stripslashes($this->params["longname"]));
- }
-
- if(isset($this->params["filter"]))
- {
- $options->setFilter("true");
- }
- else
- {
- $options->setFilter("false");
- }
- //slides comments private
- if(isset($this->params["show_reply"]))
- {
- $options->setShowReply("true");
- }
- else
- {
- $options->setShowReply("false");
- }
-
- //Media
- if(isset($this->params["audio_format"]))
- {
- $audio->setName($this->params["audio_format"]);
- }
- //message length
- if(isset($this->params["max_length"]))
- {
- $options->setMaxLength($this->params["max_length"]);
- }
-
-
- $options->setAudioFormat($audio);
- $ressource->setOptions($options);
- $ressource->setRid($id);
- //create the resource on the vt server
- $result = voicetools_api_modify_resource($ressource->getResource());
- return $result;
-
-
- }
-
- /********
- Podcaster
- **********/
- /*
- * This function creates a podcaster the vt server
- * params : elements of the form(constructor)
- */
- function createPodcaster(){
-
- $ressource = new vtResource(NULL);
- $audio = new vtAudioFormat(NULL);
- $options = new VtOptions(NULL);
-
- // Info
- $ressource->setType("pc");//Podcaster
- if (isset($this->params["description"]))
- {
- $ressource->setDescription(stripslashes($this->params["description"]));
- }
-
- if (isset($this->params["longname"]))
- {
- $ressource->setTitle(stripslashes($this->params["longname"]));
- }
- if(isset($this->params["show_compose"]))
- {
- $options->setShowCompose("true");
- }
- else
- {
- $options->setShowCompose("false");
- }
-
- //Media
- if(isset($this->params["audio_format"]))
- {
- $audio->setName($this->params["audio_format"]);
- }
-
- if(isset($this->params["delay"]))
- {
- $options->setDelay($this->params["delay"]); //no delay
- }
-
- //Features
- if(isset($this->params["short_title"]))
- {
- $options->setShortTitle("true");
- }
- else{
- $options->setShortTitle("false");
- }
- $options->setMaxLength(1200); //set to 20 min
- $options->setAudioFormat($audio);
- $ressource->setOptions($options);
-
- //create the resource on the vt server
- $result = voicetools_api_create_resource($ressource->getResource());
-
- return $result;
- }
- /*
- * This function modifies a podcaster the vt server
- * params : elements of the form(constructor)
- */
- function modifyPodcaster($id){
- $ressource = new vtResource(NULL);
- $audio = new vtAudioFormat(NULL);
- $options = new VtOptions(NULL);
-
- // Info
- $ressource->setType("pc");//Podcaster
- if (isset($this->params["description"]))
- {
- $ressource->setDescription(stripslashes($this->params["description"]));
- }
-
- if (isset($this->params["longname"]))
- {
- $ressource->setTitle(stripslashes($this->params["longname"]));
- }
- if(isset($this->params["show_compose"]))
- {
- $options->setShowCompose("true");
- }
- else
- {
- $options->setShowCompose("false");
- }
-
- //Media
- if(isset($this->params["audio_format"]))
- {
- $audio->setName($this->params["audio_format"]);
- }
-
- if(isset($this->params["delay"]))
- {
- $options->setDelay($this->params["delay"]); //no delay
- }
-
- //Features
- if(isset($this->params["short_title"]))
- {
- $options->setShortTitle("true");
- }
- else{
- $options->setShortTitle("false");
- }
- $options->setMaxLength(1200); //set to 20 min
- $options->setAudioFormat($audio);
- $ressource->setOptions($options);
-
- $ressource->setRid($id);
- //create the resource on the vt server
- $result = voicetools_api_modify_resource($ressource->getResource());
-
- return $result;
- }
- /********
- Recorder
- **********/
- /*
- * This function creates a recorder the vt server
- * params : blocks' id
- */
- function createRecorder(){
-
- $ressource = new vtResource(NULL);
- $audio = new vtAudioFormat(NULL);
- $options = new VtOptions(NULL);
-
- // Info
- $ressource->setType("recorder");
-
-
- $options->setMaxLength(1200); //set to 20 min
- $options->setAudioFormat($audio);
- $ressource->setOptions($options);
-
- //create the resource on the vt server
- $result = voicetools_api_create_resource($ressource->getResource());
-
- return $result;
- }
-
- function deleteRessource($rid)
- {
- $result = voicetools_api_delete_resource($rid);
- return $result;
- }
-
- function getVtSession($resource,$user,$rights,$message=null)
- {
- if($message!=null)
- return voicetools_api_create_session ($user->getUser(),$resource->getResource(),$rights->getRights(),$message->getMessage()) ;
- else
- return voicetools_api_create_session ($user->getUser(),$resource->getResource(),$rights->getRights()) ;
-
- }
-}
-
-
-
-
?>
\ No newline at end of file
Modified: branches/team/Thomas/integrations_common/php/common/WimbaLib.php
===================================================================
--- branches/team/Thomas/integrations_common/php/common/WimbaLib.php 2008-01-22 22:59:37 UTC (rev 230)
+++ branches/team/Thomas/integrations_common/php/common/WimbaLib.php 2008-01-22 23:00:11 UTC (rev 231)
@@ -5,7 +5,7 @@
function getKeysOfGeneralParameters(){
return array(
- array("value"=>"enc_courseId","type"=>PARAM_INT,"default_value"=>null),
+ 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),
@@ -16,7 +16,8 @@
array("value"=>"type","type"=>PARAM_ALPHA,"default_value"=>null),
array("value"=>"studentView","type"=>PARAM_BOOL,"default_value"=>null),
array("value"=>"createWorkflow","type"=>PARAM_BOOL,"default_value"=>null),
-
+ array("value"=>"action","type"=>PARAM_ALPHA,"default_value"=>null),
+ array("value"=>"resource_id","type"=>PARAM_CLEAN,"default_value"=>"0"),
);
}
@@ -27,7 +28,7 @@
return array (
array("value"=>"longname","type"=>PARAM_CLEAN,"default_value"=>null),
- array("value"=>"description","type"=>PARAM_CLEAN,"default_value"=>null),
+ 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"=>"0"),
@@ -46,7 +47,42 @@
) ;
}
+function getKeyWimbaVoiceForm(){
+
+
+ return array (
+ array("value"=>"longname","type"=>PARAM_CLEAN,"default_value"=>null),
+ array("value"=>"description","type"=>PARAM_CLEAN,"default_value"=>"dd"),
+ array("value"=>"led","type"=>PARAM_ALPHA,"default_value"=>"instructor"),
+
+ array("value"=>"audio_format","type"=>PARAM_CLEAN,"default_value"=>"medium"),
+ array("value"=>"max_length","type"=>PARAM_INT,"default_value"=>"0"),
+ array("value"=>"delay","type"=>PARAM_INT,"default_value"=>"0"),
+
+ array("value"=>"short_title","type"=>PARAM_ALPHA,"default_value"=>"false"),
+ array("value"=>"chrono_order","type"=>PARAM_ALPHA,"default_value"=>"false"),
+ array("value"=>"show_reply","type"=>PARAM_ALPHA,"default_value"=>"false"),
+ array("value"=>"show_forward","type"=>PARAM_ALPHA,"default_value"=>"false"),
+ array("value"=>"show_compose","type"=>PARAM_ALPHA,"default_value"=>"false"),
+ array("value"=>"filter","type"=>PARAM_ALPHA,"default_value"=>"false"),
+
+ array("value"=>"accessAvailable","type"=>PARAM_BOOL,"default_value"=>"0"),
+ array("value"=>"start_date","type"=>PARAM_BOOL,"default_value"=>"0"),
+ array("value"=>"start_month","type"=>PARAM_INT,"default_value"=>"0"),
+ array("value"=>"start_day","type"=>PARAM_INT,"default_value"=>"0"),
+ array("value"=>"start_year","type"=>PARAM_INT,"default_value"=>"0"),
+ array("value"=>"start_hr","type"=>PARAM_INT,"default_value"=>-1),
+ array("value"=>"start_min","type"=>PARAM_INT,"default_value"=>-1),
+ array("value"=>"end_date","type"=>PARAM_BOOL,"default_value"=>"0"),
+ array("value"=>"end_month","type"=>PARAM_INT,"default_value"=>"0"),
+ array("value"=>"end_day","type"=>PARAM_INT,"default_value"=>"0"),
+ array("value"=>"end_year","type"=>PARAM_INT,"default_value"=>"f"),
+ array("value"=>"end_hr","type"=>PARAM_INT,"default_value"=>-1),
+ array("value"=>"end_min","type"=>PARAM_INT,"default_value"=>-1),
+ );
+}
+
function getListOfWeeks($course,$current){
$i=1;
@@ -171,7 +207,7 @@
$role=getRoleForWimbaTools($courseid,$USER->id);
$signature = md5($courseid.$USER->email.$USER->firstname.$USER->lastname.$role);
- $url_params = "enc_courseId=".rawurlencode($courseid).
+ $url_params = "enc_course_id=".rawurlencode($courseid).
"&enc_email=".rawurlencode($USER->email).
"&enc_firstname=".rawurlencode($USER->firstname).
"&enc_lastname=".rawurlencode($USER->lastname).
@@ -274,7 +310,7 @@
$voicetools->end_date="-1";
}
}
-
+
return voicetools_store_new_element($voicetools);
}
Modified: branches/team/Thomas/integrations_common/php/common/WimbaUI.php
===================================================================
--- branches/team/Thomas/integrations_common/php/common/WimbaUI.php 2008-01-22 22:59:37 UTC (rev 230)
+++ branches/team/Thomas/integrations_common/php/common/WimbaUI.php 2008-01-22 23:00:11 UTC (rev 231)
@@ -152,7 +152,7 @@
/********
SESSION
*********/
- $this->xml->CreateInformationElement($this->session->timeOfLoad, $this->session->hparams["firstname"], $this->session->hparams["lastname"], $this->session->hparams["email"], $this->session->hparams["role"], $this->session->hparams["courseId"], $this->session->signature, "", "", "", "");
+ $this->xml->CreateInformationElement($this->session->timeOfLoad, $this->session->hparams["firstname"], $this->session->hparams["lastname"], $this->session->hparams["email"], $this->session->hparams["role"], $this->session->hparams["course_id"], $this->session->signature, "", "", "", "");
/********
HEADER
*********/
@@ -210,7 +210,7 @@
function getListVoiceTools() {
//get the list of the boards
- $list = voicetools_get_voicetools_list($this->session->hparams["courseId"]);
+ $list = voicetools_get_voicetools_list($this->session->hparams["course_id"]);
$vtResources = voicetools_api_get_resources($list["rid"]);
@@ -324,7 +324,7 @@
/********
SESSION
*********/
- $this->xml->CreateInformationElement($this->session->timeOfLoad, $this->session->hparams["firstname"], $this->session->hparams["lastname"], $this->session->hparams["email"], $this->session->hparams["role"], $this->session->hparams["courseId"], $this->session->signature, "", "", "", "");
+ $this->xml->CreateInformationElement($this->session->timeOfLoad, $this->session->hparams["firstname"], $this->session->hparams["lastname"], $this->session->hparams["email"], $this->session->hparams["role"], $this->session->hparams["course_id"], $this->session->signature, "", "", "", "");
/********
HEADER
*********/
@@ -395,7 +395,7 @@
**/
function getListLiveClassroom() {
- $rooms = $this->api->getRooms($this->session->getCourseId() . "_T");
+ $rooms = $this->api->getRooms($this->session->getcourse_id() . "_T");
if($rooms==false){
return false;
@@ -542,7 +542,7 @@
);
if($this->disabled!="")
$parameters["disabled"] = $this->disabled;
- if ($this->currentObject == null || $this->api->isStudentAdmin($this->currentObject->getRoomId(), $this->session->getCourseId() . "_S") == "false")
+ if ($this->currentObject == null || $this->api->isStudentAdmin($this->currentObject->getRoomId(), $this->session->getcourse_id() . "_S") == "false")
$parameters["checked"] = "true";
$this->xml->addInputElement("input", $parameters);
$parameters = array (
@@ -567,7 +567,7 @@
);
if($this->disabled!="")
$parameters["disabled"] = $this->disabled;
- if ($this->currentObject != null && $this->api->isStudentAdmin($this->currentObject->getRoomId(), $this->session->getCourseId() . "_S") == "true")
+ if ($this->currentObject != null && $this->api->isStudentAdmin($this->currentObject->getRoomId(), $this->session->getcourseId() . "_S") == "true")
$parameters["checked"] = "true";
$this->xml->addInputElement("input", $parameters);
$parameters = array (
Modified: branches/team/Thomas/integrations_common/php/common/WimbaXml.php
===================================================================
--- branches/team/Thomas/integrations_common/php/common/WimbaXml.php 2008-01-22 22:59:37 UTC (rev 230)
+++ branches/team/Thomas/integrations_common/php/common/WimbaXml.php 2008-01-22 23:00:11 UTC (rev 231)
@@ -346,7 +346,7 @@
- function CreateInformationElement($timeOfLoad, $firstName, $lastName, $email, $role, $courseId, $signature, $authToken,$lc,$vt,$picturesToLoad)
+ function CreateInformationElement($timeOfLoad, $firstName, $lastName, $email, $role, $courseId, $signature, $authToken,$lc,$vt,$picturesToLoad=null)
{
$this->Informations = $this->xmldoc->create_element("information");
@@ -372,9 +372,11 @@
$vtUrl->append_child($this->xmldoc->create_text_node($vt));
$lcUrl = $this->xmldoc->create_element("lcServerUrl");
$lcUrl->append_child($this->xmldoc->create_text_node($lc));
- $epicturesToLoad = $this->xmldoc->create_element("picturesToLoad");
- $epicturesToLoad->append_child($this->xmldoc->create_text_node($picturesToLoad));
-
+ if($picturesToLoad!=null){
+ $epicturesToLoad = $this->xmldoc->create_element("picturesToLoad");
+ $epicturesToLoad->append_child($this->xmldoc->create_text_node($picturesToLoad));
+ $this->Informations->append_child($epicturesToLoad);
+ }
$this->Informations->append_child($etimeOfLoad);
$this->Informations->append_child($efirstName);
$this->Informations->append_child($elastName);
@@ -385,7 +387,7 @@
$this->Informations->append_child($eemail);
$this->Informations->append_child($vtUrl);
$this->Informations->append_child($lcUrl);
- $this->Informations->append_child($epicturesToLoad);
+
//xml.DocumentElement->append_child(Informations);
}
Modified: branches/team/Thomas/integrations_common/php/vt/WimbaVoicetools.php
===================================================================
--- branches/team/Thomas/integrations_common/php/vt/WimbaVoicetools.php 2008-01-22 22:59:37 UTC (rev 230)
+++ branches/team/Thomas/integrations_common/php/vt/WimbaVoicetools.php 2008-01-22 23:00:11 UTC (rev 231)
@@ -99,20 +99,34 @@
}
function getType(){
- return $this->hparams["type"];
+ if(isset($this->hparams["type"]))
+ return $this->hparams["type"];
+ else
+ return "";
}
function getRid(){
- return $this->hparams["rid"];
+ if(isset($this->hparams["rid"]))
+ return $this->hparams["rid"];
+ else
+ return "";
}
function getTitle(){
-
- return $this->hparams["title"];
+ if(isset($this->hparams["title"]))
+ return $this->hparams["title"];
+ else
+ return "";
}
function getDescription(){
- return $this->hparams["description"];
+ if(isset($this->hparams["description"]))
+ return $this->hparams["description"];
+ else
+ return "";
}
function getMail(){
- return $this->hparams["email"];
+ if(isset($this->hparams["email"]))
+ return $this->hparams["email"];
+ else
+ return "";
}
function setType($type)
Modified: branches/team/Thomas/integrations_common/web/js/ajax.js
===================================================================
--- branches/team/Thomas/integrations_common/web/js/ajax.js 2008-01-22 22:59:37 UTC (rev 230)
+++ branches/team/Thomas/integrations_common/web/js/ajax.js 2008-01-22 23:00:11 UTC (rev 231)
@@ -86,7 +86,7 @@
function getSessionParameters() {
var params = new Array();
params["signature"] = session["signature"];
- params["enc_courseId"] = session["courseId"];
+ params["enc_course_id"] = session["courseId"];
params["enc_email"] = session["email"];
params["enc_firstname"] = session["firstName"];
params["enc_lastname"] = session["lastName"];
@@ -99,7 +99,7 @@
params["type"] = typeSelect;
}
if (currentId != "") {
- params["id"] = currentId;
+ params["resource_id"] = currentId;
}
if (currentIdtab != "") {
params["idtab"] = currentIdtab;
@@ -119,7 +119,7 @@
function getUrlParameters() {
var url = "";
url += "signature=" + session["signature"];
- url += "&enc_courseId=" + session["courseId"];
+ url += "&enc_course_id=" + session["courseId"];
url += "&enc_email=" + session["email"];
url += "&enc_firstname=" + session["firstName"];
url += "&enc_lastname=" + session["lastName"];
@@ -133,7 +133,7 @@
}
if (currentId != "") {
- url += "&id=" + currentId;
+ url += "&resource_id=" + currentId;
}
if (currentIdtab != "") {
@@ -186,7 +186,7 @@
if (action != "") {
url += "?action=" + action;
}
- if (createWorkflow != "" && action!="") {
+ if (createWorkflow != null && action!=null) {
url += "&createWorkflow=" + createWorkflow;
}
isFilter = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tro...@us...> - 2008-02-11 21:15:41
|
Revision: 240
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=240&view=rev
Author: trollinger
Date: 2008-02-11 13:15:38 -0800 (Mon, 11 Feb 2008)
Log Message:
-----------
-handle error
-add logs
Modified Paths:
--------------
branches/team/Thomas/integrations_common/php/common/WimbaLib.php
branches/team/Thomas/integrations_common/php/common/WimbaXml.php
branches/team/Thomas/integrations_common/web/js/ajax.js
branches/team/Thomas/integrations_common/web/js/hwCommons.js
branches/team/Thomas/integrations_common/web/js/xsl/wimba.xsl
Modified: branches/team/Thomas/integrations_common/php/common/WimbaLib.php
===================================================================
--- branches/team/Thomas/integrations_common/php/common/WimbaLib.php 2008-02-05 22:48:13 UTC (rev 239)
+++ branches/team/Thomas/integrations_common/php/common/WimbaLib.php 2008-02-11 21:15:38 UTC (rev 240)
@@ -1,5 +1,10 @@
<?php
+define('WIMBA_INFO', 'info');
+define('WIMBA_WARN', 'warn');
+define('WIMBA_ERROR', 'error');
+define('WIMBA_DEBUG', 'debug');
+define('WIMBA_DIR', $CFG->dataroot . "/wimba");
/**
* Returns the keys of the general parameters passed by GET or POST
*/
@@ -155,13 +160,15 @@
function manage_error($errno, $error, $file, $line, $context)
{
- global $CFG;
- if ($errno < 10) {
- redirection('welcome.php?error=rrr');
+
+ if ($errno == E_USER_ERROR or $errno == E_ERROR) {
+ wimba_add_log(WIMBA_ERROR,"general",$error);
+
}
- if ($errno < 10) {
- // add to log
- }
+ else
+ {
+ wimba_add_log(WIMBA_DEBUG,"general",$error);
+ }
}
function txt($string)
@@ -262,12 +269,15 @@
}
}
-function storeResource($rid, $params)
+function storeResource($rid,$course_id, $params)
{
$voicetools = new Object();
$voicetools->rid = $rid;
- $voicetools->course = $params["course_id"];
- $voicetools->name = $params["name"];
+ $voicetools->course = $course_id;
+ if(isset($params["name"]))
+ {
+ $voicetools->name = $params["name"];
+ }
$voicetools->type = $params["type"];
if ($params != null)
@@ -303,11 +313,11 @@
return voicetools_store_new_element($voicetools);
}
-function updateResource($rid, $params)
+function updateResource($rid,$course_id, $params)
{
$voicetools = new Object();
$voicetools->rid = $rid;
- $voicetools->course = $params["course_id"];
+ $voicetools->course = $course_id;
$voicetools->type = $params["type"];
$voicetools->availability = $params["accessAvailable"];
@@ -372,4 +382,48 @@
return $preview;
}
+
+/**Add logs in moodledata
+ * param : the level og the log ('info', 'warn','error' or 'debug'), the message to display on the log
+ * return : void, store the log in MOODLEDATADIR/wimba/logs/LEVEL
+ */
+function wimba_add_log($level,$product,$message){
+
+//Set the log level values.
+$level_values = array(
+ WIMBA_DEBUG => 1,
+ WIMBA_INFO => 2,
+ WIMBA_WARN => 3,
+ WIMBA_ERROR => 4
+);
+ global $CFG;
+
+ $log_product = $product."_log_level";
+//Write on the logs only if the configured level allows it.
+ if ($product=="general" ||$level_values[$level] >= $CFG->$log_product){
+
+ // Gets the site shortname
+ $site = get_record('course','id',SITEID);
+
+ //Computes the timestamp corresponding to the day (at 00:00:00).
+ $today_timestamp = @mktime(0, 0, 0, date("m"), date("d"), date("Y"));
+
+ //If it doesn't exist, create the log folder'
+ @mkdir(WIMBA_DIR, 0700);
+
+ @mkdir(WIMBA_DIR . "/" . $product, 0700);
+
+ $wimba_logs= WIMBA_DIR . "/" . $product . "/logs";
+ @mkdir($wimba_logs, 0700);
+
+ //Computes the log filename. Space characters are replaced by unerscore, to have a correct filename.
+ $file = $wimba_logs."/".str_replace(' ','_',$site->shortname)."-".$today_timestamp."-wimba.log";
+
+ //Writes the message in the log, and close it
+ $fh = @fopen($file, "a");
+ @fwrite($fh,gmdate("Y-m-d H:i:s")." ".strtoupper($level)." ".$product." - ".$message."\n");
+ @fclose($fh);
+ }
+}
+
?>
Modified: branches/team/Thomas/integrations_common/php/common/WimbaXml.php
===================================================================
--- branches/team/Thomas/integrations_common/php/common/WimbaXml.php 2008-02-05 22:48:13 UTC (rev 239)
+++ branches/team/Thomas/integrations_common/php/common/WimbaXml.php 2008-02-11 21:15:38 UTC (rev 240)
@@ -813,7 +813,7 @@
$ephones = $this->xmldoc->create_element("phones");
$ephoneL = $this->xmldoc->create_element("phoneLabel");
$ephoneL->append_child($this->xmldoc->create_text_node($phoneLabel));
- $ephones->append_child(ephoneL);
+ $ephones->append_child($ephoneL);
foreach ($toll as $key => $value)
{
if($key!="" && $value!="")
Modified: branches/team/Thomas/integrations_common/web/js/ajax.js
===================================================================
--- branches/team/Thomas/integrations_common/web/js/ajax.js 2008-02-05 22:48:13 UTC (rev 239)
+++ branches/team/Thomas/integrations_common/web/js/ajax.js 2008-02-11 21:15:38 UTC (rev 240)
@@ -161,6 +161,7 @@
if (action != null) {
url += "?action=" + action;
}
+
transform(url,"first",div,nextAction)
}
@@ -224,6 +225,7 @@
url:pathXsl,
mimetype:"application/xml",
load:function (type, data, evt) {
+
xslData = data;
var xml = xsltProcess(xmlSource, xslData);
hidePopup();
@@ -271,7 +273,7 @@
* (Google AJAXSLT) to execute the xslt transformation because it is not supported natively
*/
function transform(urlXml,TypeParams, div,nextAction) {
-
+
if(window.ActiveXObject){//ie
if(TypeParams=="first")
@@ -300,28 +302,28 @@
xsltTransformation(sourceDoc,xslDoc,div,nextAction);
- }else if (window.XSLTProcessor){//firefox
+ }
+ else if (window.XSLTProcessor)
+ {//firefox
if(TypeParams=="first")
params=getURLParametersTab();
else
params=getSessionParameters();
dojo.io.bind({url:urlXml, mimetype:"application/xml", load:function (type, data, evt) {
-
+
if (div == "all" && data.documentElement.getElementsByTagName("type")[0].childNodes[0].nodeValue!="error") {
createSessionByXmlDocument(data);
}
-
xmlSource = data;
+
//get the stylesheet
dojo.io.bind({
url:pathXsl,
mimetype:"application/xml",
load:function (type, data, evt) {
- //do the xslt transformatio
-
+ //do the xslt transformation
xsltTransformation(xmlSource,data,div,nextAction)
-
},
error:BadResult,
content:null,
@@ -371,7 +373,7 @@
* and add the html into the page
*/
function xsltTransformation(xml,xsl,div,nextAction){
-
+
if(window.ActiveXObject)//ie
{
var result = xml.transformNode(xsl);
@@ -394,7 +396,7 @@
var processor = new XSLTProcessor();
processor.setParameter(null, 'pathPictures', pathPictures);
-
+
processor.importStylesheet(xsl);
document.getElementById(div).innerHTML="";
var resultDocument = processor.transformToFragment(xml, document);
@@ -416,10 +418,10 @@
if(nextAction!="")
eval(nextAction);
- }else{
-
+ }
+ else
+ {
var xml = xsltProcess(xml, xsl);
-
//hide the loading page
if (div == "all") {
hidePopup();
Modified: branches/team/Thomas/integrations_common/web/js/hwCommons.js
===================================================================
--- branches/team/Thomas/integrations_common/web/js/hwCommons.js 2008-02-05 22:48:13 UTC (rev 239)
+++ branches/team/Thomas/integrations_common/web/js/hwCommons.js 2008-02-11 21:15:38 UTC (rev 240)
@@ -94,7 +94,7 @@
if(archiveMatched>0){//change the pciture
var pictureId = elements[roomLinked].id + "_ExpandPicture";
- changePicture(pictureId, pathPictures+"listitem-show.png");
+ changePicture(pictureId, pathPictures+"/items/listitem-show.png");
}
elements[roomLinked].setAttribute("stateSearch", "");//change the status of the element to manage the display
elements[roomLinked].style.display = display;
@@ -136,10 +136,10 @@
//management of the picture to expand the archives
if(archiveMatched>0){
var pictureId = elements[roomLinked].id + "_ExpandPicture";
- changePicture(pictureId, pathPictures+"listitem-hide.png");
+ changePicture(pictureId, pathPictures+"/items/listitem-hide.png");
}else{
var pictureId = elements[roomLinked].id + "_ExpandPicture";
- changePicture(pictureId, pathPictures+"space-16px.png");
+ changePicture(pictureId, pathPictures+"/items/space-16px.png");
}
}
} else {
@@ -160,7 +160,7 @@
elements[roomLinked].style.display = display;
elements[roomLinked].setAttribute("stateSearch", "");
var pictureId = elements[roomLinked].id + "_ExpandPicture";
- changePicture(pictureId, pathPictures+"listitem-hide.png");
+ changePicture(pictureId, pathPictures+"/items/listitem-hide.png");
}else{
elements[roomLinked].style.display = "none";
elements[roomLinked].setAttribute("stateSearch", "ignore");
@@ -189,18 +189,18 @@
if (currentId != "" && currentId != id) {
document.getElementById(currentId).style.backgroundColor = "white";
if(document.getElementById(currentId).getAttribute("typeProduct")=="archive"){
- document.getElementById(currentId+"_archive_subitem").src=pathPictures+"listitem-subitem.jpg";
- document.getElementById(currentId+"_archive_icon").src=pathPictures+"listitem-archiveicon.jpg";
+ document.getElementById(currentId+"_archive_subitem").src=pathPictures+"/items/listitem-subitem.jpg";
+ document.getElementById(currentId+"_archive_icon").src=pathPictures+"/items/listitem-archiveicon.jpg";
}
}
if (lineCurrentId != id) {
document.getElementById(id).style.backgroundColor = "#c3dbf7";
if(type=="archive"){
- document.getElementById(id+"_archive_subitem").src=pathPictures+"listitem-subitem-selected.jpg";
- document.getElementById(id+"_archive_icon").src=pathPictures+"listitem-archiveicon-selected.jpg";
+ document.getElementById(id+"_archive_subitem").src=pathPictures+"/items/listitem-subitem-selected.jpg";
+ document.getElementById(id+"_archive_icon").src=pathPictures+"/items/listitem-archiveicon-selected.jpg";
}
}
-
+
//update the current context
currentId = id;
currentProduct = product;
@@ -234,13 +234,13 @@
}
}
if(archiveAvailable==true){
- changePicture(id + "_ExpandPicture", pathPictures+"listitem-hide.png");
+ changePicture(id + "_ExpandPicture", pathPictures+"/items/listitem-hide.png");
div.style.height="";
document.getElementById(nameMore).innerHTML = "<label class='moreRoom' onclick='RemoveAllDiv(\"" + name + "\",\"" + nameMore + "\",\"" + (listRoomsArchives.length-numHide) + "\")'>Show Top 5...</label>";
expandState=1;
}
else{
- changePicture(id + "_ExpandPicture", pathPictures+"listitem-show.png");
+ changePicture(id + "_ExpandPicture", pathPictures+"/items/listitem-show.png");
if(expandState!=1)
document.getElementById(nameMore).innerHTML = "<label class='moreRoom' onclick='displayAllDiv(\"" + name + "\",\"" + nameMore + "\",\"" + (listRoomsArchives.length-numHide) + "\")'>"+(listRoomsArchives.length-numHide-5)+" more...</label>";
else
@@ -345,7 +345,7 @@
elements[i].style.display = "none";
if(elements[i + 1] != null && elements[i + 1].getAttribute("typeProduct") == "archive"){//this room contains archives
document.getElementById(elements[linkedRoom].id + "_ExpandPicture").style.visibility="visible";
- changePicture(document.getElementById(elements[linkedRoom].id + "_ExpandPicture"), pathPictures+"listitem-show.png");
+ changePicture(document.getElementById(elements[linkedRoom].id + "_ExpandPicture"), pathPictures+"/items/listitem-show.png");
while (elements[i + 1].getAttribute("typeProduct") == "archive") {
elements[i + 1].className = "archiveHide";
elements[i + 1].setAttribute("stateStudentView", "ignore");
@@ -370,7 +370,7 @@
}
if(archiveMatched==0){//hide the element which allow the expand/collapse
document.getElementById(elements[linkedRoom].id + "_ExpandPicture").style.visibility="hidden";
- changePicture(document.getElementById(elements[linkedRoom].id + "_ExpandPicture"), pathPictures+"listitem-show.png");
+ changePicture(document.getElementById(elements[linkedRoom].id + "_ExpandPicture"), pathPictures+"/items/listitem-show.png");
}
}
@@ -387,7 +387,7 @@
elements[i].style.display = display;
if(elements[i+1]!=null && elements[i+1].getAttribute("typeProduct") == "archive"){
document.getElementById(elements[i].id + "_ExpandPicture").style.visibility="visible";
- changePicture(document.getElementById(elements[i].id + "_ExpandPicture"), pathPictures+"listitem-show.png");
+ changePicture(document.getElementById(elements[i].id + "_ExpandPicture"), pathPictures+"/items/listitem-show.png");
}
} else {
@@ -447,6 +447,7 @@
changeFilterStatus(id, "rollover");
}
}
+
function outFilter(id) {
if (currentFilter == id) {
changeFilterStatus(id, "enabled");
@@ -454,6 +455,7 @@
changeFilterStatus(id, "disabled");
}
}
+
function changeFilterStatus(id, status) {
if (document.getElementById(id) != null) {
document.getElementById(id).className = "filter" + status;
@@ -609,7 +611,7 @@
* Filled the session array thanks to the xmlDocument
*/
function createSessionByXmlDocument(data) {
-
+
objDomTree = data.documentElement;
if (objDomTree.getElementsByTagName("timeOfLoad")[0].hasChildNodes() == true)
@@ -647,7 +649,6 @@
else
session["role"] ="";
-
//preload all the pictures
}
@@ -710,6 +711,7 @@
}
}
}
+
/*
* Launch the LiveClassroom into a popup
*/
@@ -723,6 +725,7 @@
window.open(complete_url, "lc_popup", "scrollbars=no,resizable=yes,width=700,height=500");
}
}
+
/*
* Launch the VoiceTools into a popup
*/
Modified: branches/team/Thomas/integrations_common/web/js/xsl/wimba.xsl
===================================================================
--- branches/team/Thomas/integrations_common/web/js/xsl/wimba.xsl 2008-02-05 22:48:13 UTC (rev 239)
+++ branches/team/Thomas/integrations_common/web/js/xsl/wimba.xsl 2008-02-11 21:15:38 UTC (rev 240)
@@ -41,20 +41,24 @@
<div class="popupDialContainer">
<xsl:if test="popupDial/phones/phone!=''">
<div class="popupDialContent">
- <table cellspacing="0" cellpadding="0" border="0" >
+ <table cellspacing="0" cellpadding="0" border="0" >
+ <tr>
+ <td colspan="2">
+ <label class='nameElement'>
+ <xsl:value-of select="popupDial/phones/phoneLabel" />
+ </label>
+ </td>
+ </tr>
<xsl:for-each select="popupDial/phones/phone">
<xsl:choose>
- <xsl:when test="position()=1">
+ <xsl:when test="position()=1">
<tr>
- <td align="right" style="width:143px;">
- <xsl:value-of select="preceding::phoneLabel[1]" />
- </td>
- <td align="right" style="width:95px;">
- <label class='nameElement'>
- <xsl:value-of select="phoneDesc"/> :
+ <td align="right" colspan="2">
+ <label>
+ <xsl:value-of select="phoneDesc"/> :
</label>
</td>
- <td align="left" style="width:100px;">
+ <td align="left">
<xsl:value-of select="number"/>
</td>
</tr>
@@ -62,8 +66,8 @@
<xsl:otherwise>
<tr>
<td align="right" colspan="2">
- <label class='nameElement'>
- <xsl:value-of select="phoneDesc"/> :
+ <label>
+ <xsl:value-of select="phoneDesc"/> :
</label>
</td>
<td align="left">
@@ -79,12 +83,16 @@
<div class="popupDialContent">
<table cellspacing="0" cellpadding="0" border="0" >
<tr>
- <td align="right" style="width:143px;">
- <xsl:value-of select="popupDial/pin/pinLabel" />
- </td>
- <td align="right" style="width:95px;">
+ <td colspan="2">
+ <label class='nameElement'>
+ <xsl:value-of select="popupDial/pin/pinLabel" />
+ </label>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" colspan="2">
<xsl:if test="popupDial/pin/instructor!=''">
- <label class='nameElement'>
+ <label>
Instructor :
</label>
</xsl:if>
@@ -95,7 +103,7 @@
</tr>
<tr>
<td align="right" colspan="2">
- <label class='nameElement'>
+ <label>
Student :
</label>
</td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tro...@us...> - 2008-02-14 23:21:44
|
Revision: 242
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=242&view=rev
Author: trollinger
Date: 2008-02-14 15:21:43 -0800 (Thu, 14 Feb 2008)
Log Message:
-----------
-add log to the common files
-fix a couple of small issues
Modified Paths:
--------------
branches/team/Thomas/integrations_common/php/common/WimbaLib.php
branches/team/Thomas/integrations_common/php/common/WimbaUI.php
branches/team/Thomas/integrations_common/php/common/WimbaXml.php
branches/team/Thomas/integrations_common/php/lc/lcapi.php
branches/team/Thomas/integrations_common/php/vt/VtAction.php
branches/team/Thomas/integrations_common/php/vt/WimbaVoicetoolsAPI.php
branches/team/Thomas/integrations_common/web/js/verifForm.js
Added Paths:
-----------
branches/team/Thomas/integrations_common/web/pictures/items/voice_tools.png
Modified: branches/team/Thomas/integrations_common/php/common/WimbaLib.php
===================================================================
--- branches/team/Thomas/integrations_common/php/common/WimbaLib.php 2008-02-11 21:25:53 UTC (rev 241)
+++ branches/team/Thomas/integrations_common/php/common/WimbaLib.php 2008-02-14 23:21:43 UTC (rev 242)
@@ -8,6 +8,7 @@
/**
* Returns the keys of the general parameters passed by GET or POST
*/
+
function getKeysOfGeneralParameters()
{
return array(
@@ -20,8 +21,8 @@
array("value" => "signature", "type" => PARAM_ALPHANUM, "default_value" => null),
array("value" => "product", "type" => PARAM_ALPHA, "default_value" => null),
array("value" => "type", "type" => PARAM_ALPHA, "default_value" => null),
- array("value" => "studentView", "type" => PARAM_BOOL, "default_value" => null),
- array("value" => "createWorkflow", "type" => PARAM_BOOL, "default_value" => null),
+ array("value" => "studentView", "type" => PARAM_ALPHA, "default_value" => "false"),
+ array("value" => "createWorkflow", "type" => PARAM_BOOL, "default_value" => false),
array("value" => "action", "type" => PARAM_ALPHA, "default_value" => null),
array("value" => "resource_id", "type" => PARAM_CLEAN, "default_value" => "0"),
array("value" => "error", "type" => PARAM_CLEAN, "default_value" => ""),
@@ -54,34 +55,34 @@
function getKeyWimbaVoiceForm()
{
return array (
- array("value" => "longname", "type" => PARAM_CLEAN, "default_value" => ""),
+ array("value" => "longname", "type" => PARAM_CLEAN, "default_value" => ""),
array("value" => "description", "type" => PARAM_CLEAN, "default_value" => "dd"),
- array("value" => "led", "type" => PARAM_ALPHA, "default_value" => "instructor"),
+ array("value" => "led", "type" => PARAM_ALPHA, "default_value" => "student"),
array("value" => "audio_format", "type" => PARAM_CLEAN, "default_value" => "medium"),
- array("value" => "max_length", "type" => PARAM_INT, "default_value" => "0"),
- array("value" => "delay", "type" => PARAM_INT, "default_value" => "0"),
+ array("value" => "max_length", "type" => PARAM_INT, "default_value" => "0"),
+ array("value" => "delay", "type" => PARAM_INT, "default_value" => "0"),
- array("value" => "short_title", "type" => PARAM_ALPHA, "default_value" => "false"),
- array("value" => "chrono_order", "type" => PARAM_ALPHA, "default_value" => "false"),
- array("value" => "show_reply", "type" => PARAM_ALPHA, "default_value" => "false"),
- array("value" => "show_forward", "type" => PARAM_ALPHA, "default_value" => "false"),
- array("value" => "show_compose", "type" => PARAM_ALPHA, "default_value" => "false"),
- array("value" => "filter", "type" => PARAM_ALPHA, "default_value" => "false"),
+ array("value" => "short_title", "type" => PARAM_ALPHA, "default_value" => "false"),
+ array("value" => "chrono_order", "type" => PARAM_ALPHA, "default_value" => "false"),
+ array("value" => "show_reply", "type" => PARAM_ALPHA, "default_value" => "false"),
+ array("value" => "show_forward", "type" => PARAM_ALPHA, "default_value" => "false"),
+ array("value" => "show_compose", "type" => PARAM_ALPHA, "default_value" => "false"),
+ array("value" => "filter", "type" => PARAM_ALPHA, "default_value" => "false"),
- array("value" => "accessAvailable", "type" => PARAM_BOOL, "default_value" => "0"),
- array("value" => "start_date", "type" => PARAM_ALPHA, "default_value" => "false"),
- array("value" => "start_month", "type" => PARAM_ALPHA, "default_value" => "0"),
- array("value" => "start_day", "type" => PARAM_ALPHA, "default_value" => "0"),
- array("value" => "start_year", "type" => PARAM_ALPHA, "default_value" => "0"),
- array("value" => "start_hr", "type" => PARAM_ALPHA, "default_value" => "0"),
- array("value" => "start_min", "type" => PARAM_ALPHA, "default_value" => "0"),
- array("value" => "end_date", "type" => PARAM_ALPHA, "default_value" => "false"),
- array("value" => "end_month", "type" => PARAM_ALPHA, "default_value" => "0"),
- array("value" => "end_day", "type" => PARAM_ALPHA, "default_value" => "0"),
- array("value" => "end_year", "type" => PARAM_ALPHA, "default_value" => "0"),
- array("value" => "end_hr", "type" => PARAM_ALPHA, "default_value" => "0"),
- array("value" => "end_min", "type" => PARAM_ALPHA, "default_value" => "0"),
+ array("value" => "accessAvailable", "type" => PARAM_BOOL, "default_value" => "0"),
+ array("value" => "start_date", "type" => PARAM_ALPHA, "default_value" => "false"),
+ array("value" => "start_month", "type" => PARAM_ALPHANUM, "default_value" => "0"),
+ array("value" => "start_day", "type" => PARAM_ALPHANUM, "default_value" => "0"),
+ array("value" => "start_year", "type" => PARAM_ALPHANUM, "default_value" => "0"),
+ array("value" => "start_hr", "type" => PARAM_ALPHANUM, "default_value" => "0"),
+ array("value" => "start_min", "type" => PARAM_ALPHANUM, "default_value" => "0"),
+ array("value" => "end_date", "type" => PARAM_ALPHA, "default_value" => "false"),
+ array("value" => "end_month", "type" => PARAM_ALPHANUM, "default_value" => "0"),
+ array("value" => "end_day", "type" => PARAM_ALPHANUM, "default_value" => "0"),
+ array("value" => "end_year", "type" => PARAM_ALPHANUM, "default_value" => "0"),
+ array("value" => "end_hr", "type" => PARAM_ALPHANUM, "default_value" => "0"),
+ array("value" => "end_min", "type" => PARAM_ALPHANUM, "default_value" => "0"),
);
}
@@ -273,6 +274,7 @@
function storeResource($rid,$course_id, $params)
{
+
$voicetools = new Object();
$voicetools->rid = $rid;
$voicetools->course = $course_id;
@@ -289,7 +291,7 @@
{
$start_hr = intval($params["start_hr"]);
$start_min = intval($params["start_min"]);
- $start_month = intval($params["start_months"]);
+ $start_month = intval($params["start_month"]);
$start_day = intval($params["start_day"]);
$start_year = intval($params["start_year"]);
$voicetools->start_date = mktime($start_hr, $start_min, 0, $start_month, $start_day, $start_year);
@@ -302,7 +304,7 @@
if ($params["end_date"] == "true") {
$end_hr = intval($params["end_hr"]);
$end_min = intval($params["end_min"]);
- $end_month = intval($params["end_months"]);
+ $end_month = intval($params["end_month"]);
$end_day = intval($params["end_day"]);
$end_year = intval($params["end_year"]);
$voicetools->end_date = mktime($end_hr, $end_min, 0, $end_month, $end_day, $end_year);
@@ -327,7 +329,7 @@
{
$start_hr = intval($params["start_hr"]);
$start_min = intval($params["start_min"]);
- $start_month = intval($params["start_months"]);
+ $start_month = intval($params["start_month"]);
$start_day = intval($params["start_day"]);
$start_year = intval($params["start_year"]);
$voicetools->start_date = mktime($start_hr, $start_min, 0, $start_month, $start_day, $start_year);
@@ -340,7 +342,7 @@
if ($params["end_date"] == "true") {
$end_hr = intval($params["end_hr"]);
$end_min = intval($params["end_min"]);
- $end_month = intval($params["end_months"]);
+ $end_month = intval($params["end_month"]);
$end_day = intval($params["end_day"]);
$end_year = intval($params["end_year"]);
$voicetools->end_date = mktime($end_hr, $end_min, 0, $end_month, $end_day, $end_year);
Modified: branches/team/Thomas/integrations_common/php/common/WimbaUI.php
===================================================================
--- branches/team/Thomas/integrations_common/php/common/WimbaUI.php 2008-02-11 21:25:53 UTC (rev 241)
+++ branches/team/Thomas/integrations_common/php/common/WimbaUI.php 2008-02-14 23:21:43 UTC (rev 242)
@@ -526,7 +526,7 @@
"javascript:launchAjaxRequest('getXmlListPanel.php','',true,'all')",
"advanced_Ok");
- if ($createWorkflow == "true")
+ if ($createWorkflow == true)
{
$this->xml->createValidationButtonElement(
get_string("validationElement_cancel", "voicetools"),
@@ -556,7 +556,7 @@
$this->xml->createValidationButtonElement(
get_string("validationElement_saveAll", "voicetools"),
"action",
- "javascript:submitForm('manageAction.php','update','" . $this->currentObject->getRid() . "')",
+ "javascript:submitForm('manageAction.php','update','" . $this->currentObject->getRid() . "','" . $createWorkflow . "')",
"setting_Save");
}
}
@@ -603,15 +603,12 @@
"rows" => "4",
"cols" => "30"
);
- if ($this->currentObject != null)
+ $display = "";
+ if (isset ($this->currentObject))
{
- $parameters["value"] = $this->currentObject->getDescription();
+ $display = $this->currentObject->getDescription();
}
- else
- {
- $parameters["value"] = "";
- }
- $this->xml->addTextAreaElement($parameters);
+ $this->xml->addTextAreaElement($parameters,$display);
$this->xml->createLinePart();
$this->xml->createLine();
@@ -1625,14 +1622,13 @@
"rows" => "4",
"cols" => "30"
);
+
+ $display = "";
if (isset ($this->currentObject))
{
- $parameters["value"] = $this->currentObject->getDescription();
+ $display = $this->currentObject->getDescription();
}
- else{
- $parameters["value"] = "";
- }
- $this->xml->addTextAreaElement($parameters);
+ $this->xml->addTextAreaElement($parameters,$display);
$this->xml->createLinePart();
$this->xml->createLine();
@@ -1681,7 +1677,7 @@
$parameters = array (
"type" => "checkbox",
- "value" => "instructor",
+ "value" => "true",
"id" => "show_compose",
"name" => "show_compose"
);
@@ -2072,7 +2068,7 @@
$optionsMonth);
}
//add space
- $this->xml->addSimpleLineElement("space");
+ $this->xml->addSimpleLineElement("label", " ");
if ($this->currentObjectInformations != null)
{
$optionsDay = $this->createSelectDay(
@@ -2099,7 +2095,7 @@
$optionsDay);
}
//add space
- $this->xml->addSimpleLineElement("space");
+ $this->xml->addSimpleLineElement("label", " ");
if ($this->currentObjectInformations != null)
{
$optionsYear = $this->createSelectYear(
@@ -2210,8 +2206,18 @@
$this->xml->createLine();
- if ($this->endSelect == false || $this->currentObject == null)
+ if ($this->currentObjectInformations != null)
{
+ $optionsMonth = $this->createSelectMonth(
+ $this->endSelect,
+ date('m', $this->currentObjectInformations->end_date));
+ }
+ else
+ {
+ $optionsMonth = $this->createSelectMonth();
+ }
+ if ($this->endSelect == false || $this->currentObject == null)
+ {
$this->xml->createOptionElement(
"end_month",
"end_month_field",
@@ -2223,12 +2229,20 @@
$this->xml->createOptionElement(
"end_month",
"end_month_field",
- $this->createSelectMonth(
- $this->endSelect,
- date('m', $this->currentObjectInformations->end_date)));
+ $optionsMonth);
}
$this->xml->addSimpleLineElement("label", " ");
+ if ($this->currentObjectInformations != null)
+ {
+ $optionsDay = $this->createSelectDay(
+ $this->endSelect,
+ date('d', $this->currentObjectInformations->end_date));
+ }
+ else
+ {
+ $optionsDay = $this->createSelectDay();
+ }
if ($this->endSelect == false || $this->currentObject == null)
{
$this->xml->createOptionElement(
@@ -2242,12 +2256,21 @@
$this->xml->createOptionElement(
"end_day",
"end_day_field",
- $this->createSelectDay(
- $this->endSelect,
- date('d', $this->currentObjectInformations->end_date)));
+ $optionsDay);
+
}
$this->xml->addSimpleLineElement("label", " ");
+ if ($this->currentObjectInformations != null)
+ {
+ $optionsYear = $this->createSelectYear(
+ $this->endSelect,
+ date('Y', $this->currentObjectInformations->end_date));
+ }
+ else
+ {
+ $optionsYear = $this->createSelectYear();
+ }
if ($this->endSelect == false || $this->currentObject == null)
{
$this->xml->createOptionElement(
@@ -2261,12 +2284,21 @@
$this->xml->createOptionElement(
"end_year",
"end_year_field",
- $this->createSelectYear(
- $this->endSelect,
- date('Y', $this->currentObjectInformations->end_date)));
+ $optionsYear);
+
}
$this->xml->createLinePart(array ("style" => "date"));
+ if ($this->currentObjectInformations != null)
+ {
+ $optionsHour = $this->createSelectHour(
+ $this->endSelect,
+ date('G', $this->currentObjectInformations->end_date));
+ }
+ else
+ {
+ $optionsHour = $this->createSelectHour();
+ }
if ($this->endSelect == false || $this->currentObject == null)
{
$this->xml->createOptionElement(
@@ -2280,12 +2312,21 @@
$this->xml->createOptionElement(
"end_hr",
"end_hr_field",
- $this->createSelectHour(
- $this->endSelect,
- date('G', $this->currentObjectInformations->end_date)));
+ $optionsHour);
}
$this->xml->addSimpleLineElement("label", " ");
+ if ($this->currentObjectInformations != null)
+ {
+ $optionsMinute = $this->createSelectMin(
+ $this->endSelect,
+ date('i', $this->currentObjectInformations->end_date));
+ }
+ else
+ {
+ $optionsMinute = $this->createSelectMin();
+ }
+
if ($this->endSelect == false || $this->currentObject == null)
{
$this->xml->createOptionElement(
@@ -2299,9 +2340,7 @@
$this->xml->createOptionElement(
"end_min",
"end_min_field",
- $this->createSelectMin(
- $this->endSelect,
- date('i', $this->currentObjectInformations->end_date)));
+ $optionsMinute);
}
$this->xml->createLinePart();
@@ -2748,6 +2787,7 @@
$allVt = array ();
$list = voicetools_get_voicetools_list($this->session->hparams["course_id"]);
$vtResources = voicetools_api_get_resources($list["rid"]);
+
if ($vtResources == null)
{
return null;
Modified: branches/team/Thomas/integrations_common/php/common/WimbaXml.php
===================================================================
--- branches/team/Thomas/integrations_common/php/common/WimbaXml.php 2008-02-11 21:25:53 UTC (rev 241)
+++ branches/team/Thomas/integrations_common/php/common/WimbaXml.php 2008-02-14 23:21:43 UTC (rev 242)
@@ -484,9 +484,9 @@
* Add a new textarea element
* @param parameters : array of attributes ( Key = name of the attribute, Value = value of the attribute)
*/
- function addTextAreaElement($parameters=NULL)
+ function addTextAreaElement($parameters=NULL,$display)
{
- $this->addSimpleLineElement("textarea","",$parameters);
+ $this->addSimpleLineElement("textarea",$display,$parameters);
}
function addDivLineElement($type, $displayContext,$parameters)
Modified: branches/team/Thomas/integrations_common/php/lc/lcapi.php
===================================================================
--- branches/team/Thomas/integrations_common/php/lc/lcapi.php 2008-02-11 21:25:53 UTC (rev 241)
+++ branches/team/Thomas/integrations_common/php/lc/lcapi.php 2008-02-14 23:21:43 UTC (rev 242)
@@ -175,7 +175,7 @@
if (!isset ($this->_lcapi_config))
{
// $this->lcapi_error(self::LCAPI_ENOCONF);
- error_log(__FUNCTION__ . ": LCAPI not configured in " . print_r(debug_backtrace(), true));
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": LCAPI not configured in " . print_r(debug_backtrace(), true));
return false;
}
$url = $this->_lcapi_config->server . LCAPI_COMMAND . LCAPI_FUNCTION_NOOP . "&AuthType=AuthCookieHandler" . "&AuthName=Horizon" . "&credential_0=" . $this->_lcapi_config->login . "&credential_1=" . $this->_lcapi_config->password;
@@ -190,24 +190,21 @@
curl_setopt($ch, CURLOPT_TIMEOUT, 4);
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookie_file_path);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": executing request: " . $url);
- }
-
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": executing request: " . $url);
$data = curl_exec($ch);
if (curl_errno($ch))
{
$this->lcapi_error(LCAPI_EADDR);
- error_log("HTTP Request failed: " . curl_error($ch));
+ wimba_add_error(WIMBA_ERROR,WC,"HTTP Request failed: " . curl_error($ch));
return false;
}
preg_match("(\d*)", $data, $matches);
$resp_code = $matches[0];
if ($resp_code == 204) {
$this->lcapi_error(LCAPI_EAUTH);
- error_log(__FUNCTION__ . ": Authentication failed (204)");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Authentication failed (204)");
return false;
}
else
@@ -215,15 +212,13 @@
if ($resp_code != 100 && $resp_code != 301)
{
$this->lcapi_error(LCAPI_EAUTH);
- error_log(__FUNCTION__ . ": Authentication Failed: $resp_code");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Authentication Failed: $resp_code");
return false;
}
}
curl_close($ch);
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": Authentication successful");
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": Authentication successful");
return $ch;
}
@@ -242,7 +237,7 @@
if (!isset ($this->_lcapi_config))
{
// $this->lcapi_error(self::LCAPI_ENOCONF);
- error_log(__FUNCTION__ . ": LCAPI not configured in " . print_r(debug_backtrace(), true));
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": LCAPI not configured in " . print_r(debug_backtrace(), true));
return false;
}
// $this->cookie_tstamp = $this->_lcapi_config->tmppath.self::LCAPI_COOKIE_TSTAMP; //Open the temp file to check the last modification date
@@ -253,18 +248,14 @@
// $this->tstamp = time();
// echo $tstamp;
// }
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": cookie timestamp:" . $this->tstamp);
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": cookie timestamp:" . $this->tstamp);
$this->valid = $this->tstamp + LCAPI_DELAY;
// 1800 seconds = 30 minutes
if ((!file_exists($this->cookie_file)) || time() > $this->valid)
{
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": Timestamp too old (tstamp: $tstamp, valid: $valid), re-auth necessary.");
- }
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": Timestamp too old (tstamp: $tstamp, valid: $valid), re-auth necessary.");
+
if (!$ch = $this->lcapi_authenticate())
{
return false;
@@ -281,22 +272,18 @@
curl_setopt($ch, CURLOPT_COOKIEJAR, $this->cookie_file);
curl_setopt($ch, CURLOPT_COOKIEFILE, $this->cookie_file);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": executing request: " . $url);
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": executing request: " . $url);
$response = curl_exec($ch);
if (curl_errno($ch))
{
$this->lcapi_error(LCAPI_ECURL);
- error_log("Curl error: " . curl_error($ch));
+ wimba_add_error(WIMBA_ERROR,WC,"Curl error: " . curl_error($ch));
return false;
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": Request Returned: " . $response);
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": Request Returned: " . $response);
return $response;
}
/**
@@ -317,24 +304,21 @@
if ($lc_respcode == 301)
{
$this->lcapi_error(LCAPI_EEXIST);
- if (LCAPI_DEBUG)
- {
- error_log("User ($this->prefix.$userid, $firstname, $lastname) already exist, not created.");
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,"User ($this->prefix.$userid, $firstname, $lastname) already exist, not created.");
return false;
}
if ($lc_respcode != 100)
{
$this->lcapi_error(LCAPI_ECRUD);
- error_log(__FUNCTION__ . ": User Creation Failed for ($this->prefix.$userid, $firstname, $lastname) with $lc_respcode");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": User Creation Failed for ($this->prefix.$userid, $firstname, $lastname) with $lc_respcode");
return false;
}
- if (LCAPI_DEBUG)
- {
- error_log("User ($this->prefix.$userid, $firstname, $lastname) created.");
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,"User ($this->prefix.$userid, $firstname, $lastname) created.");
return true;
}
+
/**
* Returns a session id (hzA) to be inserted in URLs to access the LC server
*
@@ -355,7 +339,7 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_ENOSESN);
- error_log(__FUNCTION__ . ": Cannot Create Session ($respcode).");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Cannot Create Session ($respcode).");
return false;
}
$currentline = strtok($response, "\n");
@@ -366,20 +350,18 @@
if (empty ($currentline))
{
$this->lcapi_error(LCAPI_ENOSESN);
- error_log(__FUNCTION__ . ": Session was returned with good code, but session not available ($enc_params => $response)");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Session was returned with good code, but session not available ($enc_params => $response)");
return false;
}
$authtoken = substr($currentline, 10);
if (empty ($authtoken)) {
$this->lcapi_error(LCAPI_ENOSESN);
- error_log(__FUNCTION__ . ": Token empty, response: $response");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Token empty, response: $response");
return false;
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": Auth OK (hzA=$authtoken)");
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": Auth OK (hzA=$authtoken)");
return $authtoken;
}
/**
@@ -405,10 +387,6 @@
*/
function lcapi_create_class($roomid, $roomname, $attributes)
{
- if (LCAPI_DEBUG)
- {
- // error_log(__FUNCTION__ . ": invoked with:". $this->prefix.$roomid, $roomname, " . print_r($attributes, TRUE));
- }
$params = '';
$this->lcapi_check_room_params($attributes);
while (list ($key, $val) = each($attributes))
@@ -427,19 +405,17 @@
if ($respcode == 301)
{
$this->lcapi_error(LCAPI_EEXIST);
- error_log(__FUNCTION__ . ": Class ($roomid, $roomname) already exist, not created");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Class ($roomid, $roomname) already exist, not created");
return false;
}
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_ECRUD);
- error_log(__FUNCTION__ . ": Cannot Create Class with id : $roomid, and name : $roomname.");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Cannot Create Class with id : $roomid, and name : $roomname.");
return false;
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": Class ($roomid, $roomname) created with success.");
- }
+
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Class ($roomid, $roomname) created with success.");
return true;
}
/**
@@ -461,13 +437,11 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_ECRUD);
- error_log(__FUNCTION__ . ": Cannot Add Role $role to userid $userid in Class with id:$roomid");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Cannot Add Role $role to userid $userid in Class with id:$roomid");
return false;
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": Role $role added for $userid in Class $roomid");
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": Role $role added for $userid in Class $roomid");
return true;
}
/**
@@ -490,13 +464,11 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_ECRUD);
- error_log(__FUNCTION__ . ": Cannot Removed Role $role from userid $this->prefix.$userid in Class with id:" . $roomid);
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Cannot Removed Role $role from userid $this->prefix.$userid in Class with id:" . $roomid);
return false;
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": Role $role removed from $userid in Class $roomid");
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": Role $role removed from $userid in Class $roomid");
return true;
}
/**
@@ -513,7 +485,7 @@
if ($respcode == 302)
{
$this->lcapi_error(LCAPI_ECRUD);
- error_log(__FUNCTION__ . ": $roomid suppression failed");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": $roomid suppression failed");
return false;
}
else
@@ -521,14 +493,12 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_ECRUD);
- error_log(__FUNCTION__ . ": $roomid suppression failed for an unknown reason (response: $response)");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": $roomid suppression failed for an unknown reason (response: $response)");
return false;
}
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": $roomid deleted successfully.");
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": $roomid deleted successfully.");
return true;
}
/**
@@ -556,13 +526,11 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_CRUD);
- error_log(__FUNCTION__ . ": Room modification failed ($roomid): $response");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Room modification failed ($roomid): $response");
return false;
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . "$roomid has been modified with success");
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . "$roomid has been modified with success");
return true;
}
/**
@@ -576,10 +544,7 @@
function lcapi_get_archives($userid, $roomid = '')
{
$result = $this->lcapi_get_rooms($this->prefix . $userid, $this->prefix . $roomid, 1);
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": returning archives for '$this->prefix.$userid' and '$this->prefix.$roomid': " . print_r($result, true));
- }
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": returning archives for '$this->prefix.$userid' and '$this->prefix.$roomid': " . print_r($result, true));
return $result;
}
/**
@@ -603,7 +568,7 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_ECRUD);
- error_log(__FUNCTION__ . ": List of room query failed");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": List of room query failed");
return false;
}
list (, $body) = explode("\n", $response, 2);
@@ -631,10 +596,8 @@
$rooms[] = $room;
}
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": retrieved Rooms for $userid and roomid '$roomid': " . print_r($rooms, true));
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": retrieved Rooms for $userid and roomid '$roomid': " . print_r($rooms, true));
return $rooms;
}
/**
@@ -670,14 +633,14 @@
$response = $this->lcapi_send_query(LCAPI_FUNCTION_LIST_USER, $request);
if (LCAPI_DEBUG)
{
- error_log(__FUNCTION__ . ": request '$request', response: $response");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": request '$request', response: $response");
}
preg_match("(\d*)", $response, $matches);
$respcode = $matches[0];
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_EQRY);
- error_log(__FUNCTION__ . ": Unable to query the server. request: '$request', response: '$response'");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Unable to query the server. request: '$request', response: '$response'");
return false;
}
list (, $body) = explode("\n", $response, 2);
@@ -705,12 +668,11 @@
$answers[$answer[ LCAPI_ATTR_USERID]] = $answer;
}
}
- if (LCAPI_DEBUG) {
- error_log(__FUNCTION__ . ": returning answers: " . print_r($answers, true));
- }
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": returning answers: " . print_r($answers, true));
return $answer;
}
+
/**
* Give the role of the user on a given room
*
@@ -724,7 +686,9 @@
{
$userid = $this->prefix . $userid;
}
- $params = "&attribute=" . LCAPI_ATTR_ROLEID . "&filter01=" . LCAPI_ATTR_USERID . "&filter01value=" . $userid . "&filter02=" . LCAPI_ATTR_OBJECTID . "&filter02value=" . $this->prefix . $roomid;
+ $params = "&attribute=" . LCAPI_ATTR_ROLEID . "&filter01=" . LCAPI_ATTR_USERID .
+ "&filter01value=" . $userid . "&filter02=" . LCAPI_ATTR_OBJECTID .
+ "&filter02value=" . $this->prefix . $roomid;
$response = $this->lcapi_send_query(LCAPI_FUNCTION_LIST_ROLE, $params);
preg_match("(\d*)", $response, $matches);
@@ -732,7 +696,7 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_EQRY);
- error_log(__FUNCTION__ . ": request '$params', response: $reponse");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": request '$params', response: $reponse");
return false;
}
// Some dichotomy to retreive the role name
@@ -740,12 +704,11 @@
$records = explode(LCAPI_RECORD_SEPERATOR, $body);
$result = explode(LCAPI_ATTR_ROLEID . "=", $records[0]);
$result = explode("\n", $result[1]);
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": returning answer: " . $result[0]);
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": returning answer: " . $result[0]);
return $result[0];
}
+
/**
* Check if the room is an archive
*
@@ -761,13 +724,14 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_EQRY);
- error_log(__FUNCTION__ . ": Cannot perform query: $params, reponse: $response");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Cannot perform query: $params, reponse: $response");
return false;
}
list (, $body) = explode("\n", $response, 2);
$records = explode(LCAPI_RECORD_SEPARATOR, $body);
return (count($records) > 1);
}
+
/**
* Give the name of the room given
*
@@ -783,7 +747,7 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_EQRY);
- error_log(__FUNCTION__ . ": cannot retrieve the room name");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": cannot retrieve the room name");
return false;
}
list (, $body) = explode("\n", $response, 2);
@@ -794,19 +758,15 @@
list ($key, $value) = explode("=", $line);
if ($key == LCAPI_ATTR_LONGNAME)
{
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": $this->prefix.$roomid's room name is $value");
- }
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": $this->prefix.$roomid's room name is $value");
return $value;
}
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": did not find name of room: $roomid");
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": did not find name of room: $roomid");
return false;
}
+
/**
* Give the media type of the room given
*
@@ -822,7 +782,7 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_EQRY);
- error_log(__FUNCTION__ . ": Cannot query the media type of $roomid");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Cannot query the media type of $roomid");
return false;
}
list (, $body) = explode("\n", $response, 2);
@@ -833,16 +793,11 @@
list ($key, $value) = explode("=", $line);
if ($key == LCAPI_ATTR_MEDIATYPE)
{
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": $roomid's media type is $value");
- }
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": $roomid's media type is $value");
return $value;
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": did not find media type for $roomid");
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": did not find media type for $roomid");
return false;
}
}
@@ -863,7 +818,7 @@
if ($respcode != 100)
{
// $this->lcapi_error(self::LCAPIEQRY);
- error_log(__FUNCTION__ . ": cannot query room info for $roomid");
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": cannot query room info for $roomid");
return false;
}
list (, $body) = explode("\n", $response, 2);
@@ -877,14 +832,14 @@
$roominfo[$key] = $value;
}
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": returning room info for $roomid: " . print_r($roominfo, true));
- }
+
$room = new LCRoom();
- $room->setByRecord($roominfo, $this->prefix);
+ $room->setByRecord($roominfo, $this->prefix);.
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": returning room info for $roomid: " . print_r($roominfo, true));
return $room;
}
+
/**
* Returns status information from the server
*
@@ -898,7 +853,7 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_EQRY);
- error_log(__FUNCTION__ . ": Query failed: " . $response);
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Query failed: " . $response);
return false;
}
list (, $body) = explode("\n", $response, 2);
@@ -909,12 +864,11 @@
list ($key, $value) = explode("=", $line);
$answer[trim($key)] = trim($value);
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": returning server status: " . print_r($answer, true));
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": returning server status: " . print_r($answer, true));
return $answer;
}
+
/**
* Returns the system configuration
*
@@ -928,7 +882,7 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_EQRY);
- error_log(__FUNCTION__ . ": Query failed: " . $response);
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Query failed: " . $response);
return false;
}
list (, $body) = explode("\n", $response, 2);
@@ -940,12 +894,11 @@
list (, $value) = explode("=", $lines[1], 2);
$answers[trim($key)] = trim($value);
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": returning server config: " . print_r($answers, true));
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": returning server config: " . print_r($answers, true));
return $answers;
}
+
function lcapi_get_simulcast()
{
$response = $this->lcapi_send_query(LCAPI_FUNCTION_LIST_SIMULCAST, '');
@@ -954,7 +907,7 @@
if ($respcode != 100)
{
$this->lcapi_error(LCAPI_EQRY);
- error_log(__FUNCTION__ . ": Query failed: " . $response);
+ wimba_add_error(WIMBA_ERROR,WC,__FUNCTION__ . ": Query failed: " . $response);
return false;
}
list (, $body) = explode("\n", $response, 2);
@@ -966,10 +919,8 @@
list (, $value) = explode("=", $lines[1], 2);
$answers[trim($key)] = trim($value);
}
- if (LCAPI_DEBUG)
- {
- error_log(__FUNCTION__ . ": returning server config: " . print_r($answers, true));
- }
+
+ wimba_add_error(WIMBA_DEBUG,WC,__FUNCTION__ . ": returning server config: " . print_r($answers, true));
return $answers;
}
}
Modified: branches/team/Thomas/integrations_common/php/vt/VtAction.php
===================================================================
--- branches/team/Thomas/integrations_common/php/vt/VtAction.php 2008-02-11 21:25:53 UTC (rev 241)
+++ branches/team/Thomas/integrations_common/php/vt/VtAction.php 2008-02-14 23:21:43 UTC (rev 242)
@@ -31,7 +31,7 @@
{
$ressource->setTitle(stripslashes($this->params["longname"]));
}
-
+
if ($this->params["led"] == "student")
{
$options->setFilter("false");
@@ -59,10 +59,7 @@
//create the resource on the vt server
$result = voicetools_api_create_resource($ressource->getResource());
- if (VTAPI_DEBUG)
- {
- error_log (__FUNCTION__ ." : Board Created , rid=".$result->getRid(), TRUE);
- }
+
return $result;
}
@@ -128,13 +125,14 @@
$audio = new vtAudioFormat(NULL);
$options = new VtOptions(NULL);
// Info
- $ressource->setType("presentation"); //Voice Baord
+ $ressource->setType("presentation"); //Voice Presentation
if (isset($this->params["description"]))
{
$ressource->setDescription(stripslashes($this->params["description"]));
}
- if (isset($this->params["longname"])) {
+ if (isset($this->params["longname"]))
+ {
$ressource->setTitle(stripslashes($this->params["longname"]));
}
Modified: branches/team/Thomas/integrations_common/php/vt/WimbaVoicetoolsAPI.php
===================================================================
--- branches/team/Thomas/integrations_common/php/vt/WimbaVoicetoolsAPI.php 2008-02-11 21:25:53 UTC (rev 241)
+++ branches/team/Thomas/integrations_common/php/vt/WimbaVoicetoolsAPI.php 2008-02-14 23:21:43 UTC (rev 242)
@@ -1,44 +1,39 @@
-<?PHP
-/******************************************************************************
-* *
-* Copyright (c) 1999-2006 Horizon Wimba, All Rights Reserved. *
-* *
-* COPYRIGHT: *
-* This software is the property of Horizon Wimba. *
-* You can redistribute it and/or modify it under the terms of *
-* the GNU General Public License as published by the *
-* Free Software Foundation. *
-* *
-* WARRANTIES: *
-* This software is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public License *
-* along with the Horizon Wimba Moodle Integration; *
-* if not, write to the Free Software Foundation, Inc., *
-* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
-* *
-* Author: Hugues Pisapia *
-* *
-* Date: 15th April 2006 *
-* *
-******************************************************************************/
+<?php
+/**
+ * Copyright (c) 1999-2006 Horizon Wimba, All Rights Reserved. *
+ *
+ * COPYRIGHT: *
+ * This software is the property of Horizon Wimba. *
+ * You can redistribute it and/or modify it under the terms of *
+ * the GNU General Public License as published by the *
+ * Free Software Foundation. *
+ *
+ * WARRANTIES: *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ *
+ * You should have received a copy of the GNU General Public License *
+ * along with the Horizon Wimba Moodle Integration; *
+ * if not, write to the Free Software Foundation, Inc., *
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
+ *
+ * Author: Hugues Pisapia *
+ *
+ * Date: 15th April 2006 *
+ */
/* $Id: WimbaVoicetoolsAPI.php 50661 2007-06-28 20:33:11Z thomasr $ */
-error_reporting(E_ALL);
+error_reporting(E_ALL);
global $CFG;
-//WebService Client.
-require_once($CFG->libdir.'/soap/nusoap.php');
+// WebService Client.
+require_once($CFG->libdir . '/soap/nusoap.php');
require_once("WimbaVoicetools.php");
-
-define("VTAPI_DEBUG", false);//for the log
-
-/// Library of functions and constants for the voicetool API
-
+define("VTAPI_DEBUG", false); //for the log
+// / Library of functions and constants for the voicetool API
// Resources
define("VT_API_VBOARD", 'board');
define("VT_API_VMAIL", 'vmail');
@@ -46,7 +41,6 @@
define("VT_API_VRECORDER", 'recorder');
define("VT_API_VPRESENTATION", 'presentation');
define("VT_API_PODCASTER", 'pc');
-
// Qudio Qualities
define("VT_API_QUALITY_BASIC", 'spx_8_q3');
define("VT_API_QUALITY_STANDARD", 'spx_16_q4');
@@ -55,7 +49,6 @@
// API calls
define("VT_API_SERVICES", '/services/Broker?wsdl');
-
define("VT_API_CREATE_RESOURCE", 'createResource');
define("VT_API_MODIFY_RESOURCE", 'modifyResource');
define("VT_API_DELETE_RESOURCE", 'deleteResource');
@@ -69,583 +62,601 @@
define("VT_API_GET_AUDIO", 'getAudio');
define("VT_API_AUDIO_EXISTS", 'audioExists');
define("VT_API_GET_VERSION", 'getVersion');
-
-// Voice Tools Module Tables
+// Voice Tools Module Tables
define("VT_API_ACTIVITY", 'voicetools_activity');
define("VT_API_INSTANCE", 'voicetools_instance');
-set_time_limit(30);
/**
-* Send an SDK request to the VT server to create the resource.
-* @uses CFG
-* @uses VT_API_SERVICES
-* @uses VT_API_CREATE_RESOURCE
-* @param $resource_data - the resource to create
-* @return - the object returned by the call, or false if something goes wrong
-*/
-function voicetools_api_create_resource ($resource_data) {
- global $CFG;
+ * Send an SDK request to the VT server to create the resource.
+ *
+ * @uses CFG
+ * @uses VT_API_SERVICES
+ * @uses VT_API_CREATE_RESOURCE
+ * @param $resource_data - the resource to create
+ * @return - the object returned by the call, or false if something goes wrong
+ */
+function voicetools_api_create_resource ($resource_data)
+{
+ global $CFG;
+ // Set the WebService URL
+ $soapclient = new soap_client($CFG->voicetools_servername . VT_API_SERVICES, true);
+ $err = $soapclient->getError();
+ if ($err)
+ {
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ return null;
+ }
+ // Set the parameters to send to the WebService
+ $resourceArray = array ($CFG->voicetools_adminusername, $CFG->voicetools_adminpassword, $resource_data);
+ // Call the WebService and store its result in $result.
+ $result = $soapclient->call(VT_API_CREATE_RESOURCE, $resourceArray);
- // Set the WebService URL
- $soapclient = new soap_client($CFG->voicetools_servername.VT_API_SERVICES,true);
- $err = $soapclient->getError();
- if ($err)
- {
- error_log (__FUNCTION__ .' : Error to create the soap element : ' .$err, TRUE);
- return NULL;
- }
- // Set the parameters to send to the WebService
- $resourceArray = array ($CFG->voicetools_adminusername,$CFG->voicetools_adminpassword,$resource_data);
+ if ($soapclient->fault)
+ {
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ return null;
+ }
+ else
+ {
+ // Check for errors
+ $err = $soapclient->getError();
+ if ($err)
+ {
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ return null;
+ }
+ }
+ $resource = new vtResource($result);
- // Call the WebService and store its result in $result.
- $result = $soapclient->call(VT_API_CREATE_RESOURCE, $resourceArray);
+ if ($resource->error == "error")
+ {
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . " : Resource not created because " . $resource->error_message);
+ }
+
+ wimba_add_log (WIMBA_DEBUG, WV, __FUNCTION__ . " : Resource Created");
+ return $resource;
+}
- if ($soapclient->fault) {
- error_log (__FUNCTION__ .' : Fault with the web service : ' . $soapclient->fault , TRUE);
- return NULL;
- }
- else
- {
- // Check for errors
+/**
+ * Send an SDK request to the VT server to create the resource.
+ *
+ * @uses CFG
+ * @uses VT_API_SERVICES
+ * @uses VT_API_MODIFY_RESOURCE
+ * @param $resource_data - the resource to create
+ * @return - the object returned by the call, or false if something goes wrong
+ */
+function voicetools_api_modify_resource ($resource_data)
+{
+ global $CFG;
+
+ $soapclient = new soap_client($CFG->voicetools_servername . VT_API_SERVICES, true);
$err = $soapclient->getError();
if ($err)
{
- // Display the error
- error_log (__FUNCTION__ .' : error with the web service : ' . $err , TRUE);
- return NULL;
- }
- }
- $resource=new vtResource($result);
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ return null;
+ }
+ $resourceArray = array ($CFG->voicetools_adminusername, $CFG->voicetools_adminpassword, $resource_data);
- if($resource->error=="error")
- {
- error_log (__FUNCTION__ ." : Resource not created because ".$resource->error_message, TRUE);
-
- }
- if(VTAPI_DEBUG)
- {
- error_log (__FUNCTION__ ." : Resource Created", TRUE);
- }
- return $resource;
-}
+ $result = $soapclient->call(VT_API_MODIFY_RESOURCE, $resourceArray);
-/**
-* Send an SDK request to the VT server to create the resource.
-* @uses CFG
-* @uses VT_API_SERVICES
-* @uses VT_API_MODIFY_RESOURCE
-* @param $resource_data - the resource to create
-* @return - the object returned by the call, or false if something goes wrong
-*/
-function voicetools_api_modify_resource ($resource_data) {
- global $CFG;
+ if ($soapclient->fault)
+ {
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ return null;
+ }
+ else
+ {
+ // Check for errors
+ $err = $soapclient->getError();
+ if ($err) {
+ // Display the error
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ return null;
+ }
+ }
- $soapclient = new soap_client($CFG->voicetools_servername.VT_API_SERVICES,true);
- $err = $soapclient->getError();
- if ($err)
- {
- error_log (__FUNCTION__ .' : Error to create the soap element : ' .$err, TRUE);
- return NULL;
- }
- $resourceArray = array ($CFG->voicetools_adminusername,$CFG->voicetools_adminpassword,$resource_data);
+ $resource = new vtResource($result);
- $result = $soapclient->call(VT_API_MODIFY_RESOURCE, $resourceArray);
+ if ($resource->error == "error")
+ {
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . " : Resource not modified because " . $resource->error_message);
+ return null;
+ }
+
+ wimba_add_log (WIMBA_DEBUG, WV, __FUNCTION__ . " : Resource Modified");
+ return $resource;
+}
- if ($soapclient->fault) {
- error_log (__FUNCTION__ .' : Fault with the web service : ' . $soapclient->fault , TRUE);
- return NULL;
- }
- else
- {
- // Check for errors
+// To CHECK !!!
+function voicetools_api_message_exists ($rid, $mid)
+{
+ global $CFG;
+
+ $soapclient = new soap_client($CFG->voicetools_servername . VT_API_SERVICES, true);
$err = $soapclient->getError();
if ($err)
{
- // Display the error
- error_log (__FUNCTION__ .' : error with the web service : ' . $err , TRUE);
- return NULL;
- }
- }
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ return null;
+ }
+ $resource = array ($CFG->voicetools_adminusername, $CFG->voicetools_adminpassword, $rid, $mid);
- $resource=new vtResource($result);
+ $result = $soapclient->call(VT_API_MESSAGE_EXISTS, $resource);
- if($resource->error=="error")
- {
- error_log (__FUNCTION__ ." : Resource not modified because ".$resource->error_message, TRUE);
- return NULL;
- }
- if(VTAPI_DEBUG)
- {
- error_log (__FUNCTION__ ." : Resource Modified", TRUE);
- }
- return $resource;
-}
+ if ($soapclient->fault)
+ {
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ return null;
+ }
+ else
+ {
+ // Check for errors
+ $err = $soapclient->getError();
+ if ($err)
+ {
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ return null;
+ }
+ }
-// To CHECK !!!
-function voicetools_api_message_exists ($rid, $mid) {
+ $res = false;
+ foreach ($result['values'] as $item)
+ {
+ if ($item['name'] == 'exists')
+ {
+ $res = $item['value'];
+ }
+ }
+ return $res;
+}
- global $CFG;
+/**
+ * Send an SDK request to the VT server to delete a resource.
+ *
+ * @uses CFG
+ * @uses VT_API_SERVICES
+ * @uses VT_API_DELETE_RESOURCE
+ * @param $rid - the rid of the resource to delete
+ * @return - the object returned by the call, or false if something goes wrong
+ */
+function voicetools_api_delete_resource ($rid)
+{
+ global $CFG;
- $soapclient = new soap_client($CFG->voicetools_servername.VT_API_SERVICES,true);
- $err = $soapclient->getError();
- if ($err)
- {
- error_log (__FUNCTION__ .' : Error to create the soap element : ' .$err, TRUE);
- return NULL;
- }
- $resource = array ($CFG->voicetools_adminusername,$CFG->voicetools_adminpassword,$rid,$mid);
-
-
- $result = $soapclient->call(VT_API_MESSAGE_EXISTS, $resource);
-
- if ($soapclient->fault) {
- error_log (__FUNCTION__ .' : Fault with the web service : ' . $soapclient->fault , TRUE);
- return NULL;
- }
- else
- {
- // Check for errors
+ $soapclient = new soap_client($CFG->voicetools_servername . VT_API_SERVICES, true);
$err = $soapclient->getError();
if ($err)
{
- // Display the error
- error_log (__FUNCTION__ .' : error with the web service : ' . $err , TRUE);
- return NULL;
- }
- }
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Error to create the soap element : ' . $err);
+ return null;
+ }
+ $resource = array ($CFG->voicetools_adminusername, $CFG->voicetools_adminpassword, $rid);
- $res=false;
- foreach ($result['values'] as $item)
- {
- if ($item['name'] == 'exists')
+ $result = $soapclient->call(VT_API_DELETE_RESOURCE, $resource);
+
+ if ($soapclient->fault)
{
- $res = $item['value'];
- }
- }
- return $res;
- //return $result;
-}
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : Fault with the web service : ' . $soapclient->fault);
+ return null;
+ }
+ else
+ {
+ // Check for errors
+ $err = $soapclient->getError();
+ if ($err)
+ {
+ // Display the error
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . ' : error with the web service : ' . $err);
+ return null;
+ }
+ }
-/**
-* Send an SDK request to the VT server to delete a resource.
-* @uses CFG
-* @uses VT_API_SERVICES
-* @uses VT_API_DELETE_RESOURCE
-* @param $rid - the rid of the resource to delete
-* @return - the object returned by the call, or false if something goes wrong
-*/
-function voicetools_api_delete_resource ($rid) {
- global $CFG;
+ $resource = new vtResource($result);
- $soapclient = new soap_client($CFG->voicetools_servername.VT_API_SERVICES,true);
- $err = $soapclient->getError();
- if ($err)
- {
- error_log (__FUNCTION__ .' : Error to create the soap element : ' .$err, TRUE);
- return NULL;
- }
- $resource = array ($CFG->voicetools_adminusername,$CFG->voicetools_adminpassword,$rid);
+ if ($resource->error == "error")
+ {
+ wimba_add_log (WIMBA_ERROR, WV, __FUNCTION__ . " : Resource not deleted because " . $resource->error_message);
+ }
- $result = $soapclient->call(VT_API_DELETE_RESOURCE, $resource);
+ wimba_add_log (WIMBA_DEBUG, WV, __FUNCTION__ . " : Resource Deleted");
+ return $resource;
+}
- if ($soapclient->fault) {
- error_log (__FUNCTION__ .' : Fault with the web service : ' . $soapclient->fault , TRUE);
- return NULL;
- }
- else
- {
- // Check for errors
+/**
+ * Send an SDK request to the VT server to test if the resource exist.
+ *
+ * @uses CFG
+ * @uses VT_API_SERVICES
+ * @uses VT_API_RESOURCE_EXISTS
+ * @param $rid - the rid of the resource to find
+ * @return - a boolean. true if the resource exist, false elsewhere.
+ */
+function voicetools_api_resource_exists ($rid)
+{
+ global $CFG;
+
+ $soapclient = new soap_client($CFG->voicetools_servername . VT_API_SERVICES, true);
$err = $soa...
[truncated message content] |
