[Hw4mdl-svn] SF.net SVN: hw4mdl: [133] trunk/moodle/mod/liveclassroom

[<sh...@us...>]

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.