mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-28 12:38:00 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
94b8690266
|
@ -123,6 +123,7 @@ if (!$user->isAdmin()) {
|
||||||
$log = array();
|
$log = array();
|
||||||
$newusers = array();
|
$newusers = array();
|
||||||
$csvheader = array();
|
$csvheader = array();
|
||||||
|
$colmap = array();
|
||||||
if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
|
if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
|
||||||
if(!is_uploaded_file($_FILES["userdata"]["tmp_name"]))
|
if(!is_uploaded_file($_FILES["userdata"]["tmp_name"]))
|
||||||
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
|
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
|
||||||
|
@ -132,7 +133,6 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
|
||||||
|
|
||||||
$csvdelim = ';';
|
$csvdelim = ';';
|
||||||
$csvencl = '"';
|
$csvencl = '"';
|
||||||
$colmap = array();
|
|
||||||
if($fp = fopen($_FILES['userdata']['tmp_name'], 'r')) {
|
if($fp = fopen($_FILES['userdata']['tmp_name'], 'r')) {
|
||||||
/* First of all build up a column map, which contains for each columen
|
/* First of all build up a column map, which contains for each columen
|
||||||
* the column name
|
* the column name
|
||||||
|
|
Loading…
Reference in New Issue
Block a user