Fixed #04330: SQL error when trying to view public statistics

dev: Admin and public statistics share the same code now, added a parameter to generate_statistics to display browse button or not (default = yes). !!PLEASE HELP TEST AS I NEVER USED PUBLIC STATISTICS MYSELF!! git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8770 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jun 1, 2010 · 0f408b3 · 0f408b3
1 parent 486cf59
commit 0f408b3
Show file tree

Hide file tree

Showing 2 changed files with 103 additions and 2,015 deletions.
diff --git a/admin/statistics_function.php b/admin/statistics_function.php
@@ -83,7 +83,7 @@
 
 //generate_statistics('999','all',0,'pdf','F');
 
-function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $outputType='pdf', $pdfOutput='DD',$statlangcode=null)
+function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $outputType='pdf', $pdfOutput='DD',$statlangcode=null, $browse = true)
 {
     //$allfields ="";
     global $connect, $dbprefix, $clang,
@@ -154,8 +154,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
     if($q2show=='all' )
     {
         $summarySql=" SELECT gid, parent_qid, qid, type "
-        ." FROM {$dbprefix}questions where parent_qid=0"
-        ." WHERE sid=$surveyid ";
+        ." FROM {$dbprefix}questions WHERE parent_qid=0"
+        ." AND sid=$surveyid ";
 
         $summaryRs = db_execute_assoc($summarySql);
 
@@ -199,7 +199,11 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
     else
     {
         // This gets all the 'to be shown questions' from the POST and puts these into an array
-        $summary=returnglobal('summary');
+        if (!is_array($q2show)) 
+            $summary = returnglobal('summary');
+        else
+            $summary = $q2show;           
+
         //print_r($_POST);
         //if $summary isn't an array we create one
         if (isset($summary) && !is_array($summary))
@@ -291,7 +295,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
      * Remember there might be some filters applied which have to be put into an SQL statement
      */
     if(isset($postvars))
-
+    
     foreach ($postvars as $pv)
     {
         //Only do this if there is actually a value for the $pv
@@ -587,7 +591,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
     //only continue if we have something to output
     if ($results > 0)
     {
-        if($outputType=='html')
+        if($outputType=='html' && $browse === true)
         {
             //add a buttons to browse results
             $statisticsoutput .= "<form action='$scriptname?action=browse' method='post' target='_blank'>\n"
@@ -1866,7 +1870,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
                         {
                             if ($qtype == "P") $ColumnName_RM = $al[2]."comment";
                             else  $ColumnName_RM = $al[2];
-                            $fname="$al[1] <input type='button' value='".$statlang->gT("Browse")."' onclick=\"window.open('admin.php?action=listcolumn&amp;sid=$surveyid&amp;column=$ColumnName_RM&amp;sql=".urlencode($sql)."', 'results', 'width=460, height=500, left=50, top=50, resizable=yes, scrollbars=yes, menubar=no, status=no, location=no, toolbar=no')\" />";
+                            $fname="$al[1]";
+                            if ($browse===true) $fname .= " <input type='button' value='".$statlang->gT("Browse")."' onclick=\"window.open('admin.php?action=listcolumn&amp;sid=$surveyid&amp;column=$ColumnName_RM&amp;sql=".urlencode($sql)."', 'results', 'width=460, height=500, left=50, top=50, resizable=yes, scrollbars=yes, menubar=no, status=no, location=no, toolbar=no')\" />";
                         }
 
                         /*
@@ -1885,7 +1890,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
                             //show free text answers
                             if ($al[0] == "Answers")
                             {
-                                $fname= "$al[1] <input type='submit' value='"
+                                $fname= "$al[1]";
+                                if ($browse===true) $fname .= " <input type='submit' value='"
                                 . $statlang->gT("Browse")."' onclick=\"window.open('admin.php?action=listcolumn&sid=$surveyid&amp;column=$al[2]&amp;sql="
                                 . urlencode($sql)."', 'results', 'width=460, height=500, left=50, top=50, resizable=yes, scrollbars=yes, menubar=no, status=no, location=no, toolbar=no')\" />";
                             }