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

Change function name.

Browse Source
1.10.x
Julio Montoya 11 years ago
parent c0a5c87db4
commit 6889d77b42
29 changed files with 68 additions and 56 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. 2
      main/admin/class_import.php
  2. 2
      main/admin/class_user_import.php
  3. 13
      main/admin/course_export.php
  4. 2
      main/admin/course_import.php
  5. 6
      main/admin/course_user_import.php
  6. 2
      main/admin/course_user_import_by_email.php
  7. 10
      main/admin/session_export.php
  8. 2
      main/admin/session_list.php
  9. 2
      main/admin/session_user_import.php
  10. 2
      main/admin/skills_import.php
  11. 5
      main/admin/subscribe_user2course.php
  12. 2
      main/admin/user_import.php
  13. 2
      main/admin/user_update_import.php
  14. 2
      main/admin/usergroup_import.php
  15. 2
      main/admin/usergroup_user_import.php
  16. 2
      main/course_progress/thematic_controller.php
  17. 8
      main/cron/import_csv.php
  18. 2
      main/glossary/index.php
  19. 2
      main/gradebook/gradebook_view_result.php
  20. 16
      main/inc/lib/import.lib.php
  21. 2
      main/inc/lib/myspace.lib.php
  22. 4
      main/user/user_import.php
  23. 16
      main/webservices/user_import/import.lib.php
  24. 2
      tests/main/inc/lib/import.lib.test.php
  25. 2
      tests/main/inc/lib/sessionmanager.lib.test.php
  26. 6
      tests/phpunit/classes/ImportTest.class.php
  27. 2
      tests/scripts/check_users_in_csv_file.php
  28. 2
      tests/scripts/delete_users_from_csv.php
  29. 2
      tests/scripts/update_user_extra_field.php

2
main/admin/class_import.php
Unescape View File

@ -78,7 +78,7 @@ $form->addElement('file', 'import_file', get_lang('ImportCSVFileLocation'));
$form->addButtonImport(get_lang('Import'));
if ($form->validate()) {
$classes = Import::csv_to_array($_FILES['import_file']['tmp_name']);
$classes = Import::csvToArray($_FILES['import_file']['tmp_name']);
$errors = validate_data($classes);
if (count($errors) == 0) {
$number_of_added_classes = save_data($classes);

2
main/admin/class_user_import.php
Unescape View File

@ -127,7 +127,7 @@ function save_data($users_classes) {
* @return array All course-information read from the file
*/
function parse_csv_data($file) {
$courses = Import::csv_to_array($file);
$courses = Import::csvToArray($file);
return $courses;
}

13
main/admin/course_export.php
Unescape View File

@ -1,12 +1,11 @@
<?php
/* For licensing terms, see /license.txt */
/**
* This tool allows platform admins to export courses to CSV file
* @package chamilo.admin
*/
/**
* Code
*/
$cidReset = true;
require_once '../inc/global.inc.php';
@ -25,12 +24,12 @@ $archiveURL = api_get_path(WEB_CODE_PATH).'course_info/download.php?archive=';
$course_list = CourseManager::get_courses_list();
$formSent = null;
$courses = $selected_courses = array();
if (isset($_POST['formSent']) && $_POST['formSent']) {
$formSent = $_POST['formSent'];
$select_type=intval($_POST['select_type']);
$select_type = intval($_POST['select_type']);
$file_type = 'csv';
$courses = $selected_courses = array();
if ($select_type == 2) {
// Get selected courses from courses list in form sent
@ -117,7 +116,9 @@ if (!empty($msg)) {
<?php
foreach($course_list as $course) {
?>
<option value="<?php echo $course['code']; ?>" <?php if(is_array($selected_courses) && in_array($course['code'],$selected_courses)) echo 'selected="selected"'; ?>><?php echo $course['title'].' ('.$course['code'].') ' ?></option>
<option value="<?php echo $course['code']; ?>" <?php if(is_array($selected_courses) && in_array($course['code'],$selected_courses)) echo 'selected="selected"'; ?>>
<?php echo $course['title'].' ('.$course['code'].') ' ?>
</option>
<?php
}
?>

2
main/admin/course_import.php
Unescape View File

@ -151,7 +151,7 @@ function save_data($courses)
*/
function parse_csv_data($file)
{
$courses = Import::csv_to_array($file);
$courses = Import::csvToArray($file);
return $courses;
}

6
main/admin/course_user_import.php
Unescape View File

@ -1,10 +1,12 @@
<?php
/* For licensing terms, see /license.txt */
/**
* This tool allows platform admins to update course-user relations by uploading
* a CSV file
* @package chamilo.admin
*/
/**
* Validates the imported data.
*/
@ -135,7 +137,7 @@ function save_data($users_courses)
*/
function parse_csv_data($file)
{
$courses = Import :: csv_to_array($file);
$courses = Import :: csvToArray($file);
return $courses;
}
@ -217,7 +219,7 @@ $form->display();
<b>UserName</b>;<b>CourseCode</b>;<b>Status</b>
jdoe;course01;<?php echo COURSEMANAGER; ?>
adam;course01;<?php echo STUDENT; ?>
adam;course01;<?php echo STUDENT; ?>
</pre>
<?php
echo COURSEMANAGER.': '.get_lang('Teacher').'<br />';

2
main/admin/course_user_import_by_email.php
Unescape View File

@ -138,7 +138,7 @@ function save_data($users_courses)
*/
function parse_csv_data($file)
{
$courses = Import :: csv_to_array($file);
$courses = Import :: csvToArray($file);
return $courses;
}

10
main/admin/session_export.php
Unescape View File

@ -1,18 +1,20 @@
<?php
/* For licensing terms, see /license.txt */
/**
* @package chamilo.admin
*/
$cidReset = true;
include '../inc/global.inc.php';
require_once '../inc/global.inc.php';
// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true);
$session_id = intval($_GET['session_id']);
$session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : 0;
$formSent = 0;
$errorMsg = '';
@ -36,7 +38,7 @@ $interbreadcrumb[] = array('url' => 'index.php',"name" => get_lang('PlatformAdmi
set_time_limit(0);
if ($_POST['formSent']) {
if (isset($_POST['formSent'])) {
$formSent = $_POST['formSent'];
$file_type = ($_POST['file_type'] == 'csv')?'csv':'xml';
$session_id = $_POST['session_id'];
@ -260,7 +262,7 @@ Display::display_header($tool_name);
//select of sessions
$sql = "SELECT id, name FROM $tbl_session ORDER BY name";
if ($_configuration['multiple_access_urls']) {
if (api_is_multiple_url_enabled()) {
$tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){

2
main/admin/session_list.php
Unescape View File

@ -18,7 +18,7 @@ $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;
$idChecked = isset($_REQUEST['idChecked']) ? $_REQUEST['idChecked'] : null;
if ($action == 'delete') {
SessionManager::delete_session($idChecked);
SessionManager::delete($idChecked);
header('Location: session_list.php');
exit();
} elseif ($action == 'copy') {

2
main/admin/session_user_import.php
Unescape View File

@ -39,7 +39,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$send_mail = $_POST['sendMail'] ? 1 : 0;
// CSV
$users = Import::csv_to_array($_FILES['import_file']['tmp_name']);
$users = Import::csvToArray($_FILES['import_file']['tmp_name']);
$user_list = array();
foreach ($users as $user_data) {
$username = $user_data['username'];

2
main/admin/skills_import.php
Unescape View File

@ -83,7 +83,7 @@ function save_data($skills)
*/
function parse_csv_data($file)
{
$skills = Import :: csv_to_array($file);
$skills = Import :: csvToArray($file);
foreach ($skills as $index => $skill) {
$skills[$index] = $skill;
}

5
main/admin/subscribe_user2course.php
Unescape View File

@ -1,5 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* This script allows platform admins to add users to courses.
* It displays a list of users and a list of courses;
@ -65,8 +66,8 @@ if (is_array($extra_field_list)) {
/* React on POSTed request */
if (isset($_POST['form_sent']) && $_POST['form_sent']) {
$form_sent = $_POST['form_sent'];
$users = is_array($_POST['UserList']) ? $_POST['UserList'] : array() ;
$courses = is_array($_POST['CourseList']) ? $_POST['CourseList'] : array() ;
$users = isset($_POST['UserList']) && is_array($_POST['UserList']) ? $_POST['UserList'] : array() ;
$courses = isset($_POST['CourseList']) && is_array($_POST['CourseList']) ? $_POST['CourseList'] : array() ;
$first_letter_user = $_POST['firstLetterUser'];
$first_letter_course = $_POST['firstLetterCourse'];

2
main/admin/user_import.php
Unescape View File

@ -247,7 +247,7 @@ function save_data($users)
*/
function parse_csv_data($file)
{
$users = Import :: csv_to_array($file);
$users = Import :: csvToArray($file);
foreach ($users as $index => $user) {
if (isset ($user['Courses'])) {
$user['Courses'] = explode('|', trim($user['Courses']));

2
main/admin/user_update_import.php
Unescape View File

@ -244,7 +244,7 @@ function updateUsers($users)
*/
function parse_csv_data($file)
{
$users = Import :: csv_to_array($file);
$users = Import :: csvToArray($file);
foreach ($users as $index => $user) {
if (isset ($user['Courses'])) {
$user['Courses'] = explode('|', trim($user['Courses']));

2
main/admin/usergroup_import.php
Unescape View File

@ -103,7 +103,7 @@ $form->addGroup($group, '', get_lang('FileType'), '<br/>');
$form->addButtonImport(get_lang('Import'));
if ($form->validate()) {
$classes = Import::csv_to_array($_FILES['import_file']['tmp_name']);
$classes = Import::csvToArray($_FILES['import_file']['tmp_name']);
$errors = validate_data($classes);
if (count($errors) == 0) {
$number_of_added_classes = save_data($classes);

2
main/admin/usergroup_user_import.php
Unescape View File

@ -118,7 +118,7 @@ function save_data($users_classes, $deleteUsersNotInList = false) {
* @return array All course-information read from the file
*/
function parse_csv_data($file) {
$courses = Import::csv_to_array($file);
$courses = Import::csvToArray($file);
return $courses;
}
$cidReset = true;

2
main/course_progress/thematic_controller.php
Unescape View File

@ -113,7 +113,7 @@ class ThematicController
case 'thematic_import_select':
break;
case 'thematic_import':
$csv_import_array = Import::csv_to_array($_FILES['file']['tmp_name']);
$csv_import_array = Import::csvToArray($_FILES['file']['tmp_name']);
if (isset($_POST['replace']) && $_POST['replace']) {
// Remove current thematic.

8
main/cron/import_csv.php
Unescape View File

@ -326,7 +326,7 @@ class ImportCsv
*/
private function importTeachers($file, $moveFile = true)
{
$data = Import::csv_to_array($file);
$data = Import::csvToArray($file);
/* Unique identifier: official-code username.
Email address and password should never get updated. *ok
@ -461,7 +461,7 @@ class ImportCsv
*/
private function importStudents($file, $moveFile = true)
{
$data = Import::csv_to_array($file);
$data = Import::csvToArray($file);
/*
* Another users import.
@ -647,7 +647,7 @@ class ImportCsv
*/
private function importCalendarStatic($file, $moveFile = true)
{
$data = Import::csv_to_array($file);
$data = Import::csvToArray($file);
if ($this->getDumpValues()) {
// Remove all calendar items
@ -892,7 +892,7 @@ class ImportCsv
*/
private function importCourses($file, $moveFile = true)
{
$data = Import::csv_to_array($file);
$data = Import::csvToArray($file);
if (!empty($data)) {
$this->logger->addInfo(count($data)." records found.");

2
main/glossary/index.php
Unescape View File

@ -212,7 +212,7 @@ if (api_is_allowed_to_edit(null, true)) {
}
}
}
//$data = Import::csv_to_array($_FILES['file']['tmp_name']);
//$data = Import::csvToArray($_FILES['file']['tmp_name']);
$data = Import::csv_reader($_FILES['file']['tmp_name']);
$good = 0;
$bad = 0;

2
main/gradebook/gradebook_view_result.php
Unescape View File

@ -107,7 +107,7 @@ if (isset($_GET['import'])) {
$file_type = $_POST['file_type'];
$file_name = $_FILES['import_file']['tmp_name'];
if ($file_type == 'csv') {
$results = Import :: csv_to_array($file_name);
$results = Import :: csvToArray($file_name);
} else {
$results = parse_xml_data($file_name);
}

16
main/inc/lib/import.lib.php
Unescape View File

@ -21,6 +21,10 @@ class Import
*/
static function csv_reader($path, $setFirstRowAsHeader = true)
{
if (empty($path)) {
return false;
}
$file = new \SplFileObject($path);
$csvReader = new CsvReader($file, ';');
@ -51,14 +55,16 @@ class Import
*
* @deprecated use cvs_reader instead
*/
static function csv_to_array($filename)
static function csvToArray($filename)
{
$csvReader = self::csv_reader($filename);
$workflow = new Workflow($csvReader);
$resultArray = [];
$writer = new ArrayWriter($resultArray);
$result = $workflow->addWriter($writer)->process();
if ($csvReader) {
$workflow = new Workflow($csvReader);
$writer = new ArrayWriter($resultArray);
$result = $workflow->addWriter($writer)->process();
}
return $resultArray;
}

2
main/inc/lib/myspace.lib.php
Unescape View File

@ -2645,7 +2645,7 @@ class MySpace
* @return array All userinformation read from the file
*/
function parse_csv_data($file) {
$users = Import :: csv_to_array($file);
$users = Import :: csvToArray($file);
foreach ($users as $index => $user) {
if (isset ($user['Courses'])) {
$user['Courses'] = explode('|', trim($user['Courses']));

4
main/user/user_import.php
Unescape View File

@ -43,8 +43,8 @@ if ($form->validate()) {
if (isset($_FILES['import_file']['size']) && $_FILES['import_file']['size'] !== 0) {
$unsubscribe_users = isset($_POST['unsubscribe_users']) ? true : false;
//@todo : csv_to_array deprecated
$users = Import::csv_to_array($_FILES['import_file']['tmp_name']);
//@todo : csvToArray deprecated
$users = Import::csvToArray($_FILES['import_file']['tmp_name']);
$invalid_users = array();
$clean_users = array();

16
main/webservices/user_import/import.lib.php
Unescape View File

@ -93,9 +93,9 @@ function save_data($users) {
if(is_array($users)) {
foreach ($users as $index => $user) {
$user = complete_missing_data($user);
$user['Status'] = api_status_key($user['Status']);
$user_id = UserManager :: create_user($user['FirstName'], $user['LastName'], $user['Status'], $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], '', $user['AuthSource']);
foreach ($user['Courses'] as $index => $course) {
if(CourseManager :: course_exists($course))
@ -105,24 +105,24 @@ function save_data($users) {
$class_id = ClassManager :: get_class_id($user['ClassName']);
ClassManager :: add_user($user_id, $class_id);
}
// TODO: Hard-coded French texts.
// Qualite
if (!empty($user['Qualite'])) {
UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']);
}
// Categorie
if (!empty($user['Categorie'])) {
UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']);
}
// Etat
if (!empty($user['Etat'])) {
UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']);
}
// Niveau
if (!empty($user['Niveau'])) {
UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']);
@ -137,7 +137,7 @@ function save_data($users) {
* @return array All userinformation read from the file
*/
function parse_csv_data($file) {
$users = Import :: csv_to_array($file);
$users = Import :: csvToArray($file);
foreach ($users as $index => $user) {
if (isset ($user['Courses'])) {
$user['Courses'] = explode('|', trim($user['Courses']));

2
tests/main/inc/lib/import.lib.test.php
Unescape View File

@ -8,7 +8,7 @@ class TestImport extends UnitTestCase {
}
function testCsvToArray(){
$filename='';
$res=Import::csv_to_array($filename);
$res=Import::csvToArray($filename);
$this->assertTrue(is_array($res));
//var_dump($res);
}

2
tests/main/inc/lib/sessionmanager.lib.test.php
Unescape View File

@ -63,7 +63,7 @@ class TestSessionManager extends UnitTestCase {
global $_user;
$id_checked='';
$this->sessionmanager = new SessionManager();
$res=SessionManager::delete_session($id_checked);
$res=SessionManager::delete($id_checked);
$idsesion->expectOnce(Database :: get_main_table(TABLE_MAIN_SESSION));
$this->assertTrue(is_object($idsesion));
$this->assertTrue(is_null($res));

6
tests/phpunit/classes/ImportTest.class.php
Unescape View File

@ -39,10 +39,10 @@ class ImportTest extends PHPUnit_Framework_TestCase
}
/**
* @covers Import::csv_to_array
* @todo Implement testCsv_to_array().
* @covers Import::csvToArray
* @todo Implement testcsvToArray().
*/
public function testCsv_to_array()
public function testcsvToArray()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(

2
tests/scripts/check_users_in_csv_file.php
Unescape View File

@ -7,7 +7,7 @@ require_once '../inc/global.inc.php';
api_protect_admin_script();
$file = '';
$users = Import :: csv_to_array($file);
$users = Import :: csvToArray($file);
foreach ($users as $user) {
$userInfo = api_get_user_info_from_email($user['Email']);
if (empty($userInfo)) {

2
tests/scripts/delete_users_from_csv.php
Unescape View File

@ -9,7 +9,7 @@ api_protect_admin_script();
$debug = true;
$file = 'file.csv';
$users = Import :: csv_to_array($file);
$users = Import :: csvToArray($file);
foreach ($users as $user) {
//$userInfo = api_get_user_info_from_username($user['UserName']);
$userInfo = api_get_user_info_from_email($user['Email']);

2
tests/scripts/update_user_extra_field.php
Unescape View File

@ -26,7 +26,7 @@ api_protect_admin_script();
$extraField = new ExtraField('user');
$file = 'file.csv';
$users = Import :: csv_to_array($file);
$users = Import :: csvToArray($file);
foreach ($users as $user) {
$userInfo = api_get_user_info_from_username($user['user']);
if (!empty($userInfo)) {

Write Preview
Loading…
Cancel
Save