projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy New Year
[platal.git]
/
classes
/
csvimporter.php
diff --git
a/classes/csvimporter.php
b/classes/csvimporter.php
index
6bb92ee
..
70aa377
100644
(file)
--- a/
classes/csvimporter.php
+++ b/
classes/csvimporter.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
7
Polytechnique.org *
+ * Copyright (C) 2003-200
9
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-134,7
+134,7
@@
class CSVImporter
VarStream::init();
global $csv_source;
$this->index = null;
VarStream::init();
global $csv_source;
$this->index = null;
-
+
$csv_source = $csv;
$res = fopen('var://csv_source', 'r');
$csv_source = $csv;
$res = fopen('var://csv_source', 'r');
@@
-239,7
+239,7
@@
class CSVImporter
}
/** Handle insertion form
}
/** Handle insertion form
- * @param $page Pl
atal
Page to process
+ * @param $page PlPage to process
* @param $url URI of the page
* @param $field Editable fields
*/
* @param $url URI of the page
* @param $field Editable fields
*/
@@
-291,13
+291,13
@@
class CSVImporter
}
if ($current == 'values' && Env::has('csv_valid')) {
$next = 'valid';
}
if ($current == 'values' && Env::has('csv_valid')) {
$next = 'valid';
- }
+ }
if (empty($csv)) {
$next = 'source';
}
if (Env::has('csv_action')) {
$_SESSION['csv_action'] = Env::v('csv_action');
if (empty($csv)) {
$next = 'source';
}
if (Env::has('csv_action')) {
$_SESSION['csv_action'] = Env::v('csv_action');
- }
+ }
if ($next == 'valid') {
if ($current != 'valid') {
$cpyfields = array('csv_value', 'csv_user_value', 'csv_cond_field',
if ($next == 'valid') {
if ($current != 'valid') {
$cpyfields = array('csv_value', 'csv_user_value', 'csv_cond_field',
@@
-330,6
+330,7
@@
class CSVImporter
$fields[] = $key;
}
if ($current == 'valid' && Env::has('csv_valid')) {
$fields[] = $key;
}
if ($current == 'valid' && Env::has('csv_valid')) {
+ S::assert_xsrf_token();
$this->run($_SESSION['csv_action'], $insert, $update);
$page->assign('csv_done', true);
$this->cleanSession($sesfields);
$this->run($_SESSION['csv_action'], $insert, $update);
$page->assign('csv_done', true);
$this->cleanSession($sesfields);
@@
-346,7
+347,7
@@
class CSVImporter
$page->assign('csv_field_desc', $this->field_desc);
$page->assign('csv_page', $next);
$page->assign('csv_path', $url);
$page->assign('csv_field_desc', $this->field_desc);
$page->assign('csv_page', $next);
$page->assign('csv_path', $url);
- $page->assign('csv_fields', $fields);
+ $page->assign('csv_fields', $fields);
}
}
}
}