|
From: <hu...@us...> - 2006-04-20 05:56:43
|
Revision: 6 Author: hugues Date: 2006-04-19 22:56:39 -0700 (Wed, 19 Apr 2006) ViewCVS: http://svn.sourceforge.net/hw4mdl/?rev=6&view=rev Log Message: ----------- reverted the LC view to the previous version Modified Paths: -------------- trunk/moodle/mod/liveclassroom/view.php Modified: trunk/moodle/mod/liveclassroom/view.php =================================================================== --- trunk/moodle/mod/liveclassroom/view.php 2006-04-20 05:55:30 UTC (rev 5) +++ trunk/moodle/mod/liveclassroom/view.php 2006-04-20 05:56:39 UTC (rev 6) @@ -71,7 +71,6 @@ } function myStartHorizon() { - document.cookie="request_uri=; path=/" startHorizon(null,null,null,null,null,'hzA=<?php p($usersession)?>'); } </script> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <hu...@us...> - 2006-04-21 08:26:32
|
Revision: 8 Author: hugues Date: 2006-04-21 01:26:27 -0700 (Fri, 21 Apr 2006) ViewCVS: http://svn.sourceforge.net/hw4mdl/?rev=8&view=rev Log Message: ----------- removing debugging stuff Modified Paths: -------------- trunk/moodle/mod/liveclassroom/view.php Modified: trunk/moodle/mod/liveclassroom/view.php =================================================================== --- trunk/moodle/mod/liveclassroom/view.php 2006-04-20 14:50:17 UTC (rev 7) +++ trunk/moodle/mod/liveclassroom/view.php 2006-04-21 08:26:27 UTC (rev 8) @@ -63,16 +63,13 @@ /// Print the main part of the page ?> -<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 doOpenAdmin(url) { var w = window.open(url, 'lc_admin_popup', 'scrollbars=yes, resizable=yes, width=800, height=500'); w.focus(); } - function myStartHorizon() { - startHorizon(null,null,null,null,null,'hzA=<?php p($usersession)?>'); - } </script> <table style="background-color: #ffffff !important; border-left : 1px solid #999; border-right : 1px solid #999; border-top : 1px solid #999;border-bottom : 1px solid #999;" width="100%" cellspacing="0" cellpadding="0" border="0" align="center" summary="layout"> @@ -90,8 +87,7 @@ </td></tr> <tr> <td> - <!--a href="javascript:myStartHorizon()"--> - <a href="javascript:startHorizon()"> + <a href="javascript:startHorizon(null,null,null,null,null,'hzA=<?php p($usersession)?>')"> <?php p(get_string("accessrooms", 'liveclassroom')) ?> </a> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sh...@us...> - 2006-08-25 12:35:56
|
Revision: 48 Author: shazan Date: 2006-08-25 05:35:45 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/hw4mdl/?rev=48&view=rev Log Message: ----------- Modified Paths: -------------- trunk/moodle/mod/liveclassroom/view.php Modified: trunk/moodle/mod/liveclassroom/view.php =================================================================== --- trunk/moodle/mod/liveclassroom/view.php 2006-08-25 10:38:19 UTC (rev 47) +++ trunk/moodle/mod/liveclassroom/view.php 2006-08-25 12:35:45 UTC (rev 48) @@ -78,25 +78,22 @@ if (!liveclassroom_create_profiles ($course)) { error ("Cannot create liveclassroom profiles"); } - - if (!liveclassroom_create_rooms ($course)) { - error ("Cannot create liveclassroom rooms"); - } - //ajouter ds la BD liveclassroom_rooms l'instance correspondant - if($liveclassroom->type==0) { //lecture hall - $name = $course->shortname.'_LectureHall'; - } - else if($liveclassroom->type==1) { // breackout - $name = $course->shortname.'_BreackOut'; - } - $liveclassroom_rooms->course = $liveclassroom->course; - $liveclassroom_rooms->lc_id = $liveclassroom->id; - $liveclassroom_rooms->name = $name; - - if(!liveclassroom_rooms_add_instance($liveclassroom_rooms)) { - return false; - } + liveclassroom_create_rooms ($course); + +//Check if the room is already link in the database with the liveclassroom + if(!liveclassroom_rooms_exists ($liveclassroom)) { + $type = liveclassroom_get_type($liveclassroom); + $name =liveclassroom_get_room_name($course,$type); + //create the liveclassroom_rooms in moodle database + $liveclassroom_rooms->course = $liveclassroom->course; + $liveclassroom_rooms->name = $name; + $liveclassroom_rooms->lc_id = $liveclassroom->id; + $liveclassroom_rooms->room_id = liveclassroom_api_get_roomid($name); + if(!liveclassroom_rooms_add_instance($liveclassroom_rooms)) { + return false; + } + } // Create the session fir this user if (!$usersession = liveclassroom_create_session ($course, isteacher($course->id, $USER->id))) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sh...@us...> - 2006-09-29 13:34:41
|
Revision: 71
http://svn.sourceforge.net/hw4mdl/?rev=71&view=rev
Author: shazan
Date: 2006-09-29 06:34:33 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/view.php
Modified: trunk/moodle/mod/liveclassroom/view.php
===================================================================
--- trunk/moodle/mod/liveclassroom/view.php 2006-09-29 13:31:54 UTC (rev 70)
+++ trunk/moodle/mod/liveclassroom/view.php 2006-09-29 13:34:33 UTC (rev 71)
@@ -67,24 +67,7 @@
add_to_log($course->id, "liveclassroom", "view", "view.php?id=$cm->id", "$liveclassroom->id");
-
- // Check if the rooms exist on the server
- if(!(liveclassroom_api_user_exist($course))){
- // make sure the profiles exist
- if (!liveclassroom_create_profiles ($course)) {
- error ("Cannot create liveclassroom profiles");
- }
- liveclassroom_create_rooms ($course);
- }
- else {
- //update le lc with it room id
- /*$name = liveclassroom_get_room_name($course, $liveclassroom->type);
- $lcr = get_record("liveclassroom_rooms", "course", $course->id, "name", $name);
- $liveclassroom->room_id = $lcr->room_id;
- update_record('liveclassroom', $liveclassroom);*/
- }
-
-
+
// Create the session for this user
if (!$usersession = liveclassroom_create_session ($course, isteacher($course->id, $USER->id))) {
error ("Cannot create session");
@@ -149,8 +132,8 @@
</script>
<?php
//$classid = liveclassroom_api_get_roomid(liveclassroom_get_room_name($course,liveclassroom_get_type($liveclassroom)));
- $classid = $liveclassroom->room_id;
- if (isstudent($course->id)) {
+ $classid = $liveclassroom->type;
+ if ((isstudent($course->id)) or (isteacher($course->id, $USER->id))) {
?>
<body onload="javascript:startHorizon('<?php p($classid) ?>',null,null,null,null,'hzA=<?php p($usersession)?>' )">
</body>
@@ -172,45 +155,26 @@
</tr>
<tr ><td style="border-bottom: 1px solid #999;"><span class='fnt0'></span>
</td></tr>
- <tr>
+
+
+
+
+<?php
+ if ( (isteacher($course->id, $USER->id))|| (isstudent($course->id)) ) {
+?>
+ <tr>
<td>
<a href="javascript:startHorizon('<?php p($classid) ?>',null,null,null,null,'hzA=<?php p($usersession)?>')">
- <?php p(get_string("accessrooms", 'liveclassroom')) ?>
+ <?php p(get_string("accessroomsstudent", 'liveclassroom')) ?>
</a>
</td>
</tr>
+
<?php
- if (isteacher($course->id, $USER->id)) {
-
+}
?>
- <tr>
- <td>
- <a href="javascript:doOpenAdmin('<?php p($CFG->liveclassroom_servername)?>/admin/?hzA=<?php p($usersession)?>&closeOnExit=1')">
- <?php p(get_string('managerooms', 'liveclassroom')) ?>
- </a>
- </td>
- <tr>
-
-
- <!-- REMOVE THIS
- <tr>
- <td>
- <form method="get" name="createRoom" action="create.php">
- <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>"
- <label for="createroomname"><?php echo get_string('labelcreateroom', 'liveclassroom') ?></label>
- <input id="createroomname" type="text" size="10" name="roomname">
- <input type="hidden" name="id" value="<?php echo $course->id ?>">
- <input type="submit" value="<?php echo get_string('buttoncreateroom', 'liveclassroom') ?>">
- </form>
- </td>
- </tr>
- -->
-<?php
- }
-?>
-
<tr >
<td>
<em><font size="-1">
@@ -239,7 +203,8 @@
</tr>
</table>
-
+</td>
+ </tr>
<tr style="background-color:#EEEEEE; font-weight:normal; color:black;"><td style="border-right:1px solid #999;"> </td><td> </td></tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-16 18:55:26
|
Revision: 181
http://svn.sourceforge.net/hw4mdl/?rev=181&view=rev
Author: hugues
Date: 2007-01-16 10:55:23 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10766
- Fixed the Javascript error
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/view.php
Modified: trunk/moodle/mod/liveclassroom/view.php
===================================================================
--- trunk/moodle/mod/liveclassroom/view.php 2007-01-11 21:55:02 UTC (rev 180)
+++ trunk/moodle/mod/liveclassroom/view.php 2007-01-16 18:55:23 UTC (rev 181)
@@ -87,18 +87,18 @@
<script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch.js'></script>
<script type="text/javascript">
-function monitor (name, destination) {
- if (win[name] == null) {
- setTimeout(monitor(name, destination), 1000);
+function monitor () {
+ if (win['horizonWin'] == null) {
+ setTimeout("monitor()", 1000);
}
else { // window exists
- location.href= destination;
+ location.href='<?php p("$CFG->wwwroot/course/view.php?id=$course->id")?>';
}
}
function startActivity(){
startHorizon('<?php p($classid) ?>',null,null,null,null,'hzA=<?php p($usersession)?>');
- setTimeout (monitor('horizonWin', "<?php echo "$CFG->wwwroot/course/view.php?id=$course->id" ?>"), 1000);
+ setTimeout ("monitor()", 1000);
}
startActivity();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
