chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r18645] Update to XML import to show clear warning message (FS#3552)

Browse Source
skala
Yannick Warnier 16 years ago
parent 22a938f433
commit c37867bb19
2 changed files with 15 additions and 54 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 37
      main/admin/user_import.php
  2. 32
      main/admin/user_list.php

37
main/admin/user_import.php
Unescape View File

@ -1,27 +1,5 @@
<?php // $Id: user_import.php 18641 2009-02-24 00:49:03Z yannoo $ <?php // $Id: user_import.php 18645 2009-02-24 02:00:35Z yannoo $
/* /* For licensing terms, see /dokeos_license.txt */
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2009 Dokeos SPRL
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) Olivier Brouckaert
Copyright (c) 2005 Bart Mollet <bart.mollet@hogent.be>
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
==============================================================================
*/
/** /**
============================================================================== ==============================================================================
* This tool allows platform admins to add users by uploading a CSV or XML file * This tool allows platform admins to add users by uploading a CSV or XML file
@ -343,18 +321,17 @@ if ($_POST['formSent'] AND $_FILES['import_file']['size'] !== 0)
{ {
$inserted_in_course = array(); $inserted_in_course = array();
save_data($users); save_data($users);
$msg = ' ('; $msg2 = '';
if (count($inserted_in_course)>1) { if (count($inserted_in_course)>1) {
$msg .= get_lang('UsersSubscribedToSeveralCoursesBecauseOfVirtualCourses').':'; $msg2 .= get_lang('UsersSubscribedToSeveralCoursesBecauseOfVirtualCourses').':';
foreach ($inserted_in_course as $course) { foreach ($inserted_in_course as $course) {
$msg .= ' '.$course.','; $msg2 .= ' '.$course.',';
} }
$msg = substr($msg,0,-1); $msg2 = substr($msg2,0,-1);
$msg .=')';
} }
Security::clear_token(); Security::clear_token();
$tok = Security::get_token(); $tok = Security::get_token();
header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('FileImported').$msg).'&sec_token='.$tok); header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('FileImported')).'&warn='.urlencode($msg2).'&sec_token='.$tok);
exit (); exit ();
} }
} }

32
main/admin/user_list.php
Unescape View File

@ -1,26 +1,5 @@
<?php // $Id: user_list.php 18639 2009-02-23 22:37:10Z yannoo $ <?php // $Id: user_list.php 18645 2009-02-24 02:00:35Z yannoo $
/* /* For licensing terms, see /dokeos_license.txt */
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2008 Dokeos SPRL
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) Olivier Brouckaert
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
==============================================================================
*/
/** /**
============================================================================== ==============================================================================
@author Bart Mollet @author Bart Mollet
@ -592,7 +571,12 @@ else
if($check) { if($check) {
switch ($_GET['action']) { switch ($_GET['action']) {
case 'show_message' : case 'show_message' :
Display :: display_normal_message(stripslashes($_GET['message'])); if (!empty($_GET['warn'])) {
Display::display_warning_message(urldecode($_GET['warn']));
}
if (!empty($_GET['message'])) {
Display :: display_normal_message(stripslashes($_GET['message']));
}
break; break;
case 'delete_user' : case 'delete_user' :
if (api_is_platform_admin()) { if (api_is_platform_admin()) {

Write Preview
Loading…
Cancel
Save