From 74742e8608139e020246502e141480c4031279a4 Mon Sep 17 00:00:00 2001 From: Jason Cleeland Date: Tue, 30 Dec 2003 13:39:47 +0000 Subject: [PATCH] Code tidying, added extra header for CVS download. Note that some elements of language files conflict, and this will need to be resolved at a future date. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/trunk/unstable@819 b72ed6b6-b9f8-46b5-92b4-906544132732 --- admin/export.php | 128 ++++++++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 57 deletions(-) diff --git a/admin/export.php b/admin/export.php index 3fddebf0653..9e35bd09e6b 100644 --- a/admin/export.php +++ b/admin/export.php @@ -34,66 +34,80 @@ ############################################################# */ -$sid = $_GET['sid']; if (!$sid) {$sid=$_POST['sid'];} -$style = $_GET['style']; if (!$style) {$style=$_POST['style'];} -$answers = $_GET['answers']; if (!$answers) {$answers=$_POST['answers'];} -$type = $_GET['type']; if (!$type) {$type=$_POST['type'];} +include("config.php"); +if (!isset($sid)) {$sid=returnglobal('sid');} +if (!isset($style)) {$style=returnglobal('style');} +if (!isset($answers)) {$answers=returnglobal('answers');} +if (!isset($type)) {$type=returnglobal('type');} if (!$style) { - include ("config.php"); sendcacheheaders(); - echo "$htmlheader"; - echo "
\n"; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\t\n"; - echo "\t\n"; - echo "\t\n"; - if ($_POST['sql']) + echo $htmlheader + ."
\n" + ."
"._EXPORTRESULTS; - if ($_POST['sql']) {echo " ("._EX_FROMSTATS.")";} - echo "
"._EX_HEADINGS."
\n"; - echo "\t\t\t$setfont"._EX_HEAD_ABBREV."
\n"; - echo "\t\t\t"._EX_HEAD_FULL."\n"; - echo "\t\t
"._EX_ANSWERS."
\n"; - echo "\t\t\t$setfont"._EX_ANS_ABBREV."
\n"; - echo "\t\t\t"._EX_ANS_FULL."\n"; - echo "\t\t
"._EX_FORMAT."
\n"; - echo "\t\t\t$setfont"._EX_FORM_WORD."
\n"; - echo "\t\t\t"._EX_FORM_EXCEL."
\n"; - echo "\t\t\t"._EX_FORM_CSV."\n"; - echo "\t\t
\n"; - echo "\t\t\t$setfont\n"; - echo "\t\t
\n" + ."\t\n" + ."\t\n" + ."\t\n" + ."\t\n" + ."\t\t\n" + ."\t\n" + ."\t\n" + ."\t\n" + ."\t\t\n" + ."\t\n" + ."\t\n" + ."\t\n" + ."\t\t\n" + ."\t\n" + ."\t\n" + ."\t\n" + ."\t\t\n" + ."\t\n" + ."\t\n"; + if (isset($_POST['sql'])) { - echo "\t\n"; + echo "\t\n"; } - echo "\t\n"; - echo "\t\n"; - echo "\t\t\n"; - echo "\t\n"; - echo "
" + ._EXPORTRESULTS; + if (isset($_POST['sql'])) {echo " ("._EX_FROMSTATS.")";} + echo "
"._EX_HEADINGS."
\n" + ."\t\t\t$setfont" + ._EX_HEAD_ABBREV."
\n" + ."\t\t\t" + ._EX_HEAD_FULL."\n" + ."\t\t
" + ._EX_ANSWERS."
\n" + ."\t\t\t$setfont" + ._EX_ANS_ABBREV."
\n" + ."\t\t\t" + ._EX_ANS_FULL."\n" + ."\t\t
" + ._EX_FORMAT."
\n" + ."\t\t\t$setfont" + ._EX_FORM_WORD."
\n" + ."\t\t\t" + ._EX_FORM_EXCEL."
\n" + ."\t\t\t" + ._EX_FORM_CSV."\n" + ."\t\t
\n" + ."\t\t\t$setfont\n" + ."\t\t
\n"; - echo "\t\t\t\n"; - echo "\t\t
\n"; - echo "
\n"; - echo htmlfooter("instructions.html", "General PHPSurveyor Instructions"); - echo "\n"; + echo "\t\n" + ."\t\n" + ."\t\t\n" + ."\t\t\t\n" + ."\t\t\n" + ."\t\n" + ."\n" + ."
\n" + .htmlfooter("instructions.html", "General PHPSurveyor Instructions") + ."\n"; exit; } @@ -112,6 +126,7 @@ elseif ($type == "csv") { header("Content-Disposition: attachment; filename=survey.csv"); + header("Content-Type: application/download"); $s=","; } else @@ -125,8 +140,6 @@ header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); // HTTP/1.0 -include ("config.php"); - //Select public language file $query = "SELECT language FROM {$dbprefix}surveys WHERE sid=$sid"; $result = mysql_query($query); @@ -151,6 +164,7 @@ $dquery = "SELECT * FROM $surveytable ORDER BY id LIMIT 1"; $dresult = mysql_query($dquery); $fieldcount = mysql_num_fields($dresult); +$firstline=""; for ($i=0; $i<$fieldcount; $i++) { $fieldinfo=mysql_field_name($dresult, $i); @@ -208,7 +222,7 @@ $firstline = str_replace("\r", "", $firstline); if ($type == "csv") {$firstline .= "\"$qname";} else {$firstline .= "$qname";} - if ($faid) {$firstline .= " [{$faid}]"; $faid="";} + if (isset($faid)) {$firstline .= " [{$faid}]"; $faid="";} if ($type == "csv") {$firstline .= "\"";} $firstline .= "$s"; } @@ -338,7 +352,7 @@ //Now dump the data -if ($_POST['sql']) //this applies if export has been called from the statistics package +if (isset($_POST['sql'])) //this applies if export has been called from the statistics package { if ($_POST['sql'] == "NULL") {$dquery = "SELECT * FROM $surveytable ORDER BY id";} else {$dquery = "SELECT * FROM $surveytable WHERE ".stripcslashes($_POST['sql'])." ORDER BY id";}