From 37eb9e814e5114fcd855bb97792edab4a59dad9d Mon Sep 17 00:00:00 2001
From: Cristian Fasanando <cristian.fasanando@beeznest.com>
Date: Wed, 15 Apr 2009 00:28:23 +0200
Subject: [PATCH] [svn r19771] Minor - Fixed warning simplexml_load_file and
 message about don't contain data when you import a session from a file XML -
 partial FS#3909

---
 main/admin/session_import.php | 9 ++++++---
 main/admin/session_list.php   | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/main/admin/session_import.php b/main/admin/session_import.php
index 992c596a47..6d50978add 100644
--- a/main/admin/session_import.php
+++ b/main/admin/session_import.php
@@ -1,4 +1,4 @@
-<?php // $Id: session_import.php 19770 2009-04-14 20:44:00Z cfasanando $
+<?php // $Id: session_import.php 19771 2009-04-14 22:28:23Z cfasanando $
 /* For licensing terms, see /dokeos_license.txt */
 /**
 ==============================================================================
@@ -54,8 +54,8 @@ if ($_POST['formSent']) {
 		
 		if ($file_type == 'xml') {
 
-			$racine = simplexml_load_file($_FILES['import_file']['tmp_name']);			
-			if (is_object($racine)) {
+			$racine = @simplexml_load_file($_FILES['import_file']['tmp_name']);																		
+			if (is_object($racine)) {																				
 				if (count($racine->Users->User) > 0) {					
 					foreach($racine->Users->User as $userNode)
 					{
@@ -452,6 +452,9 @@ if ($_POST['formSent']) {
 					api_sql_query("UPDATE $tbl_session SET nbr_users='$countUsers', nbr_courses='$countCourses' WHERE id='$session_id'",__FILE__,__LINE__);
 
 				}
+				if(empty($racine->Users->User) && empty($racine->Courses->Course) && empty($racine->Session)) {
+					$errorMsg=get_lang('NoNeededData');
+				}
 			}
 			else
 			{
diff --git a/main/admin/session_list.php b/main/admin/session_list.php
index 4b9c951632..9b14f8a293 100644
--- a/main/admin/session_list.php
+++ b/main/admin/session_list.php
@@ -140,10 +140,10 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
 	//api_display_tool_title($tool_name);
     
     if (!empty($_GET['warn'])) {
-        Display::display_warning_message(urldecode($_GET['warn']));
+        Display::display_warning_message(urldecode($_GET['warn']),false);
     }
     if(isset($_GET['action'])) {
-        Display::display_normal_message($_GET['message']);
+        Display::display_normal_message($_GET['message'],false);
     }
     ?>	
 	<div id="main">