Fixed issue #4959 : Can't browse answer

Dev : dev/svn merge error (double test at fuqtquestions ) git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9802 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Feb 16, 2011 · b058a7d · b058a7d
1 parent bb4c918
commit b058a7d
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/admin/browse.php b/admin/browse.php
@@ -254,8 +254,7 @@
     {
         $browseoutput .=  "<img align='left' hspace='0' border='0' src='$imageurl/delete_disabled.png' alt='".$clang->gT("You don't have permission to delete this entry.")."'/>";
     }
-
-    if (bHasFileUploadQuestion($surveyid))
+    if (bHasFileUploadQuestion($surveyid)) 
     {
         $browseoutput .= "<a href='#' title='".$clang->gTview("Download files for this entry")."' onclick=\" ".get2post($scriptname.'?action=browse&amp;subaction=all&amp;downloadfile='.$id.'&amp;sid='.$surveyid)."\" >"
                 ."<img align='left' hspace='0' border='0' src='$imageurl/download.png' alt='".$clang->gT("Download files for this entry")."' /></a>\n";
@@ -370,8 +369,7 @@
             if ($field['type'] == "|" && strpos($field['fieldname'], "_filecount") == 0)
                 $fuqtquestions[] = $field['fieldname'];
         }
-        if (count($fuqtquestions)>0)
-        {
+
         if (!empty($fuqtquestions)) {
             // find all responses (filenames) to the fuqt questions
             $query="SELECT " . implode(", ", $fuqtquestions) . " FROM $surveytable where id={$_POST['deleteanswer']}";
@@ -392,7 +390,7 @@
         }
 
         // delete the row
-        $query="delete FROM $surveytable where id={$_POST['deleteanswer']}";
+        $query="delete FROM $surveytable where id=".mysql_real_escape_string($_POST['deleteanswer']);
         $connect->execute($query) or safe_die("Could not delete response<br />$dtquery<br />".$connect->ErrorMsg()); // checked
     }
     // Marked responses -> deal with the whole batch of marked responses
@@ -517,7 +515,7 @@
                 $query .= ", $question ";
             $count++;
         }
-        $query .= " FROM $surveytable WHERE id={".mysql_real_escape_string($_POST['downloadfile'])."}";
+        $query .= " FROM $surveytable WHERE id=".mysql_real_escape_string($_POST['downloadfile']);
         $filearray = db_execute_assoc($query) or safe_die("Could not download response<br />$query<br />".$connect->ErrorMsg());
         while ($metadata = $filearray->FetchRow())
         {
@@ -700,8 +698,9 @@
         $tableheader .= "<img id='imgDeleteMarkedResponses' src='{$imageurl}/token_delete.png' alt='".$clang->gT('Delete marked responses')."' />";
     }
     if (bHasFileUploadQuestion($surveyid))
+    {
         $tableheader .="<img id='imgDownloadMarkedFiles' src='{$imageurl}/down_all.png' alt='".$clang->gT('Download marked files')."' />";
-
+    }
     $tableheader .="</td></tr></tfoot>\n\n";
 
     $start=returnglobal('start');
@@ -732,12 +731,12 @@
     }
 
     //LETS COUNT THE DATA
-    //$dtquery = "SELECT count(*) FROM $sql_from $sql_where";
     $dtquery = "SELECT count(*) FROM $sql_from";
     if ($sql_where!="")
     {
         $dtquery .=" WHERE $sql_where";
     }
+
     $dtresult=db_execute_num($dtquery) or safe_die("Couldn't get response data<br />$dtquery<br />".$connect->ErrorMsg());
     while ($dtrow=$dtresult->FetchRow()) {$dtcount=$dtrow[0];}
 
@@ -1016,11 +1015,11 @@
 		if ($fielddetails['type']=='id')
 			$fnames[]=array($fielddetails['fieldname'],$fielddetails['question']);
         if ($fielddetails['type']=='interview_time')
-            $fnames[]=array($fielddetails['fieldname'],$clang->gT('Total time'));
+			$fnames[]=array($fielddetails['fieldname'],$clang->gT('Total time'));
         if ($fielddetails['type']=='page_time')
-            $fnames[]=array($fielddetails['fieldname'],$clang->gT('Group').": ".$fielddetails['group_name']);
+			$fnames[]=array($fielddetails['fieldname'],$clang->gT('Group').": ".$fielddetails['group_name']);
 		if ($fielddetails['type']=='answer_time')
-            $fnames[]=array($fielddetails['fieldname'],$clang->gT('Question').": ".$fielddetails['title']);
+			$fnames[]=array($fielddetails['fieldname'],$clang->gT('Question').": ".$fielddetails['title']);
     }
     $fncount = count($fnames);