You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/06/07 08:29:37 UTC

svn commit: r1347413 - /incubator/openmeetings/trunk/plugins/moodle_plugin/view.php

Author: solomax
Date: Thu Jun  7 06:29:37 2012
New Revision: 1347413

URL: http://svn.apache.org/viewvc?rev=1347413&view=rev
Log:
Moodle user picture is set to the correct user profile image

Modified:
    incubator/openmeetings/trunk/plugins/moodle_plugin/view.php

Modified: incubator/openmeetings/trunk/plugins/moodle_plugin/view.php
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/moodle_plugin/view.php?rev=1347413&r1=1347412&r2=1347413&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/moodle_plugin/view.php (original)
+++ incubator/openmeetings/trunk/plugins/moodle_plugin/view.php Thu Jun  7 06:29:37 2012
@@ -104,10 +104,13 @@ if ($openmeetings_gateway->openmeetings_
 		$becomemoderator = 1;
 	}
 		
+	$profilePictureUrl = moodle_url::make_pluginfile_url(
+		get_context_instance(CONTEXT_USER, $USER->id)->id, 'user', 'icon', NULL, '/', 'f2')->out(false);
+
 	// Simulate the User automatically
 	if ($openmeetings->type != 0){
 		$returnVal = $openmeetings_gateway->openmeetings_setUserObjectAndGenerateRoomHashByURLAndRecFlag($USER->username,$USER->firstname,
-		$USER->lastname,$USER->picture,$USER->email,$USER->id,$CFG->openmeetings_openmeetingsModuleKey,$openmeetings->room_id,$becomemoderator,$allowRecording);
+		$USER->lastname,$profilePictureUrl,$USER->email,$USER->id,$CFG->openmeetings_openmeetingsModuleKey,$openmeetings->room_id,$becomemoderator,$allowRecording);
 	} else {
 		$returnVal = $openmeetings_gateway->openmeetings_setUserObjectAndGenerateRecordingHashByURL($USER->username,$USER->firstname,
 		$USER->lastname,$USER->id,$CFG->openmeetings_openmeetingsModuleKey,$openmeetings->room_recording_id);
@@ -125,9 +128,7 @@ if ($openmeetings_gateway->openmeetings_
 							 	"/".$CFG->openmeetings_webappname."/?" .
 								"secureHash=" . $returnVal . 
 								"&scopeRoomId=" . $scope_room_id .
-		//"&swf=maindebug.swf8.swf" .
 								"&language=" . $openmeetings->language . 
-								"&picture=" . $USER->picture . 
 								"&user_id=". $USER->id . 
 								"&moodleRoom=1" .   
 								"&wwwroot=". $CFG->wwwroot;