[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

skala
Cristian Fasanando 17 years ago
parent 6a0c112508
commit 37eb9e814e
  1. 9
      main/admin/session_import.php
  2. 4
      main/admin/session_list.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 */ /* For licensing terms, see /dokeos_license.txt */
/** /**
============================================================================== ==============================================================================
@ -54,8 +54,8 @@ if ($_POST['formSent']) {
if ($file_type == 'xml') { if ($file_type == 'xml') {
$racine = simplexml_load_file($_FILES['import_file']['tmp_name']); $racine = @simplexml_load_file($_FILES['import_file']['tmp_name']);
if (is_object($racine)) { if (is_object($racine)) {
if (count($racine->Users->User) > 0) { if (count($racine->Users->User) > 0) {
foreach($racine->Users->User as $userNode) 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__); 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 else
{ {

@ -140,10 +140,10 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
//api_display_tool_title($tool_name); //api_display_tool_title($tool_name);
if (!empty($_GET['warn'])) { if (!empty($_GET['warn'])) {
Display::display_warning_message(urldecode($_GET['warn'])); Display::display_warning_message(urldecode($_GET['warn']),false);
} }
if(isset($_GET['action'])) { if(isset($_GET['action'])) {
Display::display_normal_message($_GET['message']); Display::display_normal_message($_GET['message'],false);
} }
?> ?>
<div id="main"> <div id="main">

Loading…
Cancel
Save