Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WIP: Fix xml parser entity issue using lib: symfony/dom-crawler
user_update_import.php
  • Loading branch information
jmontoyaa authored and AngelFQC committed Jan 16, 2019
commit 25c872334ffedf903e1a32c2e456406a194725da
60 changes: 0 additions & 60 deletions main/admin/user_import.php
Original file line number Diff line number Diff line change
Expand Up @@ -307,66 +307,6 @@ function parse_csv_data($file)

return $users;
}
/**
* XML-parser: handle start of element.
*
* @param string $parser Deprecated?
* @param string $data The data to be parsed
*/
function element_start($parser, $data)
{
$data = api_utf8_decode($data);
global $user;
global $current_tag;
switch ($data) {
case 'Contact':
$user = [];
break;
default:
$current_tag = $data;
}
}

/**
* XML-parser: handle end of element.
*
* @param string $parser Deprecated?
* @param string $data The data to be parsed
*/
function element_end($parser, $data)
{
$data = api_utf8_decode($data);
global $user;
global $users;
global $current_value;
switch ($data) {
case 'Contact':
if ($user['Status'] == '5') {
$user['Status'] = STUDENT;
}
if ($user['Status'] == '1') {
$user['Status'] = COURSEMANAGER;
}
$users[] = $user;
break;
default:
$user[$data] = $current_value;
break;
}
}

/**
* XML-parser: handle character data.
*
* @param string $parser Parser (deprecated?)
* @param string $data The data to be parsed
*/
function character_data($parser, $data)
{
$data = trim(api_utf8_decode($data));
global $current_value;
$current_value = $data;
}

/**
* Read the XML-file.
Expand Down
92 changes: 16 additions & 76 deletions main/admin/user_update_import.php
Original file line number Diff line number Diff line change
Expand Up @@ -254,86 +254,26 @@ function parse_csv_data($file)

return $users;
}
/**
* XML-parser: handle start of element.
*
* @param string $parser Deprecated?
* @param string $data The data to be parsed
*/
function element_start($parser, $data)
{
$data = api_utf8_decode($data);
global $user;
global $current_tag;
switch ($data) {
case 'Contact':
$user = [];
break;
default:
$current_tag = $data;
}
}

/**
* XML-parser: handle end of element.
*
* @param string $parser Deprecated?
* @param string $data The data to be parsed
*/
function element_end($parser, $data)
function parse_xml_data($file)
{
$data = api_utf8_decode($data);
global $user;
global $users;
global $current_value;
switch ($data) {
case 'Contact':
if ($user['Status'] == '5') {
$user['Status'] = STUDENT;
}
if ($user['Status'] == '1') {
$user['Status'] = COURSEMANAGER;
$crawler = new \Symfony\Component\DomCrawler\Crawler();
$crawler->addXmlContent(file_get_contents($file));
$crawler = $crawler->filter('Contacts > Contact ');
$array = [];
foreach ($crawler as $domElement) {
$row = [];
foreach ($domElement->childNodes as $node) {
if ($node->nodeName != '#text') {
$row[$node->nodeName] = $node->nodeValue;
}
$users[] = $user;
break;
default:
$user[$data] = $current_value;
break;
}
if (!empty($row)) {
$array[] = $row;
}
}
}

/**
* XML-parser: handle character data.
*
* @param string $parser Parser (deprecated?)
* @param string $data The data to be parsed
*/
function character_data($parser, $data)
{
$data = trim(api_utf8_decode($data));
global $current_value;
$current_value = $data;
}

/**
* Read the XML-file.
*
* @param string $file Path to the XML-file
*
* @return array All user information read from the file
*/
function parse_xml_data($file)
{
global $users;
$users = [];
$parser = xml_parser_create('UTF-8');
xml_set_element_handler($parser, 'element_start', 'element_end');
xml_set_character_data_handler($parser, 'character_data');
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
xml_parser_free($parser);

return $users;
return $array;
}

$this_section = SECTION_PLATFORM_ADMIN;
Expand Down Expand Up @@ -429,7 +369,7 @@ function parse_xml_data($file)
exit;
}
}
Display :: display_header($tool_name);
Display::display_header($tool_name);

if (!empty($error_message)) {
echo Display::return_message($error_message, 'error');
Expand Down