|
From: <sh...@us...> - 2006-12-07 10:41:23
|
Revision: 105
http://svn.sourceforge.net/hw4mdl/?rev=105&view=rev
Author: shazan
Date: 2006-12-07 02:41:11 -0800 (Thu, 07 Dec 2006)
Log Message:
-----------
add features :logs, new room form when no room are available.
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/generateListRooms.php
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/index.php
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/manageRoomAction.php
trunk/moodle/mod/liveclassroom/mod.html
trunk/moodle/mod/liveclassroom/reports.php
trunk/moodle/mod/liveclassroom/view.php
trunk/moodle/mod/liveclassroom/welcome.php
Added Paths:
-----------
trunk/moodle/mod/liveclassroom/js/Ajax.js
trunk/moodle/mod/liveclassroom/js/constants.js
trunk/moodle/mod/liveclassroom/js/hwCommons.js
trunk/moodle/mod/liveclassroom/js/manageXml.js
trunk/moodle/mod/liveclassroom/js/pngfix.js
trunk/moodle/mod/liveclassroom/js/verifForm.js
trunk/moodle/mod/liveclassroom/logs.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-11-29 12:35:15 UTC (rev 104)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-07 10:41:11 UTC (rev 105)
@@ -65,7 +65,6 @@
$LIVECLASSROOM_API_RECORD_SEPERATOR = "=END RECORD";
-//session_start();
/**
@@ -101,9 +100,6 @@
"&credential_0=". $login.
"&credential_1=". $passwd;
- //add_to_log("", "liveclassroom", "", "", "auth ".time());
-
-
$cookie_file_path = $CFG->dataroot.'/cookie.txt'; // Cookie File path
$cook = fopen($CFG->dataroot.'/tmp.txt', "w+"); //temporary file to check the date
fputs($cook,time()); // Add the current time into the file = last authenticate time
@@ -119,7 +115,8 @@
$data = curl_exec($ch);
if (curl_errno($ch)) {
- print curl_error($ch);
+ add_to_log("", "liveclassroom", "URL", "", "URL incorrect");
+ // print curl_error($ch);
return false;
}
preg_match("(\d*)", $data, $matches);
@@ -127,11 +124,12 @@
if ( $resp_code != 100 && $resp_code != 301) {
//error( "Response: Authentication Failed: $resp_code");
+ add_to_log("", "liveclassroom", "Authentication", "", "Authentication Failed: $resp_code");
return false;
}
-
curl_close($ch);
//fclose($cook);
+ add_to_log("", "liveclassroom", "Authentication", "", "Authentication succeeded");
return $ch;
}
@@ -186,7 +184,7 @@
print curl_error($ch);
return false;
}
-
+
return $data;
}
@@ -214,18 +212,20 @@
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
- /*
- if ( $respcode == 301) {
- error( "Creation user failed, already exist");
+/*
+ if ( $respcode == 302) {
+ error( "Creation user failed, malformed exist");
return false;
- }*/
-
+ }
+ */
+
+
if ( $respcode != 100 && $respcode != 301) {
- error( "Response: Account ($userId) Creation Failed: $resp_code");
+ add_to_log("", "liveclassroom", "Create User", "", "$userId Creation Failed");
+ // error( "Response: Account ($userId) Creation Failed: $resp_code");
return false;
}
-
-
+ add_to_log("", "liveclassroom", "Create User", "", "$userId Creation succeeded");
return true;
}
@@ -275,13 +275,13 @@
$data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_TOKEN, "&target=$userid&nickname=$nickname");
- add_to_log("", "liveclassroom", "", "liveclassroom_api_get_session", "userid: ".$userid." nickname ". $nickname);
+
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
if ( $respcode != 100) {
- error( "Response: Cannot Create Session: $resp_code");
+ add_to_log("", "liveclassroom", "Create Session", "", "Cannot Create Session : $resp_code");
return false;
}
@@ -299,13 +299,14 @@
$authtoken= substr($currentline, 10);
//DEBUG
- //add_to_log("", "liveclassroom", "", "liveclassroom_api_get_session", "AuthToken: '$authtoken'");
+
if (empty($authtoken)) {
//error ("Token empty, data=<pre>$data</pre>");
return false;
}
-
+ add_to_log("", "liveclassroom", "", "create session", "Creating Session for $nickname");
+
return $authtoken;
}
@@ -327,9 +328,9 @@
}
}
$final_list = "&target=$roomid"."&longname=$roomname".$list_attributes;
-// echo $final_list;
+
$data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_CREATE_CLASS,$final_list);
- add_to_log("", "liveclassroom", "", "liveclassroom_api_create_class", "apres query".$roomname);
+
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -338,10 +339,11 @@
return false;
}
if ( $respcode != 100) {
- error( "Response: Cannot Create Class with id:$roomid, and name: $roomname.");
+ add_to_log("", "liveclassroom", "Create Room", "", "Cannot Create Class with id:$roomid, and name: $roomname.");
return false;
}
- // add_to_log("", "liveclassroom", "", "liveclassroom_api_create_class", "avan retour".time());
+
+ add_to_log("", "liveclassroom", "Create Room", "", "$roomname create with success");
return true;
}
@@ -464,6 +466,8 @@
$response = split($pattern,$line);
//$result = substr($response[1],0,-1);
+
+
return $response[1];
}
@@ -490,7 +494,7 @@
}
$tok = split("100 OK",$data);
$tok1 = split($LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
- $result = liveclassroom_parse_line($tok1[0],"class_id=");
+ $result = liveclassroom_parse_line($tok1[0],"class_id=");
//Remove le " " at the end of the line
$response = substr($result,0,-1);
@@ -514,12 +518,16 @@
liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_DELETE_ROOM,"&target=$roomid");
if ( $respcode == 302) {
- error( "Target not found");
+ add_to_log("", "liveclassroom", "Delete Room", "", "$roomid suppression failed, target not found");
+ // error( "Target not found");
return false;
}
else if ( $respcode != 100) {
+ add_to_log("", "liveclassroom", "Delete Room", "", "$roomid suppression failed");
return false;
}
+
+ add_to_log("", "liveclassroom", "Delete Room", "", "$roomid has been deleted with success");
return true;
}
@@ -539,13 +547,14 @@
$respcode = $matches[0];
if ( $respcode == 302) {
- error( "Target not found");
+ add_to_log("", "liveclassroom", "Open Room", "", "$roomid opening failed, target nor found");
return false;
}
if ( $respcode != 100) {
+ add_to_log("", "liveclassroom", "Open Room", "", "$roomid opening failed");
return false;
}
-
+ add_to_log("", "liveclassroom", "Open Room", "", "$roomid has been opened with success");
return true;
}
@@ -565,13 +574,15 @@
$respcode = $matches[0];
if ( $respcode == 302) {
- error( "Target not found");
+ add_to_log("", "liveclassroom", "Close Room", "", "$roomid closing failed, target nor found");
+
return false;
}
if ( $respcode != 100) {
+ add_to_log("", "liveclassroom", "Close Room", "", "$roomid closing failed");
return false;
}
-
+ add_to_log("", "liveclassroom", "Close Room", "", "$roomid has been closed with success");
return true;
}
@@ -602,10 +613,11 @@
$respcode = $matches[0];
if ( $respcode != 100) {
+ add_to_log("", "liveclassroom", "Modify Room", "", "$roomid modification failed");
return false;
}
-
+ add_to_log("", "liveclassroom", "Modify Room", "", "$roomid has been modified with success");
return true;
}
@@ -1344,6 +1356,7 @@
$roomid= liveclassroom_parse_line($line[$i+1],"class_id="); //class_id
$roomname= liveclassroom_parse_line($line[$i+2],"longname="); //longname
+
$roompreview= liveclassroom_parse_line($line[$i],"preview="); //preview
$element = $xmldoc->createElement('listElement');
@@ -1416,7 +1429,7 @@
$archivename = $xmldoc->createElement('nameDisplay');
$archivename->appendChild($xmldoc->createTextNode("$tabarchive_value[2]"));
$archivepreview = $xmldoc->createElement('preview');
- add_to_log("", "liveclassroom", "view all", "archive", $tabarchive_value[0]);
+
if($tabarchive_value[0]=="1") {
$archivepreview->appendChild($xmldoc->createTextNode("unavailable"));
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2006-11-29 12:35:15 UTC (rev 104)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2006-12-07 10:41:11 UTC (rev 105)
@@ -14,6 +14,9 @@
body p, body div, body li, body li li,
body input, body textarea, body select, body option ,td textarea
{font-size:100%;}
+
+
+
.page_title
{
font-family: Verdana, Arial, Helvetica, sans-serif;
@@ -34,61 +37,89 @@
padding-left:2px;
vertical-align:middle;
}
-table.tab
-{
- width:100%;
+.limitWidth
+{
+ width:160px;
}
-table.tab td
+.alignRight
{
- vertical-align:top;
+ padding-right: 5px;
+
}
+.shiftAvailability
+{
+
+ padding-right:100px;
+}
div.tab
{
- padding-top:2%;
- padding-left:5%;
+ padding-top:2%;
+
+ padding-left:5%;
+ padding-right:5%;
display: none;
height:180px;
+
+
}
+
+.button_hide
+{
+
+ width:25px;
+ display:none;
+}
div.current_tab
{
- margin-top:2%;
- margin-left:5%;
+ padding-top:2%;
+
+ padding-left:5%;
+ padding-right:5%;
position: relative;
display: block;
height:180px;
+
+
}
td.tabSelected
-{
+{
+
background-image:url(../pictures/tab_Select.gif);
background-repeat: no-repeat;
width: 78px;
- font-size: 10pt;
+ font-size: 10px;
font-family: Verdana;
-}
-td.tabDisabled
-{
-background-image:url(../pictures/tab_disabled.gif);
+ }
+
+ td.tabDisabled
+{
+ color:#CACACA;
+ background-image:url(../pictures/tab.gif);
background-repeat: no-repeat;
width: 78px;
- font-size: 10pt;
+ font-size: 10px;
font-family: Verdana;
border-bottom:solid 1px #818181;
-}
+ }
td.tabNoSelected
-{
-background-image:url(../pictures/tab.gif);
+{
+
+ background-image:url(../pictures/tab.gif);
background-repeat: no-repeat;
width: 78px;
- font-size: 10pt;
+ font-size: 10px;
font-family: Verdana;
border-bottom:solid 1px #818181;
}
+
a {
text-decoration:none;
color:Black; }
+
a:hover {
text-decoration:none;
color:Black; }
+
td.action,input.action{
background-image:url(../pictures/buttons/general-empty.png);
background-repeat :no-repeat;
@@ -111,28 +142,43 @@
{
cursor:pointer
}
+
.alert
{
color:Red;
}
-a.room {
-color:#889EB3;
+
+
+
+a.room { color:#889EB3;
+
text-decoration:none;
display:block;
width:100%;
+
}
-a.room:hover {color:#889EB3;
+
+a.room:hover {color:#889EB3;
+
+
text-decoration:none;
- border: none;
- background-position: 3px 4px;
+ border: none;
+
+ background-position: 3px 4px;
+
}
+
+
.info a{
position:relative; /*this is the key*/
z-index:24;
color:#000;
text-decoration:none}
+
.info a:hover{z-index:25;text-decoration:underline;}
+
.info a span{display: none;font-size:8pt;}
+
.info a:hover span{ /*the span will display just on :hover state*/
font-size:8pt;
display:block;
@@ -140,55 +186,80 @@
top:1.5em; left:5em; width:28em;
border:1px solid #FFF99F;
background-color:#FFF99F; color:#000;
- text-align: center}
-.button_disabled a{
+ text-align: center}
+
+
+
+.button_disabled {
+
color:#666666;
font-family: Arial;
text-decoration:none;
font-size: 9px;
- height:44px;
+
}
-.button_disabled a:hover
+
+
+.button_enabled a
{
- color:#666666;
+
+ color:black;
font-family: Arial;
- text-decoration:none;
+ width:30px;
font-size: 9px;
- cursor:pointer;
+
}
-.button_enabled a
+
+.separator_space
{
- color:black;
+ width:2px;
+ }
+
+.empty_space
+{
+ width:30px;
+ }
+
+
+.button_enabled a:hover{ color:black;
+
font-family: Arial;
- text-decoration:none;
- font-size: 9px;
-}
-.button_enabled a:hover{ color:black;
- font-family: Arial;
+
font-size: 9px;
- text-decoration: underline;
- display:block;
+ font-weight:bold;
+
cursor:hand;
}
+
+
+
+
tr.selectRoom{
background-color:red;
cursor:hand;
}
.divProduct
{
- padding-top:3px;
+ padding-top:3px;
+padding-left:5px ;
}
+
+
.shortShift{
+
padding-left:5px;
}
-.room td{
+
+.room td{
+ padding-left:5px ;
font-family:Verdana;
color:Black;
font-size:10;
border-bottom:solid 1px #F3F3F3;
cursor:pointer;
}
-.room label{
+.room label{
+
font-family:Verdana;
color:Black;
font-size:10;
@@ -204,35 +275,44 @@
cursor:pointer;
cursor:hand;
}
-.archive{
+
+.archive{
+ padding-left:5px ;
font-family:Verdana;
color:#666666;
font-style:italic;
font-size:11px;
border-bottom:solid 1px #F3F3F3;
}
-.filterBar {
+.filterBar table{
+ padding-left:5px ;
background-image:url("../pictures/backgrounds/filterbar.png");
height:24px;
font-weight:bold ;
width:100%;
border-bottom:fine 1px #C7D3E1
}
+
+
+
.filter_enabled
{
font-family :Verdana;
color:#333333;
height:24px;
- font-size:12px;
+ font-size:10px;
font-weight:bold ;
}
+
.filter_selected
{ font-weight:bold ;
font-family :Verdana;
color:#ffffff;
height:24px;
- font-size:12px;
+ font-size:10px;
+
}
+
.filter_left_enabled
{
background-image:url("../pictures/items/filter-enabled-left.png");
@@ -243,57 +323,78 @@
font-family :Verdana;
color:#ffffff;
height:24px;
- font-size:12px;
+ font-size:10px;
font-weight:bold ;
}
.filter_right_enabled
{
background-image:url("../pictures/items/filter-enabled-right.png");
}
+
.contextBar table
{
+ padding-left:5px;
+ padding-right:5px;
background-image:url("../pictures/backgrounds/toolbar.png");
height:30px;
- width:100%
+ width:100%
+
}
+
.tabBackground
{
background-image:url("../pictures/backgrounds/toolbar.png");
+
}
+
.productChoice table
-{
+{
+
height:72px;
border-bottom:solid 1px #F0F0F0;
margin-left:10px;
margin-right:10px;
+
}
-.comment{
+
+
+.comment{
+
font-family:Verdana;
color:#555555;
font-style:italic;
font-size:11px;
padding-left:20px;
}
+
.subOption td {
- font-family:Verdana;
+
+ font-family:Verdana;
+
font-size:11px;
padding-left:20px;
vertical-align:top;
}
+
.roomNameForSettings
{
font-family:Verdana;
font-weight: bold;
- font-size:12px;
+ font-size:12px;
+
+
}
+
.hide
{
display:none;
}
+
.visible
{
display:block;
}
+
label.moreRoom
{
color:Navy;
@@ -301,56 +402,80 @@
padding-left:20px;
font-weight: bold;
}
+
+
#popup {
+
display:none;
font-size:8pt;
display:block;
position:absolute;
- top:50%; left:50%;
+ top:50%; left:50%;
+
color:#000;
text-align: center;
}
+
+
.expand
{
background-color:Black;
-}.headerBar table
+}
+
+
+.headerBar table
{
-padding:0px ;
+padding-left:5px ;
width:100%;
+padding-right:5px ;
+
background-image:url("../pictures/backgrounds/headerbar.png");
height:32px;
border-bottom:solid 1px Black;
+
}
.toolBar table
{
+ padding-left:5px ;
width:100%;
- padding:0px ;
+
background-image:url("../pictures/backgrounds/toolbar.png");
+
+
}
-.search
-{
- max-width:105px;
- }
+
.list
{
- height:280px;
+ height:215px;
overflow-y:scroll;
+
+
}
-.productTitle {
+.lineTitle{
+
+padding-left:10px
+}
+.productTitle{
+
background-color:#B0C1D5;
font-family:Verdana;
color:White;
font-size:12px;
height:16px;
font-weight:bold;
- cursor:default;
+ cursor:default;
+
+
}
.validationBar table
{
width:100%;
height:24px ;
padding:0px ;
- background-color:#F0F0F0;
+ background-color:#F0F0F0;
+
+
+
}
.panelSettings table
{
@@ -359,12 +484,11 @@
display:none;
width:100%
}
-.part td
+
+
+ .part td
{
+
width:100%;
border-bottom: #818181 1px solid;
- }
- .messageBar
- {
- background-color:#ffff99;
}
\ No newline at end of file
Modified: trunk/moodle/mod/liveclassroom/generateListRooms.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-11-29 12:35:15 UTC (rev 104)
+++ trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-07 10:41:11 UTC (rev 105)
@@ -88,7 +88,7 @@
$menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'all', 'all', 'pictures/buttons/toolbar-launch', 'Launch', 'Launch()', "hza=".$params['authToken']));
$menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-activities', 'Add Activity', "doOpenAddActivity('../../course/mod.php','add=liveclassroom')",''));
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'true', 'button', 'instructor', 'all', 'pictures/buttons/new-createroom', 'New', "launchAjaxRequest('generateSettings.php','Management','new','true')", ''));
+ $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'true', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-new', 'New', "launchAjaxRequest('generateSettings.php','Management','new','true')", ''));
$menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'true', 'fixSpace', 'all', 'all', '', '', '', '', ''));
$menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-content', 'Content', "openContentWindows()", ''));
$menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-poll', 'Reports', 'doOpenReport()',''));
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2006-11-29 12:35:15 UTC (rev 104)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-07 10:41:11 UTC (rev 105)
@@ -130,9 +130,17 @@
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
-
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "label", $parameters=array("class" => "alert", "value" => "*") ));
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Title : ") ));
+
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode("right"));
+ $linepart->appendChild($align);
+
+ $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay, "label", $parameters=array("class" => "alert", "value" => "*") ));
+ $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"label", $parameters=array("value" => "Title : ") ));
$panelLine->appendChild($linepart);
$parameters=array("id" => "longname", "maxlength" => "50", "name" => "longname", "type" => "text");
@@ -141,7 +149,16 @@
}
$linepart = $xmldoc->createElement('panelLinePart');
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"input", $parameters));
+
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
+
+ $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"input", $parameters));
$panelLine->appendChild($linepart);
$panelContent->appendChild($panelLine);
@@ -154,11 +171,27 @@
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
-
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Description : ") ));
+
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode("right"));
+ $linepart->appendChild($align);
+
+ $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"label", $parameters=array("value" => "Description : ") ));
$panelLine->appendChild($linepart);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
+
$linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"textarea", $parameters=array("cols" => "40", "id" => "description", "value" => $room_info['description'], "name" => "description", "rows" => "4") ));
$panelLine->appendChild($linepart);
@@ -172,8 +205,14 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(""));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay ,"label", $parameters=array("value" => "Type : ") ));
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode("right"));
+ $linepart->appendChild($align);
+ $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay ,"label", $parameters=array("value" => "Type : ") ));
$panelLine->appendChild($linepart);
$parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"mainLectureRoom\")") ;
@@ -192,12 +231,19 @@
}
$linepart = $xmldoc->createElement('panelLinePart');
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,"mainLectureRoom","input", $parameters));
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
+ $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, "mainLectureRoom","input", $parameters));
$panelLine->appendChild($linepart);
$parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"mainLectureRoom\")") ;
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,"discussionRoom","input", $parameters));
+ $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, "discussionRoom","input", $parameters));
$panelLine->appendChild($linepart);
@@ -221,10 +267,24 @@
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" =>"")));
$panelLine->appendChild($linepart);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"discussionRoom\")") ;
$linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,"mainLectureRoom","input", $parameters));
@@ -268,7 +328,7 @@
$panelSettingsM = $xmldoc->createElement('panelSettings');
// MEDIA PANEL INFO
- $panelSettingsM->appendChild(create_panel_info($xmldoc, 'mainLectureRoom', 'tabSelected', 'tabDisabled', 'Media', "2", 'none'));
+ $panelSettingsM->appendChild(create_panel_info($xmldoc, 'mainLectureRoom', 'tabNoSelected', 'tabDisabled', 'Media', "2", 'none'));
// MEDIA CONTENT
$panelContentM = $xmldoc->createElement('panelContent');
@@ -281,7 +341,13 @@
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "radio", "value" => "two-way-audio", "id" => "audio", "name" => "media_type", "onclick" =>"doChangeMedia(\"audio\")") ;
if($action=='update') {
if($room_info['media_type']=="two-way-audio") $parameters['checked']=true;
@@ -301,7 +367,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "student_simulcast", "name" => "hms_simulcast_restricted") ;
if($action=='update'){
if($room_info['hms_simulcast_restricted']==1){
@@ -335,7 +407,14 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
+
$parameters=array("type" => "checkbox", "value" => "1", "id" => "two_way_enabled", "name" => "hms_two_way_enabled") ;
if($action=='update'){
if($room_info['hms_two_way_enabled']==1){
@@ -361,14 +440,20 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "radio", "value" => "one-way-audio", "id" => "video", "name" => "media_type", "onclick" => "doChangeMedia(\"video\")") ;
if($action=='update'){
if($room_info['media_type']=="one-way-video"){
$parameters['checked']=true;
}
}
-
+
$linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
$panelLine->appendChild($linepart);
$linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "One-way Video") ));
@@ -390,7 +475,13 @@
$panelLineId->appendChild($xmldoc->createTextNode("roomId_row"));
$panelLine->appendChild($panelLineId);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "roomId_field", "value" => "Room Id : ") ));
$panelLine->appendChild($linepart);
@@ -413,7 +504,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "radio", "value" => "none", "id" => "none", "name" => "media_type", "onclick" => "doChangeMedia(\"none\")") ;
if($action=='update') {
if($room_info['media_type']=="none") $parameters['checked']=true;
@@ -435,7 +532,7 @@
$panelSettings = $xmldoc->createElement('panelSettings');
// FEATURES PANEL INFO
- $panelSettings->appendChild(create_panel_info($xmldoc, 'mainLectureRoom-discussionRoom', 'tabSelected', 'tabDisabled', 'Features', "3", 'none'));
+ $panelSettings->appendChild(create_panel_info($xmldoc, 'mainLectureRoom-discussionRoom', 'tabNoSelected', 'tabDisabled', 'Features', "3", 'none'));
@@ -448,7 +545,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_eboard", "name" => "student_wb_enabled") ;
if($action=='update'){
if($room_info['student_wb_enabled']==1) $parameters['checked']=true;
@@ -467,7 +570,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_liveapp", "name" => "student_wb_liveapp") ;
if($action=='update'){
if($room_info['student_wb_liveapp']==1) $parameters['checked']=true;
@@ -487,7 +596,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "enable_archive", "name" => "can_archive") ;
if($action=='update'){
if($room_info['can_archive']==1) $parameters['checked']=true;
@@ -507,7 +622,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "enable_appshare", "name" => "can_liveshare") ;
if($action=='update'){
if($room_info['can_liveshare']==1) $parameters['checked']=true;
@@ -527,7 +648,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "enable_ppt", "name" => "can_ppt_import") ;
if($action=='update'){
if($room_info['can_ppt_import']==1) $parameters['checked']=true;
@@ -549,7 +676,7 @@
// ------------------ CHAT --------------------
// CHAT PANEL INFO
$panelSettings = $xmldoc->createElement('panelSettings');
- $panelSettings->appendChild(create_panel_info($xmldoc, 'mainLectureRoom', 'tabSelected', 'tabDisabled', 'Chat', "4", 'none'));
+ $panelSettings->appendChild(create_panel_info($xmldoc, 'mainLectureRoom', 'tabNoSelected', 'tabDisabled', 'Chat', "4", 'none'));
// CHAT CONTENT
$panelContent = $xmldoc->createElement('panelContent');
@@ -560,7 +687,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_chat", "name" => "chatenable") ;
if($action=='update'){
if($room_info['chatenable']==1) $parameters['checked']=true;
@@ -579,7 +712,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "radio", "value" => "1", "id" => "privateenabled", "name" => "privatechatenable") ;
if($action=='update'){
if($room_info['privatechatenable']==1)$parameters['checked']=true;
@@ -598,7 +737,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "radio", "value" => "0", "id" => "privatedisbledd", "name" => "privatechatenable") ;
if($action=='update'){
if($room_info['privatechatenable']==0) $parameters['checked']=true;
@@ -616,7 +761,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Note :Students are always able to chat with presenters and/or technical help") ));
$panelLine->appendChild($linepart);
@@ -630,7 +781,7 @@
// ------------------- ACCESS ----------------------
$panelSettings = $xmldoc->createElement('panelSettings');
// ACCESS PANEL INFO
- $panelSettings->appendChild(create_panel_info($xmldoc, 'all', 'tabSelected', 'tabDisabled', 'Access', "5", 'none'));
+ $panelSettings->appendChild(create_panel_info($xmldoc, 'all', 'tabNoSelected', 'tabDisabled', 'Access', "5", 'none'));
// ACCESS CONTENT
$panelContent = $xmldoc->createElement('panelContent');
@@ -641,7 +792,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "checkbox", "value" => "0", "id" => "acessAvailable_true", "name" => "preview") ;
if($action=='update'){
if($room_info['preview']==0) $parameters['checked']=true;
@@ -660,7 +817,14 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"hr", $parameters=array()) );
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
+ $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"hr", $parameters=array()) );
$panelLine->appendChild($linepart);
$panelContent->appendChild($panelLine);
@@ -670,11 +834,24 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Maximum users : ") ));
$panelLine->appendChild($linepart);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "radio", "value" => "-1", "id" => "userlimit_false", "name" => "userlimit", "onclick" => "toggleUserlimit(\"false\")") ;
if($action=='update'){
if($room_info['userlimit']==-1) $parameters['checked']=true;
@@ -695,11 +872,25 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(" "));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "") ));
$panelLine->appendChild($linepart);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
+
$parameters=array("type" => "radio", "id" => "userlimit_true", "name" => "userlimit", "onclick" => "toggleUserlimit(\"true\")") ;
if($action=='update'){
if($room_info['userlimit']!=-1) $parameters['checked']=true;
@@ -726,7 +917,13 @@
$panelLineStyle->appendChild($xmldoc->createTextNode(""));
$panelLine->appendChild($panelLineStyle);
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "guestAccess_value", "name" => "guests", "onclick" => "hideDiv(\"launcher_link_row\")") ;
if(($action=='update')&&(liveclassroom_api_role_user_room($roomId,'Guest')=='Student')){
$parameters['checked']=true;
@@ -750,7 +947,13 @@
$linepart = $xmldoc->createElement('panelLinePart');
+ $style = $xmldoc->createElement('style');
+ $style->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($style);
+ $align = $xmldoc->createElement('align');
+ $align->appendChild($xmldoc->createTextNode(""));
+ $linepart->appendChild($align);
$linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "launcher_link_field", "value" => "Room Id :") ));
$panelLine->appendChild($linepart);
@@ -782,7 +985,7 @@
$root->appendChild($windows);
$xmldoc->appendChild($root);
-// $xmldoc->save('settings.xml');
+$xmldoc->save('settings.xml');
$xmlstring = $xmldoc->saveXML(); // Xml datas into a string
Modified: trunk/moodle/mod/liveclassroom/index.php
===================================================================
--- trunk/moodle/mod/liveclassroom/index.php 2006-11-29 12:35:15 UTC (rev 104)
+++ trunk/moodle/mod/liveclassroom/index.php 2006-12-07 10:41:11 UTC (rev 105)
@@ -67,14 +67,17 @@
print_header("$course->shortname: $strliveclassrooms", "$course->fullname", "$navigation $strliveclassrooms", "", "", true, "", navmenu($course));
/// Get all the appropriate data
-
+/*
if (! $liveclassrooms = get_all_instances_in_course("liveclassroom", $course)) {
notice("There are no liveclassrooms", "../../course/view.php?id=$course->id");
die;
}
-
+*/
$url = liveclassroom_get_url_params($course->id);
+ //You come frome "Add an ctivity" and no room are available, you must create one!
+ if( (isset($_GET['noliveclassroom'])) &&( $_GET['noliveclassroom']=="true") ) { $url .= "&addnew=true"; }
+
?>
<script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch.js'></script>
<head>
Added: trunk/moodle/mod/liveclassroom/js/Ajax.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/Ajax.js (rev 0)
+++ trunk/moodle/mod/liveclassroom/js/Ajax.js 2006-12-07 10:41:11 UTC (rev 105)
@@ -0,0 +1,278 @@
+function getHTTPObject()
+{
+ var xmlhttp = false;
+
+ /* Compilation conditionnelle d'IE */
+ /*@cc_on
+ @if (@_jscript_version >= 5)
+ try
+ {
+ xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
+ }
+ catch (e)
+ {
+ try
+ {
+ xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+ }
+ catch (E)
+ {
+ xmlhttp = false;
+ }
+ }
+ @else
+ xmlhttp = false;
+ @end @*/
+
+ /* on essaie de cr\xE9er l'objet si ce n'est pas d\xE9j\xE0 fait */
+ if (!xmlhttp && typeof XMLHttpRequest != 'undefined')
+ {
+ try
+ {
+ xmlhttp = new XMLHttpRequest();
+ }
+ catch (e)
+ {
+ xmlhttp = false;
+ }
+ }
+
+ if (xmlhttp)
+ {
+ /* on d\xE9finit ce qui doit se passer quand la page r\xE9pondra */
+ xmlhttp.onreadystatechange=function()
+ {
+
+ if (xmlhttp.readyState == 4) /* 4 : \xE9tat "complete" */
+ {
+
+ /*alert(xmlhttp.responseText);
+ Traitement de la r\xE9ponse.
+ Ici on affiche la r\xE9ponse dans une bo\xEEte de dialogue.
+ */
+ studentView=false;
+ objDom=new XMLDoc(xmlhttp.responseText, null);
+ manageXml("");
+
+ }
+ }
+ }
+ return xmlhttp;
+}
+
+
+function gestionDisplay(isfilter)
+{
+
+
+ if(numberMainLectureRoom>5 && isfilter==false)
+ {
+
+ document.getElementById("div1").style.height=5*19+"px";
+
+
+
+ document.getElementById("div1More").style.display="block";
+ document.getElementById("div1More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div1\",\""+numberMainLectureRoom+"\")'>"+(numberMainLectureRoom-5)+" more...</label>";
+
+ }else if(numberMainLectureRoom==0){
+ document.getElementById("div1").style.display="none";
+ document.getElementById("div1Title").style.display="none";
+ document.getElementById("div1More").style.display="none";
+
+ }else{
+
+ document.getElementById("div1").style.height=numberMainLectureRoom*19+"px";
+ document.getElementById("div1More").style.display="none";
+
+ }
+
+ if(numberBreakoutRoom>5 && isfilter==false)
+ {
+ document.getElementById("div2").style.height=5*19+"px";
+ document.getElementById("div2More").style.display="block";
+ document.getElementById("div2More").innerHTML="<table><tr><td><label class='moreRoom' onclick='displayAllDiv(\"div2\",\""+numberBreakoutRoom+"\")'>"+(numberBreakoutRoom-5)+" more...</label></td></tr></table>";
+
+
+
+
+ }else if(numberBreakoutRoom==0){
+ document.getElementById("div2").style.display="none";
+ document.getElementById("div2Title").style.display="none";
+ document.getElementById("div2More").style.display="none";
+
+ }else{
+
+ document.getElementById("div2").style.height=numberBreakoutRoom*19+"px";
+ document.getElementById("div2More").style.display="none";
+ }
+
+ if(numberVoiceBoard>5 && isfilter==false)
+ {
+ document.getElementById("div3").style.height=5*19+"px";
+ document.getElementById("div3More").style.display="block";
+ document.getElementById("div3More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div3\",\""+numberVoiceBoard+"\")'>"+(numberVoiceBoard-5)+" more...</label>";
+
+
+
+
+ }else if(numberVoiceBoard==0){
+ document.getElementById("div3").style.display="none";
+ document.getElementById("div3Title").style.display="none";
+ document.getElementById("div3More").style.display="none";
+
+ }else{
+
+ document.getElementById("div3").style.height=numberVoiceBoard*19+"px";
+ document.getElementById("div3More").style.display="none";
+ }
+
+ if(numberVoicePresentation>5 && isfilter==false)
+ {
+
+ document.getElementById("div4").style.height=5*19+"px";
+ document.getElementById("div4More").style.display="block";
+ document.getElementById("div4More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div4\",\""+numberVoicePresentation+"\")'>"+(numberVoicePresentation-5)+" more...</label>";
+
+
+
+ }else if(numberVoicePresentation==0 && isfilter==false){
+ document.getElementById("div4").style.display="none";
+ document.getElementById("div4Title").style.display="none";
+ document.getElementById("div4More").style.display="none";
+
+ }
+ else{
+ document.getElementById("div4").style.height=numberVoicePresentation*19+"px";
+ document.getElementById("div4More").style.display="none";
+ }
+
+
+}
+
+
+function displayAllDiv(name,number){
+ if(currentId!="")
+ document.getElementById(currentId).style.backgroundColor="white";
+currentId="";
+
+ document.getElementById(name).style.height=number*19+"px";
+ document.getElementById(name+"More").innerHTML="<label class='moreRoom' onclick='RemoveAllDiv(\""+name+"\",\""+number+"\")'>Show Top 5...</label>";
+
+}
+function RemoveAllDiv(name,number){
+ if(currentId!="")
+ document.getElementById(currentId).style.backgroundColor="white";
+currentId="";
+ document.getElementById(name).style.height=5*19+"px";
+ document.getElementById(name+"More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\""+name+"\",\""+number+"\")'>"+(number-5)+" more...</label>";
+
+}
+function createAction(action){
+if(action!="") {
+ return "\"javascript:"+action[0].getElements("name")[0].getText()+"('"+action[0].getElements("parameters")[0].getText()+"')\"";
+}
+return "";
+}
+
+
+
+
+function getURLParameters()
+{
+ var sURL = window.document.URL.toString();
+ var params="";
+ if (sURL.indexOf("?") > 0)
+ {
+ var arrParams = sURL.split("?");
+
+ var arrURLParams = arrParams[1].split("&");
+
+ var arrParamNames = new Array(arrURLParams.length);
+ var arrParamValues = new Array(arrURLParams.length);
+
+ var i = 0;
+ for (i=0;i<arrURLParams.length;i++)
+ {
+ var sParam = arrURLParams[i];
+ arrParamNames[i] = sParam[0];
+ if (sParam[1] != "")
+ params += "&"+unescape(sParam);
+
+ }
+ params=params.substring(1,params.length)
+ }
+ return params;
+}
+
+
+function DisplayFirstPage(){
+
+/* Cr\xE9ation de l'objet : */
+/*
+var m=
+if(t!=null) m=t;
+
+else m=getURLParameters();
+*/
+/* Pr\xE9paration d'une requ\xEAte asynchrone de type GET : */
+xmlhttp.open("POST", 'generateListRooms.php',true);
+/* Effectue la requ\xEAte : */
+xmlhttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+ xmlhttp.onreadystatechange=Management;
+
+xmlhttp.send(getURLParameters())
+
+
+}
+
+
+function launchAjaxRequest(url,fonction,action,init){
+
+ showPopup()
+
+ var parameters="";
+ if(currentProduct != "" )
+ parameters="product="+currentProduct+"&"
+
+ if( currentId != "")
+ parameters+="id="+currentId+"&"
+ if(action!="")
+ parameters+="action="+action+"&";
+
+ if(init=="true")
+ currentId = ""
+ /* Pr\xE9paration d'une requ\xEAte asynchrone de type GET : */
+ xmlhttp.open("GET", url+'?'+parameters+'time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]+'',true);
+ /* Effectue la requ\xEAte : */
+ xmlhttp.onreadystatechange=eval(fonction);
+
+ xmlhttp.send(null);
+}
+
+
+function launchNew(url,fonction,action,product){
+
+ currentProduct = product;
+ launchAjaxRequest(url,fonction,action,"true");
+}
+
+
+
+
+
+function Management(){
+
+ if (xmlhttp.readyState == 4) /* 4 : \xE9tat "complete" */
+ {
+ hidePopup()
+
+ objDom=new XMLDoc(xmlhttp.responseText, null);
+ objDomTree = objDom.docNode;
+
+ //session management
+ manageXml("","all");
+ }
+}
+
+
Property changes on: trunk/moodle/mod/liveclassroom/js/Ajax.js
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author Id
Name: svn:eol-style
+ native
Added: trunk/moodle/mod/liveclassroom/js/constants.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/constants.js (rev 0)
+++ trunk/moodle/mod/liveclassroom/js/constants.js 2006-12-07 10:41:11 UTC (rev 105)
@@ -0,0 +1,30 @@
+// JScript File
+
+var session=new Array();
+var timeOfLoad="";
+var currentFilter='all';
+var numberOfProduct=4;
+var currentId="";
+var currentProduct="";
+var typeSelect="mainLecture"
+
+var currentDiv=0;
+var numberMainLectureRoom=0;
+var numberBreakoutRoom=0;
+var numberVoiceBoard=0;
+var numberVoicePresentation=0;
+var studentView=false;
+var numberArchive=new Array();
+// xml
+var objDom;
+var objDomTree;
+
+//Constants
+var LIVECLASSROOM="liveclassroom";
+var MAINLECTURE="mainLectureRoom";
+var DISCUSSION="discussionRoom";
+var BOARD="voiceBoard";
+var PRESENTATION="voicePresentation";
+
+//Ajax
+var xmlhttp = getHTTPObject();
\ No newline at end of file
Property changes on: trunk/moodle/mod/liveclassroom/js/constants.js
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author Id
Name: svn:eol-style
+ native
Added: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js (rev 0)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-07 10:41:11 UTC (rev 105)
@@ -0,0 +1,400 @@
+function changePicture(id,pictureUrl){
+ if(Navigateur()=="Explorer" && parseFloat(navigator.appVersion)<5.5)
+ {
+ document.getElementById(id).style.filter=" progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+pictureUrl+"', sizingMethod='scale')";
+ }
+ else
+ {
+ document.images[id].src=pictureUrl;
+
+ }
+
+}
+
+
+
+ function toggleUserlimit(isLimited){
+ document.forms[0].userlimittext.disabled = (isLimited==false);
+ }
+ function doChangeChat() {
+ var radio = document.forms[0].privateChatEnabled;
+ for (i=0; i<radio.length; i++) {
+ radio[i].disabled = !document.forms[0].chatEnabled.checked;
+ }
+ }
+
+ function doChangeMedia(mediatype)
+ {
+ document.forms[0].student_simulcast.disabled = (mediatype=="video" || mediatype=="none")
+ document.forms[0].two_way_enabled.disabled = (mediatype=="video" || mediatype=="none")
+ if (mediatype=="video"){document.getElementById('roomId_row').style.display="block"}else{
+ document.getElementById('roomId_row').style.display="none"}
+ }
+ function doChangeLink()
+ {
+
+ if (document.getElementById('launcher_link_row').style.display=="block"){
+ document.getElementById('launcher_link_row').style.display="none"
+ }else{
+ document.getElementById('launcher_link_row').style.display="block"
+ }
+ }
+
+
+ function toggleType(type)
+ {
+ typeSelect=type;
+ manageXml('','all');
+
+
+
+
+ }
+ function confirmDelete(delUrl, type){
+ if (confirm("Are you sure you want to delete this " + type)) {
+ if (confirm("Are you really sure you want to delete this " + type)) {
+ location.href = delUrl
+ }
+ }
+ }
+
+
+
+ var currentIdtab="1";
+ function onTab(id)
+ {
+
+ document.getElementById('tab'+id).style.backgroundImage="url(pictures/tab_Select.gif)";
+ document.getElementById('tab'+currentIdtab).style.borderBottom="#818181 1px solid";
+ document.getElementById('tab'+currentIdtab).style.backgroundImage="url(pictures/tab.gif)";
+ document.getElementById('tab'+id).style.borderBottom="none";
+ document.getElementById('span'+currentIdtab).style.display="none";
+ document.getElementById('span'+id).style.display="block";
+ currentIdtab=id;
+ }
+
+ function onOver(id)
+ {
+ if(currentIdtab!=id)
+ document.getElementById('tab'+id).style.backgroundImage="url(pictures/tab_over.gif)";
+
+ }
+ function onOut(id)
+ {
+ if(currentIdtab!=id)
+ document.getElementById('tab'+id).style.backgroundImage="url(pictures/tab.gif)";
+
+ }
+
+ function hwSubmit(action) {
+ if(action != null)
+ {
+ document.forms[0].action.value=action;
+ }
+ document.forms[0].submit();
+ }
+
+
+ function hideDiv(id,pictureId){
+ if (document.getElementById(id).style.display=="none")
+ {
+
+ document.getElementById(id).style.display="block";
+ document.getElementById(id+"More").style.display="block";
+ if(pictureId!="")
+ document.images[pictureId].src="pictures/items/category-expanded.png";
+
+ }
+ else if (document.getElementById(id).style.display=="block")
+ {
+
+ document.getElementById(id).style.display="none";
+ document.getElementById(id+"More").style.display="none";
+ if(pictureId!="")
+ document.images[pictureId].src="pictures/items/category-collapsed.png";
+ }
+ if (document.getElementById(id).className=="hide")
+ {
+ document.getElementById(id).className="visible";
+ document.getElementById(id+"More").className="visible";
+
+ if(pictureId!="")
+ document.images[pictureId].src="pictures/items/category-expanded.png";
+
+ }
+ else if (document.getElementById(id).className=="visible")
+ {
+ document.getElementById(id).className="hide";
+ document.getElementById(id+"More").className="hide";
+
+ if(pictureId!="")
+ document.images[pictureId].src="pictures/items/category-collapsed.png";
+ }
+}
+
+
+
+
+function hideArchive(type,id,pictureId,roomId)
+{
+
+ if (document.getElementById(id).style.display=="none")
+ {
+ if(type=="MainLecture")
+ numberMainLectureRoom+=numberArchive[roomId];
+ else
+ numberBreakoutRoom+=numberArchive[roomId];
+ document.getElementById(id).style.display="block";
+ document.images[pictureId].src="pictures/minus.gif";
+
+
+ }
+ else
+ {
+ if(type=="MainLecture")
+ numberMainLectureRoom-=numberArchive[roomId];
+ else
+ numberBreakoutRoom-=numberArchive[roomId];
+
+ document.getElementById(id).style.display="none";
+ document.images[pictureId].src="pictures/plus.gif";
+
+
+ }
+ gestionDisplay(false)
+}
+
+function Navigateur()
+{
+ if (navigator.appName.indexOf("Netscape") > -1)
+ {
+ return "Netscape";
+ }
+ if (navigator.appName.indexOf("Explorer") > -1)
+ {
+ return "Explorer";
+ }
+ return "Unknown";
+}
+
+
+
+
+function OneClick(id,product,type)
+
+{
+
+ if(currentId!="" && currentId!=id)
+ document.getElementById(currentId).style.backgroundColor="white";
+ if(currentId!=id)
+ {
+ document.getElementById(id).style.backgroundColor="#c3dbf7";
+ }
+ currentI...
[truncated message content] |
|
From: <sh...@us...> - 2006-12-07 16:08:31
|
Revision: 106
http://svn.sourceforge.net/hw4mdl/?rev=106&view=rev
Author: shazan
Date: 2006-12-07 08:08:14 -0800 (Thu, 07 Dec 2006)
Log Message:
-----------
add url encoding anf logs popup displaying
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/logs.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-07 10:41:11 UTC (rev 105)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-07 16:08:14 UTC (rev 106)
@@ -65,8 +65,8 @@
$LIVECLASSROOM_API_RECORD_SEPERATOR = "=END RECORD";
+$LIVECLASSROOM_LOGS = "logs.php";
-
/**
* Creates a CURL session with the Live Classroom server. Upon success, it
* returns a CURL Handle authenticated and ready for use. It returns false
@@ -85,7 +85,9 @@
global $CFG;
global $LIVECLASSROOM_API_ADMIN;
global $LIVECLASSROOM_API_FUNCTION_NOOP;
-
+ global $LIVECLASSROOM_LOGS;
+ global $COURSE;
+
if (empty($servername)) { // feed them with $CFG
$servername = $CFG->liveclassroom_servername;
$login = $CFG->liveclassroom_adminusername;
@@ -115,7 +117,7 @@
$data = curl_exec($ch);
if (curl_errno($ch)) {
- add_to_log("", "liveclassroom", "URL", "", "URL incorrect");
+ add_to_log($COURSE->id, "liveclassroom", "URL", "$LIVECLASSROOM_LOGS?type=errorUrlUnavailable&time=".time()."&courseId=".$COURSE->id, "URL incorrect");
// print curl_error($ch);
return false;
}
@@ -124,12 +126,12 @@
if ( $resp_code != 100 && $resp_code != 301) {
//error( "Response: Authentication Failed: $resp_code");
- add_to_log("", "liveclassroom", "Authentication", "", "Authentication Failed: $resp_code");
+ add_to_log($COURSE->id, "liveclassroom", "Authentication", "$LIVECLASSROOM_LOGS?type=errorAuthentication&time=".time()."&respcode=$resp_code&courseId=".$COURSE->id, "Authentication Failed");
return false;
}
curl_close($ch);
//fclose($cook);
- add_to_log("", "liveclassroom", "Authentication", "", "Authentication succeeded");
+ add_to_log($COURSE->id, "liveclassroom", "Authentication", "$LIVECLASSROOM_LOGS?type=authentication&time=".time()."&courseId=".$COURSE->id, "Authentication succeeded");
return $ch;
}
@@ -165,10 +167,12 @@
}
}
+ $enc_list = str_replace(" ", "+", $attribute);
+
$url = $CFG->liveclassroom_servername.
$LIVECLASSROOM_API_ADMIN.
$const.
- $attribute;
+ $enc_list;
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL,$url);
@@ -207,6 +211,8 @@
global $LIVECLASSROOM_API_ADMIN;
global $LIVECLASSROOM_API_FUNCTION_CREATE_USER;
global $LIVECLASSROOM_MOODLE_PREFIX;
+ global $LIVECLASSROOM_LOGS;
+ global $COURSE;
$data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_CREATE_USER, "&target=$userid&first_name=$rolename&last_name=$coursename");
@@ -221,11 +227,11 @@
if ( $respcode != 100 && $respcode != 301) {
- add_to_log("", "liveclassroom", "Create User", "", "$userId Creation Failed");
+ add_to_log($COURSE->id, "liveclassroom", "Create User", "$LIVECLASSROOM_LOGS?type=errorCreateUser&time=".time()."&userId=$userId&respcode=$respcode&courseId=".$COURSE->id, "User Creation Failed");
// error( "Response: Account ($userId) Creation Failed: $resp_code");
return false;
}
- add_to_log("", "liveclassroom", "Create User", "", "$userId Creation succeeded");
+ add_to_log($COURSE->id, "liveclassroom", "Create User", "$LIVECLASSROOM_LOGS?type=createUser&time=".time()."&userId=$userId&courseId=".$COURSE->id, "User Creation succeeded");
return true;
}
@@ -272,16 +278,17 @@
global $USER;
global $LIVECLASSROOM_API_ADMIN;
global $LIVECLASSROOM_API_FUNCTION_GET_TOKEN;
-
+ global $LIVECLASSROOM_LOGS;
+ global $COURSE;
+
$data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_TOKEN, "&target=$userid&nickname=$nickname");
-
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
if ( $respcode != 100) {
- add_to_log("", "liveclassroom", "Create Session", "", "Cannot Create Session : $resp_code");
+ add_to_log($COURSE->id, "liveclassroom", "Create Session", "$LIVECLASSROOM_LOGS?type=errorCreateSession&time=".time()."&respcode=$respcode&nickname=$nickname&courseId=".$COURSE->id, "Cannot Create Session.");
return false;
}
@@ -305,7 +312,7 @@
//error ("Token empty, data=<pre>$data</pre>");
return false;
}
- add_to_log("", "liveclassroom", "", "create session", "Creating Session for $nickname");
+ add_to_log($COURSE->id, "liveclassroom", "Create Session", "$LIVECLASSROOM_LOGS?type=createSession&time=".time()."&nickname=$nickname&courseId=".$COURSE->id, "Creating Session for $nickname");
return $authtoken;
}
@@ -320,17 +327,20 @@
global $CFG;
global $LIVECLASSROOM_API_ADMIN,
$LIVECLASSROOM_API_FUNCTION_CREATE_CLASS;
-
+ global $LIVECLASSROOM_LOGS;
+ global $COURSE;
+
unset($attributes['longname']);
while (list($key, $val) = each($attributes)) {
if(($key!='class_id')&&(isset($val))&&($val!="")){
$list_attributes .= "&".$key."=".$val;
}
}
+
$final_list = "&target=$roomid"."&longname=$roomname".$list_attributes;
-
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_CREATE_CLASS,$final_list);
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_CREATE_CLASS, $final_list);
+
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -339,11 +349,11 @@
return false;
}
if ( $respcode != 100) {
- add_to_log("", "liveclassroom", "Create Room", "", "Cannot Create Class with id:$roomid, and name: $roomname.");
+ add_to_log($COURSE->id, "liveclassroom", "Create Room", "$LIVECLASSROOM_LOGS?type=errorCreateClass&time=".time()."&roomname=$roomname&roomId=$roomid&respcode=$respcode&courseId=".$COURSE->id, "Cannot Create Class with id : $roomid, and name : $roomname.");
return false;
}
- add_to_log("", "liveclassroom", "Create Room", "", "$roomname create with success");
+ add_to_log($COURSE->id, "liveclassroom", "Create Room", "$LIVECLASSROOM_LOGS?type=createClass&time=".time()."&roomname=$roomname&courseId=".$COURSE->id, "$roomname create with success");
return true;
}
@@ -514,20 +524,22 @@
function liveclassroom_api_delete_room($roomid) {
global $CFG;
global $LIVECLASSROOM_API_ADMIN, $LIVECLASSROOM_API_FUNCTION_DELETE_ROOM;
+ global $LIVECLASSROOM_LOGS;
+ global $COURSE;
liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_DELETE_ROOM,"&target=$roomid");
if ( $respcode == 302) {
- add_to_log("", "liveclassroom", "Delete Room", "", "$roomid suppression failed, target not found");
+ add_to_log($COURSE->id, "liveclassroom", "Delete Room", "$LIVECLASSROOM_LOGS?type=errorDeleteRoom302&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "$roomid suppression failed");
// error( "Target not found");
return false;
}
else if ( $respcode != 100) {
- add_to_log("", "liveclassroom", "Delete Room", "", "$roomid suppression failed");
+ add_to_log($COURSE->id, "liveclassroom", "Delete Room", "$LIVECLASSROOM_LOGS?type=errorDeleteRoom100&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "$roomid suppression failed");
return false;
}
- add_to_log("", "liveclassroom", "Delete Room", "", "$roomid has been deleted with success");
+ add_to_log($COURSE->id, "liveclassroom", "Delete Room", "$LIVECLASSROOM_LOGS?type=deleteRoom&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "$roomid has been deleted with success");
return true;
}
@@ -541,20 +553,22 @@
global $CFG;
global $LIVECLASSROOM_API_ADMIN,
$LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM;
+ global $LIVECLASSROOM_LOGS;
+ global $COURSE;
liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM,"&target=$roomid&preview=0");
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
if ( $respcode == 302) {
- add_to_log("", "liveclassroom", "Open Room", "", "$roomid opening failed, target nor found");
+ add_to_log($COURSE->id, "liveclassroom", "Open Room", "$LIVECLASSROOM_LOGS?type=errorOpenRoom302&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "$roomid opening failed");
return false;
}
if ( $respcode != 100) {
- add_to_log("", "liveclassroom", "Open Room", "", "$roomid opening failed");
+ add_to_log($COURSE->id, "liveclassroom", "Open Room", "$LIVECLASSROOM_LOGS?type=errorOpenRoom100&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "$roomid opening failed");
return false;
}
- add_to_log("", "liveclassroom", "Open Room", "", "$roomid has been opened with success");
+ add_to_log($COURSE->id, "liveclassroom", "Open Room", "$LIVECLASSROOM_LOGS?type=openRoom&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "$roomid has been opened with success");
return true;
}
@@ -568,21 +582,23 @@
global $CFG;
global $LIVECLASSROOM_API_ADMIN,
$LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM;
+ global $LIVECLASSROOM_LOGS;
+ global $COURSE;
liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM,"&target=$roomid&preview=1");
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
if ( $respcode == 302) {
- add_to_log("", "liveclassroom", "Close Room", "", "$roomid closing failed, target nor found");
+ add_to_log($COURSE->id, "liveclassroom", "Close Room", "$LIVECLASSROOM_LOGS?type=errorCloseRoom302&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "$roomid closing failed");
return false;
}
if ( $respcode != 100) {
- add_to_log("", "liveclassroom", "Close Room", "", "$roomid closing failed");
+ add_to_log($COURSE->id, "liveclassroom", "Close Room", "$LIVECLASSROOM_LOGS?type=errorCloseRoom100&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "$roomid closing failed");
return false;
}
- add_to_log("", "liveclassroom", "Close Room", "", "$roomid has been closed with success");
+ add_to_log($COURSE->id, "liveclassroom", "Close Room", "$LIVECLASSROOM_LOGS?type=closeRoom&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "$roomid has been closed with success");
return true;
}
@@ -597,7 +613,8 @@
global $CFG;
global $LIVECLASSROOM_API_ADMIN;
global $LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM;
-
+ global $LIVECLASSROOM_LOGS;
+ global $COURSE;
while (list($key, $val) = each($table_attributes)) {
if(($key!='class_id')&&(isset($val))&&($val!="")){
@@ -613,11 +630,11 @@
$respcode = $matches[0];
if ( $respcode != 100) {
- add_to_log("", "liveclassroom", "Modify Room", "", "$roomid modification failed");
+ add_to_log($COURSE->id, "liveclassroom", "Modify Room", "$LIVECLASSROOM_LOGS?type=errorModifyRoom100&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "Room modification failed");
return false;
}
- add_to_log("", "liveclassroom", "Modify Room", "", "$roomid has been modified with success");
+ add_to_log($COURSE->id, "liveclassroom", "Modify Room", "$LIVECLASSROOM_LOGS?type=modifyRoom&time=".time()."&roomId=$roomid&courseId=".$COURSE->id, "$roomid has been modified with success");
return true;
}
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2006-12-07 10:41:11 UTC (rev 105)
+++ trunk/moodle/mod/liveclassroom/lib.php 2006-12-07 16:08:14 UTC (rev 106)
@@ -36,8 +36,8 @@
//Suffixes used when creting the profiles account on the LC server
$LIVECLASSROOM_TEACHER_SUFFIX = "_T"; //Teachers will use the user $CFG->liveclassroom_settinguniqueid + $course->id + $LIVECLASSROOM_TEACHER_SUFFIX
$LIVECLASSROOM_STUDENT_SUFFIX = "_S"; //Students will use the user $CFG->liveclassroom_settinguniqueid + $course->id + $LIVECLASSROOM_STUDENT_SUFFIX
-$LIVECLASSROOM_LOGS = "logs.php";
+
/*
* Get the prefix to use for creating rooms and users.
@@ -97,7 +97,7 @@
/// will create a new instance and return the id number
/// of the new instance.
global $LIVECLASSROOM_LOGS;
-
+
$liveclassroom->timemodified = time();
# May have to add extra stuff in here #
@@ -105,16 +105,13 @@
$timenow = time();
- //add_to_log("", "liveclassroom", "Add activity", "$LIVECLASSROOM_LOGS?type=addInstance&liveclassroomId=".$liveclassroom->name."&roomname=$roomname", "Activity ".$liveclassroom->name." has been added with success, associated to the room $roomname");
-
- //return insert_record("liveclassroom", $liveclassroom);
-
+
if($result = insert_record("liveclassroom", $liveclassroom)) {
- add_to_log("", "liveclassroom", "Add activity", "$LIVECLASSROOM_LOGS?type=addInstance&liveclassroomId=".$result."&roomname=$roomname&time=$timenow", "Activity \"".$liveclassroom->name."\" added");
+ add_to_log($liveclassroom->course, "liveclassroom", "Add activity", "$LIVECLASSROOM_LOGS?type=addInstance&liveclassroomId=".$result."&roomname=$roomname&time=$timenow", "Activity \"".$liveclassroom->name."\" added");
}
else
{
- add_to_log("", "liveclassroom", "Add activity", "$LIVECLASSROOM_LOGS?type=errorAddInstance", "Activity \"".$liveclassroom->name."\" has not been added");
+ add_to_log($liveclassroom->course, "liveclassroom", "Add activity", "$LIVECLASSROOM_LOGS?type=errorAddInstance&liveclassroomId=".$result."&roomname=$roomname&time=$timenow", "Activity \"".$liveclassroom->name."\" has not been added");
$result=false;
}
@@ -131,7 +128,8 @@
$liveclassroom->timemodified = time();
$liveclassroom->id = $liveclassroom->instance;
-
+ $roomname = liveclassroom_api_get_room_name($liveclassroom->type);
+ $timenow = time();
// Need to update the section
@@ -158,7 +156,7 @@
error("Could not update the course module with the correct section");
}
- add_to_log("", "liveclassroom", "Update activity", "$LIVECLASSROOM_LOGS?type=updateInstance", "Activity ".$liveclassroom->name." has been updated with success, associated to the room $roomname");
+ add_to_log($liveclassrooms->course, "liveclassroom", "Update activity", "$LIVECLASSROOM_LOGS?type=updateInstance&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow", "Activity ".$liveclassroom->name." has been updated with success");
return update_record("liveclassroom", $liveclassroom);
/*
@@ -180,19 +178,21 @@
/// and any data that depends on it.
global $LIVECLASSROOM_LOGS;
+
if (! $liveclassroom = get_record("liveclassroom", "id", "$id")) {
return false;
}
-
+ $roomname = liveclassroom_api_get_room_name($liveclassroom->type);
+ $timenow = time();
$result = true;
# Delete any dependent records here #
- if (! delete_records("liveclassroom", "id", "$liveclassroom->id")) {
- add_to_log("", "liveclassroom", "Delete activity", "$LIVECLASSROOM_LOGS?type=errorDeleteInstance", "Activity ".$liveclassroom->name." deletion failed");
+ if (! delete_records("liveclassroom", "id", $liveclassroom->id)) {
+ add_to_log($liveclassrooms->course, "liveclassroom", "Delete activity", "$LIVECLASSROOM_LOGS?type=errorDeleteInstance&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow", "Activity ".$liveclassroom->name." deletion failed");
$result = false;
}
- add_to_log("", "liveclassroom", "Delete activity", "$LIVECLASSROOM_LOGS?type=deleteInstance", "Activity ".$liveclassroom->name." has been deleted with success");
+ add_to_log($liveclassrooms->course, "liveclassroom", "Delete activity", "$LIVECLASSROOM_LOGS?type=deleteInstance&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow", "Activity ".$liveclassroom->name." has been deleted with success");
return $result;
}
@@ -519,10 +519,11 @@
/// this function will permanently delete the instance
/// and any data that depends on it.
global $LIVECLASSROOM_LOGS;
- $result = true;
+
+ $result = true;
if ($liveclassrooms = get_records("liveclassroom", "type", $roomid)) {
$roomname = liveclassroom_api_get_room_name($liveclassroom->type);
-
+ $timenow = time();
# Delete any dependent records here #
foreach($liveclassrooms as $liveclassroom){
@@ -531,18 +532,18 @@
error("Course Module ID was incorrect");
}
if (! delete_course_module($cm->id)) {
- add_to_log("", "liveclassroom", "$LIVECLASSROOM_LOGS?error=deleteAll", "Delete all activities", "Could not delete the ".$cm->id." (coursemodule)");
+ add_to_log($liveclassrooms->course, "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorDeleteAllcm&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow&cm=".$cm->id, "Delete all activities", "Could not delete the ".$cm->id." (coursemodule)");
$result = false;
//Delete a course module and any associated data at the course level (events)
// notify("Could not delete the $cm->id (coursemodule)");
}
if (! delete_records("liveclassroom", "id", "$liveclassroom->id")) {
- add_to_log("", "liveclassroom", "$LIVECLASSROOM_LOGS?error=deleteAll", "Delete all activities", "All activities associated to the room $roomname have not been deleted frome the liveclassroom database");
+ add_to_log($liveclassrooms->course, "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorDeleteAlldb&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow", "Delete all activities", "All activities associated to the room $roomname have not been deleted from the liveclassroom database");
$result = false;
}
//delete in the course section too
if (! delete_mod_from_section($cm->id, "$cm->section")) {
- add_to_log("", "liveclassroom", "$LIVECLASSROOM_LOGS?error=deleteAll", "Delete all activities", "Could not delete the ".$mod->modulename." from that section");
+ add_to_log($liveclassrooms->course, "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorDeleteAllsection&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow&cm=".$cm->id."§ion=".$cm->section, "Delete all activities", "Could not delete the ".$cm->id." from that section");
$result = false;
//notify("Could not delete the $mod->modulename from that section");
}
@@ -550,7 +551,7 @@
}
}
- add_to_log("", "liveclassroom", "$LIVECLASSROOM_LOGS?type=deleteAll", "Delete all activities", "All activities associated to the room $roomname have been deleted with success");
+ add_to_log($liveclassrooms->course, "liveclassroom", "$LIVECLASSROOM_LOGS?type=deleteAll&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow", "Delete all activities", "All activities associated to the room $roomname have been deleted with success");
return $result;
}
@@ -912,10 +913,10 @@
$signature .= $value;
$url_params .= "enc_".$key."=".$value."&" ;
}
-
+
if(strcmp(md5($signature), $request['signature'])!=0) {
- add_to_log("", "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorSignature", "Init session", "Signature is not recognize.");
- error("BadSignatureException");
+ add_to_log($request['enc_course_id'], "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorSignature", "Init session", "Signature is not recognize.");
+ error("Signature is not recognize.");
return false;
}
@@ -923,7 +924,7 @@
return true;
}
else {
- add_to_log("", "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorSessionTimeOut", "Init session", "Session has timed out due to inactivity.");
+ add_to_log($request['enc_course_id'], "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorSessionTimeOut", "Init session", "Session has timed out due to inactivity.");
error("The session has timed out due to inactivity. Please reload the page to reconnect.");
return false;
Modified: trunk/moodle/mod/liveclassroom/logs.php
===================================================================
--- trunk/moodle/mod/liveclassroom/logs.php 2006-12-07 10:41:11 UTC (rev 105)
+++ trunk/moodle/mod/liveclassroom/logs.php 2006-12-07 16:08:14 UTC (rev 106)
@@ -1,8 +1,9 @@
<?php
//This page is to show the logs types and errors, and to explain how resolve the errors!
-require_once("../../../config.php");
+require_once("../../config.php");
global $CFG;
+
require_once($CFG->libdir.'/datalib.php');
require_once($CFG->dirroot.'/course/lib.php');
@@ -17,10 +18,15 @@
return false;
}
if (! $course = get_record("course", "id", $liveclassroom->course)) {
- return false;
- }
+ return false;
+ }
+}
+else if (isset($_GET['courseId'])) {
+ if (! $course = get_record("course", "id", $_GET['courseId'])) {
+ return false;
+ }
+}
-}
if(isset($_GET['roomname'])) {
$roomname = $_GET['roomname'];
}
@@ -31,32 +37,187 @@
switch ($type)
{
- case "errorUrlUnavailable":
- $message = "URL unavailable.";
- break;
+
case "addInstance":
$message = "Activity \"".$liveclassroom->name."\" has been added with success, associated to the room \"$roomname\".";
- $information = "Activity \"".$liveclassroom->name."\" added";
+ $information = "Activity \"".$liveclassroom->name."\" creation";
break;
+ case "errorAddInstance":
+ $information = "Activity \"".$liveclassroom->name."\" creation";
+ $message = "Error : URL ".$CFG->liveclassroom_servername." creation failed.";
+ break;
case "updateInstance":
+ $information = "Activity \"".$liveclassroom->name."\" update";
$message = "Activity \"".$liveclassroom->name."\" has been updated with success, associated to the room \"$roomname\".";
-
- break;
+ break;
case "deleteInstance":
- $message = "Activity \"".$liveclassroom->name."\" has been deleted with success.";
+ $information = "Activity \"".$liveclassroom->name."\" suppression";
+ $message = "Activity \"".$liveclassroom->name."\" associated to the room \"$roomname\" has been deleted with success.";
break;
case "errorDeleteInstance":
- $message = "Activity \"".$liveclassroom->name."\" deletion failed. ";
+ $information = "Error : Activity \"".$liveclassroom->name."\" suppression";
+ $message = "Error : Activity \"".$liveclassroom->name."\" associated to the room \"$roomname\". has not been deleted";
break;
case "deleteAll":
+ $information = "Activities suppression";
$message = "All activities associated to the room \"$roomname\" have been deleted with success. ";
break;
+ case "errorDeleteAllcm":
+ $information = "Activities suppression";
+ $message = "All activities associated to the room \"$roomname\" have been deleted with success. ";
+ if(isset($_GET['cm'])){
+ $tip = "Could not delete the ".$_GET['cm']." (coursemodule), please you need to delete it manually";
+ }
+ break;
+ case "errorDeleteAlldb":
+ $information = "Activities suppression";
+ $message = "All activities associated to the room $roomname have not been deleted from the liveclassroom database.";
+ $tip = "Please you need to delete it manually";
+ break;
+ case "errorDeleteAllsection":
+ $information = "Activities suppression";
+ $message = "All activities associated to the room $roomname have not been deleted from the liveclassroom database.";
+ if( (isset($_GET['section'])) && (isset($_GET['cm'])) ){
+ $tip = "Could not delete the ".$_GET['cm']." from the section ".$_GET['section']." , please you need to delete it manually";
+ }
+ break;
case "errorSignature":
- $message = "Signature is not recognize. ";
+ $information = "Testing signature";
+ $message = "Error : Signature is not recognize.";
break;
case "errorSessionTimeOut":
+ $information = "Testing session time";
$message = "Session has timed out due to inactivity.";
+ break;
+ case "errorUrlUnavailable":
+ $information = "URL unavailable.";
+ $message = "Error : URL ".$CFG->liveclassroom_servername." unavailable.";
break;
+ case "errorAuthentication":
+ $information = "Authentication Failed.";
+ if(isset($_GET['respcode'])){
+ $message = "Error : Authentication Failed.";
+ $tip = "The response code is : ".$_GET['respcode']."Please contact your administrator.";
+ }
+ break;
+ case "authentication":
+ $information = "Authentication succeeded.";
+ $message = "The authentication to the Live Classroom server is succeeded.";
+ break;
+ case "createUser":
+ $information = "User creation succeeded.";
+ if(isset($_GET['userId'])){
+ $message = "User creation succeeded. Id of the new user : ".$_GET['userId'];
+ }
+ break;
+ case "errorCreateUser":
+ $information = "User creation";
+ if(isset($_GET['userId'])){
+ $message = "Error : ".$_GET['userId']." Creation Failed.";
+ $tip = "The response code is : ".$_GET['respcode']."Please contact your administrator.";
+ }
+ break;
+ case "createSession":
+ $information = "Session creation succeeded.";
+ if(isset($_GET['nickname'])){
+ $message = "Session created for ".$_GET['nickname'];
+ }
+ break;
+ case "errorCreateSession":
+ $information = "Session creation";
+ if( (isset($_GET['respcode'])) && (isset($_GET['nickname'])) ){
+ $message = "Error : Cannot create a session for ".$_GET['nickname'];
+ $tip = "The response code is : ".$_GET['respcode']."Please contact your administrator.";
+ }
+ break;
+ case "createClass":
+ $information = "Room creation succeeded.";
+ if(isset($_GET['roomname'])){
+ $message = $_GET['roomname']." has been created with success on the Live Classroom server";
+ }
+ break;
+ case "errorCreateClass":
+ $information = "Room creation";
+ if( (isset($_GET['respcode'])) && (isset($_GET['roomname'])) ){
+ $message = "Error : Cannot Create Class with id : ".$_GET['roomId'].", and name : ".$_GET['roomname'];
+ $tip = "The response code is : ".$_GET['respcode']."Please contact your administrator.";
+ }
+ break;
+ case "deleteRoom":
+ $information = "Room suppression succeeded.";
+ if(isset($_GET['roomId'])){
+ $message = $_GET['roomId']." has been deleted with success.";
+ }
+ break;
+ case "errorDeleteRoom100":
+ $information = "Room suppression";
+ if(isset($_GET['roomId']) ){
+ $message = "Error : Cannot delete room with id : ".$_GET['roomId'];
+ $tip = "The response code is : 100. Please contact your administrator.";
+ }
+ break;
+ case "errorDeleteRoom302":
+ $information = "Room suppression";
+ if(isset($_GET['roomId']) ){
+ $message = "Error : Cannot delete room with id : ".$_GET['roomId'];
+ $tip = "The response code is : 302. The target is not found. Please contact your administrator.";
+ }
+ break;
+ case "openRoom":
+ $information = "Room opening succeeded.";
+ if(isset($_GET['roomId'])){
+ $message = $_GET['roomId']." has been opened with success.";
+ }
+ break;
+ case "errorOpenRoom100":
+ $information = "Room opening";
+ if(isset($_GET['roomId']) ){
+ $message = "Error : Cannot open room with id : ".$_GET['roomId'];
+ $tip = "The response code is : 100. Please contact your administrator.";
+ }
+ break;
+ case "errorOpenRoom302":
+ $information = "Room opening";
+ if(isset($_GET['roomId']) ){
+ $message = "Error : Cannot open room with id : ".$_GET['roomId'];
+ $tip = "The response code is : 302. The target is not found. Please contact your administrator.";
+ }
+ break;
+ case "closeRoom":
+ $information = "Room closing succeeded.";
+ if(isset($_GET['roomId'])){
+ $message = $_GET['roomId']." has been closed with success.";
+ }
+ break;
+ case "errorCloseRoom100":
+ $information = "Room closing";
+ if(isset($_GET['roomId']) ){
+ $message = "Error : Cannot close room with id : ".$_GET['roomId'];
+ $tip = "The response code is : 100. Please contact your administrator.";
+ }
+ break;
+ case "errorCloseRoom302":
+ $information = "Room closing";
+ if(isset($_GET['roomId']) ){
+ $message = "Error : Cannot close room with id : ".$_GET['roomId'];
+ $tip = "The response code is : 302. The target is not found. Please contact your administrator.";
+ }
+ break;
+ case "modifyRoom":
+ $information = "Room modification succeeded.";
+ if(isset($_GET['roomId'])){
+ $message = $_GET['roomId']." has been modified with success.";
+ }
+ break;
+ case "errorModifyRoom100":
+ $information = "Room modification";
+ if(isset($_GET['roomId']) ){
+ $message = "Error : Cannot modify room with id : ".$_GET['roomId'];
+ $tip = "The response code is : 100. Please contact your administrator.";
+ }
+ break;
+
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-08 09:29:23
|
Revision: 108
http://svn.sourceforge.net/hw4mdl/?rev=108&view=rev
Author: shazan
Date: 2006-12-08 01:29:21 -0800 (Fri, 08 Dec 2006)
Log Message:
-----------
url encoding
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/view.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-08 09:26:55 UTC (rev 107)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-08 09:29:21 UTC (rev 108)
@@ -67,6 +67,29 @@
$LIVECLASSROOM_LOGS = "logs.php";
+
+/*
+* Get the prefix to use for creating rooms and users.
+*
+* return $prefix : a string which is the prefix to use
+*/
+function liveclassroom_api_get_prefix() {
+ global $CFG;
+
+ //get the admin user name
+ $aun = $CFG->liveclassroom_adminusername;
+ if( (substr($aun, 0,1)=='_') && (substr($aun, -1,1)=='_') ) { //Prefix
+ $prefix = $aun;
+
+ }
+ else {
+ $prefix = '';
+
+ }
+ return $prefix;
+
+}
+
/**
* Creates a CURL session with the Live Classroom server. Upon success, it
* returns a CURL Handle authenticated and ready for use. It returns false
@@ -167,12 +190,12 @@
}
}
- $enc_list = str_replace(" ", "+", $attribute);
+// $enc_list = str_replace(" ", "+", $attribute);
$url = $CFG->liveclassroom_servername.
$LIVECLASSROOM_API_ADMIN.
$const.
- $enc_list;
+ $attribute;
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL,$url);
@@ -281,13 +304,17 @@
global $LIVECLASSROOM_LOGS;
global $COURSE;
+
+
+
$data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_TOKEN, "&target=$userid&nickname=$nickname");
-
+
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
if ( $respcode != 100) {
+
add_to_log($COURSE->id, "liveclassroom", "Create Session", "$LIVECLASSROOM_LOGS?type=errorCreateSession&time=".time()."&respcode=$respcode&nickname=$nickname&courseId=".$COURSE->id, "Cannot Create Session.");
return false;
}
@@ -338,8 +365,9 @@
}
$final_list = "&target=$roomid"."&longname=$roomname".$list_attributes;
-
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_CREATE_CLASS, $final_list);
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_CREATE_CLASS, $enc_list);
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -444,8 +472,11 @@
global $LIVECLASSROOM_API_ADMIN,
$LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST;
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST,"&filter00=longname&filter00value=$roomname");
+ $final_list = "&filter00=longname&filter00value=$roomname";
+ $enc_list = str_replace(" ", "+", $final_list);
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
+
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -493,8 +524,11 @@
global $LIVECLASSROOM_API_RECORD_SEPERATOR;
global $LIVECLASSROOM_API_ADMIN,
$LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST;
-
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST,"&filter00=longname&filter00value=$roomname");
+
+ $final_list = "&filter00=longname&filter00value=$roomname";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -555,6 +589,7 @@
$LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM;
global $LIVECLASSROOM_LOGS;
global $COURSE;
+
liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM,"&target=$roomid&preview=0");
preg_match("(\d*)", $data, $matches);
@@ -624,7 +659,9 @@
$final_list = "&target=$roomid".$list_attributes;
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM, $final_list);
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM, $enc_list);
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -655,7 +692,10 @@
global $LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST;
global $LIVECLASSROOM_API_RECORD_SEPERATOR;
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, "&attribute=preview&attribute=class_id&attribute=longname&filter01=archive&filter01value=1&AccessUser=$userid");
+ $final_list = "&attribute=preview&attribute=class_id&attribute=longname&filter01=archive&filter01value=1&AccessUser=$userid";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -697,7 +737,10 @@
global $LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST;
global $LIVECLASSROOM_API_RECORD_SEPERATOR;
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, "&attribute=class_id&attribute=longname&filter01=archive&filter01value=1&filter02=preview&filter02value=1&AccessUser=$userid");
+ $final_list = "&attribute=class_id&attribute=longname&filter01=archive&filter01value=1&filter02=preview&filter02value=1&AccessUser=$userid";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -738,7 +781,10 @@
global $LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST;
global $LIVECLASSROOM_API_RECORD_SEPERATOR;
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, "&attribute=preview&attribute=class_id&attribute=longname&filter01=archive&filter01value=1&AccessUser=$userid");
+ $final_list = "&attribute=preview&attribute=class_id&attribute=longname&filter01=archive&filter01value=1&AccessUser=$userid";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -1222,7 +1268,10 @@
$LIVECLASSROOM_API_RECORD_SEPERATOR,
$LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST;
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST,"&attribute=class_id&attribute=longname&filter00=archive&filter00value=0&AccessUser=$userid");
+ $final_list = "&attribute=class_id&attribute=longname&filter00=archive&filter00value=0&AccessUser=$userid";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -1258,7 +1307,10 @@
$LIVECLASSROOM_API_RECORD_SEPERATOR,
$LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST;
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST,"&attribute=class_id&attribute=preview&attribute=longname&attribute=archive&AccessUser=$userid");
+ $final_list = "&attribute=class_id&attribute=preview&attribute=longname&attribute=archive&AccessUser=$userid";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
$studentuserid = liveclassroom_api_get_student_user_id($course->id);
preg_match("(\d*)", $data, $matches);
@@ -1346,8 +1398,11 @@
$LIVECLASSROOM_API_RECORD_SEPERATOR,
$LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST;
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST,"&attribute=class_id&attribute=preview&attribute=longname&filter01=archive&filter01value=0&AccessUser=$userid");
+ $final_list = "&attribute=class_id&attribute=preview&attribute=longname&filter01=archive&filter01value=0&AccessUser=$userid";
+ $enc_list = str_replace(" ", "+", $final_list);
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
+
$studentuserid = liveclassroom_api_get_student_user_id($courseid);
// $teacherid = liveclassroom_api_get_teacher_user_id($course->shortname);
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2006-12-08 09:26:55 UTC (rev 107)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2006-12-08 09:29:21 UTC (rev 108)
@@ -254,7 +254,7 @@
padding-left:5px ;
font-family:Verdana;
color:Black;
- font-size:10;
+ font-size:8;
border-bottom:solid 1px #F3F3F3;
cursor:pointer;
}
@@ -262,7 +262,7 @@
font-family:Verdana;
color:Black;
- font-size:10;
+ font-size:8;
border-bottom:solid 1px #F3F3F3;
cursor:pointer;
}
@@ -276,7 +276,7 @@
cursor:hand;
}
-.archive{
+.archive td{
padding-left:5px ;
font-family:Verdana;
color:#666666;
@@ -284,12 +284,41 @@
font-size:11px;
border-bottom:solid 1px #F3F3F3;
}
+
+.room td{
+ padding-left:5px ;
+ font-family:Verdana;
+ color:Black;
+ font-size:10;
+ border-bottom:solid 1px #F3F3F3;
+ cursor:pointer;
+}
+
+.archive label{
+
+ font-family:Verdana;
+ color:Black;
+ font-size:8;
+ border-bottom:solid 1px #F3F3F3;
+ cursor:pointer;
+}
+.room label{
+
+ font-family:Verdana;
+ color:Black;
+ font-size:10;
+ border-bottom:solid 1px #F3F3F3;
+ cursor:pointer;
+}
+
+
+
.filterBar table{
padding-left:5px ;
background-image:url("../pictures/backgrounds/filterbar.png");
height:24px;
font-weight:bold ;
- width:100%;
+
border-bottom:fine 1px #C7D3E1
}
@@ -316,10 +345,12 @@
.filter_left_enabled
{
background-image:url("../pictures/items/filter-enabled-left.png");
+ background-repeat:no-repeat;
}
.filter_middle_enabled
{
background-image:url("../pictures/items/filter-enabled-middle.png");
+
font-family :Verdana;
color:#ffffff;
height:24px;
@@ -329,6 +360,7 @@
.filter_right_enabled
{
background-image:url("../pictures/items/filter-enabled-right.png");
+ background-repeat:no-repeat;
}
.contextBar table
@@ -336,6 +368,7 @@
padding-left:5px;
padding-right:5px;
background-image:url("../pictures/backgrounds/toolbar.png");
+ background-repeat:no-repeat;
height:30px;
width:100%
@@ -447,10 +480,13 @@
.list
{
height:215px;
- overflow-y:scroll;
-
+ overflow-y:scroll;
+ overflow-x: hidden;
+ width:100%;
}
+
+
.lineTitle{
padding-left:10px
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-08 09:26:55 UTC (rev 107)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-08 09:29:21 UTC (rev 108)
@@ -985,8 +985,6 @@
$root->appendChild($windows);
$xmldoc->appendChild($root);
-$xmldoc->save('settings.xml');
-
$xmlstring = $xmldoc->saveXML(); // Xml datas into a string
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2006-12-08 09:26:55 UTC (rev 107)
+++ trunk/moodle/mod/liveclassroom/lib.php 2006-12-08 09:29:21 UTC (rev 108)
@@ -39,28 +39,8 @@
-/*
-* Get the prefix to use for creating rooms and users.
-*
-* return $prefix : a string which is the prefix to use
-*/
-function liveclassroom_api_get_prefix() {
- global $CFG;
- //get the admin user name
- $aun = $CFG->liveclassroom_adminusername;
- if( (substr($aun, 0,1)=='_') && (substr($aun, -1,1)=='_') ) { //Prefix
- $prefix = $aun;
- }
- else {
- $prefix = '';
-
- }
- return $prefix;
-
-}
-
/**
* Validate the data in passed in the configuration page
* @param $config - the information from the form mod.html
@@ -328,7 +308,7 @@
$userid = $LIVECLASSROOM_MOODLE_PREFIX.$course->shortname.
($isteacher?$LIVECLASSROOM_TEACHER_SUFFIX:$LIVECLASSROOM_STUDENT_SUFFIX);
- $nickname = fullname ($USER);
+ $nickname = fullname($USER);
Modified: trunk/moodle/mod/liveclassroom/view.php
===================================================================
--- trunk/moodle/mod/liveclassroom/view.php 2006-12-08 09:26:55 UTC (rev 107)
+++ trunk/moodle/mod/liveclassroom/view.php 2006-12-08 09:29:21 UTC (rev 108)
@@ -64,14 +64,14 @@
require_login($course->id);
- add_to_log($course->id, "liveclassroom", "view", "view.php?id=$cm->id", "$liveclassroom->id");
+ // add_to_log($course->id, "liveclassroom", "view", "view.php?id=$cm->id", "$liveclassroom->id");
// Create the session for this user
if (!$usersession = liveclassroom_create_session ($course, isteacher($course->id, $USER->id))) {
- error ("Cannot create session");
- }
+ error ("Cannot create session");
+ }
/// Print the page header
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-14 14:22:10
|
Revision: 109
http://svn.sourceforge.net/hw4mdl/?rev=109&view=rev
Author: shazan
Date: 2006-12-14 06:22:06 -0800 (Thu, 14 Dec 2006)
Log Message:
-----------
version works on php4.3
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/generateListRooms.php
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/index.php
trunk/moodle/mod/liveclassroom/js/manageXml.js
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/mod.html
trunk/moodle/mod/liveclassroom/reports.php
trunk/moodle/mod/liveclassroom/welcome.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-08 09:29:21 UTC (rev 108)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-14 14:22:06 UTC (rev 109)
@@ -41,12 +41,12 @@
* @package liveclassroom
*/
-require_once('System.php');
+//require_once('System.php');
require_once('lib.php');
$LIVECLASSROOM_MOODLE_PREFIX = liveclassroom_api_get_prefix();
-$LIVECLASSROOM_API_ADMIN = '/admin/api/api.pl?';
+$LIVECLASSROOM_API_ADMIN = 'admin/api/api.pl?';
$LIVECLASSROOM_API_FUNCTION_NOOP = 'function=NOOP';
$LIVECLASSROOM_API_FUNCTION_CREATE_USER = 'function=createUser';
$LIVECLASSROOM_API_FUNCTION_MODIFY_USER = 'function=modifyUser';
@@ -65,7 +65,7 @@
$LIVECLASSROOM_API_RECORD_SEPERATOR = "=END RECORD";
-$LIVECLASSROOM_LOGS = "logs.php";
+$LIVECLASSROOM_LOGS = "logs.php"; //file use to the logs
/*
@@ -1281,14 +1281,25 @@
}
$line = explode("\n",$data);
$rooms=array();
+
for($i=1;$i<sizeof($line)-2;$i=$i+3){
$room[0] = liveclassroom_parse_line($line[$i],"class_id="); //class_id
$room[1]= liveclassroom_parse_line($line[$i+1],"longname="); //longname
- array_push($rooms,$room);
+ array_push($rooms,$room);
}
return $rooms;
}
+function inputRightPlace($array, $value){
+
+ $return = array();
+ foreach($array as $room){
+ if(strcmp($room[0],$value[0])<0) array_push($return,$room);
+ else array_push($return,$value);
+ }
+ return $return;
+}
+
/*
* List all the rooms and their archives associed + the orphaned archives list
*
@@ -1415,7 +1426,7 @@
- $listElements = $xmldoc->createElement('listElements');
+ $listElements = $xmldoc->create_element('listElements');
//$orphanedArchivesForStudent = $xmldoc->createElement('orphanedArchivesForStudent');
$line = explode("\n",$data);
@@ -1431,10 +1442,10 @@
$roompreview= liveclassroom_parse_line($line[$i],"preview="); //preview
- $element = $xmldoc->createElement('listElement');
+ $element = $xmldoc->create_element('listElement');
- $roomParameters = $xmldoc->createElement('listElementParameters');
+ $roomParameters = $xmldoc->create_element('listElementParameters');
if ($isteacher=="1")
{
@@ -1449,40 +1460,40 @@
if(liveclassroom_api_role_user_room($roomid, $studentuserid)=='Student') { //lecture room
- $type = $xmldoc->createElement('typeOfElement');
- $type->appendChild($xmldoc->createTextNode("Main Lecture"));
+ $type = $xmldoc->create_element('typeOfElement');
+ $type->append_child($xmldoc->create_text_node("Main Lecture"));
$positionValue = 1;
}
else{
- $type = $xmldoc->createElement('typeOfElement');
- $type->appendChild($xmldoc->createTextNode("DiscussionRoom"));
+ $type = $xmldoc->create_element('typeOfElement');
+ $type->append_child($xmldoc->create_text_node("DiscussionRoom"));
$positionValue = 2;
}
- $position = $xmldoc->createElement('position');
- $position->appendChild($xmldoc->createTextNode("$positionValue"));
- $id = $xmldoc->createElement('id');
- $id->appendChild($xmldoc->createTextNode("$roomid"));
- $longname = $xmldoc->createElement('nameDisplay');
- $longname->appendChild($xmldoc->createTextNode("$roomname"));
- $preview = $xmldoc->createElement('preview');
+ $position = $xmldoc->create_element('position');
+ $position->append_child($xmldoc->create_text_node("$positionValue"));
+ $id = $xmldoc->create_element('id');
+ $id->append_child($xmldoc->create_text_node("$roomid"));
+ $longname = $xmldoc->create_element('nameDisplay');
+ $longname->append_child($xmldoc->create_text_node("$roomname"));
+ $preview = $xmldoc->create_element('preview');
if ($roompreview=="1")
{
- $preview->appendChild($xmldoc->createTextNode("unavailable"));
+ $preview->append_child($xmldoc->create_text_node("unavailable"));
}
else
{
- $preview->appendChild($xmldoc->createTextNode("available"));
+ $preview->append_child($xmldoc->create_text_node("available"));
}
- $roomParameters->appendChild($type);
- $roomParameters->appendChild($position);
- $roomParameters->appendChild($id);
- $roomParameters->appendChild($longname);
- $roomParameters->appendChild($preview);
- $element->appendChild($roomParameters);
+ $roomParameters->append_child($type);
+ $roomParameters->append_child($position);
+ $roomParameters->append_child($id);
+ $roomParameters->append_child($longname);
+ $roomParameters->append_child($preview);
+ $element->append_child($roomParameters);
// $tabarchive = liveclassroom_api_get_archive_list_for_a_room($roomid,$userid);
@@ -1490,30 +1501,30 @@
$nbrClosedArchive = 0;
- $archives = $xmldoc->createElement('archives');
+ $archives = $xmldoc->create_element('archives');
foreach ($tabarchive as $tabarchive_value) {
- $archive = $xmldoc->createElement('archive');
+ $archive = $xmldoc->create_element('archive');
// $xmlOrphanedArchiveForStudent = $xmldoc->CreateElement("orphanedArchiveForStudent");
- $archiveid = $xmldoc->createElement('id');
- $archiveid->appendChild($xmldoc->createTextNode("$tabarchive_value[1]"));
- $archivename = $xmldoc->createElement('nameDisplay');
- $archivename->appendChild($xmldoc->createTextNode("$tabarchive_value[2]"));
- $archivepreview = $xmldoc->createElement('preview');
+ $archiveid = $xmldoc->create_element('id');
+ $archiveid->append_child($xmldoc->create_text_node("$tabarchive_value[1]"));
+ $archivename = $xmldoc->create_element('nameDisplay');
+ $archivename->append_child($xmldoc->create_text_node("$tabarchive_value[2]"));
+ $archivepreview = $xmldoc->create_element('preview');
if($tabarchive_value[0]=="1") {
- $archivepreview->appendChild($xmldoc->createTextNode("unavailable"));
+ $archivepreview->append_child($xmldoc->create_text_node("unavailable"));
$nbrClosedArchive++;
}
else {
- $archivepreview->appendChild($xmldoc->createTextNode("available"));
+ $archivepreview->append_child($xmldoc->create_text_node("available"));
}
- $archive->appendChild($archiveid);
- $archive->appendChild($archivename);
- $archive->appendChild($archivepreview);
- $archives->appendChild($archive);
+ $archive->append_child($archiveid);
+ $archive->append_child($archivename);
+ $archive->append_child($archivepreview);
+ $archives->append_child($archive);
unset($orphanedArchives[$tabarchive_value[1]]) ;
/*
if ( ($roompreview==1) && ($tabarchive_value[0]==0))
@@ -1537,81 +1548,81 @@
}
*/
}
- $roomParameters->appendChild($archives);
+ $roomParameters->append_child($archives);
}
- $closedArchive = $xmldoc->createElement("closedArchive");
+ $closedArchive = $xmldoc->create_element("closedArchive");
if (sizeof($tabarchive) == $nbrClosedArchive)
{
- $closedArchive->appendChild($xmldoc->createTextNode("true"));
+ $closedArchive->append_child($xmldoc->create_text_node("true"));
}
else
{
- $closedArchive->appendChild($xmldoc->createTextNode("false"));
+ $closedArchive->append_child($xmldoc->create_text_node("false"));
}
- $roomParameters->appendChild($closedArchive);
+ $roomParameters->append_child($closedArchive);
- $element->appendChild($roomParameters);
+ $element->append_child($roomParameters);
- $listElements->appendChild($element);
+ $listElements->append_child($element);
}
foreach ($orphanedArchives as $orphanedArchive)
{
- $xmlOrphanedArchive = $xmldoc->createElement("listElement");
+ $xmlOrphanedArchive = $xmldoc->create_element("listElement");
- $parametersOrphaned = $xmldoc->createElement("listElementParameters");
+ $parametersOrphaned = $xmldoc->create_element("listElementParameters");
- $typeOrphaned = $xmldoc->createElement("typeOfElement");
- $typeOrphaned->appendChild($xmldoc->createTextNode("orphanedArchive"));
- $parametersOrphaned->appendChild($typeOrphaned);
+ $typeOrphaned = $xmldoc->create_element("typeOfElement");
+ $typeOrphaned->append_child($xmldoc->create_text_node("orphanedArchive"));
+ $parametersOrphaned->append_child($typeOrphaned);
- $pos = $xmldoc->createElement("position");
- $pos->appendChild($xmldoc->createTextNode("3"));
- $parametersOrphaned->appendChild($pos);
+ $pos = $xmldoc->create_element("position");
+ $pos->append_child($xmldoc->create_text_node("3"));
+ $parametersOrphaned->append_child($pos);
- $typeOrphanedArchive = $xmldoc->createElement("type");
+ $typeOrphanedArchive = $xmldoc->create_element("type");
if(liveclassroom_api_role_user_room($orphanedArchive[1], $studentuserid)=='Student') { //lecture room
- $typeOrphanedArchive->appendChild($xmldoc->createTextNode("mainLectureRoom"));
+ $typeOrphanedArchive->append_child($xmldoc->create_text_node("mainLectureRoom"));
}
else{
- $typeOrphanedArchive->appendChild($xmldoc->createTextNode("discussionRoom"));
+ $typeOrphanedArchive->append_child($xmldoc->create_text_node("discussionRoom"));
}
- $parametersOrphaned->appendChild($typeOrphanedArchive);
+ $parametersOrphaned->append_child($typeOrphanedArchive);
- $idOrphanedArchive = $xmldoc->createElement("id");
- $idOrphanedArchive->appendChild($xmldoc->createTextNode($orphanedArchive[1]));
- $parametersOrphaned->appendChild($idOrphanedArchive);
+ $idOrphanedArchive = $xmldoc->create_element("id");
+ $idOrphanedArchive->append_child($xmldoc->create_text_node($orphanedArchive[1]));
+ $parametersOrphaned->append_child($idOrphanedArchive);
- $longnameOrphanedArchive = $xmldoc->createElement("nameDisplay");
- $longnameOrphanedArchive->appendChild($xmldoc->createTextNode($orphanedArchive[2]));
- $parametersOrphaned->appendChild($longnameOrphanedArchive);
+ $longnameOrphanedArchive = $xmldoc->create_element("nameDisplay");
+ $longnameOrphanedArchive->append_child($xmldoc->create_text_node($orphanedArchive[2]));
+ $parametersOrphaned->append_child($longnameOrphanedArchive);
- $previewOrphanedArchive = $xmldoc->createElement("preview");
+ $previewOrphanedArchive = $xmldoc->create_element("preview");
if ($orphanedArchive[$j][0]==1)
{
- $previewOrphanedArchive->appendChild($xmldoc->createTextNode("unavailable"));
+ $previewOrphanedArchive->append_child($xmldoc->create_text_node("unavailable"));
}
else
{
- $previewOrphanedArchive->appendChild($xmldoc->createTextNode("available"));
+ $previewOrphanedArchive->append_child($xmldoc->create_text_node("available"));
}
- $parametersOrphaned->appendChild($previewOrphanedArchive);
+ $parametersOrphaned->append_child($previewOrphanedArchive);
- $xmlOrphanedArchive->appendChild($parametersOrphaned);
+ $xmlOrphanedArchive->append_child($parametersOrphaned);
- $listElements->appendChild($xmlOrphanedArchive);
+ $listElements->append_child($xmlOrphanedArchive);
}
- $xmldoc->appendChild($listElements);
+ $xmldoc->append_child($listElements);
return $listElements;
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2006-12-08 09:29:21 UTC (rev 108)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2006-12-14 14:22:06 UTC (rev 109)
@@ -527,4 +527,16 @@
width:100%;
border-bottom: #818181 1px solid;
- }
\ No newline at end of file
+ }
+
+.toolTip{
+width: 200px;
+display: none;
+position: absolute;
+z-index : 1;
+background-color: #ffffd0;
+padding: 2px;
+margin: 2px;
+font-family: Verdana;
+font-size: 8pt;
+}
\ No newline at end of file
Modified: trunk/moodle/mod/liveclassroom/generateListRooms.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-08 09:29:21 UTC (rev 108)
+++ trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-14 14:22:06 UTC (rev 109)
@@ -64,88 +64,87 @@
}
- $xmldoc = new DomDocument();
+ $xmldoc = domxml_new_doc("1.0");// new DomDocument();
- $root = $xmldoc->createElement('root');
+ $root = $xmldoc->create_element('root');
- $root->appendChild(liveclassroom_get_session_params($xmldoc,$params));
+ $root->append_child(liveclassroom_get_session_params($xmldoc,$params));
- $windows = $xmldoc->createElement('windows');
+ $windows = $xmldoc->create_element('windows');
//HEADER BAR
- $windows->appendChild(liveclassroom_create_headerbar($xmldoc));
+ $windows->append_child(liveclassroom_create_headerbar($xmldoc));
-
+
//TOOL BAR
- $toolbar = $xmldoc->createElement('windowsElement');
- $tbtype = $xmldoc->createElement('type');
- $tbtype->appendChild($xmldoc->createTextNode("toolBar"));
- $toolbar->appendChild($tbtype);
+ $toolbar = $xmldoc->create_element('windowsElement');
+ $tbtype = $xmldoc->create_element('type');
+ $tbtype->append_child($xmldoc->create_text_node("toolBar"));
+ $toolbar->append_child($tbtype);
- $tbelementParameters = $xmldoc->createElement("windowsElementParameters");
+ $tbelementParameters = $xmldoc->create_element("windowsElementParameters");
- $menubar = $xmldoc->createElement('menuElements');
+ $menubar = $xmldoc->create_element('menuElements');
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'all', 'all', 'pictures/buttons/toolbar-launch', 'Launch', 'Launch()', "hza=".$params['authToken']));
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-activities', 'Add Activity', "doOpenAddActivity('../../course/mod.php','add=liveclassroom')",''));
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'true', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-new', 'New', "launchAjaxRequest('generateSettings.php','Management','new','true')", ''));
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'true', 'fixSpace', 'all', 'all', '', '', '', '', ''));
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-content', 'Content', "openContentWindows()", ''));
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-poll', 'Reports', 'doOpenReport()',''));
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-settings', 'Settings', "launchAjaxRequest('generateSettings.php','Management','update','false')", ''));
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-delete', 'Delete', 'doDelete()', ''));
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'true', 'fixSpace', 'all', 'all', '', '', '', '', ''));
- $menubar->appendChild(liveclassroom_create_menu_element($xmldoc,'true','search', 'all','all', "", "", "", "",""));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'all', 'all', 'pictures/buttons/toolbar-launch', 'Launch', 'Launch()', "hza=".$params['authToken']));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-activities', 'Add Activity', "doOpenAddActivity('../../course/mod.php','add=liveclassroom')",''));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-new', 'New', "launchAjaxRequest('generateSettings.php','Management','new','true')", ''));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'fixSpace', 'all', 'all', '', '', '', '', ''));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-content', 'Content', "openContentWindows()", ''));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-poll', 'Reports', 'doOpenReport()',''));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-settings', 'Settings', "launchAjaxRequest('generateSettings.php','Management','update','false')", ''));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-delete', 'Delete', 'doDelete()', ''));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'fixSpace', 'all', 'all', '', '', '', '', ''));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true','search', 'all','all', "", "", "", "",""));
- $tbelementParameters->appendChild($menubar);
- $toolbar->appendChild($tbelementParameters);
+ $tbelementParameters->append_child($menubar);
+ $toolbar->append_child($tbelementParameters);
- $windows->appendChild($toolbar);
-
+ $windows->append_child($toolbar);
+
// MESSAGE BAR
if (isset($params['messageType'])) {
- $windows->appendChild(liveclassroom_create_message($xmldoc, 'info', liveclassroom_get_message($params['messageType'])));
+ $windows->append_child(liveclassroom_create_message($xmldoc, 'info', liveclassroom_get_message($params['messageType'])));
}
// LIST
-
- $list = $xmldoc->createElement('windowsElement');
- $typeWindowsElement = $xmldoc->createElement('type');
- $typeWindowsElement->appendChild($xmldoc->createTextNode("list"));
- $list->appendChild($typeWindowsElement);
+
+ $list = $xmldoc->create_element('windowsElement');
+ $typeWindowsElement = $xmldoc->create_element('type');
+ $typeWindowsElement->append_child($xmldoc->create_text_node("list"));
+ $list->append_child($typeWindowsElement);
- $elementParameters = $xmldoc->createElement('windowsElementParameters');
+ $elementParameters = $xmldoc->create_element('windowsElementParameters');
- $products = $xmldoc->createElement('products');
+ $products = $xmldoc->create_element('products');
// LIST PRODUCTS
- $listProducts = $xmldoc->createElement('listProducts');
+ $listProducts = $xmldoc->create_element('listProducts');
- $listProducts->appendChild(liveclassroom_create_product_information($xmldoc,'1','toggleimgmain','productType','Lecture rooms'));
- $listProducts->appendChild(liveclassroom_create_product_information($xmldoc,'2','toggleimgbreakout','productType','Discussion rooms'));
-// $listProducts->appendChild(liveclassroom_create_product_information($xmldoc,'3','toggleimgorphaned','productType','Orphaned archives'));
+ $listProducts->append_child(liveclassroom_create_product_information($xmldoc,'1','toggleimgmain','productType','Lecture rooms'));
+ $listProducts->append_child(liveclassroom_create_product_information($xmldoc,'2','toggleimgbreakout','productType','Discussion rooms'));
- $products->appendChild($listProducts);
+ $products->append_child($listProducts);
// PRODUCTS CONTENT
- $productContent = $xmldoc->createElement('productsContent');
+ $productContent = $xmldoc->create_element('productsContent');
- $productContent->appendChild(liveclassroom_list_xml_roomsarchiveslist($xmldoc,$userid,$courseid,$isteacher));
+ $productContent->append_child(liveclassroom_list_xml_roomsarchiveslist($xmldoc,$userid,$courseid,$isteacher));
- $products->appendChild($productContent);
+ $products->append_child($productContent);
- $elementParameters->appendChild($products);
+ $elementParameters->append_child($products);
- $list->appendChild($elementParameters);
+ $list->append_child($elementParameters);
- $windows->appendChild($list);
+ $windows->append_child($list);
+
+ $root->append_child($windows);
- $root->appendChild($windows);
+ $xmldoc->append_child($root);
+
+ $xmlstring = $xmldoc->dump_mem(true); //saveXML(); // Xml datas into a string
- $xmldoc->appendChild($root);
-
- $xmlstring = $xmldoc->saveXML(); // Xml datas into a string
-
$finalstring = str_replace("\n", '', $xmlstring);
echo $xmlstring;
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-08 09:29:21 UTC (rev 108)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-14 14:22:06 UTC (rev 109)
@@ -63,157 +63,157 @@
}
$contextDisplay='all';
- $xmldoc = new DomDocument();
+ $xmldoc = domxml_new_doc("1.0");//new DomDocument();
- $root = $xmldoc->createElement('root');
+ $root = $xmldoc->create_element('root');
- $root->appendChild(liveclassroom_get_session_params($xmldoc,$_GET));
- $windows = $xmldoc->createElement('windows');
+ $root->append_child(liveclassroom_get_session_params($xmldoc,$_GET));
+ $windows = $xmldoc->create_element('windows');
// HEADER BAR
- $windows->appendChild(liveclassroom_create_headerbar($xmldoc));
+ $windows->append_child(liveclassroom_create_headerbar($xmldoc));
// CONTEXT BAR
- $contextbar = $xmldoc->createElement('windowsElement');
- $cbtype = $xmldoc->createElement('type');
- $cbtype->appendChild($xmldoc->createTextNode("contextBar"));
- $contextbar->appendChild($cbtype);
- $cbelementParameters = $xmldoc->createElement("windowsElementParameters");
- $contextbarinformations = $xmldoc->createElement("contextBarInformations");
- $cbname = $xmldoc->createElement("name");
+ $contextbar = $xmldoc->create_element('windowsElement');
+ $cbtype = $xmldoc->create_element('type');
+ $cbtype->append_child($xmldoc->create_text_node("contextBar"));
+ $contextbar->append_child($cbtype);
+ $cbelementParameters = $xmldoc->create_element("windowsElementParameters");
+ $contextbarinformations = $xmldoc->create_element("contextBarInformations");
+ $cbname = $xmldoc->create_element("name");
if($action=="update") {
- $cbname->appendChild($xmldoc->createTextNode($room_info['longname']));
+ $cbname->append_child($xmldoc->create_text_node($room_info['longname']));
}
- else $cbname->appendChild($xmldoc->createTextNode("New room"));
- $contextbarinformations->appendChild($cbname);
- $cbcontext = $xmldoc->createElement("context");
- $cbcontext->appendChild($xmldoc->createTextNode("Settings"));
- $contextbarinformations->appendChild($cbcontext);
- $cbproduct = $xmldoc->createElement("product");
- $cbproduct->appendChild($xmldoc->createTextNode("Live Classroom"));
- $contextbarinformations->appendChild($cbproduct);
+ else $cbname->append_child($xmldoc->create_text_node("New room"));
+ $contextbarinformations->append_child($cbname);
+ $cbcontext = $xmldoc->create_element("context");
+ $cbcontext->append_child($xmldoc->create_text_node("Settings"));
+ $contextbarinformations->append_child($cbcontext);
+ $cbproduct = $xmldoc->create_element("product");
+ $cbproduct->append_child($xmldoc->create_text_node("Live Classroom"));
+ $contextbarinformations->append_child($cbproduct);
- $cbelementParameters->appendChild($contextbarinformations);
+ $cbelementParameters->append_child($contextbarinformations);
- $contextbar->appendChild($cbelementParameters);
+ $contextbar->append_child($cbelementParameters);
- $windows->appendChild($contextbar);
+ $windows->append_child($contextbar);
// SETTINGS
- $settings = $xmldoc->createElement('windowsElement');
- $settingstype = $xmldoc->createElement('type');
- $settingstype->appendChild($xmldoc->createTextNode("settings"));
- $settings->appendChild($settingstype);
+ $settings = $xmldoc->create_element('windowsElement');
+ $settingstype = $xmldoc->create_element('type');
+ $settingstype->append_child($xmldoc->create_text_node("settings"));
+ $settings->append_child($settingstype);
- $settingsElementParameters = $xmldoc->createElement("windowsElementParameters");
+ $settingsElementParameters = $xmldoc->create_element("windowsElementParameters");
- $panelsSettings = $xmldoc->createElement('panelsSettings');
+ $panelsSettings = $xmldoc->create_element('panelsSettings');
// -------------- ROOM INFO -------------------
- $panelSettings = $xmldoc->createElement('panelSettings');
+ $panelSettings = $xmldoc->create_element('panelSettings');
// ROOM INFO PANEL INFO
- $panelSettings->appendChild(create_panel_info($xmldoc, 'all', 'tabSelected', 'tabDisabled', 'Room Info', "1", "block"));
+ $panelSettings->append_child(create_panel_info($xmldoc, 'all', 'tabSelected', 'tabDisabled', 'Room Info', "1", "block"));
// ROOM INFO CONTENT
- $panelContent = $xmldoc->createElement('panelContent');
+ $panelContent = $xmldoc->create_element('panelContent');
// FIRST LINE
- $panelLine = $xmldoc->createElement('panelLine');
+ $panelLine = $xmldoc->create_element('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode(" "));
- $panelLine->appendChild($panelLineStyle);
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
- $linepart = $xmldoc->createElement('panelLinePart');
+ $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode("right"));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node("right"));
+ $linepart->append_child($align);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay, "label", $parameters=array("class" => "alert", "value" => "*") ));
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"label", $parameters=array("value" => "Title : ") ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay, "label", $parameters=array("class" => "alert", "value" => "*") ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"label", $parameters=array("value" => "Title : ") ));
+ $panelLine->append_child($linepart);
$parameters=array("id" => "longname", "maxlength" => "50", "name" => "longname", "type" => "text");
if($action=="update"){
$parameters['value'] = $room_info['longname'];
}
- $linepart = $xmldoc->createElement('panelLinePart');
+ $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"input", $parameters));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"input", $parameters));
+ $panelLine->append_child($linepart);
- $panelContent->appendChild($panelLine);
+ $panelContent->append_child($panelLine);
// SECOND LINE
- $panelLine = $xmldoc->createElement('panelLine');
+ $panelLine = $xmldoc->create_element('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode(" "));
- $panelLine->appendChild($panelLineStyle);
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
- $linepart = $xmldoc->createElement('panelLinePart');
+ $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode("right"));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node("right"));
+ $linepart->append_child($align);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"label", $parameters=array("value" => "Description : ") ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"label", $parameters=array("value" => "Description : ") ));
+ $panelLine->append_child($linepart);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"textarea", $parameters=array("cols" => "40", "id" => "description", "value" => $room_info['description'], "name" => "description", "rows" => "4") ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"textarea", $parameters=array("cols" => "40", "id" => "description", "value" => $room_info['description'], "name" => "description", "rows" => "4") ));
+ $panelLine->append_child($linepart);
- $panelContent->appendChild($panelLine);
+ $panelContent->append_child($panelLine);
if(($room_info['archive']!=1) || ($roomId == "")) {
// THIRD LINE
- $panelLine = $xmldoc->createElement('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode(""));
- $panelLine->appendChild($panelLineStyle);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $panelLine = $xmldoc->create_element('panelLine');
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode("right"));
- $linepart->appendChild($align);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay ,"label", $parameters=array("value" => "Type : ") ));
- $panelLine->appendChild($linepart);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node("right"));
+ $linepart->append_child($align);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay ,"label", $parameters=array("value" => "Type : ") ));
+ $panelLine->append_child($linepart);
$parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"mainLectureRoom\")") ;
if(($action=="update") && ($isLectureRoom==true))
@@ -230,65 +230,65 @@
$parameters['checked']=true;
}
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, "mainLectureRoom","input", $parameters));
- $panelLine->appendChild($linepart);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, "mainLectureRoom","input", $parameters));
+ $panelLine->append_child($linepart);
$parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"mainLectureRoom\")") ;
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, "discussionRoom","input", $parameters));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, "discussionRoom","input", $parameters));
+ $panelLine->append_child($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "led_instructor", "valign" => "top", "value" => "Lecture room" ) ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "led_instructor", "valign" => "top", "value" => "Lecture room" ) ));
+ $panelLine->append_child($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
+ $panelLine->append_child($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Instructors lead the presentation" ) ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Instructors lead the presentation" ) ));
+ $panelLine->append_child($linepart);
- $panelContent->appendChild($panelLine);
+ $panelContent->append_child($panelLine);
// FOURTH LINE
- $panelLine = $xmldoc->createElement('panelLine');
+ $panelLine = $xmldoc->create_element('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode(" "));
- $panelLine->appendChild($panelLineStyle);
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" =>"")));
- $panelLine->appendChild($linepart);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" =>"")));
+ $panelLine->append_child($linepart);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
$parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"discussionRoom\")") ;
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,"mainLectureRoom","input", $parameters));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"mainLectureRoom","input", $parameters));
+ $panelLine->append_child($linepart);
$parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"discussionRoom\")") ;
@@ -302,78 +302,78 @@
$parameters['checked']=true;
}
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,"discussionRoom","input", $parameters));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"discussionRoom","input", $parameters));
+ $panelLine->append_child($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "led_student", "value" => "Discussion room" ) ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "led_student", "value" => "Discussion room" ) ));
+ $panelLine->append_child($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
+ $panelLine->append_child($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Students and Instructors have the same rigths" ) ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Students and Instructors have the same rigths" ) ));
+ $panelLine->append_child($linepart);
- $panelContent->appendChild($panelLine);
+ $panelContent->append_child($panelLine);
}
- $panelSettings->appendChild($panelContent);
+ $panelSettings->append_child($panelContent);
- $panelsSettings->appendChild($panelSettings);
+ $panelsSettings->append_child($panelSettings);
// ----------------- MEDIA ------------------
- $panelSettingsM = $xmldoc->createElement('panelSettings');
+ $panelSettingsM = $xmldoc->create_element('panelSettings');
// MEDIA PANEL INFO
- $panelSettingsM->appendChild(create_panel_info($xmldoc, 'mainLectureRoom', 'tabNoSelected', 'tabDisabled', 'Media', "2", 'none'));
+ $panelSettingsM->append_child(create_panel_info($xmldoc, 'mainLectureRoom', 'tabNoSelected', 'tabDisabled', 'Media', "2", 'none'));
// MEDIA CONTENT
- $panelContentM = $xmldoc->createElement('panelContent');
+ $panelContentM = $xmldoc->create_element('panelContent');
// FIRST LINE
- $panelLine = $xmldoc->createElement('panelLine');
+ $panelLine = $xmldoc->create_element('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode(" "));
- $panelLine->appendChild($panelLineStyle);
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
$parameters=array("type" => "radio", "value" => "two-way-audio", "id" => "audio", "name" => "media_type", "onclick" =>"doChangeMedia(\"audio\")") ;
if($action=='update') {
if($room_info['media_type']=="two-way-audio") $parameters['checked']=true;
}
else $parameters['checked']=true;
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters));
- $panelLine->appendChild($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Audio") ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters));
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Audio") ));
+ $panelLine->append_child($linepart);
- $panelContentM->appendChild($panelLine);
+ $panelContentM->append_child($panelLine);
// SECOND LINE
- $panelLine = $xmldoc->createElement('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode(" "));
- $panelLine->appendChild($panelLineStyle);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $panelLine = $xmldoc->create_element('panelLine');
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "student_simulcast", "name" => "hms_simulcast_restricted") ;
if($action=='update'){
if($room_info['hms_simulcast_restricted']==1){
@@ -386,34 +386,34 @@
}
else $parameters['checked']=true;
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
+ $panelLine->append_child($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enabled Students to use the phone") ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enabled Students to use the phone") ));
+ $panelLine->append_child($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
+ $panelLine->append_child($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Note : Instructors can always use the phone") ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Note : Instructors can always use the phone") ));
+ $panelLine->append_child($linepart);
- $panelContentM->appendChild($panelLine);
+ $panelContentM->append_child($panelLine);
// THIRD LINE
- $panelLine = $xmldoc->createElement('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode(" "));
- $panelLine->appendChild($panelLineStyle);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $panelLine = $xmldoc->create_element('panelLine');
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "two_way_enabled", "name" => "hms_two_way_enabled") ;
if($action=='update'){
@@ -427,26 +427,26 @@
}
else $parameters['checked']=true;
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"input", $parameters) );
- $panelLine->appendChild($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enabled Students microphones at presentation start") ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"input", $parameters) );
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enabled Students microphones at presentation start") ));
+ $panelLine->append_child($linepart);
- $panelContentM->appendChild($panelLine);
+ $panelContentM->append_child($panelLine);
//FOURTh LINE
- $panelLine = $xmldoc->createElement('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode(" "));
- $panelLine->appendChild($panelLineStyle);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $panelLine = $xmldoc->create_element('panelLine');
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
$parameters=array("type" => "radio", "value" => "one-way-audio", "id" => "video", "name" => "media_type", "onclick" => "doChangeMedia(\"video\")") ;
if($action=='update'){
if($room_info['media_type']=="one-way-video"){
@@ -454,539 +454,539 @@
}
}
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
- $panelLine->appendChild($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "One-way Video") ));
- $panelLine->appendChild($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
- $panelLine->appendChild($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Presenter uses RealProducer") ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "One-way Video") ));
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Presenter uses RealProducer") ));
+ $panelLine->append_child($linepart);
- $panelContentM->appendChild($panelLine);
+ $panelContentM->append_child($panelLine);
// HIDE LINE
- $panelLine = $xmldoc->createElement('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode("hide"));
- $panelLine->appendChild($panelLineStyle);
- $panelLineId = $xmldoc->createElement('id');
- $panelLineId->appendChild($xmldoc->createTextNode("roomId_row"));
- $panelLine->appendChild($panelLineId);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $panelLine = $xmldoc->create_element('panelLine');
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node("hide"));
+ $panelLine->append_child($panelLineStyle);
+ $panelLineId = $xmldoc->create_element('id');
+ $panelLineId->append_child($xmldoc->create_text_node("roomId_row"));
+ $panelLine->append_child($panelLineId);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "roomId_field", "value" => "Room Id : ") ));
- $panelLine->appendChild($linepart);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "roomId_field", "value" => "Room Id : ") ));
+ $panelLine->append_child($linepart);
$parameters=array("type" => "text", "id" => "roomId_field", "name" => "roomId_Field", "maxlength" => "50") ;
if($action=='update'){
$parameters['value']=$roomId;
}
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
+ $panelLine->append_child($linepart);
- $panelContentM->appendChild($panelLine);
+ $panelContentM->append_child($panelLine);
//FIFTH LINE
- $panelLine = $xmldoc->createElement('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode(" "));
- $panelLine->appendChild($panelLineStyle);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $panelLine = $xmldoc->create_element('panelLine');
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
$parameters=array("type" => "radio", "value" => "none", "id" => "none", "name" => "media_type", "onclick" => "doChangeMedia(\"none\")") ;
if($action=='update') {
if($room_info['media_type']=="none") $parameters['checked']=true;
}
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
- $panelLine->appendChild($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Third-party Conference Call") ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Third-party Conference Call") ));
+ $panelLine->append_child($linepart);
- $panelContentM->appendChild($panelLine);
+ $panelContentM->append_child($panelLine);
- $panelSettingsM->appendChild($panelContentM);
- $panelsSettings->appendChild($panelSettingsM);
+ $panelSettingsM->append_child($panelContentM);
+ $panelsSettings->append_child($panelSettingsM);
//--------- END MEDIA --------
// ----------------- FEATURES ----------------
- $panelSettings = $xmldoc->createElement('panelSettings');
+ $panelSettings = $xmldoc->create_element('panelSettings');
// FEATURES PANEL INFO
- $panelSettings->appendChild(create_panel_info($xmldoc, 'mainLectureRoom-discussionRoom', 'tabNoSelected', 'tabDisabled', 'Features', "3", 'none'));
+ $panelSettings->append_child(create_panel_info($xmldoc, 'mainLectureRoom-discussionRoom', 'tabNoSelected', 'tabDisabled', 'Features', "3", 'none'));
// FEATURES CONTENT
- $panelContent = $xmldoc->createElement('panelContent');
+ $panelContent = $xmldoc->create_element('panelContent');
// FIRST LINE
- $panelLine = $xmldoc->createElement('panelLine');
- $panelLineStyle = $xmldoc->createElement('style');
- $panelLineStyle->appendChild($xmldoc->createTextNode(" "));
- $panelLine->appendChild($panelLineStyle);
- $linepart = $xmldoc->createElement('panelLinePart');
- $style = $xmldoc->createElement('style');
- $style->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($style);
+ $panelLine = $xmldoc->create_element('panelLine');
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $align = $xmldoc->createElement('align');
- $align->appendChild($xmldoc->createTextNode(""));
- $linepart->appendChild($align);
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
$parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_eboard", "name" => "student_wb_enabled") ;
if($action=='update'){
if($room_info['student_wb_enabled']==1) $parameters['checked']=true;
}
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
- $panelLine->appendChild($linepart);
- $linepart->appendChild(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enabled Students to use eBoard") ));
- $panelLine->appendChild($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enabled Students to use eBoard") ));
+ $panelLine->append_child($linepart);
- $panelContent->appendChild($pan...
[truncated message content] |
|
From: <sh...@us...> - 2006-12-15 11:04:43
|
Revision: 110
http://svn.sourceforge.net/hw4mdl/?rev=110&view=rev
Author: shazan
Date: 2006-12-15 03:04:39 -0800 (Fri, 15 Dec 2006)
Log Message:
-----------
Module can be accessed if the "Activities" block is not displayed.
php4 and php5 are now supported with the same code
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/generateListRooms.php
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/js/Ajax.js
trunk/moodle/mod/liveclassroom/js/constants.js
trunk/moodle/mod/liveclassroom/js/hwCommons.js
trunk/moodle/mod/liveclassroom/js/manageXml.js
trunk/moodle/mod/liveclassroom/js/verifForm.js
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/mod.html
trunk/moodle/mod/liveclassroom/welcome.php
Added Paths:
-----------
trunk/moodle/mod/liveclassroom/pictures/items/more-link.png
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-14 14:22:06 UTC (rev 109)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-15 11:04:39 UTC (rev 110)
@@ -68,6 +68,7 @@
$LIVECLASSROOM_LOGS = "logs.php"; //file use to the logs
+
/*
* Get the prefix to use for creating rooms and users.
*
@@ -250,11 +251,11 @@
if ( $respcode != 100 && $respcode != 301) {
- add_to_log($COURSE->id, "liveclassroom", "Create User", "$LIVECLASSROOM_LOGS?type=errorCreateUser&time=".time()."&userId=$userId&respcode=$respcode&courseId=".$COURSE->id, "User Creation Failed");
+ add_to_log($COURSE->id, "liveclassroom", "Create User", "$LIVECLASSROOM_LOGS?type=errorCreateUser&time=".time()."&userId=$userid&respcode=$respcode&courseId=".$COURSE->id, "User Creation Failed");
// error( "Response: Account ($userId) Creation Failed: $resp_code");
return false;
}
- add_to_log($COURSE->id, "liveclassroom", "Create User", "$LIVECLASSROOM_LOGS?type=createUser&time=".time()."&userId=$userId&courseId=".$COURSE->id, "User Creation succeeded");
+ add_to_log($COURSE->id, "liveclassroom", "Create User", "$LIVECLASSROOM_LOGS?type=createUser&time=".time()."&userId=$userid&courseId=".$COURSE->id, "User Creation succeeded");
return true;
}
@@ -357,6 +358,8 @@
global $LIVECLASSROOM_LOGS;
global $COURSE;
+ $list_attributes = '';
+
unset($attributes['longname']);
while (list($key, $val) = each($attributes)) {
if(($key!='class_id')&&(isset($val))&&($val!="")){
@@ -1423,9 +1426,12 @@
if ( $respcode != 100) {
return false;
}
+/*
+ if (version_compare(PHP_VERSION,'5','>=')) {
+ require_once($CFG->libdir.'/cas/domxml-php4-php5.php');
+ }
+*/
-
-
$listElements = $xmldoc->create_element('listElements');
//$orphanedArchivesForStudent = $xmldoc->createElement('orphanedArchivesForStudent');
Modified: trunk/moodle/mod/liveclassroom/generateListRooms.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-14 14:22:06 UTC (rev 109)
+++ trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-15 11:04:39 UTC (rev 110)
@@ -30,7 +30,10 @@
/* $Id$ */
/// This page is to generate the list of rooms and archives
-
+ error_reporting(E_ALL);
+
+
+
require_once("../../config.php");
require_once("lib.php");
require_once("api.php");
@@ -38,6 +41,11 @@
// Variables needed
global $CFG;
+
+ if (version_compare(PHP_VERSION,'5','>=')) {
+ require_once($CFG->libdir.'/cas/domxml-php4-php5.php');
+ }
+
if(empty($_POST)){
$params = $_GET;
}
@@ -127,11 +135,11 @@
$products->append_child($listProducts);
// PRODUCTS CONTENT
- $productContent = $xmldoc->create_element('productsContent');
+// $productContent = $xmldoc->create_element('productsContent');
- $productContent->append_child(liveclassroom_list_xml_roomsarchiveslist($xmldoc,$userid,$courseid,$isteacher));
+ $products->append_child(liveclassroom_list_xml_roomsarchiveslist($xmldoc,$userid,$courseid,$isteacher));
- $products->append_child($productContent);
+// $products->append_child($productContent);
$elementParameters->append_child($products);
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-14 14:22:06 UTC (rev 109)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-15 11:04:39 UTC (rev 110)
@@ -38,6 +38,10 @@
// Variables needed
global $CFG;
+ if (version_compare(PHP_VERSION,'5','>=')) {
+ require_once($CFG->libdir.'/cas/domxml-php4-php5.php');
+ }
+
$courseid = $_GET['enc_course_id'];
$signature = $_GET['signature'];
$action = $_GET['action'];
@@ -135,6 +139,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node("right"));
$linepart->append_child($align);
@@ -154,6 +162,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -176,6 +188,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node("right"));
$linepart->append_child($align);
@@ -188,6 +204,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -209,6 +229,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node("right"));
$linepart->append_child($align);
@@ -235,6 +259,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -271,6 +299,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -282,6 +314,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -345,6 +381,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -371,6 +411,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -411,6 +455,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -444,6 +492,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -479,6 +531,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -508,6 +564,10 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -548,7 +608,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -573,7 +635,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -599,7 +663,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -625,7 +691,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -651,7 +719,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -690,7 +760,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -715,7 +787,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -740,7 +814,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -764,7 +840,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -795,7 +873,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -820,7 +900,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -837,7 +919,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -848,7 +932,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -875,7 +961,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -886,7 +974,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -920,7 +1010,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
@@ -950,7 +1042,9 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
Modified: trunk/moodle/mod/liveclassroom/js/Ajax.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/Ajax.js 2006-12-14 14:22:06 UTC (rev 109)
+++ trunk/moodle/mod/liveclassroom/js/Ajax.js 2006-12-15 11:04:39 UTC (rev 110)
@@ -1,66 +1,61 @@
function getHTTPObject()
{
- var xmlhttp = false;
-
- /* Compilation conditionnelle d'IE */
- /*@cc_on
- @if (@_jscript_version >= 5)
- try
- {
- xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
- }
- catch (e)
- {
- try
- {
- xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
- }
- catch (E)
- {
- xmlhttp = false;
- }
- }
- @else
- xmlhttp = false;
- @end @*/
-
- /* on essaie de cr\xE9er l'objet si ce n'est pas d\xE9j\xE0 fait */
- if (!xmlhttp && typeof XMLHttpRequest != 'undefined')
- {
- try
- {
- xmlhttp = new XMLHttpRequest();
- }
- catch (e)
- {
- xmlhttp = false;
- }
- }
-
- if (xmlhttp)
- {
- /* on d\xE9finit ce qui doit se passer quand la page r\xE9pondra */
- xmlhttp.onreadystatechange=function()
- {
-
- if (xmlhttp.readyState == 4) /* 4 : \xE9tat "complete" */
- {
-
- /*alert(xmlhttp.responseText);
- Traitement de la r\xE9ponse.
- Ici on affiche la r\xE9ponse dans une bo\xEEte de dialogue.
- */
- studentView=false;
- objDom=new XMLDoc(xmlhttp.responseText, null);
- manageXml("");
-
- }
- }
- }
- return xmlhttp;
+ var xmlhttp = false;
+ /* Compilation conditionnelle d'IE */
+ /*@cc_on
+ @if (@_jscript_version >= 5)
+ try
+ {
+ xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
+ }
+ catch (e)
+ {
+ try
+ {
+ xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+ }
+ catch (E)
+ {
+ xmlhttp = false;
+ }
+ }
+ @else
+ xmlhttp = false;
+ @end @*/
+ /* on essaie de créer l'objet si ce n'est pas déj\xC3 fait */
+ if (!xmlhttp && typeof XMLHttpRequest != 'undefined')
+ {
+ try
+ {
+ xmlhttp = new XMLHttpRequest();
+ }
+ catch (e)
+ {
+ xmlhttp = false;
+ }
+ }
+ if (xmlhttp)
+ {
+ /* on définit ce qui doit se passer quand la page répondra */
+ xmlhttp.onreadystatechange = function()
+ {
+ if (xmlhttp.readyState == 4)
+ /* 4 : état "complete" */
+ {
+ /*alert(xmlhttp.responseText);
+ Traitement de la réponse.
+ Ici on affiche la réponse dans une boîte de dialogue.
+ */
+
+ studentView = false;
+ objDom = new XMLDoc(xmlhttp.responseText, null);
+ manageXml("");
+ }
+ }
+ }
+ return xmlhttp;
}
-
function gestionDisplay(isfilter)
{
@@ -109,42 +104,42 @@
if(numberVoiceBoard>5 && isfilter==false)
{
- document.getElementById("div3").style.height=5*19+"px";
- document.getElementById("div3More").style.display="block";
- document.getElementById("div3More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div3\",\""+numberVoiceBoard+"\")'>"+(numberVoiceBoard-5)+" more...</label>";
+ // document.getElementById("div3").style.height=5*19+"px";
+ // document.getElementById("div3More").style.display="block";
+ // document.getElementById("div3More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div3\",\""+numberVoiceBoard+"\")'>"+(numberVoiceBoard-5)+" more...</label>";
}else if(numberVoiceBoard==0){
- document.getElementById("div3").style.display="none";
- document.getElementById("div3Title").style.display="none";
- document.getElementById("div3More").style.display="none";
+ // document.getElementById("div3").style.display="none";
+ // document.getElementById("div3Title").style.display="none";
+ // document.getElementById("div3More").style.display="none";
}else{
- document.getElementById("div3").style.height=numberVoiceBoard*19+"px";
- document.getElementById("div3More").style.display="none";
+ // document.getElementById("div3").style.height=numberVoiceBoard*19+"px";
+ // document.getElementById("div3More").style.display="none";
}
if(numberVoicePresentation>5 && isfilter==false)
{
- document.getElementById("div4").style.height=5*19+"px";
- document.getElementById("div4More").style.display="block";
- document.getElementById("div4More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div4\",\""+numberVoicePresentation+"\")'>"+(numberVoicePresentation-5)+" more...</label>";
+ // document.getElementById("div4").style.height=5*19+"px";
+ // document.getElementById("div4More").style.display="block";
+ // document.getElementById("div4More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div4\",\""+numberVoicePresentation+"\")'>"+(numberVoicePresentation-5)+" more...</label>";
}else if(numberVoicePresentation==0 && isfilter==false){
- document.getElementById("div4").style.display="none";
- document.getElementById("div4Title").style.display="none";
- document.getElementById("div4More").style.display="none";
+ // document.getElementById("div4").style.display="none";
+ // document.getElementById("div4Title").style.display="none";
+ // document.getElementById("div4More").style.display="none";
}
else{
- document.getElementById("div4").style.height=numberVoicePresentation*19+"px";
- document.getElementById("div4More").style.display="none";
+ // document.getElementById("div4").style.height=numberVoicePresentation*19+"px";
+ // document.getElementById("div4More").style.display="none";
}
@@ -205,21 +200,16 @@
return params;
}
-
function DisplayFirstPage(){
/* Cr\xE9ation de l'objet : */
-/*
-var m=
-if(t!=null) m=t;
-else m=getURLParameters();
-*/
+
/* Pr\xE9paration d'une requ\xEAte asynchrone de type GET : */
xmlhttp.open("POST", 'generateListRooms.php',true);
/* Effectue la requ\xEAte : */
xmlhttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
- xmlhttp.onreadystatechange=Management;
+xmlhttp.onreadystatechange=Management;
xmlhttp.send(getURLParameters())
@@ -265,8 +255,9 @@
if (xmlhttp.readyState == 4) /* 4 : \xE9tat "complete" */
{
+
hidePopup()
-
+
objDom=new XMLDoc(xmlhttp.responseText, null);
objDomTree = objDom.docNode;
Modified: trunk/moodle/mod/liveclassroom/js/constants.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/constants.js 2006-12-14 14:22:06 UTC (rev 109)
+++ trunk/moodle/mod/liveclassroom/js/constants.js 2006-12-15 11:04:39 UTC (rev 110)
@@ -6,8 +6,12 @@
var numberOfProduct=4;
var currentId="";
var currentProduct="";
+var currentTool="all";
var typeSelect="mainLecture"
+var longname="";
+var description="";
+
var currentDiv=0;
var numberMainLectureRoom=0;
var numberBreakoutRoom=0;
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-14 14:22:06 UTC (rev 109)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-15 11:04:39 UTC (rev 110)
@@ -27,8 +27,11 @@
{
document.forms[0].student_simulcast.disabled = (mediatype=="video" || mediatype=="none")
document.forms[0].two_way_enabled.disabled = (mediatype=="video" || mediatype=="none")
- if (mediatype=="video"){document.getElementById('roomId_row').style.display="block"}else{
- document.getElementById('roomId_row').style.display="none"}
+ if (mediatype=="video"){
+ document.getElementById('roomId_row').className="visibleAndShift"
+ }else{
+ document.getElementById('roomId_row').className="hideAndShift"
+ }
}
function doChangeLink()
{
@@ -43,9 +46,15 @@
function toggleType(type)
{
+
+ longname=document.getElementById('longname').value;
+ description=document.getElementById('description').value;
typeSelect=type;
+
manageXml('','all');
-
+ longname="";
+ description="";
+
@@ -102,7 +111,7 @@
document.getElementById(id).style.display="block";
document.getElementById(id+"More").style.display="block";
if(pictureId!="")
- document.images[pictureId].src="pictures/items/category-expanded.png";
+ changePicture(pictureId,"pictures/items/category-expanded.png");
}
else if (document.getElementById(id).style.display=="block")
@@ -111,7 +120,7 @@
document.getElementById(id).style.display="none";
document.getElementById(id+"More").style.display="none";
if(pictureId!="")
- document.images[pictureId].src="pictures/items/category-collapsed.png";
+ changePicture(pictureId,"pictures/items/category-collapsed.png");
}
if (document.getElementById(id).className=="hide")
{
@@ -119,7 +128,7 @@
document.getElementById(id+"More").className="visible";
if(pictureId!="")
- document.images[pictureId].src="pictures/items/category-expanded.png";
+ changePicture(pictureId,"pictures/items/category-expanded.png");
}
else if (document.getElementById(id).className=="visible")
@@ -128,24 +137,28 @@
document.getElementById(id+"More").className="hide";
if(pictureId!="")
- document.images[pictureId].src="pictures/items/category-collapsed.png";
+ changePicture(pictureId,"pictures/items/category-collapsed.png");
}
}
-
function hideArchive(type,id,pictureId,roomId)
{
- if (document.getElementById(id).style.display=="none")
+ if (document.getElementById(id).style.display=="none" || document.getElementById(id).className=="hide")
{
if(type=="MainLecture")
numberMainLectureRoom+=numberArchive[roomId];
else
numberBreakoutRoom+=numberArchive[roomId];
+ if (document.getElementById(id).className=="hide")
+ {
+ document.getElementById(id).className="visible";
+ }else{
document.getElementById(id).style.display="block";
- document.images[pictureId].src="pictures/minus.gif";
+ }
+ changePicture(pictureId,"pictures/items/listitem-hide.png");
}
@@ -155,9 +168,15 @@
numberMainLectureRoom-=numberArchive[roomId];
else
numberBreakoutRoom-=numberArchive[roomId];
+ if (document.getElementById(id).className=="visible")
+ {
- document.getElementById(id).style.display="none";
- document.images[pictureId].src="pictures/plus.gif";
+ document.getElementById(id).className="hide";
+
+ }else{
+ document.getElementById(id).style.display="none";
+ }
+ changePicture(pictureId,"pictures/items/listitem-show.png");
}
@@ -246,17 +265,19 @@
if(currentId!="")
{
- var complete_url=url+'?roomId='+currentId+'&'+param;
+ var complete_url=url+'?product='+currentProduct+'&id='+currentId+'&'+param;
- window.open(complete_url,"_self");
+ window.open(complete_url,"_self");
}
}
+
+
function doOpenPopup(url,param)
{
if(currentId!="")
{
- var complete_url=url+'?roomId='+currentId+'&'+param;
+ var complete_url=url+'?id='+currentId+'&'+param;
var w = window.open(complete_url,'lc_popup','scrollbars=yes,resizable=yes,width=800,height=500');
w.focus();
}
@@ -298,36 +319,45 @@
currentId="";
currentProduct="";
manageXml('',"all");
+
+
}
function onFilter(id){
if(currentFilter!=id){
- document.getElementById(id+"_left").style.backgroundImage="url(pictures/items/filter-rollover-left.png)";
- document.getElementById(id+"_center").style.backgroundImage="url(pictures/items/filter-rollover-middle.png)";
- document.getElementById(id+"_right").style.backgroundImage="url(pictures/items/filter-rollover-right.png)";
+ document.getElementById(id+"_left").className="filter_left_rollover";
+ document.getElementById(id+"_center").className="filter_middle_rollover";
+ document.getElementById(id+"_right").className="filter_right_rollover";
}
}
function outFilter(id){
if(currentFilter==id){
- document.getElementById(id+"_left").style.backgroundImage="url(pictures/items/filter-enabled-left.png)";
- document.getElementById(id+"_center").style.backgroundImage="url(pictures/items/filter-enabled-middle.png)";
- document.getElementById(id+"_right").style.backgroundImage="url(pictures/items/filter-enabled-right.png)";
- }else{
- document.getElementById(id+"_left").style.backgroundImage="";
- document.getElementById(id+"_center").style.backgroundImage="";
- document.getElementById(id+"_right").style.backgroundImage="";
+ document.getElementById(id+"_left").className="filter_left_enabled";
+ document.getElementById(id+"_center").className="filter_middle_enabled";
+ document.getElementById(id+"_right").className="filter_right_enabled";
+ }else{
+ document.getElementById(id+"_left").className="noFilter";
+ document.getElementById(id+"_center").className="noFilter";
+ document.getElementById(id+"_right").className="noFilter";
}
}
-function startBoard()
+function startBoard(type)
{
if(currentId!="")
{
- openPopup('<%=Setup.getInstance().getVtServerURL()%>/board?action=display_popup&nid='+currentId)
+ var type;
+ if(typeSelect=="voiceBoard"){
+ type="board"
}
+ else if(typeSelect=="voicePresentation"){
+ type="presentation"
+ }
+ window.open(session["vtServerUrl"]+'/'+type+'?action=display_popup&nid='+currentId,"vt_popup",'scrollbars=yes,resizable=yes,width=800,height=500')
+ }
}
@@ -335,34 +365,91 @@
currentId=""
currentProduct=""
manageXml(search.value,"all");
-
+ gestionDisplay();
}
function Launch(){
-
- if(currentProduct="liveclassroom"){
+
+ if(currentProduct=="liveClassroom"){
Horizon();
- }else if(currentProduct="voiceboard"){
- startBoard();
+ }else if(currentProduct=="voiceBoard"){
+
+ startBoard(typeSelect);
}
+ currentId="";
+ currentProduct="";
+
}
+
function openContentWindows(){
if(currentId!="")
- window.open('http://test13.horizonwimba.com/admin/class/carousels.epl?class_id='+currentId+'&hzA='+session["authToken"],'lc_popup','scrollbars=yes,resizable=yes,width=800,height=500');
+ window.open(session["lcServerUrl"]+'/admin/class/carousels.epl?class_id='+currentId+'&hzA='+session["authToken"],'lc_popup','scrollbars=yes,resizable=yes,width=800,height=500');
}
-function submitForm(url,action){
- //alert(currentId)
- document.myform.action=url+'?product='+currentProduct+'&id='+currentId+'&action='+action+'&time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"];
- document.myform.submit();
- }
+function openPopup(name,url,size,title) {
+ window.open(url,name,size);
+}
+function startHorizon( channel, useplugin, user, password, nickname, paramstring )
+{
+ var windowname = "horizonWin";
+ var horizonurl = session["lcServerUrl"]+"/main/horizon_ui.pl.epl";
+
+ // set the channel ( default to lobby )
+ if ( channel != null) {
+ horizonurl += "?channel=" + channel;
+ }
+ else {
+ horizonurl += "?channel=lobby";
+ }
+
+ if ( useplugin != null ) {
+ horizonurl += "&useplugin=" + useplugin;
+ }
+
+ if ( user != null ) {
+ horizonurl += "&AuthName=Horizon&credential_0=" + user;
+ }
+ if ( password != null ) {
+ horizonurl += "&credential_1=" + password;
+ }
+
+ if ( nickname != null ) {
+ horizonurl += "&credential_2=" + nickname;
+ }
+
+ if ( paramstring != null ) {
+ horizonurl += "&" + paramstring;
+ }
+
+ // open a window with the horizon ui
+ var properties = "scrollbars=no,resizable=yes,width=700,height=500" ;
+ openPopup( windowname, horizonurl, properties, "Live Classroom");
+
+ return;
+}
+
+
+function doOpenPodcaster(url)
+{
+
+ var w = window.open(url,'pc','scrollbars=yes,resizable=yes,width=1000,height=1000');
+ w.focus();
+
+}
+function submitForm(url,action,id){
+alert(id);
+ if(currentProduct=="liveClassroom")
+ verifyFormLiveClassRoom(url+'?product='+currentProduct+'&id='+id+'&action='+action+'&time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]);
+ else
+ verifyFormVoiceBoard(url+'?product='+currentProduct+'&id='+id+'&action='+action+'&time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]);
+ }
- function execAction(lcAction,VtAction){
+ function execAction(lcAction,VtAction){
eval(lcAction);
@@ -394,7 +481,131 @@
function initSearch(search){
- alert("rrr");
- manageXml(search,"toolBar");
-
- }
\ No newline at end of file
+ currentProduct="";
+ currentId="";
+ manageXml(search,"all");
+ document.getElementById("search").focus();
+ }
+
+
+ function getPosition(e) {
+ e = e || window.event;
+ var cursor = {x:0, y:0};
+ if (e.pageX || e.pageY) {
+ cursor.x = e.pageX;
+ cursor.y = e.pageY;
+ }
+ else {
+ var de = document.documentElement;
+ var b = document.body;
+ cursor.x = e.clientX +
+ (de.scrollLeft || b.scrollLeft) - (de.clientLeft || 0);
+ cursor.y = e.clientY +
+ (de.scrollTop || b.scrollTop) - (de.clientTop || 0);
+ }
+ return cursor;
+}
+var timer=0;
+var current;
+function ShowToolTip(ev,lname,availibility)
+{
+var Xdoc, Xfen, Ydoc, Yfen, htDiv, lgDiv, dX, dY;
+ var Ybulle;
+ var el=document.getElementById("Tip");
+
+ //on affiche la boite de dialogue pour evaluer ses dimensions.
+
+
+
+ //height and width of the tooltip
+ htDiv = el.offsetHeight;
+ lgDiv = el.offsetWidth;
+
+ //delta of the tooltip under the curser
+ dY=20;
+ dX=0;
+
+
+ ie = document.all;
+ var cursor = getPosition(ev);
+
+ if(ie){
+ Xfen = event.x;
+ Yfen = event.y;
+ Xdoc = cursor.x;
+ Ydoc = cursor.y;
+ //window.status = x;
+ }else{
+ Xfen = ev.pageX;
+ Yfen = ev.pageY;
+ Xdoc = cursor.x;
+ Ydoc = cursor.y;
+ }
+
+ //position of the curseur :
+/* var cursor = getPosition(ev);
+
+ Xfen = ev.clientX;
+ Xdoc = cursor.x;
+
+ Yfen = ev.clientY;
+ Ydoc = cursor.y;
+*/
+ //position de la bulle dans la page :
+ if ((Xfen + lgDiv + dX) > document.body.clientWidth)
+ el.style.left = document.body.clientWidth + document.body.scrollLeft - lgDiv+"px";
+ else
+ el.style.left = Xdoc + dX +"px";
+
+ if ((Yfen + htDiv + dY) > document.body.clientHeight)
+ {
+ Ybulle = document.body.clientHeight + document.body.scrollTop - htDiv-5;
+ if (parseInt(Ybulle)>parseInt(Ydoc))
+ {
+ el.style.top = Ybulle+"px";
+ }
+ else
+ {
+ el.style.top = Ydoc - htDiv-dY+"px";
+ }
+ }
+ else
+ {
+ el.style.top = Ydoc + dY-5+"px";
+ }
+
+ //el.style.visibility = "visible";
+ //el.style.display = "block";
+
+ //tooltip content :
+ el.innerHTML = "<strong>"+lname+"</strong><br>";
+ if(availibility=="available")
+ el.innerHTML +="Available to the students.<br>";
+ else
+ el.innerHTML +="Unavailable to the students.<br>";
+ el.innerHTML+= "Click Settings to change.";
+ if(timer==0)
+ timer=setTimeout('ShowToolTipWait()', 1000)
+ if(current !=lname){
+ clearTimeout(timer)
+ timer=setTimeout('ShowToolTipWait()', 0)
+
+ }
+ current=lname;
+
+}
+
+ function ShowToolTipWait(){
+ var el=document.getElementById("Tip");
+ if (el.style.display!="inline")
+ el.style.display="inline";
+
+ }
+function HideToolTip()
+{
+ //hide the tooltip
+
+ clearTimeout(timer)
+ timer=0;
+ document.getElementById("Tip").style.display = "none";
+}
\ No newline at end of file
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2006-12-14 14:22:06 UTC (rev 109)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2006-12-15 11:04:39 UTC (rev 110)
@@ -3,11 +3,11 @@
function manageXml(search,divToReload){
var display="";
-
+
if(divToReload=="all"){
- display+="<form method=post name=myform>"
- display+=initDisplay();
-
+ display+="<form method=post name=myform>"
+ display+=initDisplay();
+
}
//session management
var information= objDomTree.getElements("information");
@@ -19,10 +19,11 @@
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++){
// display+=openPart();
var type = windowsElements[i].getElements("type")[0].getText();
-
+
switch(type){
case "headerBar":
if(divToReload=="all" ){
@@ -32,7 +33,7 @@
}else if(divToReload=="headerBar"){
display+=displayHeaderBar(windowsElements[i].getElements("windowsElementParameters"));
-
+
}
break;
case "toolBar":
@@ -45,6 +46,7 @@
display+=displayToolBar(windowsElements[i].getElements("windowsElementParameters"),search);
}
+
break;
case "filterBar":
if(divToReload=="all"){
@@ -56,6 +58,7 @@
display+=displayFilterBar(windowsElements[i].getElements("windowsElementParameters"));
}
+
break;
case "messageBar":
if(divToReload=="all"){
@@ -68,6 +71,17 @@
}
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":
if(divToReload=="all"){
display+=openDiv("list","list") //style='height:245px;overflow-y:scroll'"
@@ -134,15 +148,15 @@
document.getElementById(divToReload).innerHTML = display;
- if(divToReload=="all"){
- gestionDisplay(false);
- document.getElementById("search").focus();
- }
+
+ if(Navigateur()=="Explorer" && parseFloat(navigator.appVersion)<5.5)
+ correctPNG();
- correctPNG();
+ if(divToReload=="all" || divToReload=="list"){
+ gestionDisplay(false);
+ document.getElementById("search").focus();
+ }
-
-
}
@@ -154,24 +168,69 @@
switch(messageInformations[0].getElements("type")[0].getText()){
case "info":
- pictureUrl="";
+ pictureUrl="pictures/items/messagelabel-info.png";
break;
- case "exception":
- pictureUrl="";
+ case "error":
+
+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;
}
-
- display="<table cellspacing=0 border=1 cellpadding=0 bgcolor='#ffffd0'>"
- display+= "<tr >"
- display+= "<td><img src='pictures/items/messagelabel-info.png' /></td>"
- display+= "<td> " + messageInformations[0].getElements("value")[0].getText()+"</td>";
- display+= "<td colspan=5></td>"
- display+= "</tr>"
- display+="</table>"
+
return display;
-
+}
-}
function displayHeaderBar(elementParameters){
var display="";
var headerBarInformations=elementParameters[0].getElements("headerBarInformations")
@@ -296,7 +355,7 @@
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\");' onClick='javascript:initSearch(search.value);' value='"+search+"' />"
+ display+="onkeyup='javascript:manageXml(search.value,\"list\");' 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'> "
@@ -330,15 +389,15 @@
//get the different filters
var filterElements = filterBar[0].getElements("filter");
- display +="<table cellspacing='0' cellpadding='0' width=100%>"
+ display +="<table cellspacing='0' cellpadding='0' width=100% >"
display += "<tr>"
for(var i=0;i<filterElements.length;i++){
- display += "<td>"
+ 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+="<td width='15px'></td> "
+
}
display+="</tr></table>";
@@ -347,23 +406,23 @@
function displayfilter(value,name,action,availibility){
var display="";
- display+="<table border='0' align='center' cellpadding='0' cellspacing='0' heigth='24px'>";
+ display+="<table align='center' cellpadding='0' cellspacing='0' heigth='24px'>";
display+="<tr heigth='24px' class='filter'>";
if(currentFilter==name){
- display+="<td width='8px' class='filter_left_enabled' id='"+name+"_left'></td>";
- display+="<td class='filter_middle_enabled' id='"+name+"_center' class='filter_selected'>";
- display+="<div align='center' onclick="+action+" onmouseover=\"onFilter('"+name+"')\" onmouseout=\"outFilter('"+name+"')\"><label>"+value+"</label></strong></div>";
+ 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 width='8px' class='filter_right_enabled' id='"+name+"_right'></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'>";
- display+="<div align='center' onclick="+action+" onmouseover=\"onFilter('"+name+"')\" onmouseout=\"outFilter('"+name+"')\"><label>"+value+"</label></strong></div>";
+ 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+="<td width=8px id='"+name+"_right'></td>";
}
display+="</tr>";
display+="</table>";
@@ -414,8 +473,8 @@
start=parseInt(positionOfDiv);
}
- var productsContent = list[0].getElements("productsContent");
- var content = productsContent[0].getElements("listElements");
+
+ var content = list[0].getElements("listElements");
var listElements = content[0].getElements("listElement");
var positionDiscussionRoom=0;
var positionMainLecture=0;
@@ -479,9 +538,12 @@
}
var display="";
-
+ display+="<table border='0' align='center' cellpadding='0' cellspacing='0' width=100% >";
+
for(i=start; i< parts.length; i++)
{
+ display+="<tr><td>";
+
if(currentFilter=="all" || currentDiv== i){
if(positionMainLecture==i)
parts[i]=parts[i].toString()+orphanedMainLecture;
@@ -491,15 +553,16 @@
parts[i]+="<div id='div"+i+"More' class='hide'></div>"
display+=parts[i];
}
+ display+="</td></tr>";
}
-
+ display+="</table>";
return display;
}
function openDivProduct(name,cssStyle,value){
var display="";
- display+="<div id='div"+name+"Title'>";
+ display+="<div id='div"+name+"Title' >";
display+="<table cellpadding='0' cellspacing='0' width='100%'>";
display+="<tr class='productTitle'>";
@@ -525,7 +588,7 @@
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' >"+parameters[0].getElements("nameDisplay")[0].getText()+"</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 src=\"pictures/items/listitem-"+parameters[0].getElements("preview")[0].getText()+".png\"/></td>";
display += "</tr>";
@@ -551,7 +614,7 @@
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' >"+title+"</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>";
@@ -577,17 +640,17 @@
return display;
}
-
function displayRoom(type,availibility,longname,roomId,archive,archives)
{
var display="";
- display += "<tr id="+roomId+" height=16px Onclick=\"OneClick('"+roomId+"','liveClassroom','"+type+"')\" class='room' >"
- display += "<td Ondblclick=\"dclick('"+roomId+"')\" width=16px align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.png\" border=\"0\" /></td>";
- display += "<td align=\"left\" Ondblclick='' width=16px><img src='"+archive+"' onclick=\"hideArchive('"+type+"','"+roomId+"hide','toggleimg"+roomId+"hide','"+roomId+"')\" id=\"toggleimg"+roomId+"hide\" border=\"0\" /></td>";
- display += "<td Ondblclick=\"dclick('"+roomId+"')\" width=300px ><label onmousemove=\"ShowToolTip(event,'"+longname+"','"+availibility+"')\" onmouseout=\"HideToolTip()\">"+longname+"</label></td>";
- display += "<td Ondblclick=\"dclick('"+roomId+"')\" class='shiftAvailability' align=right ><img src=\"pictures/items/listitem-"+availibility+".png\"/></td>";
+ display += "<tr id="+roomId+" height=16px class='room'>"
+
+ display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"','liveClassroom','"+type+"')\" width=16px align=\"left\"><img 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 src='"+archive+"' id=\"toggleimg"+roomId+"hide\" border=\"0\" /></td>";
+ display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"','liveClassroom','"+type+"')\" width=300px ><label onmousemove='javascript:ShowToolTip(event,\""+longname+"\",\""+availibility+"\")' onmouseout='javascript:HideToolTip()'>"+longname+"</label></td>";
+ display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"','liveClassroom','"+type+"')\" class='shiftAvailability' align=right ><img src=\"pictures/items/listitem-"+availibility+".png\"/></td>";
display += "</tr>";
if(archives!=null){
@@ -613,10 +676,10 @@
display += "<tr id="+archive[i].getElements("id")[0].getText()+" height=16px Onclick=\"OneClick('"+archive[i].getElements("id")[0].getText()+"','liveclassroom')\" 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 src=\"pictures/items/listitem-liveclassroomicon.png\" border=\"0\" /></td>";
- display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-subitem.png\" border=\"0\" /></td>";
- display += "<td width='300px' class='archive' onmousemove=\"ShowToolTip(event,'"+archive[i].getElements("nameDisplay")[0].getText()+"')\" onmouseout=\"HideToolTip()\">"+archive[i].getElements("nameDisplay")[0].getText()+"</td>";
- display += "<td class='shiftAvailability' align=right><img src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".png\"/></td>";
+ display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.jpg\" border=\"0\" /></td>";
+ display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-subitem.jpg\" border=\"0\" /></td>";
+ display += "<td width='300px' class='archive' ><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 src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".jpg\"/></td>";
display += "</tr>";
}else{
closeArchive++;
@@ -739,7 +802,7 @@
for(var i=0;i<line.length; i++){
- if(line[i].getElements("style")[0].getText()!="" && line[i].getElements("style")[0].getText()=="hide"){
+ if(line[i].getElements("style")[0].getText()!="" && (line[i].getElements("style")[0].getText()=="hide"|| line[i].getElements("style")[0].getText()=="hideAndShift")){
display +="<tr ><td>";
display +="<div id='"+line[i].getElements("id")[0].getText()+"' class='"+line[i].getElements("style")[0].getText()+"'><table cellspacing='0px' cellpadding='0'><tr>"
@@ -780,10 +843,11 @@
var style=new String(linePart[j].getElements("style")[0].getText());
if(style != "")
display+=" class="+style;
-
+ var colspan=new String(linePart[j].getElements("colspan")[0].getText());
+ if(colspan != "0")
+ display+=" colspan="+colspan;
var align=new String(linePart[j].getElements("align")[0].getText());
if(align != "")
- display+=" align="+align;
display+=" >"
for(var i=0;i<elements.length; i++){
var context=new String(elements[i].getElements("displayContext")[0].getText());
@@ -841,27 +905,54 @@
display +=listElement[i].getElements("name")[0].getText()+"='"+listElement[i].getElements("value")[0].getText()+"' ";
else
- value=listElement[i].getElements("value")[0].getText()
+ {
+
+ value=listElement[i].getElements("value")[0].getText()
+
+
+
+ }
}
display += ">"+ value +"</label>"
break;
case "input":
display += "<input ";
+ var change=false;
for(var i=0;i<listElement.length; i++){
-
- display +=listElement[i].getElements("name")[0].getText()+"='"+listElement[i].getElements("value")[0].getText()+"' ";
-
+
+ if(listElement[i].getElements("name")[0].getText()=="id" && listElement[i].getElements("value")[0].getText()=="longname" && longname!=""){
+
+ value=longname;
+ change=true;
+
+ }
+
+ display +=listElement[i].getElements("name")[0].getText()+"='"+listElement[i].getElements("value")[0].getText()+"' ";
}
+ if(change==true ){
+ display +="value='"+value+"' ";
+
+ }
+
display+="></input>";
break;
case "textarea":
display += "<textarea ";
for(var i=0;i<listElement.length; i++){
+ if(description!="" && listElement[i].getElements("name")[0].getText()=="id" && listElement[i].getElements("value")[0].getText()=="description")
+ change=true;
+
if(listElement[i].getElements("name")[0].getText()!="value")
display +=listElement[i].getElements("name")[0].getText()+"='"+listElement[i].getElements("value")[0].getText()+"' ";
else
+ {
+ if(change==true)
+ value=description
+ else
value=listElement[i].getElements("value")[0].getText()
+
+ }
}
display+=">"+value+"</textarea>";
break;
@@ -985,6 +1076,7 @@
return display;
}
function openDiv(id,style){
+
var display="<tr><td><div id='"+id+"' class="+style+">";
return display;
}
@@ -1014,9 +1106,14 @@
session["role"] = informations[0].getElements("role")[0].getText();
if(informations[0].getElements("authToken")!="")
session["authToken"] = informations[0].getElements("authToken")[0].getText();
- if(informations[0].getElements("vtServerUrl")!="")
+ if(informations[0].getElements("vtServerUrl")!="")
session["vtServerUrl"] = informations[0].getElements("vtServerUrl")[0].getText();
- if(informations[0].getElements("lcServerUrl")!="")
+
+ ...
[truncated message content] |
|
From: <sh...@us...> - 2006-12-22 10:01:23
|
Revision: 119
http://svn.sourceforge.net/hw4mdl/?rev=119&view=rev
Author: shazan
Date: 2006-12-22 02:01:20 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/generateListRooms.php
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/index.php
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/manageRoomAction.php
trunk/moodle/mod/liveclassroom/mod.html
trunk/moodle/mod/liveclassroom/welcome.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-21 10:16:12 UTC (rev 118)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-22 10:01:20 UTC (rev 119)
@@ -40,7 +40,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package liveclassroom
*/
-//error_reporting(E_ALL);
+
//require_once('System.php');
require_once('lib.php');
Modified: trunk/moodle/mod/liveclassroom/generateListRooms.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-21 10:16:12 UTC (rev 118)
+++ trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-22 10:01:20 UTC (rev 119)
@@ -52,17 +52,16 @@
$courseid = $params['enc_course_id'];
-
+ $userid = liveclassroom_api_get_teacher_user_id($courseid);
if(isteacher($courseid, $USER->id) ) {
- $userid = liveclassroom_api_get_teacher_user_id($courseid);
+
$isteacher = 1;
}
else if (isstudent($courseid) ) {
- $userid = liveclassroom_api_get_student_user_id($courseid);
+ //$userid = liveclassroom_api_get_student_user_id($courseid);
$isteacher = 0;
-
}
if (!liveclassroom_init_session($params)) {
@@ -94,7 +93,7 @@
$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'all', 'all', 'pictures/buttons/toolbar-launch', 'Launch', 'Launch()', "hza=".$params['authToken']));
$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-activities', 'Add Activity', "doOpenAddActivity('../../course/mod.php','add=liveclassroom')",''));
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-new', 'New', "launchAjaxRequest('generateSettings.php','Management','new','true')", ''));
+ $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-new', 'New', "launchNew('generateSettings.php','Management','new','LiveClassroom','MainLecture')", ''));
$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'fixSpace', 'all', 'all', '', '', '', '', ''));
$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-content', 'Content', "openContentWindows()", ''));
$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-poll', 'Reports', 'doOpenReport()',''));
@@ -135,7 +134,7 @@
// PRODUCTS CONTENT
- $products->append_child(liveclassroom_list_xml_roomsarchiveslist($xmldoc,$userid,$courseid,$isteacher));
+ $products->append_child(liveclassroom_roomsarchiveslist($xmldoc,$userid,$courseid,$isteacher));
$elementParameters->append_child($products);
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-21 10:16:12 UTC (rev 118)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-22 10:01:20 UTC (rev 119)
@@ -28,26 +28,27 @@
******************************************************************************/
/* $Id$ */
-
/// This page is to generate the settings of a room or archive
-
- require_once("../../config.php");
+ // require_once($CFG->dirroot.'/config.php');
+ require_once("../../config.php");
require_once("lib.php");
require_once("api.php");
-
// Variables needed
global $CFG;
if (version_compare(PHP_VERSION,'5','>=')) {
require_once($CFG->libdir.'/cas/domxml-php4-php5.php');
}
-
+
$courseid = $_GET['enc_course_id'];
$signature = $_GET['signature'];
$action = $_GET['action'];
-
- if (!liveclassroom_init_session($_GET)) {
+ $MAINLECTURE = 'MainLecture';
+ $DISCUSSIONROOM = 'Discussion';
+ $MAINDISCUSSION = 'MainLectureRoom-DiscussionRoom';
+
+ if (!liveclassroom_init_session($_GET)) {
error("ExpiredSessionException");
}
@@ -66,18 +67,20 @@
$room_info = array();
}
$contextDisplay='all';
+
+ $xmldoc = domxml_new_doc("1.0");
- $xmldoc = domxml_new_doc("1.0");//new DomDocument();
+ $root = $xmldoc->create_element('root');
- $root = $xmldoc->create_element('root');
-
$root->append_child(liveclassroom_get_session_params($xmldoc,$_GET));
+
$windows = $xmldoc->create_element('windows');
-
- // HEADER BAR
-
+
+ //HEADER BAR
$windows->append_child(liveclassroom_create_headerbar($xmldoc));
+
+
// CONTEXT BAR
$contextbar = $xmldoc->create_element('windowsElement');
@@ -128,7 +131,11 @@
// FIRST LINE
$panelLine = $xmldoc->create_element('panelLine');
-
+
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -138,7 +145,7 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -161,7 +168,7 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -178,6 +185,10 @@
// SECOND LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -203,7 +214,7 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -221,6 +232,9 @@
if(($room_info['archive']!=1) || ($roomId == "")) {
// THIRD LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(""));
$panelLine->append_child($panelLineStyle);
@@ -229,6 +243,7 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -239,7 +254,7 @@
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay ,"label", $parameters=array("value" => "Type : ") ));
$panelLine->append_child($linepart);
- $parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"mainLectureRoom\")") ;
+ $parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"$MAINLECTURE\")") ;
if(($action=="update") && ($isLectureRoom==true))
{
$_SESSION['led']='instructor';
@@ -266,12 +281,12 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, "mainLectureRoom","input", $parameters));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, "$MAINLECTURE","input", $parameters));
$panelLine->append_child($linepart);
- $parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"mainLectureRoom\")") ;
+ $parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"$MAINLECTURE\")") ;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, "discussionRoom","input", $parameters));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, "$DISCUSSIONROOM","input", $parameters));
$panelLine->append_child($linepart);
@@ -290,6 +305,10 @@
// FOURTH LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -299,6 +318,7 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -314,6 +334,7 @@
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -321,24 +342,25 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"discussionRoom\")") ;
+ $parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"$DISCUSSIONROOM\")") ;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"mainLectureRoom","input", $parameters));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAINLECTURE","input", $parameters));
$panelLine->append_child($linepart);
- $parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"discussionRoom\")") ;
+ $parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"$DISCUSSIONROOM\")") ;
if(($action=="update") && ($isLectureRoom==false))
{
$_SESSION['led']='student';
$parameters['checked']=true;
+
}
else
{
$parameters['checked']=true;
}
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"discussionRoom","input", $parameters));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSIONROOM","input", $parameters));
$panelLine->append_child($linepart);
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "led_student", "value" => "Discussion room" ) ));
@@ -357,14 +379,13 @@
$panelsSettings->append_child($panelSettings);
+
-
-
// ----------------- MEDIA ------------------
$panelSettingsM = $xmldoc->create_element('panelSettings');
// MEDIA PANEL INFO
- $panelSettingsM->append_child(create_panel_info($xmldoc, 'mainLectureRoom', 'tabNoSelected', 'tabDisabled', 'Media', "2", 'none'));
+ $panelSettingsM->append_child(create_panel_info($xmldoc, "$MAINLECTURE", 'tabNoSelected', 'tabDisabled', 'Media', "2", 'none'));
// MEDIA CONTENT
$panelContentM = $xmldoc->create_element('panelContent');
@@ -372,6 +393,10 @@
// FIRST LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -403,14 +428,19 @@
// SECOND LINE
$panelLine = $xmldoc->create_element('panelLine');
+
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+
$panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLineStyle->append_child($xmldoc->create_text_node("subOption"));
$panelLine->append_child($panelLineStyle);
$linepart = $xmldoc->create_element('panelLinePart');
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -447,14 +477,17 @@
// THIRD LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLineStyle->append_child($xmldoc->create_text_node("subOption"));
$panelLine->append_child($panelLineStyle);
$linepart = $xmldoc->create_element('panelLinePart');
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -484,6 +517,9 @@
//FOURTh LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -491,7 +527,7 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -520,17 +556,19 @@
// HIDE LINE
$panelLine = $xmldoc->create_element('panelLine');
+
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node("hide"));
$panelLine->append_child($panelLineStyle);
$panelLineId = $xmldoc->create_element('id');
$panelLineId->append_child($xmldoc->create_text_node("roomId_row"));
$panelLine->append_child($panelLineId);
+
$linepart = $xmldoc->create_element('panelLinePart');
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
-
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -556,6 +594,9 @@
//FIFTH LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -563,6 +604,7 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
@@ -592,7 +634,7 @@
$panelSettings = $xmldoc->create_element('panelSettings');
// FEATURES PANEL INFO
- $panelSettings->append_child(create_panel_info($xmldoc, 'mainLectureRoom-discussionRoom', 'tabNoSelected', 'tabDisabled', 'Features', "3", 'none'));
+ $panelSettings->append_child(create_panel_info($xmldoc, "$MAINDISCUSSION", 'tabNoSelected', 'tabDisabled', 'Features', "3", 'none'));
@@ -601,6 +643,9 @@
// FIRST LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -608,6 +653,7 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -628,6 +674,9 @@
// SECOND LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -635,6 +684,7 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -647,15 +697,18 @@
}
else $parameters['checked']=true;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,'mainLecture', "input", $parameters) );
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAIN", "input", $parameters) );
$panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,'mainLecture',"label", $parameters=array("value" => "Enable Students to use AppShare tool") ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAIN","label", $parameters=array("value" => "Enable Students to use AppShare tool") ));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
// THIRD LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -675,20 +728,23 @@
}
else $parameters['checked']=true;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,'discussion', "input", $parameters) );
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION", "input", $parameters) );
$panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,'discussion',"label", $parameters=array("value" => "Enable Archiving") ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION","label", $parameters=array("value" => "Enable Archiving") ));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
// FOURTH LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
$linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
+ $style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
$colspan = $xmldoc->create_element('colspan');
@@ -703,15 +759,18 @@
}
else $parameters['checked']=true;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,'discussion', "input", $parameters) );
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION", "input", $parameters) );
$panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,'discussion',"label", $parameters=array("value" => "Enable Appshare") ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION","label", $parameters=array("value" => "Enable Appshare") ));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
// FIFTH LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -731,9 +790,9 @@
}
else $parameters['checked']=true;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,'discussion', "input", $parameters) );
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION", "input", $parameters) );
$panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,'discussion',"label", $parameters=array("value" => "Enable On-The-Fly PPT Import") ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION","label", $parameters=array("value" => "Enable On-The-Fly PPT Import") ));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
@@ -746,13 +805,16 @@
// ------------------ CHAT --------------------
// CHAT PANEL INFO
$panelSettings = $xmldoc->create_element('panelSettings');
- $panelSettings->append_child(create_panel_info($xmldoc, 'mainLectureRoom', 'tabNoSelected', 'tabDisabled', 'Chat', "4", 'none'));
+ $panelSettings->append_child(create_panel_info($xmldoc, "$MAINLECTURE", 'tabNoSelected', 'tabDisabled', 'Chat', "4", 'none'));
// CHAT CONTENT
$panelContent = $xmldoc->create_element('panelContent');
// FIRST LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -780,8 +842,11 @@
// SECOND LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLineStyle->append_child($xmldoc->create_text_node("subOption"));
$panelLine->append_child($panelLineStyle);
$linepart = $xmldoc->create_element('panelLinePart');
$style = $xmldoc->create_element('style');
@@ -807,8 +872,11 @@
// THIRD LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLineStyle->append_child($xmldoc->create_text_node("subOption"));
$panelLine->append_child($panelLineStyle);
$linepart = $xmldoc->create_element('panelLinePart');
$style = $xmldoc->create_element('style');
@@ -833,6 +901,9 @@
// FOURTH LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -866,6 +937,9 @@
// FIRST LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -893,6 +967,9 @@
// SECOND LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -900,6 +977,7 @@
$style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
+
$colspan = $xmldoc->create_element('colspan');
$colspan->append_child($xmldoc->create_text_node("0"));
$linepart->append_child($colspan);
@@ -912,6 +990,9 @@
// THIRD LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -954,6 +1035,9 @@
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(" "));
$panelLine->append_child($panelLineStyle);
@@ -1003,6 +1087,9 @@
// FIFTH LINE
$panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node(""));
$panelLine->append_child($panelLineStyle);
@@ -1016,34 +1103,36 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "checkbox", "value" => "1", "id" => "guestAccess_value", "name" => "guests", "onclick" => "hideDiv(\"launcher_link_row\")") ;
+ $parameters=array("type" => "checkbox", "value" => "1", "id" => "guestAcess_value", "name" => "guests", "onclick" => "hideDiv(\"launcher_link_row\")") ;
if(($action=='update')&&(liveclassroom_api_role_user_room($roomId,'Guest')=='Student')){
$parameters['checked']=true;
}
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
$panelLine->append_child($linepart);
+
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enabled guest access") ));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
- // SIXTH LINE
+ // SIXTH LINE - HIDE
+
$panelLine = $xmldoc->create_element('panelLine');
+
$panelLineStyle = $xmldoc->create_element('style');
$panelLineStyle->append_child($xmldoc->create_text_node("hide"));
$panelLine->append_child($panelLineStyle);
$panelLineId = $xmldoc->create_element('id');
$panelLineId->append_child($xmldoc->create_text_node("launcher_link_row"));
- $panelLine->append_child($panelLineId);
+ $panelLine->append_child($panelLineId);
-
$linepart = $xmldoc->create_element('panelLinePart');
$style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
+ $style->append_child($xmldoc->create_text_node(" "));
$linepart->append_child($style);
$colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
+ $colspan->append_child($xmldoc->create_text_node("2"));
$linepart->append_child($colspan);
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
@@ -1073,13 +1162,17 @@
$windows->append_child($settings);
//VALIDATION BAR
- $windows->append_child(liveclassroom_create_validationbar($xmldoc));
+ if($action == 'update') {
+ $windows->append_child(liveclassroom_create_validationbar($xmldoc, $roomId));
+ }
+ else $windows->append_child(liveclassroom_create_validationbar($xmldoc, ""));
$root->append_child($windows);
$xmldoc->append_child($root);
+ $xmldoc->dump_file("choice.xml", false, true);
$xmlstring = $xmldoc->dump_mem(true); // Xml datas into a string
$finalstring = str_replace("\n", '', $xmlstring);
Modified: trunk/moodle/mod/liveclassroom/index.php
===================================================================
--- trunk/moodle/mod/liveclassroom/index.php 2006-12-21 10:16:12 UTC (rev 118)
+++ trunk/moodle/mod/liveclassroom/index.php 2006-12-22 10:01:20 UTC (rev 119)
@@ -30,8 +30,8 @@
/* $Id$ */
/// This page lists all the instances of liveclassroom in a particular course
-error_reporting(E_ALL);
+
require_once("../../config.php");
require_once("lib.php");
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2006-12-21 10:16:12 UTC (rev 118)
+++ trunk/moodle/mod/liveclassroom/lib.php 2006-12-22 10:01:20 UTC (rev 119)
@@ -37,7 +37,7 @@
$LIVECLASSROOM_TEACHER_SUFFIX = "_T"; //Teachers will use the user $CFG->liveclassroom_settinguniqueid + $course->id + $LIVECLASSROOM_TEACHER_SUFFIX
$LIVECLASSROOM_STUDENT_SUFFIX = "_S"; //Students will use the user $CFG->liveclassroom_settinguniqueid + $course->id + $LIVECLASSROOM_STUDENT_SUFFIX
-
+$LIVECLASSROOM_LOGS = "logs.php"; //file use to the logs
/**
* Validate the data in passed in the configuration page
* @param $config - the information from the form mod.html
@@ -45,12 +45,9 @@
*/
function liveclassroom_process_options ($config) {
global $CFG;
- global $LIVECLASSROOM_LOGS;
- $timenow = time();
-
if(empty($config->servername)){
- add_to_log("", "liveclassroom", "URL", "$LIVECLASSROOM_LOGS?type=errorUrlUnavailable&time=$timenow", "URL unavailable");
+ add_to_log("", "liveclassroom", "URL", liveclassroom_send_logs("errorUrlUnavailable",""), "URL unavailable");
error(get_string('wrongconfigurationURLunavailable', 'liveclassroom'));
}
else if (!liveclassroom_api_authenticate($config->servername,
@@ -73,22 +70,19 @@
/// (defined by the form in mod.html) this function
/// will create a new instance and return the id number
/// of the new instance.
- global $LIVECLASSROOM_LOGS;
-
+
$liveclassroom->timemodified = time();
# May have to add extra stuff in here #
$roomname = liveclassroom_api_get_room_name($liveclassroom->type);
-
- $timenow = time();
-
-
+
if($result = insert_record("liveclassroom", $liveclassroom)) {
- add_to_log($liveclassroom->course, "liveclassroom", "Add activity", "$LIVECLASSROOM_LOGS?type=addInstance&liveclassroomId=".$result."&roomname=$roomname&time=$timenow", "Activity \"".$liveclassroom->name."\" added");
+ add_to_log($liveclassroom->course, "liveclassroom", "Add activity", liveclassroom_send_logs("addInstance","liveclassroomId=".$result."&roomname=$roomname"), "Activity \"".$liveclassroom->name."\" added");
+
}
else
{
- add_to_log($liveclassroom->course, "liveclassroom", "Add activity", "$LIVECLASSROOM_LOGS?type=errorAddInstance&liveclassroomId=".$result."&roomname=$roomname&time=$timenow", "Activity \"".$liveclassroom->name."\" has not been added");
+ add_to_log($liveclassroom->course, "liveclassroom", "Add activity", liveclassroom_send_logs("errorAddInstance","liveclassroomId=".$result."&roomname=$roomname"), "Activity \"".$liveclassroom->name."\" has not been added");
$result=false;
}
@@ -101,12 +95,10 @@
/// (defined by the form in mod.html) this function
/// will update an existing instance with new data.
- global $LIVECLASSROOM_LOGS;
-
$liveclassroom->timemodified = time();
$liveclassroom->id = $liveclassroom->instance;
$roomname = liveclassroom_api_get_room_name($liveclassroom->type);
- $timenow = time();
+
// Need to update the section
@@ -133,7 +125,7 @@
error("Could not update the course module with the correct section");
}
- add_to_log($liveclassrooms->course, "liveclassroom", "Update activity", "$LIVECLASSROOM_LOGS?type=updateInstance&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow", "Activity ".$liveclassroom->name." has been updated with success");
+ add_to_log($liveclassrooms->course, "liveclassroom", "Update activity", liveclassroom_send_logs("updateInstance","liveclassroomId=".$liveclassroom->id."&roomname=$roomname"), "Activity ".$liveclassroom->name." has been updated with success");
return update_record("liveclassroom", $liveclassroom);
/*
@@ -153,23 +145,20 @@
/// Given an ID of an instance of this module,
/// this function will permanently delete the instance
/// and any data that depends on it.
- global $LIVECLASSROOM_LOGS;
-
if (! $liveclassroom = get_record("liveclassroom", "id", "$id")) {
return false;
}
$roomname = liveclassroom_api_get_room_name($liveclassroom->type);
- $timenow = time();
$result = true;
# Delete any dependent records here #
if (! delete_records("liveclassroom", "id", $liveclassroom->id)) {
- add_to_log($liveclassrooms->course, "liveclassroom", "Delete activity", "$LIVECLASSROOM_LOGS?type=errorDeleteInstance&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow", "Activity ".$liveclassroom->name." deletion failed");
+ add_to_log($liveclassrooms->course, "liveclassroom", "Delete activity", liveclassroom_send_logs("errorDeleteInstance","liveclassroomId=".$liveclassroom->id."&roomname=$roomname"), "Activity ".$liveclassroom->name." deletion failed");
$result = false;
}
- add_to_log($liveclassrooms->course, "liveclassroom", "Delete activity", "$LIVECLASSROOM_LOGS?type=deleteInstance&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow", "Activity ".$liveclassroom->name." has been deleted with success");
+ add_to_log($liveclassrooms->course, "liveclassroom", "Delete activity", liveclassroom_send_logs("deleteInstance","liveclassroomId=".$liveclassroom->id."&roomname=$roomname"), "Activity ".$liveclassroom->name." has been deleted with success");
return $result;
}
@@ -284,8 +273,9 @@
*/
function liveclassroom_create_rooms ($course) {
- //teacher is the lead of the presentation
- liveclassroom_create_room($course->id, "Main classroom", true, liveclassroom_api_give_lectureroom_attributes());
+ //teacher is the lead of the presentation
+
+ liveclassroom_create_room($course->id, "Main Lecture Hall", true, liveclassroom_api_give_lectureroom_attributes());
//teachers and students have the same rights
liveclassroom_create_room($course->id, "Group 1", false, liveclassroom_api_give_discussionroom_attributes());
@@ -494,12 +484,11 @@
/// Given an ID of an instance of this module,
/// this function will permanently delete the instance
/// and any data that depends on it.
- global $LIVECLASSROOM_LOGS;
$result = true;
if ($liveclassrooms = get_records("liveclassroom", "type", $roomid)) {
$roomname = liveclassroom_api_get_room_name($liveclassroom->type);
- $timenow = time();
+
# Delete any dependent records here #
foreach($liveclassrooms as $liveclassroom){
@@ -508,18 +497,18 @@
error("Course Module ID was incorrect");
}
if (! delete_course_module($cm->id)) {
- add_to_log($liveclassrooms->course, "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorDeleteAllcm&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow&cm=".$cm->id, "Delete all activities", "Could not delete the ".$cm->id." (coursemodule)");
+ add_to_log($liveclassrooms->course, "liveclassroom", liveclassroom_send_logs("errorDeleteAllcm","liveclassroomId=".$liveclassroom->id."&roomname=$roomname&cm=".$cm->id), "Delete all activities", "Could not delete the ".$cm->id." (coursemodule)");
$result = false;
//Delete a course module and any associated data at the course level (events)
// notify("Could not delete the $cm->id (coursemodule)");
}
if (! delete_records("liveclassroom", "id", "$liveclassroom->id")) {
- add_to_log($liveclassrooms->course, "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorDeleteAlldb&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow", "Delete all activities", "All activities associated to the room $roomname have not been deleted from the liveclassroom database");
+ add_to_log($liveclassrooms->course, "liveclassroom", liveclassroom_send_logs("errorDeleteAlldb","liveclassroomId=".$liveclassroom->id."&roomname=$roomname"), "Delete all activities", "All activities associated to the room $roomname have not been deleted from the liveclassroom database");
$result = false;
}
//delete in the course section too
if (! delete_mod_from_section($cm->id, "$cm->section")) {
- add_to_log($liveclassrooms->course, "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorDeleteAllsection&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow&cm=".$cm->id."§ion=".$cm->section, "Delete all activities", "Could not delete the ".$cm->id." from that section");
+ add_to_log($liveclassrooms->course, "liveclassroom", liveclassroom_send_logs("errorDeleteAllsection","liveclassroomId=".$liveclassroom->id."&roomname=$roomname&cm=".$cm->id."§ion=".$cm->section), "Delete all activities", "Could not delete the ".$cm->id." from that section");
$result = false;
//notify("Could not delete the $mod->modulename from that section");
}
@@ -527,7 +516,7 @@
}
}
- add_to_log($liveclassrooms->course, "liveclassroom", "$LIVECLASSROOM_LOGS?type=deleteAll&liveclassroomId=".$liveclassroom->id."&roomname=$roomname&time=$timenow", "Delete all activities", "All activities associated to the room $roomname have been deleted with success");
+ add_to_log($liveclassrooms->course, "liveclassroom", liveclassroom_send_logs("deleteAll","liveclassroomId=".$liveclassroom->id."&roomname=$roomname"), "Delete all activities", "All activities associated to the room $roomname have been deleted with success");
return $result;
}
@@ -647,7 +636,7 @@
$validationelement = $xmldoc->create_element("validationElement");
$vtype = $xmldoc->create_element("type");
$vtype->append_child($xmldoc->create_text_node("validationButton"));
- $validationelement->append_child($vtype);
+ $validationelement->append_child($vtype);
$vparameters = $xmldoc->create_element("parameters");
@@ -691,7 +680,7 @@
* Uses liveclassroom_create_validation_comment and liveclassroom_create_validation_button
* Return a DOM document element which represent the validation bar
**/
-function liveclassroom_create_validationbar($xmldoc){
+function liveclassroom_create_validationbar($xmldoc,$roomId){
$headerbar = $xmldoc->create_element('windowsElement');
@@ -722,7 +711,7 @@
}
$parameters = array("style" => "comment", "name" => "", "action" => "submitForm", "value" => "$submitName");
- $actionParameters = array("manageRoomAction.php", "$submit");
+ $actionParameters = array("manageRoomAction.php", "$submit", "id" => "$roomId");
$validationelements->append_child(liveclassroom_create_validation_button($xmldoc, $parameters, $actionParameters));
@@ -871,9 +860,7 @@
* return a string with all the parameters if the signature is ok, false if not (HACKING)
*/
function liveclassroom_init_session($request){
-
- global $LIVECLASSROOM_LOGS;
-
+
if(time() <= ($request['time']+1800)) {
$enc_params = array();
@@ -891,7 +878,7 @@
}
if(strcmp(md5($signature), $request['signature'])!=0) {
- add_to_log($request['enc_course_id'], "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorSignature", "Init session", "Signature is not recognize.");
+ add_to_log($request['enc_course_id'], "liveclassroom", liveclassroom_send_logs("errorSignature",""), "Init session", "Signature is not recognize.");
error("Signature is not recognize.");
return false;
@@ -900,7 +887,7 @@
return true;
}
else {
- add_to_log($request['enc_course_id'], "liveclassroom", "$LIVECLASSROOM_LOGS?type=errorSessionTimeOut", "Init session", "Session has timed out due to inactivity.");
+ add_to_log($request['enc_course_id'], "liveclassroom", liveclassroom_send_logs("errorSessionTimeOut",""), "Init session", "Session has timed out due to inactivity.");
error("The session has timed out due to inactivity. Please reload the page to reconnect.");
return false;
@@ -916,11 +903,15 @@
function liveclassroom_get_url_params($courseid) {
global $USER;
-
+/*
+ //For moodle 1.7
+ if(strstr($CFG->release,"1.6")) // 1.6.* version
+ else if(strstr($CFG->release,"1.7")) // 1.7.* version
+*/
if (isstudent($courseid)) {
$role='Student';
}
- else if (isteacher($courseid, $USER->id)) {
+ else if (isteacher($courseid, $USER->id) || isteacheredit($courseid)) {
$role='Instructor';
}
$signature = md5($courseid.$USER->email.$USER->firstname.$USER->lastname.$role);
@@ -960,6 +951,8 @@
}
$lcServerUrl = $xmldoc->create_element("lcServerUrl");
$lcServerUrl->append_child($xmldoc->create_text_node($CFG->liveclassroom_servername));
+ $vtServerUrl = $xmldoc->create_element("vtServerUrl");
+ $vtServerUrl->append_child($xmldoc->create_text_node(""));
$signature = $xmldoc->create_element("signature");
$signature->append_child($xmldoc->create_text_node($sessionParams['signature']));
@@ -971,6 +964,7 @@
$information->append_child($courseId);
$information->append_child($authToken);
$information->append_child($lcServerUrl);
+ $information->append_child($vtServerUrl);
$information->append_child($signature);
return $information;
@@ -1068,4 +1062,22 @@
return $return;
}
+/*
+* Send info to the logs system
+* @param $type : type of the log
+* @param $parameters : string with the parameters needed
+* return a string which is the link to the logs file
+*/
+function liveclassroom_send_logs($type,$parameters) {
+
+ global $LIVECLASSROOM_LOGS;
+
+
+ $link = $LIVECLASSROOM_LOGS."?type=$type";
+ $link .= "&$parameters";
+ $link .= "&time=".time();
+
+ return $link;
+}
+
?>
Modified: trunk/moodle/mod/liveclassroom/manageRoomAction.php
===================================================================
--- trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-21 10:16:12 UTC (rev 118)
+++ trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-22 10:01:20 UTC (rev 119)
@@ -52,6 +52,8 @@
session_start(); // to get the previous type of the room
+ add_to_log($COURSE->id, "liveclassroom", "Modify Room", "gaga", $_GET['id']);
+
if(!empty($_POST)) {
while (list($key, $val) = each($_POST)) {
$list_attributes[$key] = $val;
@@ -78,6 +80,7 @@
}
else if($_GET['action']=='updateRoom') {
//Available
+
if (!isset($list_attributes['preview'])) $list_attributes['preview']=1;
//Test if the type of room has been changed
@@ -113,6 +116,7 @@
if (! liveclassroom_delete_all_instance_of_room($_GET['id'])) {
notify("Could not delete the instances of the room");
}
+
//delete the room on the server
liveclassroom_api_delete_room($_GET['id']);
Modified: trunk/moodle/mod/liveclassroom/mod.html
===================================================================
--- trunk/moodle/mod/liveclassroom/mod.html 2006-12-21 10:16:12 UTC (rev 118)
+++ trunk/moodle/mod/liveclassroom/mod.html 2006-12-22 10:01:20 UTC (rev 119)
@@ -2,9 +2,13 @@
<!-- It is used from /course/mod.php. The whole instance is available as $form. -->
<?php
-//error_reporting(E_ALL);
+
require_once($CFG->dirroot.'/calendar/lib.php');
include_once($CFG->dirroot.'/mod/liveclassroom/lib.php');
+ require_once($CFG->dirroot.'/version.php');
+
+
+
$id = optional_param('id', 0, PARAM_INT);
require_once("../config.php");
@@ -12,7 +16,7 @@
require_login($course->id);
if (!isteacher($course->id, $USER->id)) { //to Be sure
- error("You need to be a teacher in this course to c reate an instance");
+ error("You need to be a teacher in this course to create an instance");
}
// Check if the rooms exist on the server
@@ -166,7 +170,7 @@
</tr>
<tr valign="top">
- <td align="right"><font color="red">*</font><font class="fontCurrent"><?php print_string("name") ?> :</font></td>
+ <td align="right"><font color="red">*</font><font class="fontCurrent"><?php print_string('name', 'liveclassroom') ?> :</font></td>
<td align="left">
<input type="text" name="name" size="30" <?php if(isset($action) && $action=="update") echo "value=$liveclassroom->name"; ?> >
@@ -239,8 +243,8 @@
if (!$thissection = get_record('course_sections', 'course',$course->id, 'section', $section)) {
notify('Error getting course_sections!');
}
- $desc = format_text($thissection->summary, FORMAT_MOODLE, NULL, $course->id);
- $descTxt = txt($desc);
+ $desc = format_text($thissection->summary, FORMAT_MOODLE, NULL, $course->id);
+ $descTxt = txt($desc);
$minidesc = substr($descTxt, 0, 20);
if ( ($thissection->summary != NULL) && (strlen($descTxt)>20) ) {
Modified: trunk/moodle/mod/liveclassroom/welcome.php
===================================================================
--- trunk/moodle/mod/liveclassroom/welcome.php 2006-12-21 10:16:12 UTC (rev 118)
+++ trunk/moodle/mod/liveclassroom/welcome.php 2006-12-22 10:01:20 UTC (rev 119)
@@ -29,7 +29,7 @@
/* $Id$ */
-/// This page is to display the widget - Rooms and archives list
+/// This page is to display the tyes - Rooms and archives list
@@ -39,7 +39,7 @@
$id = optional_param('id', 0, PARAM_INT);
$course = optional_param('course', 0, PARAM_INT);
- $roomname = optional_param('idroomname', 0, PARAM_TEXT);
+// $roomname = optional_param('idroomname', 0, PARAM_TEXT);
global $CFG;
@@ -83,7 +83,7 @@
<script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch.js'></script>
- <script language="javascript" src="js/Ajax.js"></script>
+ <script language="javascript" src="js/ajax.js"></script>
<script language="javascript" src="js/xmldom.js"></script>
<script language="javascript" src="js/verifForm.js"></script>
<script language="javascript" src="js/constants.js"></script>
@@ -102,7 +102,7 @@
if(currentId!="") {
- if( (typeSelect=="mainLectureRoom") || (typeSelect == "discussionRoom") ) {
+ if( (typeSelect=="MainLecture") || (typeSelect == "Discussion") ) {
var complete_url=url+'?roomId='+currentId+'&id=<?php p($id) ?>§ion=0&sesskey=<?php echo sesskey(); ?>&'+param;
window.open(complete_url,"_top");
@@ -127,14 +127,14 @@
if(currentId!="")
{
- if (confirm("Are you sure you want to delete this room")) {
- if (confirm("Are you really sure you want to delete this room")) {
+
+ if (confirm("Are you really sure you want to delete this room ?")) {
var complete_url='manageRoomAction.php'+'?time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]+'&id ='+currentId+'&action=deleteRoom&hza='+session['authToken'] ;
location.href = complete_url
//var w = window.open(complete_url, '_top');
// w.focus();
}
- }
+
}
@@ -174,7 +174,7 @@
{
?>
- DisplayFirstPage();
+ DisplayFirstPage("generateListRooms.php");
<?php
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-22 13:43:06
|
Revision: 123
http://svn.sourceforge.net/hw4mdl/?rev=123&view=rev
Author: shazan
Date: 2006-12-22 05:43:04 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
message bar color changed
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/js/manageXml.js
trunk/moodle/mod/liveclassroom/welcome.php
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2006-12-22 12:45:02 UTC (rev 122)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2006-12-22 13:43:04 UTC (rev 123)
@@ -638,4 +638,9 @@
margin : 0;
text-align : left;
vertical-align : top;
- }
\ No newline at end of file
+ }
+
+ .message{
+
+ background-color:#ffff99;
+ }
\ No newline at end of file
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2006-12-22 12:45:02 UTC (rev 122)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2006-12-22 13:43:04 UTC (rev 123)
@@ -169,7 +169,7 @@
switch(messageInformations[0].getElements("type")[0].getText()){
case "message":
- display="<table><tr><td><img src='pictures/items/messagelabel-info.png'></td><td>"+messageInformations[0].getElements("value")[0].getText()+"</td></tr></table>"
+ display="<table class=message width=100%><tr><td><img src='pictures/items/messagelabel-info.png'></td><td>"+messageInformations[0].getElements("value")[0].getText()+"</td></tr></table>"
break;
case "error":
Modified: trunk/moodle/mod/liveclassroom/welcome.php
===================================================================
--- trunk/moodle/mod/liveclassroom/welcome.php 2006-12-22 12:45:02 UTC (rev 122)
+++ trunk/moodle/mod/liveclassroom/welcome.php 2006-12-22 13:43:04 UTC (rev 123)
@@ -83,7 +83,7 @@
<script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch.js'></script>
- <script language="javascript" src="js/ajax.js"></script>
+ <script language="javascript" src="js/Ajax.js"></script>
<script language="javascript" src="js/xmldom.js"></script>
<script language="javascript" src="js/verifForm.js"></script>
<script language="javascript" src="js/constants.js"></script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-27 09:39:33
|
Revision: 127
http://svn.sourceforge.net/hw4mdl/?rev=127&view=rev
Author: shazan
Date: 2006-12-27 01:39:30 -0800 (Wed, 27 Dec 2006)
Log Message:
-----------
fix the bug 1051. When a course shortnane was created with a space, it made errors with the profiles creation. Now space is replace with an underscore
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/lib.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-26 11:15:55 UTC (rev 126)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-27 09:39:30 UTC (rev 127)
@@ -228,8 +228,11 @@
global $CFG;
global $LIVECLASSROOM_MOODLE_PREFIX;
global $COURSE;
+
+ $final_list = "&target=$userid&first_name=$rolename&last_name=$coursename";
+ $enc_list = str_replace(" ", "+", $final_list);
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_USER, "&target=$userid&first_name=$rolename&last_name=$coursename");
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_USER, $enc_list);
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -291,7 +294,12 @@
global $USER;
global $COURSE;
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_TOKEN, "&target=$userid&nickname=$nickname");
+
+ $final_list = "&target=$userid&nickname=$nickname";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_TOKEN, $enc_list);
preg_match("(\d*)", $data, $matches);
@@ -772,8 +780,12 @@
global $CFG;
$name = $course->shortname;
-
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, "&filter00=last_name&filter00value=$name");
+ $enc_name = str_replace(" ", "_", $name);
+
+ $final_list = "&filter00=last_name&filter00value=$enc_name";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, $enc_list);
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -888,7 +900,9 @@
$course = get_record("course", "id", $courseid);
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, "&filter00=last_name&filter00value=$course->shortname&filter01=first_name&filter01value=Student");
+ $enc_coursename = str_replace(" ", "_", $course->shortname);
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, "&filter00=last_name&filter00value=$enc_coursename&filter01=first_name&filter01value=Student");
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -1110,7 +1124,9 @@
$course = get_record("course", "id", $courseid);
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, "&filter00=last_name&filter00value=$course->shortname&filter01=first_name&filter01value=Teacher");
+ $enc_coursename = str_replace(" ", "_", $course->shortname);
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, "&filter00=last_name&filter00value=$enc_coursename&filter01=first_name&filter01value=Teacher");
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2006-12-26 11:15:55 UTC (rev 126)
+++ trunk/moodle/mod/liveclassroom/lib.php 2006-12-27 09:39:30 UTC (rev 127)
@@ -247,17 +247,20 @@
global $LIVECLASSROOM_TEACHER_SUFFIX;
global $LIVECLASSROOM_STUDENT_SUFFIX;
global $LIVECLASSROOM_MOODLE_PREFIX;
- //$userid = $CFG->liveclassroom_settinguniqueid."_".$course->id.$LIVECLASSROOM_TEACHER_SUFFIX;
- $userid = $LIVECLASSROOM_MOODLE_PREFIX.$course->shortname.$LIVECLASSROOM_TEACHER_SUFFIX;
-
- if (! liveclassroom_api_create_user ($userid, $course->shortname, 'Teacher')) {
+
+ $enc_coursename = str_replace(" ", "_", $course->shortname);
+
+ $userid = $LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.$LIVECLASSROOM_TEACHER_SUFFIX;
+
+ if (! liveclassroom_api_create_user ($userid, $enc_coursename, 'Teacher')) {
//error("Cannot Create Teacher profile");
- return false;
+ return false;
}
- $userid = $LIVECLASSROOM_MOODLE_PREFIX.$course->shortname.$LIVECLASSROOM_STUDENT_SUFFIX;
- if (! liveclassroom_api_create_user ($userid, $course->shortname, 'Student')) {
+ $userid = $LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.$LIVECLASSROOM_STUDENT_SUFFIX;
+
+ if (! liveclassroom_api_create_user ($userid, $enc_coursename, 'Student')) {
//error("Cannot Create Student profile");
return false;
@@ -292,8 +295,11 @@
global $LIVECLASSROOM_STUDENT_SUFFIX;
global $LIVECLASSROOM_MOODLE_PREFIX;
- $userid = $LIVECLASSROOM_MOODLE_PREFIX.$course->shortname.
+ $enc_coursename = str_replace(" ", "_", $course->shortname);
+
+ $userid = $LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.
($isteacher?$LIVECLASSROOM_TEACHER_SUFFIX:$LIVECLASSROOM_STUDENT_SUFFIX);
+
$nickname = fullname($USER);
@@ -315,10 +321,12 @@
global $LIVECLASSROOM_MOODLE_PREFIX;
$course_name = liveclassroom_get_course_shortname($courseid);
- $roomid = $LIVECLASSROOM_MOODLE_PREFIX.$course_name.'_'.rand();
+ $enc_coursename = str_replace(" ", "_", $course_name);
+
+ $roomid = $LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.'_'.rand();
- $teacherid = $LIVECLASSROOM_MOODLE_PREFIX.$course_name.$LIVECLASSROOM_TEACHER_SUFFIX;
- $studentid = $LIVECLASSROOM_MOODLE_PREFIX.$course_name.$LIVECLASSROOM_STUDENT_SUFFIX;
+ $teacherid = $LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.$LIVECLASSROOM_TEACHER_SUFFIX;
+ $studentid = $LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.$LIVECLASSROOM_STUDENT_SUFFIX;
if($bool==true) { // main lecture hall
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-27 10:32:24
|
Revision: 128
http://svn.sourceforge.net/hw4mdl/?rev=128&view=rev
Author: shazan
Date: 2006-12-27 02:32:22 -0800 (Wed, 27 Dec 2006)
Log Message:
-----------
fix bug 10515 : an error message is display if the user name or password is incorrect
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/config.html
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/logs.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-27 09:39:30 UTC (rev 127)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-27 10:32:22 UTC (rev 128)
@@ -143,11 +143,18 @@
preg_match("(\d*)", $data, $matches);
$resp_code = $matches[0];
- if ( $resp_code != 100 && $resp_code != 301) {
+ if ( $resp_code == 204 ) {
+ add_to_log($COURSE->id, "liveclassroom", "Authentication", liveclassroom_send_logs("errorAuthentication2","respcode=$resp_code&courseId=".$COURSE->id), "Authentication Failed");
+ error(get_string('wrongadminpass', 'liveclassroom'));
+ return false;
+ }
+ else if ( $resp_code != 100 && $resp_code != 301) {
//error( "Response: Authentication Failed: $resp_code");
add_to_log($COURSE->id, "liveclassroom", "Authentication", liveclassroom_send_logs("errorAuthentication","respcode=$resp_code&courseId=".$COURSE->id), "Authentication Failed");
return false;
}
+
+
curl_close($ch);
//fclose($cook);
add_to_log($COURSE->id, "liveclassroom", "Authentication", liveclassroom_send_logs("authentication","courseId=".$COURSE->id), "Authentication succeeded");
Modified: trunk/moodle/mod/liveclassroom/config.html
===================================================================
--- trunk/moodle/mod/liveclassroom/config.html 2006-12-27 09:39:30 UTC (rev 127)
+++ trunk/moodle/mod/liveclassroom/config.html 2006-12-27 10:32:22 UTC (rev 128)
@@ -32,7 +32,7 @@
<tr valign="top">
<td align="right"><?php print_string('adminpassword', 'liveclassroom')?> :</td>
<td>
- <input name="adminpassword" type="text" size="30" value="<?php p($CFG->liveclassroom_adminpassword) ?>" />
+ <input name="adminpassword" type="password" size="30" value="<?php p($CFG->liveclassroom_adminpassword) ?>" />
</td>
<td>
<?php print_string("configadminpassword", "liveclassroom") ?>
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2006-12-27 09:39:30 UTC (rev 127)
+++ trunk/moodle/mod/liveclassroom/lib.php 2006-12-27 10:32:22 UTC (rev 128)
@@ -49,13 +49,17 @@
if(empty($config->servername)){
add_to_log("", "liveclassroom", "URL", liveclassroom_send_logs("errorUrlUnavailable",""), "URL unavailable");
error(get_string('wrongconfigurationURLunavailable', 'liveclassroom'));
+ }
+ else if(empty($config->adminusername)){
+ error(get_string('emptyAdminUsername', 'liveclassroom'));
+ }
+ else if(empty($config->adminpassword)){
+ error(get_string('emptyAdminPassword', 'liveclassroom'));
}
- else if (!liveclassroom_api_authenticate($config->servername,
- $config->adminusername,
- $config->adminpassword))
- {
- error(get_string('wrongconfigurationURLincorrect', 'liveclassroom'));
-}
+ liveclassroom_api_authenticate($config->servername,$config->adminusername,$config->adminpassword);
+
+// error(get_string('wrongconfigurationURLincorrect', 'liveclassroom'));
+
//TODO: check the user is really an admin
return;
Modified: trunk/moodle/mod/liveclassroom/logs.php
===================================================================
--- trunk/moodle/mod/liveclassroom/logs.php 2006-12-27 09:39:30 UTC (rev 127)
+++ trunk/moodle/mod/liveclassroom/logs.php 2006-12-27 10:32:22 UTC (rev 128)
@@ -97,9 +97,16 @@
$information = "Authentication Failed.";
if(isset($_GET['respcode'])){
$message = "Error : Authentication Failed.";
- $tip = "The response code is : ".$_GET['respcode']."Please contact your administrator.";
+ $tip = "The response code is : ".$_GET['respcode']." Please contact your administrator.";
}
break;
+ case "errorAuthentication2":
+ $information = "Authentication Failed.";
+ if(isset($_GET['respcode'])){
+ $message = "Error : Authentication Failed. Bad username or password";
+ $tip = "The response code is : ".$_GET['respcode']." Please contact your administrator.";
+ }
+ break;
case "authentication":
$information = "Authentication succeeded.";
$message = "The authentication to the Live Classroom server is succeeded.";
@@ -114,7 +121,7 @@
$information = "User creation";
if(isset($_GET['userId'])){
$message = "Error : ".$_GET['userId']." Creation Failed.";
- $tip = "The response code is : ".$_GET['respcode']."Please contact your administrator.";
+ $tip = "The response code is : ".$_GET['respcode']." Please contact your administrator.";
}
break;
case "createSession":
@@ -127,7 +134,7 @@
$information = "Session creation";
if( (isset($_GET['respcode'])) && (isset($_GET['nickname'])) ){
$message = "Error : Cannot create a session for ".$_GET['nickname'];
- $tip = "The response code is : ".$_GET['respcode']."Please contact your administrator.";
+ $tip = "The response code is : ".$_GET['respcode']." Please contact your administrator.";
}
break;
case "createClass":
@@ -140,7 +147,7 @@
$information = "Room creation";
if( (isset($_GET['respcode'])) && (isset($_GET['roomname'])) ){
$message = "Error : Cannot Create Class with id : ".$_GET['roomId'].", and name : ".$_GET['roomname'];
- $tip = "The response code is : ".$_GET['respcode']."Please contact your administrator.";
+ $tip = "The response code is : ".$_GET['respcode']." Please contact your administrator.";
}
break;
case "deleteRoom":
@@ -380,7 +387,7 @@
</tr>
<tr bgcolor="yellow">
<td bgcolor="yellow" width="1"></td>
- <td bgcolor="#ffffd0"><font size="-1" face="Courier New,Courier,Monaco">tips
+ <td bgcolor="#ffffd0"><font size="-1" face="Courier New,Courier,Monaco"><?php echo $tip; ?>
</font>
<p></p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-27 13:36:57
|
Revision: 133
http://svn.sourceforge.net/hw4mdl/?rev=133&view=rev
Author: shazan
Date: 2006-12-27 05:36:56 -0800 (Wed, 27 Dec 2006)
Log Message:
-----------
fix bug 10523: the token to enter into a Live Classroom was not saved after the setting confirmation. Now it is
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/generateListRooms.php
trunk/moodle/mod/liveclassroom/js/hwCommons.js
trunk/moodle/mod/liveclassroom/js/manageXml.js
trunk/moodle/mod/liveclassroom/manageRoomAction.php
trunk/moodle/mod/liveclassroom/welcome.php
Modified: trunk/moodle/mod/liveclassroom/generateListRooms.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-27 12:43:14 UTC (rev 132)
+++ trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-27 13:36:56 UTC (rev 133)
@@ -49,7 +49,6 @@
}
else $params = $_POST;
-
$courseid = $params['enc_course_id'];
$userid = liveclassroom_api_get_teacher_user_id($courseid);
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-27 12:43:14 UTC (rev 132)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-27 13:36:56 UTC (rev 133)
@@ -248,7 +248,6 @@
function Horizon()
{
-
if(currentId!="")
startHorizon(currentId, null, null, null, null, 'hzA='+session['authToken'])
}
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2006-12-27 12:43:14 UTC (rev 132)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2006-12-27 13:36:56 UTC (rev 133)
@@ -317,7 +317,7 @@
if(product=="all" || currentTool=="all"){
if(value=="Delete")
{
- actionDelete="onclick=\";return confirm('Are you sure to delete this element?');\""
+ actionDelete="onclick=\";return confirm('Are you sure to delete this room '+longname+' ?');\""
}
display+="<td align='center' class='button_enabled' "+actionDelete+">"
@@ -331,7 +331,7 @@
if(value=="Delete")
{
- actionDelete="onclick=\";return confirm('Are you sure to delete this element?');\""
+ actionDelete="onclick=\";return confirm('Are you sure to delete this room '+longname+' ?');\""
}
display+="<td align='center' class='button_enabled' "+actionDelete+">"
Modified: trunk/moodle/mod/liveclassroom/manageRoomAction.php
===================================================================
--- trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-27 12:43:14 UTC (rev 132)
+++ trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-27 13:36:56 UTC (rev 133)
@@ -123,7 +123,11 @@
$messageType = 'roomDeleted';
}
- $urlParams = $url.'&time='.$_GET['time'];
+ if (!$usersession = liveclassroom_create_session ($course, isteacher($course->id, $USER->id))) {
+ error ("Cannot create session");
+ }
+
+ $urlParams = $url.'&authToken='.$usersession.'&time='.$_GET['time'];
if(isset($messageType)) $urlParams .= '&messageType='.$messageType;
header('Location: welcome.php?id='.$courseid.'&'.$urlParams);
Modified: trunk/moodle/mod/liveclassroom/welcome.php
===================================================================
--- trunk/moodle/mod/liveclassroom/welcome.php 2006-12-27 12:43:14 UTC (rev 132)
+++ trunk/moodle/mod/liveclassroom/welcome.php 2006-12-27 13:36:56 UTC (rev 133)
@@ -126,17 +126,11 @@
{
if(currentId!="")
{
-
-
- if (confirm("Are you really sure you want to delete this room ?")) {
- var complete_url='manageRoomAction.php'+'?time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]+'&id ='+currentId+'&action=deleteRoom&hza='+session['authToken'] ;
- location.href = complete_url
+ var complete_url='manageRoomAction.php'+'?time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]+'&id ='+currentId+'&action=deleteRoom&hza='+session['authToken'] ;
+ location.href = complete_url
//var w = window.open(complete_url, '_top');
// w.focus();
- }
-
-
-
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-27 14:11:54
|
Revision: 134
http://svn.sourceforge.net/hw4mdl/?rev=134&view=rev
Author: shazan
Date: 2006-12-27 06:11:49 -0800 (Wed, 27 Dec 2006)
Log Message:
-----------
fix bug 10372: submit form check rooms and archives, thomas has fixed this problem
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/js/hwCommons.js
trunk/moodle/mod/liveclassroom/js/verifForm.js
trunk/moodle/mod/liveclassroom/lib.php
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-27 13:36:56 UTC (rev 133)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-27 14:11:49 UTC (rev 134)
@@ -466,8 +466,13 @@
}
function submitForm(url,action,id){
- if(currentProduct==LC_PRODUCT)
- verifyFormLiveClassRoom(url+'?product='+currentProduct+'&id='+id+'&action='+action+'&time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]);
+ if(currentProduct==LC_PRODUCT){
+
+ if(action=="updateRoom")
+ verifyFormLiveClassRoomUpdate(url+'?product='+currentProduct+'&id='+id+'&action='+action+'&time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]);
+ else
+ verifyFormLiveClassRoom(url+'?product='+currentProduct+'&id='+id+'&action='+action+'&time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]);
+ }
else
verifyFormVoiceBoard(url+'?product='+currentProduct+'&id='+id+'&action='+action+'&time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]);
}
Modified: trunk/moodle/mod/liveclassroom/js/verifForm.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/verifForm.js 2006-12-27 13:36:56 UTC (rev 133)
+++ trunk/moodle/mod/liveclassroom/js/verifForm.js 2006-12-27 14:11:49 UTC (rev 134)
@@ -1,5 +1,7 @@
- function verifyFormLiveClassRoomUpdate() {
+ function verifyFormLiveClassRoomUpdate(url) {
+
var theForm = window.document.myform;
+ theForm.action=url;
var validated = false;
var errorMessage = "";
var roomIdPattern = /^[a-z|A-Z|0-9|_]{1,32}$/;
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2006-12-27 13:36:56 UTC (rev 133)
+++ trunk/moodle/mod/liveclassroom/lib.php 2006-12-27 14:11:49 UTC (rev 134)
@@ -721,6 +721,7 @@
$submit = "createRoom";
$submitName = "Create";
}
+
$parameters = array("style" => "comment", "name" => "", "action" => "submitForm", "value" => "$submitName");
$actionParameters = array("manageRoomAction.php", "$submit", "id" => "$roomId");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-28 12:50:02
|
Revision: 138
http://svn.sourceforge.net/hw4mdl/?rev=138&view=rev
Author: shazan
Date: 2006-12-28 04:49:53 -0800 (Thu, 28 Dec 2006)
Log Message:
-----------
fix bug 10539 : Enabled Students to use the phone is uncheckable
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/generateListRooms.php
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/manageRoomAction.php
trunk/moodle/mod/liveclassroom/view.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-28 09:01:30 UTC (rev 137)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-28 12:49:53 UTC (rev 138)
@@ -1381,6 +1381,8 @@
else //just the open archive
{
$tabarchive = liveclassroom_api_get_open_archive_list_for_a_room($roomid,$userid);
+ add_to_log("", "liveclassroom", "test id", "test", $userid);
+ add_to_log("", "liveclassroom", "test archive", "test", sizeof($tabarchive));
}
if(liveclassroom_api_role_user_room($roomid, $studentuserid)=='Student') { //lecture room
@@ -1512,10 +1514,10 @@
$typeOrphanedArchive = $xmldoc->create_element("type");
if(liveclassroom_api_role_user_room($orphanedArchive[1], $studentuserid)=='Student') { //lecture room
- $typeOrphanedArchive->append_child($xmldoc->create_text_node("mainLectureRoom"));
+ $typeOrphanedArchive->append_child($xmldoc->create_text_node("MainLecture"));
}
else{
- $typeOrphanedArchive->append_child($xmldoc->create_text_node("discussionRoom"));
+ $typeOrphanedArchive->append_child($xmldoc->create_text_node("Discussion"));
}
$parametersOrphaned->append_child($typeOrphanedArchive);
Modified: trunk/moodle/mod/liveclassroom/generateListRooms.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-28 09:01:30 UTC (rev 137)
+++ trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-28 12:49:53 UTC (rev 138)
@@ -51,15 +51,12 @@
$courseid = $params['enc_course_id'];
- $userid = liveclassroom_api_get_teacher_user_id($courseid);
- if(isteacher($courseid, $USER->id) ) {
-
- $isteacher = 1;
-
+ $userid = liveclassroom_api_get_teacher_user_id($courseid);
+
+ if(isteacher($courseid, $USER->id) ) {
+ $isteacher = 1;
}
else if (isstudent($courseid) ) {
-
- //$userid = liveclassroom_api_get_student_user_id($courseid);
$isteacher = 0;
}
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-28 09:01:30 UTC (rev 137)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-28 12:49:53 UTC (rev 138)
@@ -448,15 +448,15 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "checkbox", "value" => "1", "id" => "student_simulcast", "name" => "hms_simulcast_restricted") ;
+ $parameters=array("type" => "checkbox", "value" => "0", "id" => "student_simulcast", "name" => "hms_simulcast_restricted") ;
if($action=='update'){
- if($room_info['hms_simulcast_restricted']==1){
+ if($room_info['hms_simulcast_restricted']==0){
$parameters['checked']=true;
}
else if($room_info['media_type']=="two-way-video"){
$parameters['checked']=false;
}
- else $parameters['checked']=true;
+ //else $parameters['checked']=true;
}
else $parameters['checked']=true;
@@ -499,12 +499,13 @@
$parameters=array("type" => "checkbox", "value" => "1", "id" => "two_way_enabled", "name" => "hms_two_way_enabled") ;
if($action=='update'){
if($room_info['hms_two_way_enabled']==1){
- $parameters['checked']=true;
+ $parameters['checked']=true;
}
else if($room_info['media_type']=="two-way-video"){
$parameters['checked']=false;
- }
- $parameters['checked']=true;
+ }
+
+ //$parameters['checked']=true;
}
else $parameters['checked']=true;
Modified: trunk/moodle/mod/liveclassroom/manageRoomAction.php
===================================================================
--- trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-28 09:01:30 UTC (rev 137)
+++ trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-28 12:49:53 UTC (rev 138)
@@ -71,6 +71,8 @@
else $bool = false;
//Available
if (!isset($list_attributes['preview'])) $list_attributes['preview']=1;
+ if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']=0;
+ if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
if (!liveclassroom_create_room ($courseid, $list_attributes['longname'], $bool, $list_attributes)) {
notice(get_string("roomcreationfailed", "liveclassroom"), $_SERVER["HTTP_REFERER"]);
@@ -81,8 +83,11 @@
else if($_GET['action']=='updateRoom') {
//Available
+
+ if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']=0;
+ if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
if (!isset($list_attributes['preview'])) $list_attributes['preview']=1;
-
+ //print_r($list_attributes);
//Test if the type of room has been changed
if($_SESSION['led']!=$list_attributes['led']) { // Type changed
@@ -95,7 +100,7 @@
liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Instructor');
}
}
-
+ //print_r($list_attributes);
if(!liveclassroom_api_modify_room($_GET['id'],$list_attributes)) {
notice(get_string("roommodificationfailed", "liveclassroom"), $_SERVER["HTTP_REFERER"]);
exit;
Modified: trunk/moodle/mod/liveclassroom/view.php
===================================================================
--- trunk/moodle/mod/liveclassroom/view.php 2006-12-28 09:01:30 UTC (rev 137)
+++ trunk/moodle/mod/liveclassroom/view.php 2006-12-28 12:49:53 UTC (rev 138)
@@ -78,25 +78,19 @@
?>
<!--script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch-7892.js'></script-->
<script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch.js'></script>
+
+
<script type="text/javascript">
function startActivity(){
- startHorizon('<?php p($classid) ?>',null,null,null,null,'hzA=<?php p($usersession)?>' )
- location.href = "<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php echo $course->id; ?>";
-
+ startHorizon('<?php p($classid) ?>',null,null,null,null,'hzA=<?php p($usersession)?>');
+ location.href = "<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php echo $course->id; ?>";
}
</script>
-<?php
-
-
- if ((isstudent($course->id)) or (isteacher($course->id, $USER->id))) {
-?>
-
-
-<?php
- }
- ?>
- <script>startActivity();</script>
\ No newline at end of file
+
+ <script> startActivity(); </script>
+
+
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-28 13:43:26
|
Revision: 139
http://svn.sourceforge.net/hw4mdl/?rev=139&view=rev
Author: shazan
Date: 2006-12-28 05:43:22 -0800 (Thu, 28 Dec 2006)
Log Message:
-----------
fix bug 10546 : when a case is unchecked, the option must be written is a "0" and not a 0.
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/manageRoomAction.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-28 12:49:53 UTC (rev 138)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-28 13:43:22 UTC (rev 139)
@@ -625,11 +625,13 @@
global $COURSE;
while (list($key, $val) = each($table_attributes)) {
+
if(($key!='class_id')&&(isset($val))&&($val!="")){
+
$list_attributes .= "&".$key."=".$val;
}
}
-
+
$final_list = "&target=$roomid".$list_attributes;
$enc_list = str_replace(" ", "+", $final_list);
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-28 12:49:53 UTC (rev 138)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-28 13:43:22 UTC (rev 139)
@@ -636,9 +636,7 @@
$panelSettings = $xmldoc->create_element('panelSettings');
// FEATURES PANEL INFO
$panelSettings->append_child(create_panel_info($xmldoc, "$MAINDISCUSSION", 'tabNoSelected', 'tabDisabled', 'Features', "3", 'none'));
-
-
// FEATURES CONTENT
$panelContent = $xmldoc->create_element('panelContent');
@@ -666,6 +664,7 @@
if($room_info['student_wb_enabled']==1) $parameters['checked']=true;
}
+
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
$panelLine->append_child($linepart);
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enabled Students to use eBoard") ));
@@ -698,9 +697,9 @@
}
else $parameters['checked']=true;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAIN", "input", $parameters) );
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAINLECTURE", "input", $parameters) );
$panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAIN","label", $parameters=array("value" => "Enable Students to use AppShare tool") ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAINLECTURE","label", $parameters=array("value" => "Enable Students to use AppShare tool") ));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
@@ -729,9 +728,9 @@
}
else $parameters['checked']=true;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION", "input", $parameters) );
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSIONROOM", "input", $parameters) );
$panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION","label", $parameters=array("value" => "Enable Archiving") ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSIONROOM","label", $parameters=array("value" => "Enable Archiving") ));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
@@ -760,9 +759,9 @@
}
else $parameters['checked']=true;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION", "input", $parameters) );
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSIONROOM", "input", $parameters) );
$panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION","label", $parameters=array("value" => "Enable Appshare") ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSIONROOM","label", $parameters=array("value" => "Enable Appshare") ));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
@@ -791,9 +790,9 @@
}
else $parameters['checked']=true;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION", "input", $parameters) );
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSIONROOM", "input", $parameters) );
$panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSION","label", $parameters=array("value" => "Enable On-The-Fly PPT Import") ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSIONROOM","label", $parameters=array("value" => "Enable On-The-Fly PPT Import") ));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
Modified: trunk/moodle/mod/liveclassroom/manageRoomAction.php
===================================================================
--- trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-28 12:49:53 UTC (rev 138)
+++ trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-28 13:43:22 UTC (rev 139)
@@ -70,10 +70,16 @@
}
else $bool = false;
//Available
+ if (!isset($list_attributes['can_archive'])) $list_attributes['can_archive']="0";
+ if (!isset($list_attributes['can_liveshare'])) $list_attributes['can_liveshare']="0";
+ if (!isset($list_attributes['can_ppt_import'])) $list_attributes['can_ppt_import']="0";
+ if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']="0";
+ if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
if (!isset($list_attributes['preview'])) $list_attributes['preview']=1;
- if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']=0;
- if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
+ if (!isset($list_attributes['student_wb_enabled'])) $list_attributes['student_wb_enabled']="0";
+ if (!isset($list_attributes['student_wb_liveapp'])) $list_attributes['student_wb_liveapp']="0";
+
if (!liveclassroom_create_room ($courseid, $list_attributes['longname'], $bool, $list_attributes)) {
notice(get_string("roomcreationfailed", "liveclassroom"), $_SERVER["HTTP_REFERER"]);
exit;
@@ -83,10 +89,18 @@
else if($_GET['action']=='updateRoom') {
//Available
-
- if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']=0;
+ if (!isset($list_attributes['can_archive'])) $list_attributes['can_archive']="0";
+ if (!isset($list_attributes['can_liveshare'])) $list_attributes['can_liveshare']="0";
+ if (!isset($list_attributes['can_ppt_import'])) $list_attributes['can_ppt_import']="0";
+ if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']="0";
if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
if (!isset($list_attributes['preview'])) $list_attributes['preview']=1;
+ if (!isset($list_attributes['student_wb_enabled'])) $list_attributes['student_wb_enabled']="0";
+ if (!isset($list_attributes['student_wb_liveapp'])) $list_attributes['student_wb_liveapp']="0";
+
+
+
+
//print_r($list_attributes);
//Test if the type of room has been changed
if($_SESSION['led']!=$list_attributes['led']) { // Type changed
@@ -96,6 +110,7 @@
liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Student');
}
else {
+
liveclassroom_api_remove_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid) , 'Student') ;
liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Instructor');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2006-12-28 15:00:52
|
Revision: 142
http://svn.sourceforge.net/hw4mdl/?rev=142&view=rev
Author: shazan
Date: 2006-12-28 07:00:51 -0800 (Thu, 28 Dec 2006)
Log Message:
-----------
fix bug 10538 :now, the archives are visible for students if they are available.
the array with all the archives is now indexed by the id of the archive.
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/manageRoomAction.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-28 14:45:06 UTC (rev 141)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-28 15:00:51 UTC (rev 142)
@@ -691,8 +691,7 @@
$j++;
}
}
-
-
+
return $list_return;
}
@@ -705,8 +704,8 @@
*/
function liveclassroom_api_get_open_archive_list_for_a_room($roomid,$userid) {
global $CFG;
-
- $final_list = "&attribute=class_id&attribute=longname&filter01=archive&filter01value=1&filter02=preview&filter02value=1&AccessUser=$userid";
+
+ $final_list = "&attribute=preview&attribute=class_id&attribute=longname&filter01=archive&filter01value=1&AccessUser=$userid";
$enc_list = str_replace(" ", "+", $final_list);
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
@@ -724,18 +723,20 @@
$j=0;
- for($i=1;$i<sizeof($line)-2;$i=$i+3) {
+ for($i=1;$i<sizeof($line)-3;$i=$i+4) {
$test = strstr($line[$i+1],$roomid);
if($test!=false) {
- // $list_return[$j][0]= liveclassroom_parse_line($line[$i],"preview=");
- $list_return[$j][1]= liveclassroom_parse_line($line[$i],"class_id=");
- $list_return[$j][2] = liveclassroom_parse_line($line[$i+1],"longname=");
- $j++;
+ if(liveclassroom_parse_line($line[$i],"preview=")==0) {
+ $list_return[$j][1]= liveclassroom_parse_line($line[$i+1],"class_id=");
+ $list_return[$j][2] = liveclassroom_parse_line($line[$i+2],"longname=");
+ $j++;
+ }
}
}
return $list_return;
+
}
/*
@@ -766,12 +767,12 @@
$j=0;
for($i=1;$i<sizeof($line)-3;$i=$i+4) {
+ $id = liveclassroom_parse_line($line[$i+1],"class_id=");
+ $list_return[$id][0]= liveclassroom_parse_line($line[$i],"preview=");
+ $list_return[$id][1]= $id;
+ $list_return[$id][2] = liveclassroom_parse_line($line[$i+2],"longname=");
+ $j++;
- $list_return[$line[$i+1]][0]= liveclassroom_parse_line($line[$i],"preview=");
- $list_return[$line[$i+1]][1]= liveclassroom_parse_line($line[$i+1],"class_id=");
- $list_return[$line[$i+1]][2] = liveclassroom_parse_line($line[$i+2],"longname=");
- $j++;
-
}
@@ -1362,6 +1363,8 @@
$tabarchive = array();
$orphanedArchives = liveclassroom_api_get_archive_list($userid);
+
+ add_to_log($COURSE->id, "liveclassroom", "archive", "action", sizeof($orphanedArchives));
$nbrClosedArchive = 0;
for($i=1;$i<sizeof($line)-3;$i=$i+4){
@@ -1379,12 +1382,19 @@
if ($isteacher=="1")
{
$tabarchive = liveclassroom_api_get_archive_list_for_a_room($roomid,$userid);
+ add_to_log($COURSE->id, "liveclassroom", "archiveteacher", "action", sizeof($tabarchive));
+ foreach ($tabarchive as $tabarchive_value) {
+ unset($orphanedArchives[$tabarchive_value[1]]) ;
+ }
}
else //just the open archive
{
$tabarchive = liveclassroom_api_get_open_archive_list_for_a_room($roomid,$userid);
- add_to_log("", "liveclassroom", "test id", "test", $userid);
- add_to_log("", "liveclassroom", "test archive", "test", sizeof($tabarchive));
+ add_to_log($COURSE->id, "liveclassroom", "archivestudent", "action", sizeof($tabarchive));
+ $tabarchiveall = $tabarchive = liveclassroom_api_get_archive_list_for_a_room($roomid,$userid);
+ foreach ($tabarchiveall as $tabarchiveall_value) {
+ unset($orphanedArchives[$tabarchiveall_value[1]]) ;
+ }
}
if(liveclassroom_api_role_user_room($roomid, $studentuserid)=='Student') { //lecture room
@@ -1433,7 +1443,6 @@
foreach ($tabarchive as $tabarchive_value) {
$archive = $xmldoc->create_element('archive');
- // $xmlOrphanedArchiveForStudent = $xmldoc->CreateElement("orphanedArchiveForStudent");
$archiveid = $xmldoc->create_element('id');
$archiveid->append_child($xmldoc->create_text_node("$tabarchive_value[1]"));
@@ -1453,7 +1462,7 @@
$archive->append_child($archivename);
$archive->append_child($archivepreview);
$archives->append_child($archive);
- unset($orphanedArchives[$tabarchive_value[1]]) ;
+
/*
if ( ($roompreview==1) && ($tabarchive_value[0]==0))
{
@@ -1477,7 +1486,8 @@
*/
}
$roomParameters->append_child($archives);
-
+
+
}
$closedArchive = $xmldoc->create_element("closedArchive");
@@ -1497,7 +1507,7 @@
$listElements->append_child($element);
}
-
+ add_to_log($COURSE->id, "liveclassroom", "orphaned", "action", sizeof($orphanedArchives));
foreach ($orphanedArchives as $orphanedArchive)
{
$xmlOrphanedArchive = $xmldoc->create_element("listElement");
Modified: trunk/moodle/mod/liveclassroom/manageRoomAction.php
===================================================================
--- trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-28 14:45:06 UTC (rev 141)
+++ trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-28 15:00:51 UTC (rev 142)
@@ -60,26 +60,30 @@
}
-
}
if(isteacher($courseid)) {
if($_GET['action']=='createRoom') {
if($list_attributes['led']=='instructor'){
- $bool = true;
+ $bool = true;
+ if (!isset($list_attributes['chatenable'])) $list_attributes['chatenable']="0";
+ if (!isset($list_attributes['student_wb_liveapp'])) $list_attributes['student_wb_liveapp']="0";
+ if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']="0";
+ if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
}
- else $bool = false;
+ else {
+ $bool = false;
+ if (!isset($list_attributes['can_archive'])) $list_attributes['can_archive']="0";
+ if (!isset($list_attributes['can_liveshare'])) $list_attributes['can_liveshare']="0";
+ if (!isset($list_attributes['can_ppt_import'])) $list_attributes['can_ppt_import']="0";
+
+ }
//Available
- if (!isset($list_attributes['can_archive'])) $list_attributes['can_archive']="0";
- if (!isset($list_attributes['can_liveshare'])) $list_attributes['can_liveshare']="0";
- if (!isset($list_attributes['can_ppt_import'])) $list_attributes['can_ppt_import']="0";
- if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']="0";
- if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
if (!isset($list_attributes['preview'])) $list_attributes['preview']=1;
- if (!isset($list_attributes['student_wb_enabled'])) $list_attributes['student_wb_enabled']="0";
- if (!isset($list_attributes['student_wb_liveapp'])) $list_attributes['student_wb_liveapp']="0";
- if (!isset($list_attributes['chatenable'])) $list_attributes['chatenable']="0";
+ if (!isset($list_attributes['student_wb_enabled'])) $list_attributes['student_wb_enabled']="0";
+
+
if (!liveclassroom_create_room ($courseid, $list_attributes['longname'], $bool, $list_attributes)) {
notice(get_string("roomcreationfailed", "liveclassroom"), $_SERVER["HTTP_REFERER"]);
exit;
@@ -87,17 +91,21 @@
$messageType = 'roomCreated';
}
else if($_GET['action']=='updateRoom') {
+ if($list_attributes['led']=='instructor'){
+ if (!isset($list_attributes['chatenable'])) $list_attributes['chatenable']="0";
+ if (!isset($list_attributes['student_wb_liveapp'])) $list_attributes['student_wb_liveapp']="0";
+ if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']="0";
+ if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
+ }
+ else {
+ if (!isset($list_attributes['can_archive'])) $list_attributes['can_archive']="0";
+ if (!isset($list_attributes['can_liveshare'])) $list_attributes['can_liveshare']="0";
+ if (!isset($list_attributes['can_ppt_import'])) $list_attributes['can_ppt_import']="0";
+
+ }
//Available
-
- if (!isset($list_attributes['can_archive'])) $list_attributes['can_archive']="0";
- if (!isset($list_attributes['can_liveshare'])) $list_attributes['can_liveshare']="0";
- if (!isset($list_attributes['can_ppt_import'])) $list_attributes['can_ppt_import']="0";
- if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']="0";
- if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
if (!isset($list_attributes['preview'])) $list_attributes['preview']=1;
- if (!isset($list_attributes['student_wb_enabled'])) $list_attributes['student_wb_enabled']="0";
- if (!isset($list_attributes['student_wb_liveapp'])) $list_attributes['student_wb_liveapp']="0";
- if (!isset($list_attributes['chatenable'])) $list_attributes['chatenable']="0";
+ if (!isset($list_attributes['student_wb_enabled'])) $list_attributes['student_wb_enabled']="0";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-12-29 09:31:07
|
Revision: 145
http://svn.sourceforge.net/hw4mdl/?rev=145&view=rev
Author: hugues
Date: 2006-12-29 01:31:00 -0800 (Fri, 29 Dec 2006)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10560
- Updated the version of the integration: it comes from a constant defined in lib.php
- The version of the LC server comes from the server now
- Updated the way we return String messages, they will come from the anguage file in the future
- Some other re-indentation
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/config.html
trunk/moodle/mod/liveclassroom/generateListRooms.php
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/manageRoomAction.php
trunk/moodle/mod/liveclassroom/welcome.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2006-12-28 15:54:55 UTC (rev 144)
+++ trunk/moodle/mod/liveclassroom/api.php 2006-12-29 09:31:00 UTC (rev 145)
@@ -41,7 +41,6 @@
* @package liveclassroom
*/
-//require_once('System.php');
require_once('lib.php');
$LIVECLASSROOM_MOODLE_PREFIX = liveclassroom_api_get_prefix();
@@ -61,12 +60,11 @@
define("LIVECLASSROOM_API_FUNCTION_LIST_ROLE","function=listRole");
define("LIVECLASSROOM_API_FUNCTION_CREATE_GROUP","function=createGroup");
define("LIVECLASSROOM_API_FUNCTION_MODIFY_GROUP","function=modifyGroup");
+define("LIVECLASSROOM_API_FUNCTION_STATUS","function=statusServer");
define("LIVECLASSROOM_API_RECORD_SEPERATOR","=END RECORD");
-
-
/*
* Get the prefix to use for creating rooms and users.
*
Modified: trunk/moodle/mod/liveclassroom/config.html
===================================================================
--- trunk/moodle/mod/liveclassroom/config.html 2006-12-28 15:54:55 UTC (rev 144)
+++ trunk/moodle/mod/liveclassroom/config.html 2006-12-29 09:31:00 UTC (rev 145)
@@ -44,13 +44,13 @@
<tr valign="top">
<td align="right"><?php print_string('lcversion', 'liveclassroom')?> :</td>
<td>
- <?php print_string("lcversionnumber", "liveclassroom") ?>
+ <?php echo liveclassroom_get_version(); ?>
</td>
</tr>
<tr valign="top">
<td align="right"><?php print_string('integrationversion', 'liveclassroom')?> :</td>
<td>
- <?php print_string("integrationversionnumber", "liveclassroom") ?>
+ <?php echo LIVECLASSROOM_MODULE_VERSION ?>
</td>
</tr>
<tr>
Modified: trunk/moodle/mod/liveclassroom/generateListRooms.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-28 15:54:55 UTC (rev 144)
+++ trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-29 09:31:00 UTC (rev 145)
@@ -32,7 +32,7 @@
/// This page is to generate the list of rooms and archives
- require_once("../../config.php");
+ require_once("../../config.php");
require_once("lib.php");
require_once("api.php");
@@ -145,6 +145,9 @@
$xmlstring = $xmldoc->dump_mem(true); // Xml datas into a string
$finalstring = str_replace("\n", '', $xmlstring);
+
+ add_to_log("", "liveclassroom", "test id", "test", $xmlstring);
+
echo $xmlstring;
?>
\ No newline at end of file
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2006-12-28 15:54:55 UTC (rev 144)
+++ trunk/moodle/mod/liveclassroom/lib.php 2006-12-29 09:31:00 UTC (rev 145)
@@ -33,10 +33,16 @@
require_once($CFG->libdir.'/datalib.php');
require_once("api.php");
require_once($CFG->dirroot.'/course/lib.php');
+
+
+define (LIVECLASSROOM_MODULE_VERSION, "0.9");
+
//Suffixes used when creting the profiles account on the LC server
-$LIVECLASSROOM_TEACHER_SUFFIX = "_T"; //Teachers will use the user $CFG->liveclassroom_settinguniqueid + $course->id + $LIVECLASSROOM_TEACHER_SUFFIX
-$LIVECLASSROOM_STUDENT_SUFFIX = "_S"; //Students will use the user $CFG->liveclassroom_settinguniqueid + $course->id + $LIVECLASSROOM_STUDENT_SUFFIX
+define (LIVECLASSROOM_TEACHER_SUFFIX, "_T"); //Teachers will use the user $CFG->liveclassroom_settinguniqueid + $course->id + $LIVECLASSROOM_TEACHER_SUFFIX
+define (LIVECLASSROOM_STUDENT_SUFFIX, "_S"); //Students will use the user $CFG->liveclassroom_settinguniqueid + $course->id + $LIVECLASSROOM_STUDENT_SUFFIX
+
+
$LIVECLASSROOM_LOGS = "logs.php"; //file use to the logs
/**
* Validate the data in passed in the configuration page
@@ -75,22 +81,21 @@
/// will create a new instance and return the id number
/// of the new instance.
- $liveclassroom->timemodified = time();
+ $liveclassroom->timemodified = time();
- # May have to add extra stuff in here #
- $roomname = liveclassroom_api_get_room_name($liveclassroom->type);
+ # May have to add extra stuff in here #
+ $roomname = liveclassroom_api_get_room_name($liveclassroom->type);
- if($result = insert_record("liveclassroom", $liveclassroom)) {
- add_to_log($liveclassroom->course, "liveclassroom", "Add activity", liveclassroom_send_logs("addInstance","liveclassroomId=".$result."&roomname=$roomname"), "Activity \"".$liveclassroom->name."\" added");
-
- }
- else
- {
- add_to_log($liveclassroom->course, "liveclassroom", "Add activity", liveclassroom_send_logs("errorAddInstance","liveclassroomId=".$result."&roomname=$roomname"), "Activity \"".$liveclassroom->name."\" has not been added");
-
- $result=false;
- }
- return $result;
+ if($result = insert_record("liveclassroom", $liveclassroom)) {
+ add_to_log($liveclassroom->course, "liveclassroom", "Add activity",
+ liveclassroom_send_logs("addInstance","liveclassroomId=".$result."&roomname=$roomname"), "Activity \"".$liveclassroom->name."\" added");
+ }
+ else {
+ add_to_log($liveclassroom->course, "liveclassroom", "Add activity",
+ liveclassroom_send_logs("errorAddInstance","liveclassroomId=".$result."&roomname=$roomname"), "Activity \"".$liveclassroom->name."\" has not been added");
+ $result=false;
+ }
+ return $result;
}
@@ -273,6 +278,7 @@
}
+
/**
* Create the different kind of room on this course
* call the function create_room for each type of room available for the course given
@@ -1037,52 +1043,51 @@
*/
function liveclassroom_get_message($type) {
- switch ($type)
- {
- case "roomCreated":
- $return = "Your room has been successfully created.";
- break;
- case "roomUpdated":
- $return = "Your room has been successfully updated.";
- break;
- case "roomDeleted":
- $return = "Your room has been successfully deleted.";
- break;
- case "notfind":
- $return = "Invalid Live Classroom parameters. Please contact your administrator for more information.";
- break;
- case "room":
- $return = "Invalid Live Classroom parameters. Please contact your administrator for more information. ";
- break;
- case "connection":
- $return = "Moodle cannot connect to the Live Classroom server. Please reload the page or contact your administrator for more information. ";
- break;
- case "bd":
- $return = "Moodle cannot connect to the Live Classroom database. Please reload the page or contact your administrator for more information. ";
- break;
- case "session":
- //createMessage("exception","the session has timed out due to inactivity. Please reload the page to reconnect. ");
- break;
- case "signature":
- $return = "Invalid connection to Live Classroom. Please contact your administrator for more information. ";
- break;
- case "board":
- $return = "Invalid Voice Board parameters. Please contact your administrator for more information. ";
- break;
- case "connection_vt":
- $return = "Moodle cannot connect to the Voice Board server. Please reload the page or contact your administrator for more information. ";
- break;
- case "bdvt":
- $return = "Moodle cannot connect to the Voice Board database. Please reload the page or contact your administrator for more information. ";
- break;
- case "sessionvt":
- $return = "The Voice Board session has timed out due to inactivity. Please reload the page to reconnect. ";
- break;
- case "signaturevt":
- $return = "Invalid connection to Voice Board. Please contact your administrator for more information. ";
- break;
- }
- return $return;
+ switch ($type) {
+ case "roomCreated":
+ return "Your room has been successfully created.";
+
+ case "roomUpdated":
+ return "Your room has been successfully updated.";
+
+ case "roomDeleted":
+ return "Your room has been successfully deleted.";
+
+ case "notfind":
+ return "Invalid Live Classroom parameters. Please contact your administrator for more information.";
+
+ case "room":
+ return "Invalid Live Classroom parameters. Please contact your administrator for more information. ";
+
+ case "connection":
+ return "Moodle cannot connect to the Live Classroom server. Please reload the page or contact your administrator for more information. ";
+
+ case "bd":
+ return "Moodle cannot connect to the Live Classroom database. Please reload the page or contact your administrator for more information. ";
+
+ case "session":
+ //createMessage("exception","the session has timed out due to inactivity. Please reload the page to reconnect. ");
+
+ case "signature":
+ return "Invalid connection to Live Classroom. Please contact your administrator for more information. ";
+
+ case "board":
+ return "Invalid Voice Board parameters. Please contact your administrator for more information. ";
+
+ case "connection_vt":
+ return "Moodle cannot connect to the Voice Board server. Please reload the page or contact your administrator for more information. ";
+
+ case "bdvt":
+ return "Moodle cannot connect to the Voice Board database. Please reload the page or contact your administrator for more information. ";
+
+ case "sessionvt":
+ return "The Voice Board session has timed out due to inactivity. Please reload the page to reconnect. ";
+
+ case "signaturevt":
+ return "Invalid connection to Voice Board. Please contact your administrator for more information. ";
+
+ }
+ return "Default Message";
}
/*
@@ -1103,4 +1108,40 @@
return $link;
}
+
+
+/**
+ * Returns the version of the server.
+ *
+ */
+function liveclassroom_get_version () {
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_STATUS, "");
+
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
+
+ $currentline = strtok($data,"\n");
+ while (!empty($currentline) && !preg_match("/horizon_version=/", $currentline, $matches)) {
+ $currentline = strtok("\n");
+ }
+
+ if (empty($currentline)) {
+ return "noversion";
+ }
+
+ $version= substr($currentline, 16);
+
+ //DEBUG
+ if (empty($version)) {
+ return "emptyversion";
+ }
+
+ return $version;
+}
+
+
?>
Modified: trunk/moodle/mod/liveclassroom/manageRoomAction.php
===================================================================
--- trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-28 15:54:55 UTC (rev 144)
+++ trunk/moodle/mod/liveclassroom/manageRoomAction.php 2006-12-29 09:31:00 UTC (rev 145)
@@ -41,14 +41,14 @@
error("Guests are not allowed to create rooms", $_SERVER["HTTP_REFERER"]);
}
- if (isstudent($courseid)) {
+ if (isstudent($courseid)) {
error("Students are not allowed to create rooms", $_SERVER["HTTP_REFERER"]);
}
if (!liveclassroom_init_session($_GET)) {
- error("ExpiredSessionException");
- }
+ error("ExpiredSessionException");
+ }
- $url = liveclassroom_get_url_params($courseid);
+ $url = liveclassroom_get_url_params($courseid);
session_start(); // to get the previous type of the room
Modified: trunk/moodle/mod/liveclassroom/welcome.php
===================================================================
--- trunk/moodle/mod/liveclassroom/welcome.php 2006-12-28 15:54:55 UTC (rev 144)
+++ trunk/moodle/mod/liveclassroom/welcome.php 2006-12-29 09:31:00 UTC (rev 145)
@@ -77,111 +77,87 @@
?>
<html>
-<head>
-<title>Live ClassRooms</title>
-<link rel="STYLESHEET" href="css/StyleSheet.css" type="text/css" />
-<script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch.js'></script>
-
-
- <script language="javascript" src="js/Ajax.js"></script>
+ <head>
+ <title>Live ClassRooms</title>
+ <link rel="STYLESHEET" href="css/StyleSheet.css" type="text/css" />
+ <script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch.js'></script>
+ <script language="javascript" src="js/Ajax.js"></script>
<script language="javascript" src="js/xmldom.js"></script>
<script language="javascript" src="js/verifForm.js"></script>
- <script language="javascript" src="js/constants.js"></script>
+ <script language="javascript" src="js/constants.js"></script>
<script language="javascript" src="js/pngfix.js"></script>
<script language="javascript" src="js/manageXml.js"></script>
- <script language="javascript" src="js/hwCommons.js"></script>
+ <script language="javascript" src="js/hwCommons.js"></script>
-<script type="text/javascript">
-
-
-
-
+ <script type="text/javascript">
function doOpenAddActivity(url,param){
+ if(currentId!="") {
- if(currentId!="") {
-
- if( (typeSelect=="MainLecture") || (typeSelect == "Discussion") ) {
-
- var complete_url=url+'?roomId='+currentId+'&id=<?php p($id) ?>§ion=0&sesskey=<?php echo sesskey(); ?>&'+param;
- window.open(complete_url,"_top");
-
+ if( (typeSelect=="MainLecture") || (typeSelect == "Discussion") ) {
+ var complete_url=url+'?roomId='+currentId+'&id=<?php p($id) ?>§ion=0&sesskey=<?php echo sesskey(); ?>&'+param;
+ window.open(complete_url,"_top");
}
- }
-
+ }
}
-function doOpenReport()
-{
- if(currentId!="")
- {
- var complete_url='reports.php'+'?roomId='+currentId+'&hza='+session['authToken'];
- var w = window.open(complete_url,'lc_popup','scrollbars=yes,resizable=yes,width=800,height=500');
- w.focus();
- }
+function doOpenReport() {
+ if(currentId!="") {
+ var complete_url='reports.php'+'?roomId='+currentId+'&hza='+session['authToken'];
+ var w = window.open(complete_url,'lc_popup','scrollbars=yes,resizable=yes,width=800,height=500');
+ w.focus();
+ }
}
-function doDelete()
-{
- if(currentId!="")
- {
- var complete_url='manageRoomAction.php'+'?time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]+'&id ='+currentId+'&action=deleteRoom&hza='+session['authToken'] ;
- location.href = complete_url
- //var w = window.open(complete_url, '_top');
- // w.focus();
-
- }
+function doDelete(){
+ if(currentId!=""){
+ var complete_url='manageRoomAction.php'+'?time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]+'&id ='+currentId+'&action=deleteRoom&hza='+session['authToken'] ;
+ location.href = complete_url
+ //var w = window.open(complete_url, '_top');
+ // w.focus();
+ }
}
function displaySpace(){
- var display="";
- display+= "<td width='130'></td>";
- return display;
+ var display="";
+ display+= "<td width='130'></td>";
+ return display;
}
function ChoicePage(){
-
- <?php
- if(isset($_GET['addnew']))
+ <?php
+ if(isset($_GET['addnew']))
{
?>
- showPopup()
+ showPopup()
+ currentProduct = "LiveClassroom";
+ typeSelect="MainLecture";
-
- currentProduct = "LiveClassroom";
- typeSelect="MainLecture";
-
- var parameters="";
- parameters="product=liveclassroom&";
- parameters+="action=new&";
- parameters+=getURLParameters();
- currentId = "";
- /* Pr\xE9paration d'une requ\xEAte asynchrone de type GET : */
- xmlhttp.open("GET", 'generateSettings.php?'+parameters+'',true);
- /* Effectue la requ\xEAte : */
- xmlhttp.onreadystatechange=eval(Management);
+ var parameters="";
+ parameters="product=liveclassroom&";
+ parameters+="action=new&";
+ parameters+=getURLParameters();
+ currentId = "";
+ /* Preparing an asynchronous GET request: */
+ xmlhttp.open("GET", 'generateSettings.php?'+parameters+'',true);
+ /* run the request : */
+ xmlhttp.onreadystatechange=eval(Management);
- xmlhttp.send(null);
-
+ xmlhttp.send(null);
<?php
- }
- else
- {
+ }
+ else {
?>
-
- DisplayFirstPage("generateListRooms.php");
+ DisplayFirstPage("generateListRooms.php");
<?php
- }
- ?>
-
+ }
+ ?>
}
-
-
</script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-12-29 11:05:41
|
Revision: 148
http://svn.sourceforge.net/hw4mdl/?rev=148&view=rev
Author: hugues
Date: 2006-12-29 03:05:36 -0800 (Fri, 29 Dec 2006)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10561
- Fixing some more code formatting
- Fixed message displays
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/generateListRooms.php
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/manageRoomAction.php
trunk/moodle/mod/liveclassroom/welcome.php
Modified: trunk/moodle/mod/liveclassroom/generateListRooms.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-29 10:25:41 UTC (rev 147)
+++ trunk/moodle/mod/liveclassroom/generateListRooms.php 2006-12-29 11:05:36 UTC (rev 148)
@@ -21,7 +21,7 @@
* if not, write to the Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
* *
- * Author: Hazan Samy *
+ * Author: Hazan Samy *
* *
* Date: October 2006 *
* *
@@ -32,122 +32,121 @@
/// This page is to generate the list of rooms and archives
- require_once("../../config.php");
- require_once("lib.php");
- require_once("api.php");
+require_once("../../config.php");
+require_once("lib.php");
+require_once("api.php");
- // Variables needed
- global $CFG;
+// Variables needed
+global $CFG;
- if (version_compare(PHP_VERSION,'5','>=')) {
- require_once($CFG->libdir.'/cas/domxml-php4-php5.php');
- }
-
- if(empty($_POST)){
- $params = $_GET;
- }
- else $params = $_POST;
+if (version_compare(PHP_VERSION,'5','>=')) {
+ require_once($CFG->libdir.'/cas/domxml-php4-php5.php');
+}
- $courseid = $params['enc_course_id'];
+if(empty($_POST)){
+ $params = $_GET;
+}
+else {
+ $params = $_POST;
+}
- $userid = liveclassroom_api_get_teacher_user_id($courseid);
-
- if(isteacher($courseid, $USER->id) ) {
- $isteacher = 1;
- }
- else if (isstudent($courseid) ) {
- $isteacher = 0;
- }
-
- if (!liveclassroom_init_session($params)) {
- error("ExpiredSessionException");
- }
+$courseid = $params['enc_course_id'];
+$userid = liveclassroom_api_get_teacher_user_id($courseid);
+
+if(isteacher($courseid, $USER->id) ) {
+ $isteacher = 1;
+}
+else if (isstudent($courseid) ) {
+ $isteacher = 0;
+}
+
+if (!liveclassroom_init_session($params)) {
+ error("ExpiredSessionException");
+}
- $xmldoc = domxml_new_doc("1.0");
-
- $root = $xmldoc->create_element('root');
-
- $root->append_child(liveclassroom_get_session_params($xmldoc,$params));
-
- $windows = $xmldoc->create_element('windows');
- //HEADER BAR
- $windows->append_child(liveclassroom_create_headerbar($xmldoc));
+$xmldoc = domxml_new_doc("1.0");
+
+$root = $xmldoc->create_element('root');
+
+$root->append_child(liveclassroom_get_session_params($xmldoc,$params));
+
+$windows = $xmldoc->create_element('windows');
+//HEADER BAR
+$windows->append_child(liveclassroom_create_headerbar($xmldoc));
- //TOOL BAR
- $toolbar = $xmldoc->create_element('windowsElement');
- $tbtype = $xmldoc->create_element('type');
- $tbtype->append_child($xmldoc->create_text_node("toolBar"));
- $toolbar->append_child($tbtype);
-
- $tbelementParameters = $xmldoc->create_element("windowsElementParameters");
-
- $menubar = $xmldoc->create_element('menuElements');
-
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'all', 'all', 'pictures/buttons/toolbar-launch', 'Launch', 'Launch()', "hza=".$params['authToken']));
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-activities', 'Add Activity', "doOpenAddActivity('../../course/mod.php','add=liveclassroom')",''));
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-new', 'New', "launchNew('generateSettings.php','Management','new','LiveClassroom','MainLecture')", ''));
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'fixSpace', 'all', 'all', '', '', '', '', ''));
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-content', 'Content', "openContentWindows()", ''));
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-poll', 'Reports', 'doOpenReport()',''));
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-settings', 'Settings', "launchAjaxRequest('generateSettings.php','Management','update','false')", ''));
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-delete', 'Delete', 'doDelete()', ''));
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'fixSpace', 'all', 'all', '', '', '', '', ''));
- $menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true','search', 'all','all', "", "", "", "",""));
- $tbelementParameters->append_child($menubar);
- $toolbar->append_child($tbelementParameters);
-
- $windows->append_child($toolbar);
+//TOOL BAR
+$toolbar = $xmldoc->create_element('windowsElement');
+$tbtype = $xmldoc->create_element('type');
+$tbtype->append_child($xmldoc->create_text_node("toolBar"));
+$toolbar->append_child($tbtype);
+
+$tbelementParameters = $xmldoc->create_element("windowsElementParameters");
+
+$menubar = $xmldoc->create_element('menuElements');
+
+$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'all', 'all', 'pictures/buttons/toolbar-launch', 'Launch', 'Launch()', "hza=".$params['authToken']));
+$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-activities', 'Add Activity', "doOpenAddActivity('../../course/mod.php','add=liveclassroom')",''));
+$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'button', 'instructor', 'all', 'pictures/buttons/toolbar-new', 'New', "launchNew('generateSettings.php','Management','new','LiveClassroom','MainLecture')", ''));
+$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'fixSpace', 'all', 'all', '', '', '', '', ''));
+$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-content', 'Content', "openContentWindows()", ''));
+$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-poll', 'Reports', 'doOpenReport()',''));
+$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-settings', 'Settings', "launchAjaxRequest('generateSettings.php','Management','update','false')", ''));
+$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'false','button', 'instructor', 'all', 'pictures/buttons/toolbar-delete', 'Delete', 'doDelete()', ''));
+$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true', 'fixSpace', 'all', 'all', '', '', '', '', ''));
+$menubar->append_child(liveclassroom_create_menu_element($xmldoc,'true','search', 'all','all', "", "", "", "",""));
- // MESSAGE BAR
- if (isset($params['messageType'])) {
- $windows->append_child(liveclassroom_create_message($xmldoc, liveclassroom_get_message($params['messageType'])));
- }
- // LIST
+$tbelementParameters->append_child($menubar);
+$toolbar->append_child($tbelementParameters);
+
+$windows->append_child($toolbar);
- $list = $xmldoc->create_element('windowsElement');
- $typeWindowsElement = $xmldoc->create_element('type');
- $typeWindowsElement->append_child($xmldoc->create_text_node("list"));
- $list->append_child($typeWindowsElement);
-
- $elementParameters = $xmldoc->create_element('windowsElementParameters');
-
- $products = $xmldoc->create_element('products');
-
- // LIST PRODUCTS
-
- $listProducts = $xmldoc->create_element('listProducts');
-
- $listProducts->append_child(liveclassroom_create_product_information($xmldoc,'1','toggleimgmain','productType','Lecture rooms'));
- $listProducts->append_child(liveclassroom_create_product_information($xmldoc,'2','toggleimgbreakout','productType','Discussion rooms'));
-
- $products->append_child($listProducts);
-
- // PRODUCTS CONTENT
+// MESSAGE BAR
+if (isset($params['messageType'])) {
+ $windows->append_child(liveclassroom_create_message($xmldoc, liveclassroom_get_message($params['messageType'])));
+}
-
- $products->append_child(liveclassroom_roomsarchiveslist($xmldoc,$userid,$courseid,$isteacher));
-
- $elementParameters->append_child($products);
-
- $list->append_child($elementParameters);
-
- $windows->append_child($list);
+// LIST
+$list = $xmldoc->create_element('windowsElement');
+$typeWindowsElement = $xmldoc->create_element('type');
+$typeWindowsElement->append_child($xmldoc->create_text_node("list"));
+$list->append_child($typeWindowsElement);
+
+$elementParameters = $xmldoc->create_element('windowsElementParameters');
+
+$products = $xmldoc->create_element('products');
+
+// LIST PRODUCTS
+
+$listProducts = $xmldoc->create_element('listProducts');
+
+$listProducts->append_child(liveclassroom_create_product_information($xmldoc,'1','toggleimgmain','productType','Lecture rooms'));
+$listProducts->append_child(liveclassroom_create_product_information($xmldoc,'2','toggleimgbreakout','productType','Discussion rooms'));
+
+$products->append_child($listProducts);
+
+// PRODUCTS CONTENT
- $root->append_child($windows);
-
- $xmldoc->append_child($root);
+
+$products->append_child(liveclassroom_roomsarchiveslist($xmldoc,$userid,$courseid,$isteacher));
+
+$elementParameters->append_child($products);
+
+$list->append_child($elementParameters);
+
+$windows->append_child($list);
- $xmlstring = $xmldoc->dump_mem(true); // Xml datas into a string
-
- $finalstring = str_replace("\n", '', $xmlstring);
-
- add_to_log("", "liveclassroom", "test id", "test", $xmlstring);
-
- echo $xmlstring;
-
+$root->append_child($windows);
+
+$xmldoc->append_child($root);
+
+$xmlstring = $xmldoc->dump_mem(true); // Xml datas into a string
+
+$finalstring = str_replace("\n", '', $xmlstring);
+
+echo $xmlstring;
?>
\ No newline at end of file
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-29 10:25:41 UTC (rev 147)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2006-12-29 11:05:36 UTC (rev 148)
@@ -21,1162 +21,1162 @@
* if not, write to the Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
* *
- * Author: Hazan Samy *
+ * Author: Hazan Samy *
* *
- * Date: October 2006 *
+ * Date: October 2006 *
* *
******************************************************************************/
/* $Id$ */
/// This page is to generate the settings of a room or archive
- // require_once($CFG->dirroot.'/config.php');
- require_once("../../config.php");
- require_once("lib.php");
+ // require_once($CFG->dirroot.'/config.php');
+ require_once("../../config.php");
+ require_once("lib.php");
require_once("api.php");
// Variables needed
global $CFG;
- if (version_compare(PHP_VERSION,'5','>=')) {
- require_once($CFG->libdir.'/cas/domxml-php4-php5.php');
- }
-
- $courseid = $_GET['enc_course_id'];
+ if (version_compare(PHP_VERSION,'5','>=')) {
+ require_once($CFG->libdir.'/cas/domxml-php4-php5.php');
+ }
+
+ $courseid = $_GET['enc_course_id'];
$signature = $_GET['signature'];
$action = $_GET['action'];
$MAINLECTURE = 'MainLecture';
$DISCUSSIONROOM = 'Discussion';
- $MAINDISCUSSION = 'MainLectureRoom-DiscussionRoom';
-
- if (!liveclassroom_init_session($_GET)) {
- error("ExpiredSessionException");
- }
-
- if($action == 'update') {
- $roomId = $_GET['id'];
- $room_info = liveclassroom_api_get_infos_room($roomId);
- if(liveclassroom_is_lecturehall($roomId,$courseid)) {
- $isLectureRoom = true;
- }
- else {
- $isLectureRoom = false;
- }
- session_start(); // session to store the previous types of the room
+ $MAINDISCUSSION = 'MainLectureRoom-DiscussionRoom';
+
+ if (!liveclassroom_init_session($_GET)) {
+ error("ExpiredSessionException");
+ }
+
+ if($action == 'update') {
+ $roomId = $_GET['id'];
+ $room_info = liveclassroom_api_get_infos_room($roomId);
+ if(liveclassroom_is_lecturehall($roomId,$courseid)) {
+ $isLectureRoom = true;
+ }
+ else {
+ $isLectureRoom = false;
+ }
+ session_start(); // session to store the previous types of the room
}
else {
- $room_info = array();
+ $room_info = array();
}
- $contextDisplay='all';
-
- $xmldoc = domxml_new_doc("1.0");
-
- $root = $xmldoc->create_element('root');
-
- $root->append_child(liveclassroom_get_session_params($xmldoc,$_GET));
-
- $windows = $xmldoc->create_element('windows');
+ $contextDisplay='all';
+
+ $xmldoc = domxml_new_doc("1.0");
+
+ $root = $xmldoc->create_element('root');
+
+ $root->append_child(liveclassroom_get_session_params($xmldoc,$_GET));
+
+ $windows = $xmldoc->create_element('windows');
- //HEADER BAR
- $windows->append_child(liveclassroom_create_headerbar($xmldoc));
+ //HEADER BAR
+ $windows->append_child(liveclassroom_create_headerbar($xmldoc));
- // CONTEXT BAR
-
- $contextbar = $xmldoc->create_element('windowsElement');
- $cbtype = $xmldoc->create_element('type');
- $cbtype->append_child($xmldoc->create_text_node("contextBar"));
- $contextbar->append_child($cbtype);
- $cbelementParameters = $xmldoc->create_element("windowsElementParameters");
- $contextbarinformations = $xmldoc->create_element("contextBarInformations");
- $cbname = $xmldoc->create_element("name");
- if($action=="update") {
- $cbname->append_child($xmldoc->create_text_node($room_info['longname']));
- }
- else $cbname->append_child($xmldoc->create_text_node("New room"));
- $contextbarinformations->append_child($cbname);
- $cbcontext = $xmldoc->create_element("context");
- $cbcontext->append_child($xmldoc->create_text_node("Settings"));
- $contextbarinformations->append_child($cbcontext);
- $cbproduct = $xmldoc->create_element("product");
- $cbproduct->append_child($xmldoc->create_text_node("Live Classroom"));
- $contextbarinformations->append_child($cbproduct);
-
- $cbelementParameters->append_child($contextbarinformations);
-
- $contextbar->append_child($cbelementParameters);
-
- $windows->append_child($contextbar);
-
-
- // SETTINGS
-
- $settings = $xmldoc->create_element('windowsElement');
- $settingstype = $xmldoc->create_element('type');
- $settingstype->append_child($xmldoc->create_text_node("settings"));
- $settings->append_child($settingstype);
-
- $settingsElementParameters = $xmldoc->create_element("windowsElementParameters");
-
-
- $panelsSettings = $xmldoc->create_element('panelsSettings');
-
- // -------------- ROOM INFO -------------------
- $panelSettings = $xmldoc->create_element('panelSettings');
- // ROOM INFO PANEL INFO
+ // CONTEXT BAR
+
+ $contextbar = $xmldoc->create_element('windowsElement');
+ $cbtype = $xmldoc->create_element('type');
+ $cbtype->append_child($xmldoc->create_text_node("contextBar"));
+ $contextbar->append_child($cbtype);
+ $cbelementParameters = $xmldoc->create_element("windowsElementParameters");
+ $contextbarinformations = $xmldoc->create_element("contextBarInformations");
+ $cbname = $xmldoc->create_element("name");
+ if($action=="update") {
+ $cbname->append_child($xmldoc->create_text_node($room_info['longname']));
+ }
+ else $cbname->append_child($xmldoc->create_text_node("New room"));
+ $contextbarinformations->append_child($cbname);
+ $cbcontext = $xmldoc->create_element("context");
+ $cbcontext->append_child($xmldoc->create_text_node("Settings"));
+ $contextbarinformations->append_child($cbcontext);
+ $cbproduct = $xmldoc->create_element("product");
+ $cbproduct->append_child($xmldoc->create_text_node("Live Classroom"));
+ $contextbarinformations->append_child($cbproduct);
+
+ $cbelementParameters->append_child($contextbarinformations);
+
+ $contextbar->append_child($cbelementParameters);
+
+ $windows->append_child($contextbar);
+
+
+ // SETTINGS
+
+ $settings = $xmldoc->create_element('windowsElement');
+ $settingstype = $xmldoc->create_element('type');
+ $settingstype->append_child($xmldoc->create_text_node("settings"));
+ $settings->append_child($settingstype);
+
+ $settingsElementParameters = $xmldoc->create_element("windowsElementParameters");
+
+
+ $panelsSettings = $xmldoc->create_element('panelsSettings');
+
+ // -------------- ROOM INFO -------------------
+ $panelSettings = $xmldoc->create_element('panelSettings');
+ // ROOM INFO PANEL INFO
- $panelSettings->append_child(create_panel_info($xmldoc, 'all', 'tabSelected', 'tabDisabled', 'Room Info', "1", "block"));
- // ROOM INFO CONTENT
- $panelContent = $xmldoc->create_element('panelContent');
-
- // FIRST LINE
- $panelLine = $xmldoc->create_element('panelLine');
-
- $plid = $xmldoc->create_element('id');
- $plid->append_child($xmldoc->create_text_node(""));
- $panelLine->append_child($plid);
-
- $panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
- $panelLine->append_child($panelLineStyle);
+ $panelSettings->append_child(create_panel_info($xmldoc, 'all', 'tabSelected', 'tabDisabled', 'Room Info', "1", "block"));
+ // ROOM INFO CONTENT
+ $panelContent = $xmldoc->create_element('panelContent');
+
+ // FIRST LINE
+ $panelLine = $xmldoc->create_element('panelLine');
+
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
- $linepart = $xmldoc->create_element('panelLinePart');
-
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
+ $linepart = $xmldoc->create_element('panelLinePart');
+
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node("right"));
- $linepart->append_child($align);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay, "label", $parameters=array("class" => "alert", "value" => "*") ));
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"label", $parameters=array("value" => "Title : ") ));
- $panelLine->append_child($linepart);
-
- $parameters=array("id" => "longname", "maxlength" => "50", "name" => "longname", "type" => "text");
- if($action=="update"){
- $parameters['value'] = $room_info['longname'];
- }
-
- $linepart = $xmldoc->create_element('panelLinePart');
-
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node("right"));
+ $linepart->append_child($align);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay, "label", $parameters=array("class" => "alert", "value" => "*") ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"label", $parameters=array("value" => "Title : ") ));
+ $panelLine->append_child($linepart);
+
+ $parameters=array("id" => "longname", "maxlength" => "50", "name" => "longname", "type" => "text");
+ if($action=="update"){
+ $parameters['value'] = $room_info['longname'];
+ }
+
+ $linepart = $xmldoc->create_element('panelLinePart');
+
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"input", $parameters));
- $panelLine->append_child($linepart);
-
- $panelContent->append_child($panelLine);
-
- // SECOND LINE
- $panelLine = $xmldoc->create_element('panelLine');
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"input", $parameters));
+ $panelLine->append_child($linepart);
+
+ $panelContent->append_child($panelLine);
+
+ // SECOND LINE
+ $panelLine = $xmldoc->create_element('panelLine');
- $plid = $xmldoc->create_element('id');
- $plid->append_child($xmldoc->create_text_node(""));
- $panelLine->append_child($plid);
-
- $panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
- $panelLine->append_child($panelLineStyle);
-
- $linepart = $xmldoc->create_element('panelLinePart');
-
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
-
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node("right"));
- $linepart->append_child($align);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"label", $parameters=array("value" => "Description : ") ));
- $panelLine->append_child($linepart);
-
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
+
+ $linepart = $xmldoc->create_element('panelLinePart');
+
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
+
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node("right"));
+ $linepart->append_child($align);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"label", $parameters=array("value" => "Description : ") ));
+ $panelLine->append_child($linepart);
+
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"textarea", $parameters=array("cols" => "40", "id" => "description", "value" => $room_info['description'], "name" => "description", "rows" => "4") ));
- $panelLine->append_child($linepart);
-
- $panelContent->append_child($panelLine);
-
-
- if(($room_info['archive']!=1) || ($roomId == "")) {
- // THIRD LINE
- $panelLine = $xmldoc->create_element('panelLine');
- $plid = $xmldoc->create_element('id');
- $plid->append_child($xmldoc->create_text_node(""));
- $panelLine->append_child($plid);
- $panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(""));
- $panelLine->append_child($panelLineStyle);
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
-
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"textarea", $parameters=array("cols" => "40", "id" => "description", "value" => $room_info['description'], "name" => "description", "rows" => "4") ));
+ $panelLine->append_child($linepart);
+
+ $panelContent->append_child($panelLine);
+
+
+ if(($room_info['archive']!=1) || ($roomId == "")) {
+ // THIRD LINE
+ $panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
+
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node("right"));
- $linepart->append_child($align);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay ,"label", $parameters=array("value" => "Type : ") ));
- $panelLine->append_child($linepart);
-
- $parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"$MAINLECTURE\")") ;
- if(($action=="update") && ($isLectureRoom==true))
- {
- $_SESSION['led']='instructor';
- $parameters['checked']=true;
- }
- else if($action=="new")
- {
- $parameters['checked']=true;
- }
- else
- {
- $parameters['checked']=true;
- }
-
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
-
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, "$MAINLECTURE","input", $parameters));
- $panelLine->append_child($linepart);
-
- $parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"$MAINLECTURE\")") ;
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node("right"));
+ $linepart->append_child($align);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay ,"label", $parameters=array("value" => "Type : ") ));
+ $panelLine->append_child($linepart);
+
+ $parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"$MAINLECTURE\")") ;
+ if(($action=="update") && ($isLectureRoom==true))
+ {
+ $_SESSION['led']='instructor';
+ $parameters['checked']=true;
+ }
+ else if($action=="new")
+ {
+ $parameters['checked']=true;
+ }
+ else
+ {
+ $parameters['checked']=true;
+ }
+
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
+
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, "$MAINLECTURE","input", $parameters));
+ $panelLine->append_child($linepart);
+
+ $parameters=array("type" => "radio", "value" => "instructor", "id" => "led_instructor", "name" => "led", "onclick" => "toggleType(\"$MAINLECTURE\")") ;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, "$DISCUSSIONROOM","input", $parameters));
- $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, "$DISCUSSIONROOM","input", $parameters));
+ $panelLine->append_child($linepart);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "led_instructor", "valign" => "top", "value" => "Lecture room" ) ));
- $panelLine->append_child($linepart);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
- $panelLine->append_child($linepart);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Instructors lead the presentation" ) ));
- $panelLine->append_child($linepart);
-
-
- $panelContent->append_child($panelLine);
-
- // FOURTH LINE
- $panelLine = $xmldoc->create_element('panelLine');
-
- $plid = $xmldoc->create_element('id');
- $plid->append_child($xmldoc->create_text_node(""));
- $panelLine->append_child($plid);
-
- $panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
- $panelLine->append_child($panelLineStyle);
-
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
-
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "led_instructor", "valign" => "top", "value" => "Lecture room" ) ));
+ $panelLine->append_child($linepart);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
+ $panelLine->append_child($linepart);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Instructors lead the presentation" ) ));
+ $panelLine->append_child($linepart);
+
+
+ $panelContent->append_child($panelLine);
+
+ // FOURTH LINE
+ $panelLine = $xmldoc->create_element('panelLine');
+
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
+
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
+
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" =>"")));
- $panelLine->append_child($linepart);
-
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
-
-
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"$DISCUSSIONROOM\")") ;
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" =>"")));
+ $panelLine->append_child($linepart);
+
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
+
+
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"$DISCUSSIONROOM\")") ;
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAINLECTURE","input", $parameters));
- $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAINLECTURE","input", $parameters));
+ $panelLine->append_child($linepart);
-
- $parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"$DISCUSSIONROOM\")") ;
- if(($action=="update") && ($isLectureRoom==false))
- {
- $_SESSION['led']='student';
- $parameters['checked']=true;
+
+ $parameters=array("type" => "radio", "value" => "student", "id" => "led_student", "name" => "led", "onclick" => "toggleType(\"$DISCUSSIONROOM\")") ;
+ if(($action=="update") && ($isLectureRoom==false))
+ {
+ $_SESSION['led']='student';
+ $parameters['checked']=true;
- }
- else
- {
- $parameters['checked']=true;
- }
+ }
+ else
+ {
+ $parameters['checked']=true;
+ }
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSIONROOM","input", $parameters));
- $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$DISCUSSIONROOM","input", $parameters));
+ $panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "led_student", "value" => "Discussion room" ) ));
- $panelLine->append_child($linepart);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
- $panelLine->append_child($linepart);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Students and Instructors have the same rigths" ) ));
- $panelLine->append_child($linepart);
-
- $panelContent->append_child($panelLine);
- }
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "led_student", "value" => "Discussion room" ) ));
+ $panelLine->append_child($linepart);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
+ $panelLine->append_child($linepart);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Students and Instructors have the same rigths" ) ));
+ $panelLine->append_child($linepart);
+
+ $panelContent->append_child($panelLine);
+ }
- $panelSettings->append_child($panelContent);
-
- $panelsSettings->append_child($panelSettings);
-
+ $panelSettings->append_child($panelContent);
+
+ $panelsSettings->append_child($panelSettings);
+
-
- // ----------------- MEDIA ------------------
-
- $panelSettingsM = $xmldoc->create_element('panelSettings');
- // MEDIA PANEL INFO
- $panelSettingsM->append_child(create_panel_info($xmldoc, "$MAINLECTURE", 'tabNoSelected', 'tabDisabled', 'Media', "2", 'none'));
-
- // MEDIA CONTENT
- $panelContentM = $xmldoc->create_element('panelContent');
-
- // FIRST LINE
- $panelLine = $xmldoc->create_element('panelLine');
-
- $plid = $xmldoc->create_element('id');
- $plid->append_child($xmldoc->create_text_node(""));
- $panelLine->append_child($plid);
-
- $panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
- $panelLine->append_child($panelLineStyle);
-
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
-
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "two-way-audio", "id" => "audio", "name" => "media_type", "onclick" =>"doChangeMedia(\"audio\")") ;
- if($action=='update') {
- if($room_info['media_type']=="two-way-audio") $parameters['checked']=true;
- }
- else $parameters['checked']=true;
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters));
- $panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Audio") ));
- $panelLine->append_child($linepart);
-
- $panelContentM->append_child($panelLine);
-
- // SECOND LINE
- $panelLine = $xmldoc->create_element('panelLine');
-
- $plid = $xmldoc->create_element('id');
- $plid->append_child($xmldoc->create_text_node(""));
- $panelLine->append_child($plid);
-
- $panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node("subOption"));
- $panelLine->append_child($panelLineStyle);
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
+
+ // ----------------- MEDIA ------------------
+
+ $panelSettingsM = $xmldoc->create_element('panelSettings');
+ // MEDIA PANEL INFO
+ $panelSettingsM->append_child(create_panel_info($xmldoc, "$MAINLECTURE", 'tabNoSelected', 'tabDisabled', 'Media', "2", 'none'));
+
+ // MEDIA CONTENT
+ $panelContentM = $xmldoc->create_element('panelContent');
+
+ // FIRST LINE
+ $panelLine = $xmldoc->create_element('panelLine');
+
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
+
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
+
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $parameters=array("type" => "radio", "value" => "two-way-audio", "id" => "audio", "name" => "media_type", "onclick" =>"doChangeMedia(\"audio\")") ;
+ if($action=='update') {
+ if($room_info['media_type']=="two-way-audio") $parameters['checked']=true;
+ }
+ else $parameters['checked']=true;
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters));
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Audio") ));
+ $panelLine->append_child($linepart);
+
+ $panelContentM->append_child($panelLine);
+
+ // SECOND LINE
+ $panelLine = $xmldoc->create_element('panelLine');
+
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node("subOption"));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
- $parameters=array("type" => "checkbox", "value" => "0", "id" => "student_simulcast", "name" => "hms_simulcast_restricted") ;
- if($action=='update'){
- if($room_info['hms_simulcast_restricted']==0){
- $parameters['checked']=true;
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $parameters=array("type" => "checkbox", "value" => "0", "id" => "student_simulcast", "name" => "hms_simulcast_restricted") ;
+ if($action=='update'){
+ if($room_info['hms_simulcast_restricted']==0){
+ $parameters['checked']=true;
}
else if($room_info['media_type']=="two-way-video"){
- $parameters['checked']=false;
- }
- //else $parameters['checked']=true;
+ $parameters['checked']=false;
+ }
+ //else $parameters['checked']=true;
}
else $parameters['checked']=true;
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
- $panelLine->append_child($linepart);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enabled Students to use the phone") ));
- $panelLine->append_child($linepart);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
+ $panelLine->append_child($linepart);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enable Students to use the phone") ));
+ $panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
- $panelLine->append_child($linepart);
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Note : Instructors can always use the phone") ));
- $panelLine->append_child($linepart);
-
- $panelContentM->append_child($panelLine);
-
- // THIRD LINE
-
- $panelLine = $xmldoc->create_element('panelLine');
- $plid = $xmldoc->create_element('id');
- $plid->append_child($xmldoc->create_text_node(""));
- $panelLine->append_child($plid);
- $panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node("subOption"));
- $panelLine->append_child($panelLineStyle);
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
+ $panelLine->append_child($linepart);
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Note: Instructors can always use the phone") ));
+ $panelLine->append_child($linepart);
+
+ $panelContentM->append_child($panelLine);
+
+ // THIRD LINE
+
+ $panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node("subOption"));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
-
- $parameters=array("type" => "checkbox", "value" => "1", "id" => "two_way_enabled", "name" => "hms_two_way_enabled") ;
- if($action=='update'){
- if($room_info['hms_two_way_enabled']==1){
- $parameters['checked']=true;
- }
- else if($room_info['media_type']=="two-way-video"){
- $parameters['checked']=false;
- }
-
- //$parameters['checked']=true;
- }
- else $parameters['checked']=true;
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"input", $parameters) );
- $panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enabled Students microphones at presentation start") ));
- $panelLine->append_child($linepart);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+
+ $parameters=array("type" => "checkbox", "value" => "1", "id" => "two_way_enabled", "name" => "hms_two_way_enabled") ;
+ if($action=='update'){
+ if($room_info['hms_two_way_enabled']==1){
+ $parameters['checked']=true;
+ }
+ else if($room_info['media_type']=="two-way-video"){
+ $parameters['checked']=false;
+ }
+
+ //$parameters['checked']=true;
+ }
+ else $parameters['checked']=true;
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc, $contextDisplay,"input", $parameters) );
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Enable Student's microphones at presentation start") ));
+ $panelLine->append_child($linepart);
- $panelContentM->append_child($panelLine);
-
- //FOURTh LINE
- $panelLine = $xmldoc->create_element('panelLine');
- $plid = $xmldoc->create_element('id');
- $plid->append_child($xmldoc->create_text_node(""));
- $panelLine->append_child($plid);
- $panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
- $panelLine->append_child($panelLineStyle);
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
+ $panelContentM->append_child($panelLine);
+
+ //FOURTh LINE
+ $panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "one-way-video", "id" => "video", "name" => "media_type", "onclick" => "doChangeMedia(\"video\")") ;
- if($action=='update'){
- if($room_info['media_type']=="one-way-video"){
- $parameters['checked']=true;
- }
- }
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
- $panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "One-way Video") ));
- $panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
- $panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Presenter uses RealProducer") ));
- $panelLine->append_child($linepart);
-
- $panelContentM->append_child($panelLine);
-
- // HIDE LINE
-
- $panelLine = $xmldoc->create_element('panelLine');
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $parameters=array("type" => "radio", "value" => "one-way-video", "id" => "video", "name" => "media_type", "onclick" => "doChangeMedia(\"video\")") ;
+ if($action=='update'){
+ if($room_info['media_type']=="one-way-video"){
+ $parameters['checked']=true;
+ }
+ }
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "One-way Video") ));
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"br", $parameters=array() ));
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("class" => "comment", "value" => "Presenter uses RealProducer") ));
+ $panelLine->append_child($linepart);
+
+ $panelContentM->append_child($panelLine);
+
+ // HIDE LINE
+
+ $panelLine = $xmldoc->create_element('panelLine');
- $panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node("hide"));
- $panelLine->append_child($panelLineStyle);
- $panelLineId = $xmldoc->create_element('id');
- $panelLineId->append_child($xmldoc->create_text_node("roomId_row"));
- $panelLine->append_child($panelLineId);
-
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node("hide"));
+ $panelLine->append_child($panelLineStyle);
+ $panelLineId = $xmldoc->create_element('id');
+ $panelLineId->append_child($xmldoc->create_text_node("roomId_row"));
+ $panelLine->append_child($panelLineId);
+
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "roomId_field", "value" => "Room Id : ") ));
- $panelLine->append_child($linepart);
-
- $parameters=array("type" => "text", "id" => "roomId_field", "name" => "roomId_Field", "maxlength" => "50") ;
- if($action=='update'){
- $parameters['value']=$roomId;
- }
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
- $panelLine->append_child($linepart);
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("for" => "roomId_field", "value" => "Room Id : ") ));
+ $panelLine->append_child($linepart);
+
+ $parameters=array("type" => "text", "id" => "roomId_field", "name" => "roomId_Field", "maxlength" => "50") ;
+ if($action=='update'){
+ $parameters['value']=$roomId;
+ }
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
+ $panelLine->append_child($linepart);
-
- $panelContentM->append_child($panelLine);
-
-
-
- //FIFTH LINE
- $panelLine = $xmldoc->create_element('panelLine');
- $plid = $xmldoc->create_element('id');
- $plid->append_child($xmldoc->create_text_node(""));
- $panelLine->append_child($plid);
- $panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
- $panelLine->append_child($panelLineStyle);
- $linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
- $style->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($style);
+
+ $panelContentM->append_child($panelLine);
+
+
+
+ //FIFTH LINE
+ $panelLine = $xmldoc->create_element('panelLine');
+ $plid = $xmldoc->create_element('id');
+ $plid->append_child($xmldoc->create_text_node(""));
+ $panelLine->append_child($plid);
+ $panelLineStyle = $xmldoc->create_element('style');
+ $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLine->append_child($panelLineStyle);
+ $linepart = $xmldoc->create_element('panelLinePart');
+ $style = $xmldoc->create_element('style');
+ $style->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($style);
-
- $colspan = $xmldoc->create_element('colspan');
- $colspan->append_child($xmldoc->create_text_node("0"));
- $linepart->append_child($colspan);
-
- $align = $xmldoc->create_element('align');
- $align->append_child($xmldoc->create_text_node(""));
- $linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "none", "id" => "none", "name" => "media_type", "onclick" => "doChangeMedia(\"none\")") ;
- if($action=='update') {
- if($room_info['media_type']=="none") $parameters['checked']=true;
- }
-
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
- $panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Third-party Conference Call") ));
- $panelLine->append_child($linepart);
-
- $panelContentM->append_child($panelLine);
+
+ $colspan = $xmldoc->create_element('colspan');
+ $colspan->append_child($xmldoc->create_text_node("0"));
+ $linepart->append_child($colspan);
+
+ $align = $xmldoc->create_element('align');
+ $align->append_child($xmldoc->create_text_node(""));
+ $linepart->append_child($align);
+ $parameters=array("type" => "radio", "value" => "none", "id" => "none", "name" => "media_type", "onclick" => "doChangeMedia(\"none\")") ;
+ if($action=='update') {
+ if($room_info['media_type']=="none") $parameters['checked']=true;
+ }
+
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
+ $panelLine->append_child($linepart);
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => "Third-party Conference Call") ));
+ $panelLine->append_child($linepart);
+
+ $panelContentM->append_child($panelLine);
- $panelSettingsM->append_child($panelContentM);
- $panelsSetti...
[truncated message content] |
|
From: <hu...@us...> - 2007-01-03 11:48:45
|
Revision: 156
http://svn.sourceforge.net/hw4mdl/?rev=156&view=rev
Author: hugues
Date: 2007-01-03 03:48:43 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10578
I updated the style for the td containing the "subitem" icon directly in the
HTML code to have it correctly aligned.
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/js/manageXml.js
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-03 10:48:50 UTC (rev 155)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-03 11:48:43 UTC (rev 156)
@@ -294,7 +294,7 @@
}
.archive td{
- padding-left:2px ;
+ padding-left:5px ;
font-family:Verdana;
color:#666666;
font-style:italic;
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-03 10:48:50 UTC (rev 155)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-03 11:48:43 UTC (rev 156)
@@ -739,7 +739,7 @@
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 src=\"pictures/items/listitem-liveclassroomicon.png\" border=\"0\" /></td>";
- display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-subitem.png\" border=\"0\" /></td>";
+ display += "<td style=\"padding-left:7px;\" width=16px align=\"left\"><img src=\"pictures/items/listitem-subitem.png\" 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 src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".png\"/></td>";
display += "</tr>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-04 11:17:37
|
Revision: 163
http://svn.sourceforge.net/hw4mdl/?rev=163&view=rev
Author: hugues
Date: 2007-01-04 03:17:35 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10616
- Fixed the enabling/disableing of radio butons
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/js/hwCommons.js
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-04 10:45:30 UTC (rev 162)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-04 11:17:35 UTC (rev 163)
@@ -811,21 +811,21 @@
// ------------------ CHAT --------------------
// CHAT PANEL INFO
$panelSettings = $xmldoc->create_element('panelSettings');
- $panelSettings->append_child(create_panel_info($xmldoc, "$MAINLECTURE", 'tabNoSelected', 'tabDisabled', liveclassroom_get_message('Chat'), "4", 'none'));
+ $panelSettings->append_child(create_panel_info($xmldoc, "$MAINLECTURE", 'tabNoSelected', 'tabDisabled', liveclassroom_get_message('Chat'), "4", 'none'));
// CHAT CONTENT
$panelContent = $xmldoc->create_element('panelContent');
// FIRST LINE
$panelLine = $xmldoc->create_element('panelLine');
- $plid = $xmldoc->create_element('id');
+ $plid = $xmldoc->create_element('id');
$plid->append_child($xmldoc->create_text_node(""));
$panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLineStyle->append_child($xmldoc->create_text_node("visible"));
$panelLine->append_child($panelLineStyle);
$linepart = $xmldoc->create_element('panelLinePart');
- $style = $xmldoc->create_element('style');
+ $style = $xmldoc->create_element('style');
$style->append_child($xmldoc->create_text_node(""));
$linepart->append_child($style);
$colspan = $xmldoc->create_element('colspan');
@@ -834,11 +834,15 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_chat", "name" => "chatenable") ;
+ $parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_chat", "name" => "chatEnabled", "onclick" => "doChangeChat()") ;
if($action=='update'){
- if($room_info['chatenable']==1) $parameters['checked']=true;
+ if($room_info['chatenable']==1) {
+ $parameters['checked']=true;
+ }
}
- else $parameters['checked']=true;
+ else {
+ $parameters['checked']=true;
+ }
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
$panelLine->append_child($linepart);
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => liveclassroom_get_message("Enable Students to use text chat")) ));
@@ -848,7 +852,7 @@
// SECOND LINE
$panelLine = $xmldoc->create_element('panelLine');
- $plid = $xmldoc->create_element('id');
+ $plid = $xmldoc->create_element('id');
$plid->append_child($xmldoc->create_text_node(""));
$panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
@@ -864,11 +868,19 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "1", "id" => "privateenabled", "name" => "privatechatenable") ;
+ $parameters=array("type" => "radio", "value" => "1", "id" => "privatechatenabled",
+ "name" => "privateChatEnabled") ;
if($action=='update'){
- if($room_info['privatechatenable']==1)$parameters['checked']=true;
+ if($room_info['privatechatenable']==1) {
+ $parameters['checked']=true;
+ }
}
- else $parameters['checked']=true;
+ else {
+ $parameters['checked']=true;
+ }
+ if ($room_info['chatenable'] == 0 ) {
+ $parameters['disabled'] = true;
+ }
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
$panelLine->append_child($linepart);
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => liveclassroom_get_message("Enable Public and Private text chat")) ));
@@ -894,10 +906,15 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "0", "id" => "privatedisbledd", "name" => "privatechatenable") ;
+ $parameters=array("type" => "radio", "value" => "0", "id" => "privatedisbledd", "name" => "privateChatEnabled") ;
if($action=='update'){
- if($room_info['privatechatenable']==0) $parameters['checked']=true;
+ if($room_info['privatechatenable']==0) {
+ $parameters['checked']=true;
+ }
}
+ if ($room_info['chatenable'] == 0 ) {
+ $parameters['disabled'] = true;
+ }
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
$panelLine->append_child($linepart);
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => liveclassroom_get_message("Enable Public text chat only")) ));
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-04 10:45:30 UTC (rev 162)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-04 11:17:35 UTC (rev 163)
@@ -16,8 +16,10 @@
function toggleUserlimit(isLimited){
document.forms[0].userlimittext.disabled = (isLimited==false);
}
+
function doChangeChat() {
var radio = document.forms[0].privateChatEnabled;
+
for (i=0; i<radio.length; i++) {
radio[i].disabled = !document.forms[0].chatEnabled.checked;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-04 14:51:17
|
Revision: 164
http://svn.sourceforge.net/hw4mdl/?rev=164&view=rev
Author: hugues
Date: 2007-01-04 06:51:15 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10620
- Fixed the room creation parameters by forcing a couple of media parameters
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/js/hwCommons.js
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/manageRoomAction.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2007-01-04 11:17:35 UTC (rev 163)
+++ trunk/moodle/mod/liveclassroom/api.php 2007-01-04 14:51:15 UTC (rev 164)
@@ -66,25 +66,25 @@
/*
-* Get the prefix to use for creating rooms and users.
+* Get the prefix to use for creating rooms and users.
*
* return $prefix : a string which is the prefix to use
*/
function liveclassroom_api_get_prefix() {
- global $CFG;
+ global $CFG;
- //get the admin user name
- $aun = $CFG->liveclassroom_adminusername;
- if( (substr($aun, 0,1)=='_') && (substr($aun, -1,1)=='_') ) { //Prefix
- $prefix = $aun;
+ //get the admin user name
+ $aun = $CFG->liveclassroom_adminusername;
+ if( (substr($aun, 0,1)=='_') && (substr($aun, -1,1)=='_') ) { //Prefix
+ $prefix = $aun;
- }
- else {
- $prefix = '';
+ }
+ else {
+ $prefix = '';
- }
- return $prefix;
-
+ }
+ return $prefix;
+
}
/**
@@ -103,12 +103,12 @@
*/
function liveclassroom_api_authenticate ($servername='', $login='', $passwd='') {
global $CFG;
- global $COURSE;
-
+ global $COURSE;
+
if (empty($servername)) { // feed them with $CFG
- $servername = $CFG->liveclassroom_servername;
- $login = $CFG->liveclassroom_adminusername;
- $passwd = $CFG->liveclassroom_adminpassword;
+ $servername = $CFG->liveclassroom_servername;
+ $login = $CFG->liveclassroom_adminusername;
+ $passwd = $CFG->liveclassroom_adminpassword;
}
$url = $servername.
@@ -120,7 +120,7 @@
"&credential_1=". $passwd;
$cookie_file_path = $CFG->dataroot.'/cookie.txt'; // Cookie File path
- $cook = fopen($CFG->dataroot.'/tmp.txt', "w+"); //temporary file to check the date
+ $cook = fopen($CFG->dataroot.'/tmp.txt', "w+"); //temporary file to check the date
fputs($cook,time()); // Add the current time into the file = last authenticate time
$ch = curl_init();
@@ -133,17 +133,17 @@
$data = curl_exec($ch);
if (curl_errno($ch)) {
- add_to_log($COURSE->id, "liveclassroom", "URL", liveclassroom_send_logs("errorUrlUnavailable","courseId=".$COURSE->id), "URL incorrect");
+ add_to_log($COURSE->id, "liveclassroom", "URL", liveclassroom_send_logs("errorUrlUnavailable","courseId=".$COURSE->id), "URL incorrect");
// print curl_error($ch);
return false;
}
preg_match("(\d*)", $data, $matches);
$resp_code = $matches[0];
- if ( $resp_code == 204 ) {
+ if ( $resp_code == 204 ) {
add_to_log($COURSE->id, "liveclassroom", "Authentication", liveclassroom_send_logs("errorAuthentication2","respcode=$resp_code&courseId=".$COURSE->id), "Authentication Failed");
error(get_string('wrongadminpass', 'liveclassroom'));
- return false;
+ return false;
}
else if ( $resp_code != 100 && $resp_code != 301) {
//error( "Response: Authentication Failed: $resp_code");
@@ -162,38 +162,38 @@
/**
* Send a query to the server with the given function and the given attributes
* Check if the session cookie exist and get the cookie creation date.
- * If it's less than 30 minutes, the cookie is got for the request, if not a new authenticate is done.
- * @param $const : function called
+ * If it's less than 30 minutes, the cookie is got for the request, if not a new authenticate is done.
+ * @param $const : function called
* @param $attribute : different list of attributes for the function called
* return $data : result query
*/
function liveclassroom_api_send_query($const,$attribute) {
- global $CFG;
+ global $CFG;
- $cook = $CFG->dataroot.'/tmp.txt'; //Open the temp file to check the last modification date
- $cookie_file_path = $CFG->dataroot.'/cookie.txt'; // Cookie File path
-
- if(file_exists($cook)) {
- $fileContent = file_get_contents($cook);
+ $cook = $CFG->dataroot.'/tmp.txt'; //Open the temp file to check the last modification date
+ $cookie_file_path = $CFG->dataroot.'/cookie.txt'; // Cookie File path
+
+ if(file_exists($cook)) {
+ $fileContent = file_get_contents($cook);
- }
- else {
- $lastModifTime = 0;
- }
- //1800 seconds = 30 minutes
- $modif = $fileContent+1800;
+ }
+ else {
+ $lastModifTime = 0;
+ }
+ //1800 seconds = 30 minutes
+ $modif = $fileContent+1800;
- if( (!file_exists($cookie_file_path)) || ((file_exists($cook)) && (time()>$modif)) ){
- if (!$ch = liveclassroom_api_authenticate()) {
- return false;
- }
- }
-
+ if( (!file_exists($cookie_file_path)) || ((file_exists($cook)) && (time()>$modif)) ){
+ if (!$ch = liveclassroom_api_authenticate()) {
+ return false;
+ }
+ }
+
- $url = $CFG->liveclassroom_servername.
- LIVECLASSROOM_API_ADMIN.
- $const.
- $attribute;
+ $url = $CFG->liveclassroom_servername.
+ LIVECLASSROOM_API_ADMIN.
+ $const.
+ $attribute;
$ch = curl_init();
@@ -203,15 +203,15 @@
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookie_file_path);
curl_setopt($ch, CURLOPT_COOKIEFILE, $cookie_file_path);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-
- $data = curl_exec($ch);
-
- if (curl_errno($ch)) {
- print curl_error($ch);
- return false;
- }
-
- return $data;
+
+ $data = curl_exec($ch);
+
+ if (curl_errno($ch)) {
+ print curl_error($ch);
+ return false;
+ }
+
+ return $data;
}
@@ -231,28 +231,28 @@
function liveclassroom_api_create_user ($userid, $coursename, $rolename) {
global $CFG;
global $COURSE;
-
- $final_list = "&target=$userid&first_name=$rolename&last_name=$coursename";
- $enc_list = str_replace(" ", "+", $final_list);
+
+ $final_list = "&target=$userid&first_name=$rolename&last_name=$coursename";
+ $enc_list = str_replace(" ", "+", $final_list);
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_USER, $enc_list);
-
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-/*
- if ( $respcode == 302) {
- error( "Creation user failed, malformed exist");
- return false;
- }
- */
-
-
- if ( $respcode != 100 && $respcode != 301) {
- add_to_log($COURSE->id, "liveclassroom", "Create User", liveclassroom_send_logs("errorCreateUser","userId=$userid&respcode=$respcode&courseId=".$COURSE->id), "User Creation Failed");
- // error( "Response: Account ($userId) Creation Failed: $resp_code");
- return false;
- }
- add_to_log($COURSE->id, "liveclassroom", "Create User", liveclassroom_send_logs("createUser","userId=$userid&courseId=".$COURSE->id), "User Creation succeeded");
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_USER, $enc_list);
+
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+/*
+ if ( $respcode == 302) {
+ error( "Creation user failed, malformed exist");
+ return false;
+ }
+ */
+
+
+ if ( $respcode != 100 && $respcode != 301) {
+ add_to_log($COURSE->id, "liveclassroom", "Create User", liveclassroom_send_logs("errorCreateUser","userId=$userid&respcode=$respcode&courseId=".$COURSE->id), "User Creation Failed");
+ // error( "Response: Account ($userId) Creation Failed: $resp_code");
+ return false;
+ }
+ add_to_log($COURSE->id, "liveclassroom", "Create User", liveclassroom_send_logs("createUser","userId=$userid&courseId=".$COURSE->id), "User Creation succeeded");
return true;
}
@@ -263,22 +263,22 @@
*
*/
function liveclassroom_api_create_group($groupid) {
-
+
global $CFG;
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_GROUP, "&target=$groupid");
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_GROUP, "&target=$groupid");
if ( $respcode == 301) {
- error( "Response: Authentication Failed: $resp_code");
- return false;
- }
- if ( $respcode != 100 && $respcode != 301) {
- error( "Response: Cannot Create group with id:$groupid");
- return false;
- }
+ error( "Response: Authentication Failed: $resp_code");
+ return false;
+ }
+ if ( $respcode != 100 && $respcode != 301) {
+ error( "Response: Cannot Create group with id:$groupid");
+ return false;
+ }
-
- return true;
+
+ return true;
}
@@ -295,22 +295,22 @@
function liveclassroom_api_get_session ($userid, $nickname) {
global $CFG;
global $USER;
- global $COURSE;
-
-
- $final_list = "&target=$userid&nickname=$nickname";
- $enc_list = str_replace(" ", "+", $final_list);
+ global $COURSE;
+
+
+ $final_list = "&target=$userid&nickname=$nickname";
+ $enc_list = str_replace(" ", "+", $final_list);
-
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_TOKEN, $enc_list);
-
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_TOKEN, $enc_list);
+
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
if ( $respcode != 100) {
-
- add_to_log($COURSE->id, "liveclassroom", "Create Session", liveclassroom_send_logs("errorCreateSession","respcode=$respcode&nickname=$nickname&courseId=".$COURSE->id), "Cannot Create Session.");
+
+ add_to_log($COURSE->id, "liveclassroom", "Create Session", liveclassroom_send_logs("errorCreateSession","respcode=$respcode&nickname=$nickname&courseId=".$COURSE->id), "Cannot Create Session.");
return false;
}
@@ -334,8 +334,8 @@
//error ("Token empty, data=<pre>$data</pre>");
return false;
}
- add_to_log($COURSE->id, "liveclassroom", "Create Session", liveclassroom_send_logs("createSession","nickname=$nickname&courseId=".$COURSE->id), "Creating Session for $nickname");
-
+ add_to_log($COURSE->id, "liveclassroom", "Create Session", liveclassroom_send_logs("createSession","nickname=$nickname&courseId=".$COURSE->id), "Creating Session for $nickname");
+
return $authtoken;
}
@@ -347,37 +347,40 @@
*/
function liveclassroom_api_create_class ($roomid, $roomname, $bool, $attributes) {
global $CFG;
- global $COURSE;
-
- $list_attributes = '';
-
- unset($attributes['longname']);
- while (list($key, $val) = each($attributes)) {
- if(($key!='class_id')&&(isset($val))&&($val!="")){
- $list_attributes .= "&".$key."=".$val;
- }
- }
+ global $COURSE;
+
+ $list_attributes = '';
+
+ unset($attributes['longname']);
+ unset($attributes['led']);
- $final_list = "&target=$roomid"."&longname=$roomname".$list_attributes;
- $enc_list = str_replace(" ", "+", $final_list);
-
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_CLASS, $enc_list);
-
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode == 301) {
- error( "Class $roomname already exist");
- return false;
- }
- if ( $respcode != 100) {
- add_to_log($COURSE->id, "liveclassroom", "Create Room", liveclassroom_send_logs("errorCreateClass","roomname=$roomname&roomId=$roomid&respcode=$respcode&courseId=".$COURSE->id), "Cannot Create Class with id : $roomid, and name : $roomname.");
- return false;
- }
+ while (list($key, $val) = each($attributes)) {
+ if(($key!='class_id')&&(isset($val))&&($val!="")){
+ $list_attributes .= "&".$key."=".$val;
+ }
+ }
- add_to_log($COURSE->id, "liveclassroom", "Create Room", liveclassroom_send_logs("createClass","roomname=$roomname&courseId=".$COURSE->id), "$roomname create with success");
- return true;
+ $final_list = "&target=$roomid"."&longname=$roomname".$list_attributes;
+ $enc_list = str_replace(" ", "+", $final_list);
+
+//DEBUG: error($enc_list);
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_CLASS, $enc_list);
+
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode == 301) {
+ error( "Class $roomname already exist");
+ return false;
+ }
+ if ( $respcode != 100) {
+ add_to_log($COURSE->id, "liveclassroom", "Create Room", liveclassroom_send_logs("errorCreateClass","roomname=$roomname&roomId=$roomid&respcode=$respcode&courseId=".$COURSE->id), "Cannot Create Class with id : $roomid, and name : $roomname.");
+ return false;
+ }
+ add_to_log($COURSE->id, "liveclassroom", "Create Room", liveclassroom_send_logs("createClass","roomname=$roomname&courseId=".$COURSE->id), "$roomname create with success");
+ return true;
}
/*
@@ -390,7 +393,7 @@
function liveclassroom_api_add_user_role ($roomid, $userid, $role) {
global $CFG;
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_ROLE, "&target=$roomid&user_id=$userid&role_id=$role");
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_ROLE, "&target=$roomid&user_id=$userid&role_id=$role");
preg_match("(\d*)", $data, $matches);
@@ -414,7 +417,7 @@
function liveclassroom_api_remove_user_role ($roomid, $userid, $role) {
global $CFG;
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_DELETE_ROLE, "&target=$roomid&user_id=$userid&role_id=$role");
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_DELETE_ROLE, "&target=$roomid&user_id=$userid&role_id=$role");
preg_match("(\d*)", $data, $matches);
@@ -430,7 +433,7 @@
function liveclassroom_api_remove_group_role ($roomid, $groupid, $role) {
global $CFG;
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_DELETE_ROLE, "&target=$roomid&user_id=$groupid&role_id=$role");
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_DELETE_ROLE, "&target=$roomid&user_id=$groupid&role_id=$role");
preg_match("(\d*)", $data, $matches);
@@ -453,30 +456,30 @@
*/
function liveclassroom_api_room_exist($roomname) {
- global $CFG;
+ global $CFG;
- $final_list = "&filter00=longname&filter00value=$roomname";
- $enc_list = str_replace(" ", "+", $final_list);
+ $final_list = "&filter00=longname&filter00value=$roomname";
+ $enc_list = str_replace(" ", "+", $final_list);
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
- $tok = split("100 OK",$data);
- $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+ $tok = split("100 OK",$data);
+ $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
- if(sizeof($tok1)>1){
-
- return true;
- }
- else {
- return false;
- }
+ if(sizeof($tok1)>1){
+
+ return true;
+ }
+ else {
+ return false;
+ }
}
@@ -487,43 +490,43 @@
* return a string delimited by the pattern and the end of line
*/
function liveclassroom_parse_line($line,$pattern) {
-
- $response = split($pattern,$line);
- //$result = substr($response[1],0,-1);
-
+
+ $response = split($pattern,$line);
+ //$result = substr($response[1],0,-1);
+
- return $response[1];
+ return $response[1];
}
/**
* Get the room id from a roomname
-* @param $roomname
-* return the room_id from the server
+* @param $roomname
+* return the room_id from the server
*/
function liveclassroom_api_get_roomid($roomname) {
- global $CFG;
+ global $CFG;
- $final_list = "&filter00=longname&filter00value=$roomname";
- $enc_list = str_replace(" ", "+", $final_list);
-
+ $final_list = "&filter00=longname&filter00value=$roomname";
+ $enc_list = str_replace(" ", "+", $final_list);
+
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
- $tok = split("100 OK",$data);
- $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
- $result = liveclassroom_parse_line($tok1[0],"class_id=");
-
- //Remove le " " at the end of the line
- $response = substr($result,0,-1);
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
+ $tok = split("100 OK",$data);
+ $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+ $result = liveclassroom_parse_line($tok1[0],"class_id=");
+
+ //Remove le " " at the end of the line
+ $response = substr($result,0,-1);
- return $response;
+ return $response;
}
@@ -536,25 +539,25 @@
* return true if the room is deleted, false otherwise
*/
function liveclassroom_api_delete_room($roomid) {
- global $CFG;
- global $COURSE;
-
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_DELETE_ROOM,"&target=$roomid");
+ global $CFG;
+ global $COURSE;
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_DELETE_ROOM,"&target=$roomid");
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
-
- if ( $respcode == 302) {
+
+ if ( $respcode == 302) {
add_to_log($COURSE->id, "liveclassroom", "Delete Room", liveclassroom_send_logs("errorDeleteRoom302","roomId=$roomid&courseId=".$COURSE->id), "$roomid suppression failed");
- // error( "Target not found");
- return false;
- }
- else if ( $respcode != 100) {
+ // error( "Target not found");
+ return false;
+ }
+ else if ( $respcode != 100) {
add_to_log($COURSE->id, "liveclassroom", "Delete Room", liveclassroom_send_logs("errorDeleteRoom100","roomId=$roomid&courseId=".$COURSE->id), "$roomid suppression failed");
return false;
}
-
- add_to_log($COURSE->id, "liveclassroom", "Delete Room", liveclassroom_send_logs("deleteRoom","roomId=$roomid&courseId=".$COURSE->id), "$roomid has been deleted with success");
- return true;
+
+ add_to_log($COURSE->id, "liveclassroom", "Delete Room", liveclassroom_send_logs("deleteRoom","roomId=$roomid&courseId=".$COURSE->id), "$roomid has been deleted with success");
+ return true;
}
/**
@@ -564,24 +567,24 @@
* return true if the room has being opened, false otherwise
*/
function liveclassroom_api_open_room($roomid) {
- global $CFG;
- global $COURSE;
-
-
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM,"&target=$roomid&preview=0");
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode == 302) {
- add_to_log($COURSE->id, "liveclassroom", "Open Room", liveclassroom_send_logs("errorOpenRoom302","roomId=$roomid&courseId=".$COURSE->id), "$roomid opening failed");
- return false;
+ global $CFG;
+ global $COURSE;
+
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM,"&target=$roomid&preview=0");
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode == 302) {
+ add_to_log($COURSE->id, "liveclassroom", "Open Room", liveclassroom_send_logs("errorOpenRoom302","roomId=$roomid&courseId=".$COURSE->id), "$roomid opening failed");
+ return false;
}
- if ( $respcode != 100) {
- add_to_log($COURSE->id, "liveclassroom", "Open Room", liveclassroom_send_logs("errorOpenRoom100","roomId=$roomid&courseId=".$COURSE->id), "$roomid opening failed");
- return false;
- }
- add_to_log($COURSE->id, "liveclassroom", "Open Room", liveclassroom_send_logs("openRoom","roomId=$roomid&courseId=".$COURSE->id), "$roomid has been opened with success");
- return true;
+ if ( $respcode != 100) {
+ add_to_log($COURSE->id, "liveclassroom", "Open Room", liveclassroom_send_logs("errorOpenRoom100","roomId=$roomid&courseId=".$COURSE->id), "$roomid opening failed");
+ return false;
+ }
+ add_to_log($COURSE->id, "liveclassroom", "Open Room", liveclassroom_send_logs("openRoom","roomId=$roomid&courseId=".$COURSE->id), "$roomid has been opened with success");
+ return true;
}
/**
@@ -591,24 +594,24 @@
* return true if the room has being closed, false otherwise
*/
function liveclassroom_api_close_room($roomid) {
- global $CFG;
- global $COURSE;
-
- liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM,"&target=$roomid&preview=1");
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode == 302) {
- add_to_log($COURSE->id, "liveclassroom", "Close Room", liveclassroom_send_logs("errorCloseRoom302","roomId=$roomid&courseId=".$COURSE->id), "$roomid closing failed");
-
- return false;
+ global $CFG;
+ global $COURSE;
+
+ liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM,"&target=$roomid&preview=1");
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode == 302) {
+ add_to_log($COURSE->id, "liveclassroom", "Close Room", liveclassroom_send_logs("errorCloseRoom302","roomId=$roomid&courseId=".$COURSE->id), "$roomid closing failed");
+
+ return false;
}
- if ( $respcode != 100) {
- add_to_log($COURSE->id, "liveclassroom", "Close Room", liveclassroom_send_logs("errorCloseRoom100","roomId=$roomid&courseId=".$COURSE->id), "$roomid closing failed");
- return false;
- }
- add_to_log($COURSE->id, "liveclassroom", "Close Room", liveclassroom_send_logs("closeRoom","roomId=$roomid&courseId=".$COURSE->id), "$roomid has been closed with success");
- return true;
+ if ( $respcode != 100) {
+ add_to_log($COURSE->id, "liveclassroom", "Close Room", liveclassroom_send_logs("errorCloseRoom100","roomId=$roomid&courseId=".$COURSE->id), "$roomid closing failed");
+ return false;
+ }
+ add_to_log($COURSE->id, "liveclassroom", "Close Room", liveclassroom_send_logs("closeRoom","roomId=$roomid&courseId=".$COURSE->id), "$roomid has been closed with success");
+ return true;
}
@@ -620,31 +623,31 @@
*/
function liveclassroom_api_modify_room($roomid,$table_attributes) {
global $CFG;
- global $COURSE;
+ global $COURSE;
while (list($key, $val) = each($table_attributes)) {
- if(($key!='class_id')&&(isset($val))&&($val!="")){
+ if(($key!='class_id')&&(isset($val))&&($val!="")){
- $list_attributes .= "&".$key."=".$val;
- }
+ $list_attributes .= "&".$key."=".$val;
+ }
}
$final_list = "&target=$roomid".$list_attributes;
- $enc_list = str_replace(" ", "+", $final_list);
+ $enc_list = str_replace(" ", "+", $final_list);
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM, $enc_list);
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM, $enc_list);
preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
+ $respcode = $matches[0];
if ( $respcode != 100) {
- add_to_log($COURSE->id, "liveclassroom", "Modify Room", liveclassroom_send_logs("errorModifyRoom100","roomId=$roomid&courseId=".$COURSE->id), "Room modification failed");
- return false;
- }
+ add_to_log($COURSE->id, "liveclassroom", "Modify Room", liveclassroom_send_logs("errorModifyRoom100","roomId=$roomid&courseId=".$COURSE->id), "Room modification failed");
+ return false;
+ }
- add_to_log($COURSE->id, "liveclassroom", "Modify Room", liveclassroom_send_logs("modifyRoom","roomId=$roomid&courseId=".$COURSE->id), "$roomid has been modified with success");
+ add_to_log($COURSE->id, "liveclassroom", "Modify Room", liveclassroom_send_logs("modifyRoom","roomId=$roomid&courseId=".$COURSE->id), "$roomid has been modified with success");
return true;
}
@@ -666,31 +669,31 @@
$enc_list = str_replace(" ", "+", $final_list);
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
-
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
- //print $data;
+
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
+ //print $data;
-
- $line = explode ("\n",$data);
+
+ $line = explode ("\n",$data);
- $j=0;
-
- for($i=1;$i<sizeof($line)-3;$i=$i+4) {
- $test = strstr($line[$i+1],$roomid);
- if($test!=false) {
- $list_return[$j][0]= liveclassroom_parse_line($line[$i],"preview=");
- $list_return[$j][1]= liveclassroom_parse_line($line[$i+1],"class_id=");
- $list_return[$j][2] = liveclassroom_parse_line($line[$i+2],"longname=");
- $j++;
- }
- }
-
- return $list_return;
+ $j=0;
+
+ for($i=1;$i<sizeof($line)-3;$i=$i+4) {
+ $test = strstr($line[$i+1],$roomid);
+ if($test!=false) {
+ $list_return[$j][0]= liveclassroom_parse_line($line[$i],"preview=");
+ $list_return[$j][1]= liveclassroom_parse_line($line[$i+1],"class_id=");
+ $list_return[$j][2] = liveclassroom_parse_line($line[$i+2],"longname=");
+ $j++;
+ }
+ }
+
+ return $list_return;
}
/*
@@ -707,33 +710,33 @@
$enc_list = str_replace(" ", "+", $final_list);
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
-
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
- //print $data;
+
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
+ //print $data;
-
- $line = explode ("\n",$data);
+
+ $line = explode ("\n",$data);
- $j=0;
-
- for($i=1;$i<sizeof($line)-3;$i=$i+4) {
- $test = strstr($line[$i+1],$roomid);
- if($test!=false) {
- if(liveclassroom_parse_line($line[$i],"preview=")==0) {
- $list_return[$j][1]= liveclassroom_parse_line($line[$i+1],"class_id=");
- $list_return[$j][2] = liveclassroom_parse_line($line[$i+2],"longname=");
- $j++;
- }
- }
- }
-
+ $j=0;
+
+ for($i=1;$i<sizeof($line)-3;$i=$i+4) {
+ $test = strstr($line[$i+1],$roomid);
+ if($test!=false) {
+ if(liveclassroom_parse_line($line[$i],"preview=")==0) {
+ $list_return[$j][1]= liveclassroom_parse_line($line[$i+1],"class_id=");
+ $list_return[$j][2] = liveclassroom_parse_line($line[$i+2],"longname=");
+ $j++;
+ }
+ }
+ }
+
- return $list_return;
+ return $list_return;
}
@@ -750,31 +753,31 @@
$enc_list = str_replace(" ", "+", $final_list);
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
-
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
- //print $data;
+
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
+ //print $data;
-
- $line = explode ("\n",$data);
+
+ $line = explode ("\n",$data);
- $j=0;
-
- for($i=1;$i<sizeof($line)-3;$i=$i+4) {
- $id = liveclassroom_parse_line($line[$i+1],"class_id=");
- $list_return[$id][0]= liveclassroom_parse_line($line[$i],"preview=");
- $list_return[$id][1]= $id;
- $list_return[$id][2] = liveclassroom_parse_line($line[$i+2],"longname=");
- $j++;
-
- }
-
+ $j=0;
+
+ for($i=1;$i<sizeof($line)-3;$i=$i+4) {
+ $id = liveclassroom_parse_line($line[$i+1],"class_id=");
+ $list_return[$id][0]= liveclassroom_parse_line($line[$i],"preview=");
+ $list_return[$id][1]= $id;
+ $list_return[$id][2] = liveclassroom_parse_line($line[$i+2],"longname=");
+ $j++;
+
+ }
+
- return $list_return;
+ return $list_return;
}
/*
@@ -788,52 +791,52 @@
global $CFG;
$name = $course->shortname;
- $enc_name = str_replace(" ", "_", $name);
-
- $final_list = "&filter00=last_name&filter00value=$enc_name";
+ $enc_name = str_replace(" ", "_", $name);
+
+ $final_list = "&filter00=last_name&filter00value=$enc_name";
$enc_list = str_replace(" ", "+", $final_list);
-
+
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, $enc_list);
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
- $tok = split("100 OK",$data);
- $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+ $tok = split("100 OK",$data);
+ $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
- if(sizeof($tok1)>1){
- return true;
- }
- else {
- return false;
- }
+ if(sizeof($tok1)>1){
+ return true;
+ }
+ else {
+ return false;
+ }
}
/*
* Give the rights for a lecture room to the room given
* @param $roomid : the id of the room to modifiy the settings
-*
+*
*/
function liveclassroom_api_give_lectureroom_attributes() {
global $CFG;
- $attributes = array('media_type'=>'two-way-audio','preview' =>'0','archive'=>'0','can_archive'=>'1','hms_simulcast'=>'public','chatenable'=>'1','privatechatenable'=>'1','hms_two_way_enabled'=>'1','userlimit'=>'-1');
-
+ $attributes = array('media_type'=>'two-way-audio','preview' =>'0','archive'=>'0','can_archive'=>'1','hms_simulcast'=>'public','chatenable'=>'1','privatechatenable'=>'1','hms_two_way_enabled'=>'1','userlimit'=>'-1');
+
/*
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM, "&target=$roomid&media_type=two-way-audio&hms_simulcast=public&chatenable=1&privatechatenable=1&hms_two_way_enabled=1&userlimit=-1");
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM, "&target=$roomid&media_type=two-way-audio&hms_simulcast=public&chatenable=1&privatechatenable=1&hms_two_way_enabled=1&userlimit=-1");
preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
return true;
*/
return $attributes;
@@ -842,29 +845,29 @@
/*
* Give the rights for a breackout room to the room given
* @param $roomid : the id of the room to modifiy the settings
-*
+*
*/
function liveclassroom_api_give_discussionroom_attributes() {
global $CFG;
- $attributes = array('media_type'=>'two-way-audio','hms_simulcast'=>'public','archive'=>'0','preview'=>'0','chatenable'=>'1','privatechatenable'=>'1','hms_two_way_enabled'=>'1','userlimit'=>'-1','can_archive'=>'1','can_liveshare'=>'1','can_ppt_import'=>'1');
+ $attributes = array('media_type'=>'two-way-audio','hms_simulcast'=>'public','archive'=>'0','preview'=>'0','chatenable'=>'1','privatechatenable'=>'1','hms_two_way_enabled'=>'1','userlimit'=>'-1','can_archive'=>'1','can_liveshare'=>'1','can_ppt_import'=>'1');
/*
- $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM, "&target=$roomid&media_type=two-way-audio&hms_simulcast=public&chatenable=1&privatechatenable=1&hms_two_way_enabled=1&userlimit=-1&can_archive=1&can_liveshare=1&can_ppt_import=1");
+ $data = liveclassroom_api_send_query($LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM, "&target=$roomid&media_type=two-way-audio&hms_simulcast=public&chatenable=1&privatechatenable=1&hms_two_way_enabled=1&userlimit=-1&can_archive=1&can_liveshare=1&can_ppt_import=1");
preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
-
- return true;
- */
- return $attributes;
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
+
+ return true;
+ */
+ return $attributes;
}
@@ -877,24 +880,24 @@
* return a string : the role of the user
*/
function liveclassroom_api_role_user_room($roomid, $userid) {
- global $CFG;
-
+ global $CFG;
+
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_ROLE, "&attribute=role_id&filter01=user_id&filter01value=$userid&filter02=object_id&filter02value=$roomid");
-
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
+
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
- $tok = split("100 OK",$data);
- $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
- $result = liveclassroom_parse_line($tok1[0],"role_id=");
- //Remove le " " at the end of the line
- $response = substr($result,0,-1);
- return $response;
-
+ $tok = split("100 OK",$data);
+ $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+ $result = liveclassroom_parse_line($tok1[0],"role_id=");
+ //Remove le " " at the end of the line
+ $response = substr($result,0,-1);
+ return $response;
+
}
/*
@@ -911,24 +914,24 @@
$enc_coursename = str_replace(" ", "_", $course->shortname);
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, "&filter00=last_name&filter00value=$enc_coursename&filter01=first_name&filter01value=Student");
-
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
+
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
- $line = explode("\n",$data);
-
-// $tok = split("100 OK",$data);
- // $tok1 = split($LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
-// $result = liveclassroom_parse_line($tok1[0],"user_id=");
- $result = liveclassroom_parse_line($line[1],"user_id=");
- //Remove le " " at the end of the line
- //$response = substr($result,0,-1);
-
- return $result;
+ $line = explode("\n",$data);
+
+// $tok = split("100 OK",$data);
+ // $tok1 = split($LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+// $result = liveclassroom_parse_line($tok1[0],"user_id=");
+ $result = liveclassroom_parse_line($line[1],"user_id=");
+ //Remove le " " at the end of the line
+ //$response = substr($result,0,-1);
+
+ return $result;
}
@@ -945,22 +948,22 @@
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, "&filter00=class_id&filter00value=$roomid&filter01=preview&filter01value=0");
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
- $tok = split("100 OK",$data);
- $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+ $tok = split("100 OK",$data);
+ $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
- if(sizeof($tok1)>1){
- return true;
- }
- else {
- return false;
- }
+ if(sizeof($tok1)>1){
+ return true;
+ }
+ else {
+ return false;
+ }
}
/* Check if the room is an archive
@@ -972,122 +975,122 @@
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, "&attribute=archive&filter01=class_id&filter01value=$roomid");
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
- $tok = split("100 OK",$data);
- $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
-
- $test = strstr($tok1[0],"archive=");
-
- //$tok2 = split("class_id=",$tok1[0]);
- $result = liveclassroom_parse_line($test,"archive=");
- //Remove le " " at the end of the line
- $response = substr($result,0,-1);
-
- if($response==1) {
- return true;
- }
- else return false;
+ $tok = split("100 OK",$data);
+ $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+
+ $test = strstr($tok1[0],"archive=");
+
+ //$tok2 = split("class_id=",$tok1[0]);
+ $result = liveclassroom_parse_line($test,"archive=");
+ //Remove le " " at the end of the line
+ $response = substr($result,0,-1);
+
+ if($response==1) {
+ return true;
+ }
+ else return false;
}
/*
-* Give the name of the room given
-* @param $roomid : the id of the room
-* return a String :name of the room
+* Give the name of the room given
+* @param $roomid : the id of the room
+* return a String :name of the room
*/
function liveclassroom_api_get_room_name($roomid){
global $CFG;
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, "&attribute=longname&filter00=class_id&filter00value=$roomid");
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
- $tok = split("100 OK",$data);
- $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
-
- $test = strstr($tok1[0],"longname=");
-
- //$tok2 = split("class_id=",$tok1[0]);
- $result = liveclassroom_parse_line($test,"longname=");
- //Remove le " " at the end of the line
- $response = substr($result,0,-1);
-
- return $response;
+ $tok = split("100 OK",$data);
+ $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+
+ $test = strstr($tok1[0],"longname=");
+
+ //$tok2 = split("class_id=",$tok1[0]);
+ $result = liveclassroom_parse_line($test,"longname=");
+ //Remove le " " at the end of the line
+ $response = substr($result,0,-1);
+
+ return $response;
}
/*
-* Give the media type of the room given
-* @param $roomid : the id of the room
-* return a String :media type of the room
+* Give the media type of the room given
+* @param $roomid : the id of the room
+* return a String :media type of the room
*/
function liveclassroom_api_get_media_type($roomid){
global $CFG;
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, "&attribute=media_type&filter00=class_id&filter00value=$roomid");
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
- //print $url;
- $tok = split("100 OK",$data);
- $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
-
- $test = strstr($tok1[0],"media_type=");
-
- //$tok2 = split("class_id=",$tok1[0]);
- $result = liveclassroom_parse_line($test,"media_type=");
- //Remove le " " at the end of the line
- $response = substr($result,0,-1);
-
- return $response;
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
+ //print $url;
+ $tok = split("100 OK",$data);
+ $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+
+ $test = strstr($tok1[0],"media_type=");
+
+ //$tok2 = split("class_id=",$tok1[0]);
+ $result = liveclassroom_parse_line($test,"media_type=");
+ //Remove le " " at the end of the line
+ $response = substr($result,0,-1);
+
+ return $response;
}
-
+
/*
-* Get the number of user limit of the room given
-* @param $roomid : the id of the room
-* return a int : number of user limit
+* Get the number of user limit of the room given
+* @param $roomid : the id of the room
+* return a int : number of user limit
*/
function liveclassroom_api_room_get_user_limit($roomid){
global $CFG;
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, "&attribute=userlimit&filter00=class_id&filter00value=$roomid");
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
- //print $url;
- $tok = split("100 OK",$data);
- $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
-
- $test = strstr($tok1[0],"userlimit=");
-
- //$tok2 = split("class_id=",$tok1[0]);
- $result = liveclassroom_parse_line($test,"userlimit=");
- //Remove le " " at the end of the line
- $response = substr($result,0,-1);
- return $response;
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
+ //print $url;
+ $tok = split("100 OK",$data);
+ $tok1 = split(LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+
+ $test = strstr($tok1[0],"userlimit=");
+
+ //$tok2 = split("class_id=",$tok1[0]);
+ $result = liveclassroom_parse_line($test,"userlimit=");
+ //Remove le " " at the end of the line
+ $response = substr($result,0,-1);
+ return $response;
}
@@ -1096,7 +1099,7 @@
* Give the information about a room given
* @param $roomid : the id of the room
* return an array with the key as the name of the attribute
-* and the value as the value of the attribute
+* and the value as the value of the attribute
*/
function liveclassroom_api_get_infos_room($roomid) {
global $CFG;
@@ -1105,19 +1108,19 @@
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
-
+
if ( $respcode != 100) {
return false;
}
$tok = split("100 OK",$data);
$line = explode("\n",$tok[1]);
- foreach ($line as $line_value) {
- $result = explode("=",$line_value);
- $room_table[$result[0]]=$result[1];
- }
+ foreach ($line as $line_value) {
+ $result = explode("=",$line_value);
+ $room_table[$result[0]]=$result[1];
+ }
- return $room_table;
+ return $room_table;
}
@@ -1130,28 +1133,28 @@
function liveclassroom_api_get_teacher_user_id ($courseid){
global $CFG;
- $course = get_record("course", "id", $courseid);
+ $course = get_record("course", "id", $courseid);
$enc_coursename = str_replace(" ", "_", $course->shortname);
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, "&filter00=last_name&filter00value=$enc_coursename&filter01=first_name&filter01value=Teacher");
-
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
- $line = explode("\n",$data);
-
-// $tok = split("100 OK",$data);
- // $tok1 = split($LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
-// $result = liveclassroom_parse_line($tok1[0],"user_id=");
- $result = liveclassroom_parse_line($line[1],"user_id=");
- //Remove le " " at the end of the line
- //$response = substr($result,0,-1);
-
- return $result;
+
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
+ $line = explode("\n",$data);
+
+// $tok = split("100 OK",$data);
+ // $tok1 = split($LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
+// $result = liveclassroom_parse_line($tok1[0],"user_id=");
+ $result = liveclassroom_parse_line($line[1],"user_id=");
+ //Remove le " " at the end of the line
+ //$response = substr($result,0,-1);
+
+ return $result;
}
@@ -1166,15 +1169,15 @@
global $CFG;
global $LIVECLASSROOM_API_ADMIN;
global $LIVECLASSROOM_API_FUNCTION_MODIFY_GROUP;
-
- $data = liveclassroom_api_send_query($ch,$LIVECLASSROOM_API_FUNCTION_MODIFY_GROUP, "&target=$groupid&add_user=$user");
+
+ $data = liveclassroom_api_send_query($ch,$LIVECLASSROOM_API_FUNCTION_MODIFY_GROUP, "&target=$groupid&add_user=$user");
- if ( $respcode != 100 && $respcode != 301) {
- error( "Can't add user from group");
- return false;
- }
-
- return true;
+ if ( $respcode != 100 && $respcode != 301) {
+ error( "Can't add user from group");
+ return false;
+ }
+
+ return true;
}*/
@@ -1188,145 +1191,145 @@
global $CFG;
global $LIVECLASSROOM_API_ADMIN;
global $LIVECLASSROOM_API_FUNCTION_MODIFY_GROUP;
-
- $data = liveclassroom_api_send_query($ch,$LIVECLASSROOM_API_FUNCTION_MODIFY_GROUP, "&target=$groupid&delete_user=$user");
+
+ $data = liveclassroom_api_send_query($ch,$LIVECLASSROOM_API_FUNCTION_MODIFY_GROUP, "&target=$groupid&delete_user=$user");
- if ( $respcode != 100 && $respcode != 301) {
- error( "Can't remove user from group");
- return false;
- }
-
- return true;
+ if ( $respcode != 100 && $respcode != 301) {
+ error( "Can't remove user from group");
+ return false;
+ }
+
+ return true;
}*/
function liveclassroom_api_get_room_list($userid,$course) {
- global $CFG;
-
- $final_list = "&attribute=class_id&attribute=longname&filter00=archive&filter00value=0&AccessUser=$userid";
- $enc_list = str_replace(" ", "+", $final_list);
-
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
+ global $CFG;
+
+ $final_list = "&attribute=class_id&attribute=longname&filter00=archive&filter00value=0&AccessUser=$userid";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
- $line = explode("\n",$data);
- $rooms=array();
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
+ $line = explode("\n",$data);
+ $rooms=array();
- for($i=1;$i<sizeof($line)-2;$i=$i+3){
- $room[0] = liveclassroom_parse_line($line[$i],"class_id="); //class_id
- $room[1]= liveclassroom_parse_line($line[$i+1],"longname="); //longname
- array_push($rooms,$room);
- }
- return $rooms;
+ for($i=1;$i<sizeof($line)-2;$i=$i+3){
+ $room[0] = liveclassroom_parse_line($line[$i],"class_id="); //class_id
+ $room[1]= liveclassroom_parse_line($line[$i+1],"longname="); //longname
+ array_push($rooms,$room);
+ }
+ return $rooms;
}
function inputRightPlace($array, $value){
-
- $return = array();
- foreach($array as $room){
- if(strcmp($room[0],$value[0])<0) array_push($return,$room);
- else array_push($return,$value);
- }
- return $return;
+
+ $return = array();
+ foreach($array as $room){
+ if(strcmp($room[0],$value[0])<0) array_push($return,$room);
+ else array_push($return,$value);
+ }
+ return $return;
}
/*
-* List all the rooms and their archives associed + the orphaned archives list
+* List all the rooms and their archives associed + the orphaned archives list
*
* @param $userid : the user id of the current user
* @param $course : the current course
*
* Return a table composed of 3 parts:
-* - a table who list all the lecture rooms and their archives associed
-* - a table who list all the breakout rooms and their archives associed
-* - a table who list all the orphaned archives
+* - a table who list all the lecture rooms and their archives associed
+* - a table who list all the breakout rooms and their archives associed
+* - a table who list all the orphaned archives
**/
function liveclassroom_api_get_roomandarchive_list($userid,$course) {
-
- global $CFG;
-
- $final_list = "&attribute=class_id&attribute=preview&attribute=longname&attribute=archive&AccessUser=$userid";
- $enc_list = str_replace(" ", "+", $final_list);
-
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
+
+ global $CFG;
+
+ $final_list = "&attribute=class_id&attribute=preview&attribute=longname&attribute=archive&AccessUser=$userid";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
- $studentuserid = liveclassroom_api_get_student_user_id($course->id);
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
+ $studentuserid = liveclassroom_api_get_student_user_id($course->id);
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
- $line = explode("\n",$data);
+ $line = explode("\n",$data);
- $tabarchive = array();
- $orphanedarchives = array();
- $rooms=array(); //lecture rooms table
- $rooms1=array();//breakout rooms table
-
- for($i=1;$i<sizeof($line)-4;$i=$i+5){
+ $tabarchive = array();
+ $orphanedarchives = array();
+ $rooms=array(); //lecture rooms table
+ $rooms1=array();//breakout rooms table
+
+ for($i=1;$i<sizeof($line)-4;$i=$i+5){
- if((liveclassroom_parse_line($line[$i+3],"archive=")!=1)){ // it is a room
+ if((liveclassroom_parse_line($line[$i+3],"archive=")!=1)){ // it is a room
- $room[0] = liveclassroom_parse_line($line[$i+1],"class_id="); //class_id
- $room[1]= liveclassroom_parse_line($line[$i+2],"longname="); //longname
- $room[2]= liveclassroom_parse_line($line[$i],"preview="); //preview
- $room[3]= array();
-
- if(liveclassroom_api_role_user_room($room[0], $studentuserid)=='Student') { //lecture room
+ $room[0] = liveclassroom_parse_line($line[$i+1],"class_id="); //class_id
+ $room[1]= liveclassroom_parse_line($line[$i+2],"longname="); //longname
+ $room[2]= liveclassroom_parse_line($line[$i],"preview="); //preview
+ $room[3]= array();
+
+ if(liveclassroom_api_role_user_room($room[0], $studentuserid)=='Student') { //lecture room
- $rooms[$room[0]]=$room;
- }
- else { //Breakout room
-
- $rooms1[$room[0]]=$room;
- }
+ $rooms[$room[0]]=$room;
+ }
+ else { //Breakout room
+
+ $rooms1[$room[0]]=$room;
+ }
- }
- else { // it is an archive
-
- $archiveid=liveclassroom_parse_line($line[$i+1],"class_id=");// larchive id
- $roomid = substr($archiveid,0,strlen($archiveid)-18);//room id
-
- $archive=array();
- $archive[0]=$archiveid;
- $archive[1]=liveclassroom_parse_line($line[$i+2],"longname="); //longname
- $archive[2]=liveclassroom_parse_line($line[$i],"preview=");
- $archive[3]=$roomid; //preview
- array_push($tabarchive,$archive);
-
- }
- }
- foreach($tabarchive as $value) {
- if (array_key_exists($value[3],$rooms)) { //lecture room table
- array_push($rooms[$value[3]][3],$value);
- }
- else if (array_key_exists($value[3],$rooms1)) { //breakout room table
- array_push($rooms1[$value[3]][3],$value);
- }
- else { //orphaned archive
- array_push($orphanedarchives,$value);
- }
- }
-
- $table_result[0]=$rooms;
- $table_result[1]=$rooms1;
- $table_result[2]=$orphanedarchives;
+ }
+ else { // it is an archive
+
+ $archiveid=liveclassroom_parse_line($line[$i+1],"class_id=");// larchive id
+ $roomid = substr($archiveid,0,strlen($archiveid)-18);//room id
+
+ $archive=array();
+ $archive[0]=$archiveid;
+ $archive[1]=liveclassroom_parse_line($line[$i+2],"longname="); //longname
+ $archive[2]=liveclassroom_parse_line($line[$i],"preview=");
+ $archive[3]=$roomid; //preview
+ array_push($tabarchive,$archive);
+
+ }
+ }
+ foreach($tabarchive as $value) {
+ if (array_key_exists($value[3],$rooms)) { //lecture room table
+ array_push($rooms[$value[3]][3],$value);
+ }
+ else if (array_key_exists($value[3],$rooms1)) { //breakout room table
+ array_push($rooms1[$value[3]][3],$value);
+ }
+ else { //orphaned archive
+ array_push($orphanedarchives,$value);
+ }
+ }
+
+ $table_result[0]=$rooms;
+ $table_result[1]=$rooms1;
+ $table_result[2]=$orphanedarchives;
- return $table_result;
+ return $table_result;
}
/*
-* List all the rooms and their archives associed + the orphaned archives list
+* List all the rooms and their archives associed + the orphaned archives list
*
* @param $xmldoc : the DOM document to add the list
* @param $userid : the user id of the current user
@@ -1337,132 +1340,132 @@
**/
function liveclassroom_roomsarchiveslist($xmldoc,$userid,$courseid,$isteacher) {
- global $CFG;
+ global $CFG;
-
- $final_list = "&attribute=class_id&attribute=preview&attribute=longname&filter01=archive&filter01value=0&AccessUser=$userid";
- $enc_list = str_replace(" ", "+", $final_list);
-
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
-
- $studentuserid = liveclassroom_api_get_student_user_id($courseid);
-
- preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
-
- if ( $respcode != 100) {
- return false;
- }
+
+ $final_list = "&attribute=class_id&attribute=preview&attribute=longname&filter01=archive&filter01value=0&AccessUser=$userid";
+ $enc_list = str_replace(" ", "+", $final_list);
+
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, $enc_list);
+
+ $studentuserid = liveclassroom_api_get_student_user_id($courseid);
+
+ preg_match("(\d*)", $data, $matches);
+ $respcode = $matches[0];
+
+ if ( $respcode != 100) {
+ return false;
+ }
- $listElements = $xmldoc->create_element('listElements');
- //$orphanedArchivesForStudent = $xmldoc->createElement('orphanedArchivesForStudent');
+ $listElements = $xmldoc->create_element('listElements');
+ //$orphanedArchivesForStudent = $xmldoc->createElement('orphanedArchivesForStudent');
- $line = explode("\n",$data);
-
- $tabarchive = array();
- $orphanedArchives = liveclassroom_api_get_archive_list($userid);
-
- add_to_log($COURSE->id, "liveclassroom", "archive", "action", sizeof($orphanedArchives));
- $nbrClosedArchive = 0;
-
- for($i=1;$i<sizeof($line)-3;$i=$i+4){
+ $line = explode("\n",$data);
+
+ $tabarchive = array();
+ $orphanedArchives = liveclassroom_api_get_archive_list($userid);
+
+ add_to_log($COURSE->id, "liveclassroom", "archive", "action", sizeof($orphanedArchives));
+ $nbrClosedArchive = 0;
+
+ for($i=1;$i<sizeof($line)-3;$i=$i+4){
- $roomid= liveclassroom_parse_line($line[$i+1],"class_id="); //class_id
- $roomname= liveclassroom_parse_line($line[$i+2],"longname="); //longname
-
- $roompreview= liveclassroom_parse_line($line[$i],"preview="); //preview
+ $roomid= liveclassroom_parse_line($line[$i+1],"class_id="); //class_id
+ $roomname= liveclassroom_parse_line($line[$i+2],"longname="); //longname
+
+ $roompreview= liveclassroom_parse_line($line[$i],"preview="); //preview
- $element = $xmldoc->create_element('listElement');
+ $element = $xmldoc->create_element('listElement');
-
- $roomParameters = $xmldoc->create_element('listElementParameters');
-
- if ($isteacher=="1")
+
+ $roomParameters = $xmldoc->create_element('listElementParameters');
+
+ if ($isteacher=="1")
{
$tabarchive = liveclassroom_api_get_archive_list_for_a_room($roomid,$userid);
add_to_log($COURSE->id, "liveclassroom", "archiveteacher", "action", sizeof($tabarchive));
- foreach ($tabarchive as $tabarchive_value) {
- unset($orphanedArchives[$tabarchive_value[1]]) ;
- }
+ foreach ($tabarchive as $tabarchive_value) {
+ unset($orphanedArchives[$tabarchive_value[1]]) ;
+ }
}
else //just the open archive
{
$tabarchive = liveclassroom_api_get_open_archive_list_for_a_room($roomid,$userid);
add_to_log($COURSE->id, "liveclassroom", "archivestudent", "action", sizeof($tabarchive));
$tabarchiveall = $tabarchive = liveclassroom_api_get_archive_list_for_a_room($roomid,$userid);
- foreach ($tabarchiveall as $tabarchiveall_value) {
- unset($orphanedArchives[$tabarchiveall_value[1]]) ;
- }
+ foreach ($tabarchiveall as $tabarchiveall_value) {
+ unset($orphanedArchives[$tabarchiveall_value[1]]) ;
+ }
}
-
- if(liveclassroom_api_role_user_room($roomid, $studentuserid)=='Student') { //lecture room
- $type = $xmldoc->create_element('typeOfElement');
- $type->append_child($xmldoc->create_text_node("MainLecture"));
- $positionValue = 1;
- }
- else{
- $type = $xmldoc->create_element('typeOfElement');
- $type->append_child($xmldoc->create_text_node("Discussion"));
- $positionValue = 2;
- }
-
-
- $position = $xmldoc->create_element('position');
- $position->append_child($xmldoc->create_text_node("$positionValue"));
- $id = $xmldoc->create_element('id');
- $id->append_child($xmldoc->create_text_node("$roomid"));
- $longname = $xmldoc->create_element('nameDisplay');
- $longname->append_child($xmldoc->create_text_node("$roomname"));
- $preview = $xmldoc->create_element('preview');
- if ($roompreview=="1")
+
+ if(liveclassroom_api_role_user_room($roomid, $studentuserid)=='Student') { //lecture room
+ $type = $xmldoc->create_element('typeOfElement');
+ $type->append_child($xmldoc->create_text_node("MainLecture"));
+ $positionValue = 1;
+ }
+ else{
+ $type = $xmldoc->create_element('typeOfElement');
+ $type->append_child($xmldoc->create_text_node("Discussion"));
+ $positionValue = 2;
+ }
+
+
+ $position = $xmldoc->create_element('position');
+ $position->append_child($xmldoc->create_text_node("$positionValue"));
+ $id = $xmldoc->create_element('id');
+ $id->append_child($xmldoc->create_text_node("$roomid"));
+ $longname = $xmldoc->create_element('nameDisplay');
+ $longname->append_child($xmldoc->create_text_node("$roomname"));
+ $preview = $xmldoc->create_element('preview');
+ if ($roompreview=="1")
{
- $preview->append_child($xmldoc->create_text_node("unavailable"));
+ $preview->append_child($xmldoc->create_text_node("unavailable"));
}
else
{
$preview->append_child($xmldoc->create_text_node("available"));
}
-
-
- $roomParameters->append_child($type);
- $roomParameters->append_child($position);
- $roomParameters->append_child($id);
- $roomParameters->append_child($longname);
- $roomParameters->append_child($preview);
- $element->append_child($roomParameters);
-
- // $tabarchive = liveclassroom_api_get_archive_list_for_a_room($roomid,$userid);
-
- if(sizeof($tabarchive)>0){ //archives
-
- $nbrClosedArchive = 0;
-
- $archives = $xmldoc->create_element('archives');
-
- foreach ($tabarchive as $tabarchive_value) {
- $archive = $xmldoc->create_element('archive');
-
- $archiveid = $xmldoc->create_element('id');
- $archiveid->append_child($xmldoc->create_text_node("$tabarchive_value[1]"));
- $archivename = $xmldoc->create_element('nameDisplay');
- $archivename->append_child($xmldoc->create_text_node("$tabarchive_value[2]"));
- $archivepreview = $xmldoc->create_element('preview');
-
-
- if($tabarchive_value[0]=="1") {
- $archivepreview->append_child($xmldoc->create_text_node("unavailable"));
- $nbrClosedArchive++;
- }
- else {
- $archivepreview->append_child($xmldoc->create_text_node("available"));
- }
- $archive->append_child($archiveid);
- $arc...
[truncated message content] |
|
From: <hu...@us...> - 2007-01-04 16:14:25
|
Revision: 165
http://svn.sourceforge.net/hw4mdl/?rev=165&view=rev
Author: hugues
Date: 2007-01-04 08:14:21 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10620
- Fixed the room update
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/manageRoomAction.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2007-01-04 14:51:15 UTC (rev 164)
+++ trunk/moodle/mod/liveclassroom/api.php 2007-01-04 16:14:21 UTC (rev 165)
@@ -363,8 +363,6 @@
$final_list = "&target=$roomid"."&longname=$roomname".$list_attributes;
$enc_list = str_replace(" ", "+", $final_list);
-//DEBUG: error($enc_list);
-
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_CREATE_CLASS, $enc_list);
preg_match("(\d*)", $data, $matches);
@@ -625,10 +623,10 @@
global $CFG;
global $COURSE;
+ $list_attributes = "";
+
while (list($key, $val) = each($table_attributes)) {
-
if(($key!='class_id')&&(isset($val))&&($val!="")){
-
$list_attributes .= "&".$key."=".$val;
}
}
@@ -637,19 +635,21 @@
$enc_list = str_replace(" ", "+", $final_list);
+//DEBUG:
+//error($enc_list);
+
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_MODIFY_ROOM, $enc_list);
preg_match("(\d*)", $data, $matches);
- $respcode = $matches[0];
+ $respcode = $matches[0];
if ( $respcode != 100) {
- add_to_log($COURSE->id, "liveclassroom", "Modify Room", liveclassroom_send_logs("errorModifyRoom100","roomId=$roomid&courseId=".$COURSE->id), "Room modification failed");
- return false;
- }
+ add_to_log($COURSE->id, "liveclassroom", "Modify Room", liveclassroom_send_logs("errorModifyRoom100","roomId=$roomid&courseId=".$COURSE->id), "Room modification failed");
+ return false;
+ }
add_to_log($COURSE->id, "liveclassroom", "Modify Room", liveclassroom_send_logs("modifyRoom","roomId=$roomid&courseId=".$COURSE->id), "$roomid has been modified with success");
return true;
-
}
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2007-01-04 14:51:15 UTC (rev 164)
+++ trunk/moodle/mod/liveclassroom/lib.php 2007-01-04 16:14:21 UTC (rev 165)
@@ -315,6 +315,45 @@
return liveclassroom_api_get_session ($userid, $nickname);
}
+
+/**
+ * Updates the parameters of a room
+ *
+ */
+function liveclassroom_update_room ($course_id, $roomname, $instructor_led, $attributes) {
+
+ //set media_type and media_format according to the appropriate values according to the media_type attribute
+ $attributes = liveclassroom_check_media($attributes);
+
+ //print_r($list_attributes);
+ //Test if the type of room has been changed
+ if($_SESSION['led']!=$attributes['led']) { // Type changed
+ if($list_attributes['led']=='instructor'){
+ liveclassroom_api_remove_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid) , 'Instructor') ;
+ liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Student');
+ }
+ else {
+ liveclassroom_api_remove_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid) , 'Student') ;
+ liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Instructor');
+ }
+ }
+ unset($attributes['led']);
+ unset($attributes['link']);
+
+ //print_r($list_attributes);
+ if(!liveclassroom_api_modify_room($_GET['id'],$attributes)) {
+ return false;
+ }
+ //Guest enabled?
+ if ($attributes['guests']==1) {
+ if (! liveclassroom_api_add_user_role ($_GET['id'], 'Guest' , 'Student')) {
+ return false;
+ }
+ }
+ return true;
+}
+
+
/*
* Create a room
* call the function create_class to create the room into the server
@@ -333,15 +372,7 @@
$studentid = LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.LIVECLASSROOM_STUDENT_SUFFIX;
//set media_type and media_format according to the appropriate values according to the media_type attribute
- if ($attributes['media_type'] == "none") {
- $attributes['media_format'] = "none";
- }
- else if ($attributes['media_type'] == "one-way-video") {
- $attributes['media_format'] = "realmedia";
- }
- else if ($attributes['media_type'] == "two-way-audio") {
- $attributes['media_format'] = "hms";
- }
+ $attributes = liveclassroom_check_media($attributes);
if($instructor_led==true) { // main lecture hall
@@ -1105,5 +1136,20 @@
return $version;
}
+
+function liveclassroom_check_media($attributes) {
+ //set media_type and media_format according to the appropriate values according to the media_type attribute
+ if ($attributes['media_type'] == "none") {
+ $attributes['media_format'] = "none";
+ }
+ else if ($attributes['media_type'] == "one-way-video") {
+ $attributes['media_format'] = "realmedia";
+ }
+ else if ($attributes['media_type'] == "two-way-audio") {
+ $attributes['media_format'] = "hms";
+ }
+
+ return $attributes;
+}
?>
Modified: trunk/moodle/mod/liveclassroom/manageRoomAction.php
===================================================================
--- trunk/moodle/mod/liveclassroom/manageRoomAction.php 2007-01-04 14:51:15 UTC (rev 164)
+++ trunk/moodle/mod/liveclassroom/manageRoomAction.php 2007-01-04 16:14:21 UTC (rev 165)
@@ -87,7 +87,9 @@
$messageType = 'roomCreated';
}
else if($_GET['action']=='updateRoom') {
- if($list_attributes['led']=='instructor'){
+
+ $instructor_led = ($list_attributes['led']=='instructor');
+ if($instructor_led){
if (!isset($list_attributes['chatenable'])) $list_attributes['chatenable']="0";
if (!isset($list_attributes['student_wb_liveapp'])) $list_attributes['student_wb_liveapp']="0";
if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']="0";
@@ -103,31 +105,11 @@
if (!isset($list_attributes['preview'])) $list_attributes['preview']=1;
if (!isset($list_attributes['student_wb_enabled'])) $list_attributes['student_wb_enabled']="0";
-
-
- //print_r($list_attributes);
- //Test if the type of room has been changed
- if($_SESSION['led']!=$list_attributes['led']) { // Type changed
- if($list_attributes['led']=='instructor'){
- liveclassroom_api_remove_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid) , 'Instructor') ;
- liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Student');
- }
- else {
- liveclassroom_api_remove_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid) , 'Student') ;
- liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Instructor');
- }
- }
- //print_r($list_attributes);
- if(!liveclassroom_api_modify_room($_GET['id'],$list_attributes)) {
+ if (!liveclassroom_update_room($courseid, $list_attributes['longname'], $instructor_led, $list_attributes)) {
notice(get_string("roommodificationfailed", "liveclassroom"), $_SERVER["HTTP_REFERER"]);
exit;
- }
- //Guest enabled?
- if ($list_attributes['guests']==1) {
- if (! liveclassroom_api_add_user_role ($_GET['id'], 'Guest' , 'Student')) {
- return false;
- }
}
+
$messageType = 'roomUpdated';
}
else if($_GET['action']=='deleteRoom') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-08 10:12:14
|
Revision: 169
http://svn.sourceforge.net/hw4mdl/?rev=169&view=rev
Author: hugues
Date: 2007-01-08 02:12:11 -0800 (Mon, 08 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10547
- Fixed the names of the fields and radio buttons
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/js/hwCommons.js
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-05 10:52:26 UTC (rev 168)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-08 10:12:11 UTC (rev 169)
@@ -840,7 +840,8 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_chat", "name" => "chatenable", "onclick" => "doChangeChat()") ;
+ $parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_chat",
+ "name" => "chatenable", "onclick" => "doChangeChat()") ;
if($action=='update'){
if($room_info['chatenable']==1) {
$parameters['checked']=true;
@@ -875,7 +876,8 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "1", "id" => "privatechatenabled",
+ $parameters=array("type" => "radio", "value" => "1",
+ "id" => "privatechatenable",
"name" => "privateChatEnable") ;
if($action=='update'){
if($room_info['privatechatenable']==1) {
@@ -913,7 +915,8 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "0", "id" => "privatedisbledd", "name" => "privateChatEnabled") ;
+ $parameters=array("type" => "radio", "value" => "0",
+ "id" => "privatedisabled", "name" => "privateChatEnable") ;
if($action=='update'){
if($room_info['privatechatenable']==0) {
$parameters['checked']=true;
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-05 10:52:26 UTC (rev 168)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-08 10:12:11 UTC (rev 169)
@@ -18,9 +18,10 @@
}
function doChangeChat() {
- var radio = document.forms[0].privateChatEnabled;
+ var radio = document.forms[0].privateChatEnable;
for (i=0; i<radio.length; i++) {
+
radio[i].disabled = !document.forms[0].chatenable.checked;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-08 13:02:30
|
Revision: 170
http://svn.sourceforge.net/hw4mdl/?rev=170&view=rev
Author: hugues
Date: 2007-01-08 05:02:27 -0800 (Mon, 08 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10624
- Enlarged the size of the input field for the launcher link, it was not displaying correctly.
- I also fixed a bug when the guest access was removed.
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/lib.php
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-08 10:12:11 UTC (rev 169)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-08 13:02:27 UTC (rev 170)
@@ -1176,7 +1176,7 @@
$launcher_link = $CFG->liveclassroom_servername."/launcher.cgi?room=".$roomId;
$parameters=array("type" => "text", "id" => "link",
- "name" => "link", "maxlength" => "50",
+ "name" => "link", "maxlength" => isset($launcher_link)?strlen($launcher_link):"50",
"size" => strlen($launcher_link) , "readonly" => "");
if($action=='update'){
$parameters['value']=$launcher_link;
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2007-01-08 10:12:11 UTC (rev 169)
+++ trunk/moodle/mod/liveclassroom/lib.php 2007-01-08 13:02:27 UTC (rev 170)
@@ -322,6 +322,8 @@
*/
function liveclassroom_update_room ($course_id, $roomname, $instructor_led, $attributes) {
+ $student_id = liveclassroom_api_get_student_user_id ($courseid) ;
+
//set media_type and media_format according to the appropriate values according to the media_type attribute
$attributes = liveclassroom_check_media($attributes);
@@ -329,12 +331,12 @@
//Test if the type of room has been changed
if($_SESSION['led']!=$attributes['led']) { // Type changed
if($list_attributes['led']=='instructor'){
- liveclassroom_api_remove_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid) , 'Instructor') ;
- liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Student');
+ liveclassroom_api_remove_user_role ($_GET['id'], $student_id, 'Instructor') ;
+ liveclassroom_api_add_user_role ($_GET['id'], $student_id, 'Student');
}
else {
- liveclassroom_api_remove_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid) , 'Student') ;
- liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Instructor');
+ liveclassroom_api_remove_user_role ($_GET['id'], $student_id , 'Student') ;
+ liveclassroom_api_add_user_role ($_GET['id'], $student_id, 'Instructor');
}
}
unset($attributes['led']);
@@ -350,6 +352,12 @@
return false;
}
}
+ else if ($attributes['guest']==0) {
+ if (! liveclassroom_api_remove_user_role ($_GET['id'], 'Guest' , 'Student')) {
+ return false;
+ }
+ }
+
return true;
}
@@ -368,20 +376,39 @@
$roomid = LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.'_'.rand();
+ //set media_type and media_format according to the appropriate values according to the media_type attribute
+ $attributes = liveclassroom_check_media($attributes);
+
+
+ if (! liveclassroom_api_create_class ($roomid, $roomname, $instructor_led, $attributes)) {
+ //error ("liveclassroom_create_room: Cannot create room with id:$roomid and name: $roomname");
+ return false;
+ }
+
+ if (! liveclassroom_adjust_roles ($roomid, $enc_coursename, $instructor_led)) {
+ return false;
+ }
+
+ //Guest enabled?
+ if ((isset($attributes['guests'])) && ($attributes['guests']==1)) {
+ if (! liveclassroom_api_add_user_role ($roomid, 'Guest' , 'Student')) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+
+
+function liveclassroom_adjust_roles ($roomid, $enc_coursename, $instructor_led) {
+
$teacherid = LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.LIVECLASSROOM_TEACHER_SUFFIX;
$studentid = LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.LIVECLASSROOM_STUDENT_SUFFIX;
- //set media_type and media_format according to the appropriate values according to the media_type attribute
- $attributes = liveclassroom_check_media($attributes);
-
if($instructor_led==true) { // main lecture hall
- if (! liveclassroom_api_create_class ($roomid, $roomname, true, $attributes)) {
- //error ("liveclassroom_create_room: Cannot create room with id:$roomid and name: $roomname");
- return false;
- }
- if (! liveclassroom_api_add_user_role ($roomid, $teacherid, 'ClassAdmin')) {
-
+ if (! liveclassroom_api_add_user_role ($roomid, $teacherid, 'ClassAdmin')) {
//error('liveclassroom_create_room: Cannot add classadminright to Teachers');
return false;
}
@@ -395,10 +422,6 @@
}
}
else if($instructor_led==false){ // discussion room
- if (! liveclassroom_api_create_class ($roomid, $roomname, false, $attributes)) {
- //error ("liveclassroom_create_room: Cannot create room with id:$roomid and name: $roomname");
- return false;
- }
if (! liveclassroom_api_add_user_role ($roomid, $teacherid, 'ClassAdmin')) {
//error('liveclassroom_create_room: Cannot add classadminright to Teachers');
return false;
@@ -412,18 +435,9 @@
return false;
}
}
- //Guest enabled?
- if ((isset($attributes['guests'])) && ($attributes['guests']==1)) {
- if (! liveclassroom_api_add_user_role ($roomid, 'Guest' , 'Student')) {
- return false;
- }
- }
-
return true;
}
-
-
/**
* Return the id of liveclassroom activities in this course
* @param string the courseid
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-01-10 00:06:11
|
Revision: 171
http://svn.sourceforge.net/hw4mdl/?rev=171&view=rev
Author: tomroro
Date: 2007-01-09 16:06:09 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
Fix the bug#10644
I have changed different things:
-First, I have changed the png picture by jpg picture because if I put png picture on a hide div and I apply the transparency correction for Ie, the png pictures don't appear.
-I have modified some css elements to be good on ie,safari and ff
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/js/manageXml.js
Added Paths:
-----------
trunk/moodle/mod/liveclassroom/pictures/items/Thumbs.db
trunk/moodle/mod/liveclassroom/pictures/items/listitem-available.jpg
trunk/moodle/mod/liveclassroom/pictures/items/listitem-liveclassroomicon.jpg
trunk/moodle/mod/liveclassroom/pictures/items/listitem-subitem.jpg
trunk/moodle/mod/liveclassroom/pictures/items/listitem-unavailable.jpg
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-08 13:02:27 UTC (rev 170)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-10 00:06:09 UTC (rev 171)
@@ -294,12 +294,12 @@
}
.archive td{
- padding-left:5px ;
+
font-family:Verdana;
color:#666666;
font-style:italic;
font-size:11px;
-
+border-bottom:solid 1px #F3F3F3;
}
.room td{
@@ -312,11 +312,11 @@
}
.archive label{
-
+ padding-left:5px ;
font-family:Verdana;
color:Black;
font-size:10;
- border-bottom:solid 1px #F3F3F3;
+
cursor:default;
}
.room label{
@@ -324,7 +324,7 @@
font-family:Verdana;
color:Black;
font-size:10;
- border-bottom:solid 1px #F3F3F3;
+
cursor:default;
}
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-08 13:02:27 UTC (rev 170)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 00:06:09 UTC (rev 171)
@@ -738,10 +738,10 @@
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 src=\"pictures/items/listitem-liveclassroomicon.png\" border=\"0\" /></td>";
- display += "<td style=\"padding-left:7px;\" width=16px align=\"left\"><img src=\"pictures/items/listitem-subitem.png\" border=\"0\" /></td>";
+ display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.jpg\" border=\"0\" /></td>";
+ display += "<td style=\"padding-left:7px;\" width=16px align=\"left\"><img 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 src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".png\"/></td>";
+ display += "<td class='shiftAvailability' align=right><img src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".jpg\"/></td>";
display += "</tr>";
}else{
closeArchive++;
Added: trunk/moodle/mod/liveclassroom/pictures/items/Thumbs.db
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/moodle/mod/liveclassroom/pictures/items/listitem-available.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/listitem-available.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/moodle/mod/liveclassroom/pictures/items/listitem-liveclassroomicon.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/listitem-liveclassroomicon.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/moodle/mod/liveclassroom/pictures/items/listitem-subitem.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/listitem-subitem.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/moodle/mod/liveclassroom/pictures/items/listitem-unavailable.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/listitem-unavailable.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-01-10 00:24:16
|
Revision: 172
http://svn.sourceforge.net/hw4mdl/?rev=172&view=rev
Author: tomroro
Date: 2007-01-09 16:24:15 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
fix the bug#10637
problem with the variable used to determinate the current tab, this variable was not initialize when it was necessary(call to the settings).
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/js/Ajax.js
trunk/moodle/mod/liveclassroom/js/hwCommons.js
trunk/moodle/mod/liveclassroom/js/manageXml.js
trunk/moodle/mod/liveclassroom/pictures/items/Thumbs.db
Added Paths:
-----------
trunk/moodle/mod/liveclassroom/pictures/items/tab-selected.gif
trunk/moodle/mod/liveclassroom/pictures/items/tab-unselected.gif
Removed Paths:
-------------
trunk/moodle/mod/liveclassroom/pictures/tab.gif
trunk/moodle/mod/liveclassroom/pictures/tab_Select.gif
trunk/moodle/mod/liveclassroom/pictures/tab_disabled.gif
trunk/moodle/mod/liveclassroom/pictures/tab_over.gif
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-10 00:06:09 UTC (rev 171)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-10 00:24:15 UTC (rev 172)
@@ -93,33 +93,34 @@
}
td.tabSelected
{
-
-background-image:url(../pictures/tab_Select.gif);
- background-repeat: no-repeat;
- width: 78px;
- font-size: 10px;
- font-family: Verdana;
- }
-
- td.tabDisabled
+ background-image: url(../pictures/items/tab-selected.gif);
+ background-repeat: no-repeat;
+ width: 78px;
+ font-size: 10px;
+ font-family: Verdana;
+ cursor:default;
+}
+
+td.tabDisabled
{
- color:#CACACA;
- background-image:url(../pictures/tab.gif);
- background-repeat: no-repeat;
- width: 78px;
- font-size: 10px;
- font-family: Verdana;
- border-bottom:solid 1px #818181;
- }
+ color: #CACACA;
+ background-image: url(../pictures/items/tab-unselected.gif);
+ background-repeat: no-repeat;
+ width: 78px;
+ font-size: 10px;
+ font-family: Verdana;
+ border-bottom: solid 1px #818181;
+ cursor:default;
+}
td.tabNoSelected
{
-
- background-image:url(../pictures/tab.gif);
- background-repeat: no-repeat;
- width: 78px;
- font-size: 10px;
- font-family: Verdana;
- border-bottom:solid 1px #818181;
+ background-image: url(../pictures/items/tab-unselected.gif);
+ background-repeat: no-repeat;
+ width: 78px;
+ font-size: 10px;
+ font-family: Verdana;
+ border-bottom: solid 1px #818181;
+ cursor:default;
}
a {
Modified: trunk/moodle/mod/liveclassroom/js/Ajax.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/Ajax.js 2007-01-10 00:06:09 UTC (rev 171)
+++ trunk/moodle/mod/liveclassroom/js/Ajax.js 2007-01-10 00:24:15 UTC (rev 172)
@@ -56,38 +56,39 @@
return xmlhttp;
}
-function gestionDisplay(isfilter)
+function gestionDisplay()
{
if(currentTool==LC_PRODUCT || currentTool=="all"){
- if(numberMainLectureRoom>5 && isfilter==false)
+ if(document.getElementById("div1")!=null){
+ if(numberMainLectureRoom>5 && isFilter==false)
+ {
+
+ document.getElementById("div1").style.height=5*19+"px";
+ document.getElementById("div1More").style.display="block";
+ document.getElementById("div1More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div1\",\""+numberMainLectureRoom+"\")'>"+(numberMainLectureRoom-5)+" more...</label>";
+ //document.getElementById("div1Space").style.display="block";
+ }else if(numberMainLectureRoom==0){
+ document.getElementById("div1").style.display="none";
+ document.getElementById("div1Title").style.display="none";
+ document.getElementById("div1More").style.display="none";
+ // document.getElementById("div1Space").style.display="none";
+ }else{
+
+ document.getElementById("div1").style.height=numberMainLectureRoom*19+"px";
+ document.getElementById("div1More").style.display="none";
+ //document.getElementById("div1Space").style.display="none";
+
+ }
+ }
+ if(document.getElementById("div2")!=null){
+ if(numberDiscussionRoom>5 && isFilter==false)
{
-
- document.getElementById("div1").style.height=5*19+"px";
-
-
-
- document.getElementById("div1More").style.display="block";
- document.getElementById("div1More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div1\",\""+numberMainLectureRoom+"\")'>"+(numberMainLectureRoom-5)+" more...</label>";
-
- }else if(numberMainLectureRoom==0){
- document.getElementById("div1").style.display="none";
- document.getElementById("div1Title").style.display="none";
- document.getElementById("div1More").style.display="none";
-
- }else{
-
- document.getElementById("div1").style.height=numberMainLectureRoom*19+"px";
- document.getElementById("div1More").style.display="none";
-
- }
-
- if(numberDiscussionRoom>5 && isfilter==false)
- {
document.getElementById("div2").style.height=5*19+"px";
document.getElementById("div2More").style.display="block";
document.getElementById("div2More").innerHTML="<table><tr><td><label class='moreRoom' onclick='displayAllDiv(\"div2\",\""+numberDiscussionRoom+"\")'>"+(numberDiscussionRoom-5)+" more...</label></td></tr></table>";
-
+ //document.getElementById("div2Space").style.display="block";
+
@@ -95,60 +96,71 @@
document.getElementById("div2").style.display="none";
document.getElementById("div2Title").style.display="none";
document.getElementById("div2More").style.display="none";
-
+ //document.getElementById("div2Space").style.display="none";
+
}else{
-
+
document.getElementById("div2").style.height=numberDiscussionRoom*19+"px";
document.getElementById("div2More").style.display="none";
+ // document.getElementById("div2Space").style.display="none";
+
}
}
-
-
+ }
if(currentTool==VT_PRODUCT || currentTool=="all"){
- if(numberVoiceBoard>5 && isfilter==false)
- {
- document.getElementById("div3").style.height=5*19+"px";
- document.getElementById("div3More").style.display="block";
- document.getElementById("div3More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div3\",\""+numberVoiceBoard+"\")'>"+(numberVoiceBoard-5)+" more...</label>";
-
-
-
-
- }else if(numberVoiceBoard==0){
- document.getElementById("div3").style.display="none";
- document.getElementById("div3Title").style.display="none";
- document.getElementById("div3More").style.display="none";
-
- }else{
-
- document.getElementById("div3").style.height=numberVoiceBoard*19+"px";
- document.getElementById("div3More").style.display="none";
+ if(document.getElementById("div3")!=null){
+ if(numberVoiceBoard>5 && isFilter==false)
+ {
+ document.getElementById("div3").style.height=5*19+"px";
+ document.getElementById("div3More").style.display="block";
+ document.getElementById("div3More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div3\",\""+numberVoiceBoard+"\")'>"+(numberVoiceBoard-5)+" more...</label>";
+ //document.getElementById("div3Space").style.display="block";
+
+
+
+ }else if(numberVoiceBoard==0){
+ document.getElementById("div3").style.display="none";
+ document.getElementById("div3Title").style.display="none";
+ document.getElementById("div3More").style.display="none";
+ //document.getElementById("div3Space").style.display="none";
+
+ }else{
+
+ document.getElementById("div3").style.height=numberVoiceBoard*19+"px";
+ document.getElementById("div3More").style.display="none";
+ //document.getElementById("div3Space").style.display="none";
+
+ }
+ }
+ if(document.getElementById("div4")!=null){
+ if(numberVoicePresentation>5 && isFilter==false)
+ {
+
+ document.getElementById("div4").style.height=5*19+"px";
+ document.getElementById("div4More").style.display="block";
+ document.getElementById("div4More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div4\",\""+numberVoicePresentation+"\")'>"+(numberVoicePresentation-5)+" more...</label>";
+ //document.getElementById("div4Space").style.display="block";
+
+
+
+ }else if(numberVoicePresentation==0){
+ document.getElementById("div4").style.display="none";
+ document.getElementById("div4Title").style.display="none";
+ document.getElementById("div4More").style.display="none";
+ // document.getElementById("div4Space").style.display="none";
+
+ }
+ else{
+ document.getElementById("div4").style.height=numberVoicePresentation*19+"px";
+ document.getElementById("div4More").style.display="none";
+ // document.getElementById("div4Space").style.display="none";
+
+ }
}
-
- if(numberVoicePresentation>5 && isfilter==false)
- {
-
- document.getElementById("div4").style.height=5*19+"px";
- document.getElementById("div4More").style.display="block";
- document.getElementById("div4More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div4\",\""+numberVoicePresentation+"\")'>"+(numberVoicePresentation-5)+" more...</label>";
-
-
-
- }else if(numberVoicePresentation==0 && isfilter==false){
- document.getElementById("div4").style.display="none";
- document.getElementById("div4Title").style.display="none";
- document.getElementById("div4More").style.display="none";
-
+
}
- else{
- document.getElementById("div4").style.height=numberVoicePresentation*19+"px";
- document.getElementById("div4More").style.display="none";
- }
-
}
-}
-
function displayAllDiv(name,number){
if(currentId!="")
document.getElementById(currentId).style.backgroundColor="white";
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-10 00:06:09 UTC (rev 171)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-10 00:24:15 UTC (rev 172)
@@ -18,10 +18,9 @@
}
function doChangeChat() {
- var radio = document.forms[0].privateChatEnable;
+ var radio = document.forms[0].privateChatEnabled;
for (i=0; i<radio.length; i++) {
-
radio[i].disabled = !document.forms[0].chatenable.checked;
}
}
@@ -77,17 +76,22 @@
- var currentIdtab="1";
+
function onTab(id)
{
- document.getElementById('tab'+id).style.backgroundImage="url(pictures/tab_Select.gif)";
- document.getElementById('tab'+currentIdtab).style.borderBottom="#818181 1px solid";
- document.getElementById('tab'+currentIdtab).style.backgroundImage="url(pictures/tab.gif)";
- document.getElementById('tab'+id).style.borderBottom="none";
- document.getElementById('span'+currentIdtab).style.display="none";
- document.getElementById('span'+id).style.display="block";
- currentIdtab=id;
+ if(currentIdtab=="")
+ currentIdtab=1
+
+
+ if(currentIdtab !=id){
+ document.getElementById('tab'+id).className="tabSelected";
+ document.getElementById('tab'+currentIdtab).className="tabNoSelected";
+ document.getElementById('span'+currentIdtab).style.display="none";
+ document.getElementById('span'+id).style.display="block";
+ currentIdtab=id;
+ }
+
}
function onOver(id)
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 00:06:09 UTC (rev 171)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 00:24:15 UTC (rev 172)
@@ -94,6 +94,7 @@
}
break;
case "settings":
+ currentIdtab=1;
if(divToReload=="all" ){
display+=openDiv("settings","settings")
display+=displaySettings(windowsElements[i].getElements("windowsElementParameters"));
Modified: trunk/moodle/mod/liveclassroom/pictures/items/Thumbs.db
===================================================================
(Binary files differ)
Added: trunk/moodle/mod/liveclassroom/pictures/items/tab-selected.gif
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/tab-selected.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/moodle/mod/liveclassroom/pictures/items/tab-unselected.gif
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/tab-unselected.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/moodle/mod/liveclassroom/pictures/tab.gif
===================================================================
(Binary files differ)
Deleted: trunk/moodle/mod/liveclassroom/pictures/tab_Select.gif
===================================================================
(Binary files differ)
Deleted: trunk/moodle/mod/liveclassroom/pictures/tab_disabled.gif
===================================================================
(Binary files differ)
Deleted: trunk/moodle/mod/liveclassroom/pictures/tab_over.gif
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-10 11:28:44
|
Revision: 175
http://svn.sourceforge.net/hw4mdl/?rev=175&view=rev
Author: hugues
Date: 2007-01-10 03:28:38 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10578
- Looks a bit better. The dotted line is not really nicely aligned though. Cannot do more than this today.
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/js/manageXml.js
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-10 10:21:32 UTC (rev 174)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-10 11:28:38 UTC (rev 175)
@@ -294,22 +294,22 @@
cursor:default;
}
-.archive td{
-
- font-family:Verdana;
- color:#666666;
- font-style:italic;
- font-size:11px;
-border-bottom:solid 1px #F3F3F3;
+.archive td{
+ padding-left: 5px;
+ font-family:Verdana;
+ color:#666666;
+ font-style:italic;
+ font-size:11px;
+ border-bottom:solid 1px #F3F3F3;
}
.room td{
padding-left:5px ;
- font-family:Verdana;
- color:Black;
- font-size:10;
- border-bottom:solid 1px #F3F3F3;
- cursor:default;
+ font-family:Verdana;
+ color:Black;
+ font-size:10;
+ border-bottom:solid 1px #F3F3F3;
+ cursor:default;
}
.archive label{
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 10:21:32 UTC (rev 174)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 11:28:38 UTC (rev 175)
@@ -731,7 +731,7 @@
if(archive!=""){
- var display="<tr><td colspan=5 style='padding:0px 0px 0px 0px'><div id='"+roomId+"hide' class='hide' >";
+ 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++)
{
@@ -739,10 +739,10 @@
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 src=\"pictures/items/listitem-liveclassroomicon.jpg\" border=\"0\" /></td>";
- display += "<td style=\"padding-left:7px;\" width=16px align=\"left\"><img src=\"pictures/items/listitem-subitem.jpg\" border=\"0\" /></td>";
+ display += "<td width=\"16px\" align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.jpg\" border=\"0\" /></td>";
+ display += "<td class=\"subitem\" width=\"16px\" align=\"right\"><img 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 src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".jpg\"/></td>";
+ display += "<td class='shiftAvailability' align=right><img src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".jpg\"/></td>";
display += "</tr>";
}else{
closeArchive++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
