From a23e4984e30e6e99aafe8be973e1f334727b54c7 Mon Sep 17 00:00:00 2001
From: azammitdcarf <azammitdcarf>
Date: Thu, 30 Sep 2010 00:17:59 +0000
Subject: [PATCH] Added icon for scanner Updated queXMLPDF class to point to
 TCPDF isntallation Added icon to limesurvey page Modified
 export_structure_quexml to be able to export a string of noheader specified

---
 include/limesurvey/admin/admin.php            |   4 +
 .../admin/classes/quexml/quexmlpdf.php        |   4 +-
 .../admin/export_structure_quexml.php         |  24 +++--
 include/limesurvey/admin/html.php             |  32 ++++++
 include/limesurvey/admin/quexmlsurvey.php     |  94 ++++++++++++++++++
 include/limesurvey/images/scanner-3.png       | Bin 0 -> 4140 bytes
 6 files changed, 146 insertions(+), 12 deletions(-)
 create mode 100644 include/limesurvey/admin/quexmlsurvey.php
 create mode 100644 include/limesurvey/images/scanner-3.png

diff --git a/include/limesurvey/admin/admin.php b/include/limesurvey/admin/admin.php
index 6d3d2d86..62e822a3 100644
--- a/include/limesurvey/admin/admin.php
+++ b/include/limesurvey/admin/admin.php
@@ -308,6 +308,10 @@ elseif ($action == 'iteratesurvey')
     if( ($surrows['browse_response'] && $surrows['activate_survey']) || $_SESSION['USER_RIGHT_SUPERADMIN'] == 1)    {include('iterate_survey.php');}               
         else { include('access_denied.php');}    
     }    
+elseif ($action=='showquexmlsurvey')  
+    { 
+        include('quexmlsurvey.php'); //No special right needed to show the printable survey
+    } 
 elseif ($action=='showprintablesurvey')  
     { 
         include('printablesurvey.php'); //No special right needed to show the printable survey
diff --git a/include/limesurvey/admin/classes/quexml/quexmlpdf.php b/include/limesurvey/admin/classes/quexml/quexmlpdf.php
index 6f18733a..db8a458d 100644
--- a/include/limesurvey/admin/classes/quexml/quexmlpdf.php
+++ b/include/limesurvey/admin/classes/quexml/quexmlpdf.php
@@ -4,8 +4,8 @@
  * Modify these two lines to point to your TCPDF installation
  * Tested with TCPDF 5.8.008 - see http://www.tcpdf.org/
  */
-require_once('/var/lib/tcpdf/config/lang/eng.php');
-require_once('/var/lib/tcpdf/tcpdf.php');
+require_once(dirname(__FILE__) . '/../tcpdf/config/lang/eng.php');
+require_once(dirname(__FILE__) . '/../tcpdf/tcpdf.php');
 
 
 /**
diff --git a/include/limesurvey/admin/export_structure_quexml.php b/include/limesurvey/admin/export_structure_quexml.php
index 178ebec1..23b87a89 100644
--- a/include/limesurvey/admin/export_structure_quexml.php
+++ b/include/limesurvey/admin/export_structure_quexml.php
@@ -525,15 +525,19 @@ while ($Row = $QueryResult->FetchRow())
 
 $dom->append_child($questionnaire);
 
+$quexml = $dom->dump_mem(true,'UTF-8');
 
-$fn = "survey_$surveyid.xml";
-header("Content-Type: application/download");
-header("Content-Disposition: attachment; filename=$fn");
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");    // Date in the past
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); 
-Header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-header("Pragma: no-cache");                          // HTTP/1.0
-
-echo $dom->dump_mem(true,'UTF-8');
-exit;
+if (!(isset($noheader) && $noheader == true))
+{
+	$fn = "survey_$surveyid.xml";
+	header("Content-Type: application/download");
+	header("Content-Disposition: attachment; filename=$fn");
+	header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");    // Date in the past
+	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); 
+	Header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+	header("Pragma: no-cache");                          // HTTP/1.0
+	
+	echo $quexml;	
+	exit();
+}
 ?>
diff --git a/include/limesurvey/admin/html.php b/include/limesurvey/admin/html.php
index 77a6fb6b..94aa6b2c 100644
--- a/include/limesurvey/admin/html.php
+++ b/include/limesurvey/admin/html.php
@@ -592,6 +592,38 @@ if ($surveyid)
 			. "<img src='$imagefiles/dataentry_disabled.png' title='' alt='".$clang->gT("Dataentry Screen for Survey")."'"
 			. "name='DoDataentry' /></a>\n";
 		}
+
+
+		if (count(GetAdditionalLanguagesFromSurveyID($surveyid)) == 0)
+		{
+
+			$surveysummary .= "<a href=\"#\" onclick=\"window.open('$scriptname?action=showquexmlsurvey&amp;sid=$surveyid', '_top')\""
+				. " title=\"".$clang->gTview("Printable and scanable Version of Survey")."\" >"
+				. "<img src='$imagefiles/scanner-3.png' name='ShowPrintableScanableSurvey' alt='".$clang->gT("Printable and scanable Version of Survey")."' />";
+
+		} else {
+
+			$surveysummary .= "<a href=\"#\" onclick=\"document.getElementById('printpopupquexml').style.visibility='visible'; "
+				. "document.getElementById('langpopup2').style.visibility='hidden';\""
+				. " title=\"".$clang->gTview("Printable and scanable Version of Survey")."\" >"
+				. "<img src='$imagefiles/scanner-3.png' name='ShowPrintableScanableSurvey' alt='".$clang->gT("Printable and scanable Version of Survey")."' />\n";
+
+			$tmp_survlangs = GetAdditionalLanguagesFromSurveyID($surveyid);
+			$baselang = GetBaseLanguageFromSurveyID($surveyid);
+			$tmp_survlangs[] = $baselang;
+			rsort($tmp_survlangs);
+
+			// Test Survey Language Selection Popup
+			$surveysummary .="<div class=\"langpopup2\" id=\"printpopupquexml\"><table width=\"100%\"><tr><td>".$clang->gT("Please select a language:")."</td></tr>";
+			foreach ($tmp_survlangs as $tmp_lang)
+			{
+				$surveysummary .= "<tr><td><a href=\"#\" accesskey='d' onclick=\"document.getElementById('printpopupquexml').style.visibility='hidden'; window.open('$scriptname?action=showquexmlsurvey&amp;sid=$surveyid&amp;lang=".$tmp_lang."', '_blank')\"><font color=\"#097300\"><b>".getLanguageNameFromCode($tmp_lang,false)."</b></font></a></td></tr>";
+			}
+			$surveysummary .= "<tr><td align=\"center\"><a href=\"#\" accesskey='d' onclick=\"document.getElementById('printpopupquexml').style.visibility='hidden';\"><font color=\"#DF3030\">".$clang->gT("Cancel")."</font></a></td></tr></table></div>";
+
+			$surveysummary .= "<script type='text/javascript'>document.getElementById('printpopupquexml').style.left='152px';</script>\n";
+		}
+
 		
 		if (count(GetAdditionalLanguagesFromSurveyID($surveyid)) == 0)
 		{
diff --git a/include/limesurvey/admin/quexmlsurvey.php b/include/limesurvey/admin/quexmlsurvey.php
new file mode 100644
index 00000000..d292a3a2
--- /dev/null
+++ b/include/limesurvey/admin/quexmlsurvey.php
@@ -0,0 +1,94 @@
+<?php
+/*
+ * LimeSurvey
+ * Copyright (C) 2007 The LimeSurvey Project Team / Carsten Schmitz
+ * All rights reserved.
+ * License: GNU/GPL License v2 or later, see LICENSE.php
+ * LimeSurvey is free software. This version may have been modified pursuant
+ * to the GNU General Public License, and as distributed it includes or
+ * is derivative of works licensed under the GNU General Public License or
+ * other free or open source software licenses.
+ * See COPYRIGHT.php for copyright notices and details.
+ *
+ * $Id: quexmlsurvey.php 9149 2010-09-28 03:07:52Z azammitdcarf $
+ */
+
+//Ensure script is not run directly, avoid path disclosure
+include_once("login_check.php");
+include_once(dirname(__FILE__)."/classes/quexml/quexmlpdf.php");
+
+//---------------------
+// Comes from http://fr2.php.net/tempnam
+function tempdir($dir, $prefix='', $mode=0700)
+{
+    if (substr($dir, -1) != '/') $dir .= '/';
+
+    do
+    {
+        $path = $dir.$prefix.mt_rand(0, 9999999);
+    } while (!mkdir($path, $mode));
+
+    return $path;
+}
+
+global $tempdir;
+
+$surveyid = $_GET['sid'];
+
+// Set the language of the survey, either from GET parameter of session var
+if (isset($_GET['lang']))
+{
+    $_GET['lang'] = preg_replace("/[^a-zA-Z0-9-]/", "", $_GET['lang']);
+    if ($_GET['lang']) $surveyprintlang = $_GET['lang'];
+} else
+{
+    $surveyprintlang=GetbaseLanguageFromSurveyid($surveyid);
+}
+
+// Setting the selected language for printout
+$clang = new limesurvey_lang($surveyprintlang);
+
+$quexmlpdf = new queXMLPDF(PDF_PAGE_ORIENTATION, 'mm', PDF_PAGE_FORMAT, true, 'UTF-8', false);
+
+set_time_limit(120);
+
+$noheader = true;
+
+include_once("export_structure_quexml.php");
+
+$quexmlpdf->create($quexmlpdf->createqueXML($quexml));
+
+//NEED TO GET QID from $quexmlpdf
+$qid = intval($quexmlpdf->getQuestionnaireId());
+
+$zipdir=tempdir($tempdir);
+
+$f1 = "$zipdir/quexf_banding_{$qid}_{$surveyprintlang}.xml";
+$f2 = "$zipdir/quexmlpdf_{$qid}_{$surveyprintlang}.pdf";
+$f3 = "$zipdir/quexml_{$qid}_{$surveyprintlang}.xml";
+$f4 = "$zipdir/readme.txt";
+
+file_put_contents($f1, $quexmlpdf->getLayout());
+file_put_contents($f2, $quexmlpdf->Output("quexml_$qid.pdf", 'S'));
+file_put_contents($f3, $quexml);
+file_put_contents($f4, $clang->gT('This archive contains a PDF file of the survey, the queXML file of the survey and a queXF banding XML file which can be used with queXF: http://quexf.sourceforge.net/ for processing scanned surveys.'));
+
+require_once("classes/phpzip/phpzip.inc.php");
+$z = new PHPZip();
+$zipfile="$tempdir/quexmlpdf_{$qid}_{$surveyprintlang}.zip";
+$z->Zip($zipdir, $zipfile);
+
+unlink($f1);
+unlink($f2);
+unlink($f3);
+unlink($f4);
+rmdir($zipdir);
+
+header('Content-Type: application/octet-stream');
+header('Content-Disposition: attachment; filename="quexmlpdf_' . $qid . '_' . $surveyprintlang . '.zip"'); 
+header('Content-Transfer-Encoding: binary');
+// load the file to send:
+readfile($zipfile);
+unlink($zipfile);
+
+exit();
diff --git a/include/limesurvey/images/scanner-3.png b/include/limesurvey/images/scanner-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cec53cdc18421b11636e163e341e456581c28b28
GIT binary patch
literal 4140
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
T(D?g50HCR=_n=n!QRM#smrbU~

literal 0
HcmV?d00001