2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

Removed reliance on sessions as unecessary

This commit is contained in:
azammitdcarf
2011-02-24 22:05:56 +00:00
parent c618bbb4da
commit 86e5bfbd09

View File

@@ -45,26 +45,24 @@ include ("../functions/functions.xhtml.php");
include("../functions/functions.import.php"); include("../functions/functions.import.php");
session_start(); if (isset($_POST['import_form']))
if (isset($_GET['import_form']))
{ {
//form has been submitted //form has been submitted
xhtml_head(T_("Import: Validating and uploading")); xhtml_head(T_("Import: Validating and uploading"));
//verify each GET field is unique (except import_form) //verify each GET field is unique (except import_form)
$sfields = array(); $sfields = array();
foreach($_GET as $getv => $val) foreach($_POST as $getv => $val)
//clean up? //clean up?
$sfields[$getv] = $val; $sfields[$getv] = $val;
$error = verify_fields($sfields); $error = verify_fields($sfields);
$description = $_GET['description']; $description = $_POST['description'];
if ($error == "") if ($error == "")
{ //verified so upload { //verified so upload
if (import_file($_SESSION['filename'],$description,$sfields)) if (import_file($_POST['filename'],$description,$sfields))
{ {
print "<p>" . T_("Successfully imported file") . "</p>"; print "<p>" . T_("Successfully imported file") . "</p>";
} }
@@ -88,12 +86,11 @@ else if (isset($_POST['import_file']))
xhtml_head(T_("Import: Select columns to import")); xhtml_head(T_("Import: Select columns to import"));
?> ?>
<form action="" method="get"> <form action="" method="post">
<? <?
$tmpfname = tempnam("/tmp", "FOO"); $tmpfname = tempnam("/tmp", "FOO");
move_uploaded_file($_FILES['file']['tmp_name'],$tmpfname); move_uploaded_file($_FILES['file']['tmp_name'],$tmpfname);
$_SESSION['filename'] = $tmpfname;
display_table(get_first_row($tmpfname)); display_table(get_first_row($tmpfname));
@@ -101,6 +98,7 @@ else if (isset($_POST['import_file']))
?> ?>
<p><input type="hidden" name="description" value="<? if (isset($_POST['description'])) print($_POST['description']); ?>"/></p> <p><input type="hidden" name="description" value="<? if (isset($_POST['description'])) print($_POST['description']); ?>"/></p>
<p><input type="hidden" name="filename" value="<? echo $tmpfname; ?>"/></p>
<p><input type="submit" name="import_form"/></p> <p><input type="submit" name="import_form"/></p>
</form> </form>