[svn r18020] Logic changes - Removed field password when you export a list of users from an XML/CSV file and added username into error message "This username is not available" - see FS#3547

main/admin/user_export.php

@@ -1,5 +1,5 @@
 <?php
-// $Id: user_export.php 13180 2007-09-21 17:50:47Z yannoo $
+// $Id: user_export.php 18020 2009-01-27 00:02:33Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -76,8 +76,7 @@ if ($form->validate())
 					u.lastname 	AS LastName,
 					u.firstname 	AS FirstName,
 					u.email 		AS Email,
-					u.username	AS UserName,
-					u.password	AS Password,
+					u.username	AS UserName,					
 					u.auth_source	AS AuthSource,
 					u.status		AS Status,
 					u.official_code	AS OfficialCode,
@@ -95,7 +94,7 @@ if ($form->validate())
 	$data = array();
 	if ($export['addcsvheader']=='1' AND $export['file_type']=='csv')
 	{
-		$data[] = array('UserId', 'LastName', 'FirstName', 'Email', 'UserName', 'Password', 'AuthSource', 'Status', 'OfficialCode', 'Phone');
+		$data[] = array('UserId', 'LastName', 'FirstName', 'Email', 'UserName','AuthSource', 'Status', 'OfficialCode', 'Phone');
 	}
 	$res = api_sql_query($sql,__FILE__,__LINE__);
 

main/admin/user_import.php

@@ -1,4 +1,4 @@
-<?php // $Id: user_import.php 18011 2009-01-26 21:15:19Z yannoo $
+<?php // $Id: user_import.php 18020 2009-01-27 00:02:33Z cfasanando $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -330,7 +330,7 @@ if (count($errors) != 0)
 	foreach ($errors as $index => $error_user)
 	{
 		$error_message .= '<li><b>'.$error_user['error'].'</b>: ';
-		$error_message .= $error_user['FirstName'].' '.$error_user['LastName'];
+		$error_message .= $error_user['UserName'].'&nbsp;('.$error_user['FirstName'].' '.$error_user['LastName'].')';
 		$error_message .= '</li>';
 	}
 	$error_message .= '</ul>';