Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
===================================================================
diff -u -r33b67dae9d7861b3c43f3d2f49760eb5ac915d76 -re9a8f2cad81f7c3ac4c25b19b53740237de3191a
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 33b67dae9d7861b3c43f3d2f49760eb5ac915d76)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision e9a8f2cad81f7c3ac4c25b19b53740237de3191a)
@@ -135,7 +135,7 @@
 
 		GmapUser gmapUser = gmapService.getUserByUserIdAndSessionId(new Long(lamsUserDTO.getUserID()),toolSessionID);
 		GmapUserDTO gmapUserDTO = new GmapUserDTO(gmapUser);
-		request.getSession().setAttribute("userDTO", gmapUserDTO);
+		request.getSession().setAttribute("gmapUserDTO", gmapUserDTO);
 		
 
 		// construct dto's
Index: lams_tool_gmap/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r5e3929eccad29f6c65d78a0b9af638de3ce68f87 -re9a8f2cad81f7c3ac4c25b19b53740237de3191a
--- lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 5e3929eccad29f6c65d78a0b9af638de3ce68f87)
+++ lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision e9a8f2cad81f7c3ac4c25b19b53740237de3191a)
@@ -51,10 +51,21 @@
 				map.setCenter(new GLatLng('${gmapDTO.mapCenterLatitude}', '${gmapDTO.mapCenterLongitude}' ));
 				map.setZoom(${gmapDTO.mapZoom});
 				
+								
 				// Set up map controls
 				map.addControl(new GMapTypeControl());
-				map.addControl(new GLargeMapControl());
-				map.addMapType(G_PHYSICAL_MAP);
+				if (${mode == "teacher"}) 
+				{
+					map.addControl(new GLargeMapControl());
+					map.addMapType(G_PHYSICAL_MAP);
+				}
+				else
+				{
+					<c:if test="${gmapDTO.allowZoom == true}">map.addControl(new GLargeMapControl());</c:if>
+					<c:if test="${gmapDTO.allowTerrain == true}">map.addMapType(G_PHYSICAL_MAP);</c:if>
+					<c:if test="${gmapDTO.allowSatellite == false}">map.removeMapType(G_SATELLITE_MAP);</c:if>
+					<c:if test="${gmapDTO.allowHybrid == false}">map.removeMapType(G_HYBRID_MAP);</c:if>
+				}
 				
 				// Set map type
 				map.setMapType(${gmapDTO.mapType});
@@ -123,7 +134,8 @@
 				</div>
 			</c:when>
 			<c:otherwise>
-			
+				<br>
+				<h2>${sessionDTO.sessionName}</h2>
 			</c:otherwise>
 			</c:choose>
 			
@@ -205,14 +217,14 @@
 				addUserToList('${user.uid}','${user.firstName} ${user.lastName}' );
 			</c:forEach>
 			
-			<c:forEach var="marker" items="${gmapDTO.gmapMarkers}">			
+			<c:forEach var="marker" items="${gmapDTO.gmapMarkers}">							
 				<c:choose>
 					<c:when test="${marker.isAuthored == true}">
 						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName} (<fmt:message key="label.authoring.basic.authored"></fmt:message>)', '0');
 					</c:when>
 					<c:otherwise>
 						<c:choose>
-							<c:when test="${gmapDTO.allowShowAllMarkers != true || marker.createdBy.loginName == gmapUserDTO.loginName}">
+							<c:when test="${gmapDTO.allowShowAllMarkers == true || marker.createdBy.loginName == gmapUserDTO.loginName}">
 								addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}');
 							</c:when>
 						</c:choose>