Dev Added support to view surveyee's info while browsing the response…

…s in Data Entry screen for Non-Anonymous survey. Dev cleaned up browse.php amd removed CASE statements from SQL queries to enhance portability. Dev moved the survey completed logic from sql query to the views part (i.e. html generation for output) git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8576 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Apr 11, 2010 · a4889b6 · a4889b6
1 parent 1966cd3
commit a4889b6
Show file tree

Hide file tree

Showing 2 changed files with 254 additions and 181 deletions.
diff --git a/admin/activate.php b/admin/activate.php
@@ -273,10 +273,9 @@
     $presult=db_execute_assoc($pquery);
     while($prow=$presult->FetchRow())
     {
-        if ($createsurvey!='') {$createsurvey .= ",\n";}
         if ($prow['private'] == "N")
         {
-            $createsurvey .= "  token C(36)";
+            $createsurvey .= "  token C(36),\n";
             $surveynotprivate="TRUE";
         }
         if ($prow['allowregister'] == "Y")
@@ -285,14 +284,17 @@
         }
         if ($prow['ipaddr'] == "Y")
         {
-            $createsurvey .= " ipaddr X";
+            $createsurvey .= " ipaddr X,\n";
         }
         //Check to see if 'refurl' field is required.
         if ($prow['refurl'] == "Y")
         {
-            $createsurvey .= " refurl X";
+            $createsurvey .= " refurl X,\n";
         }
     }
+    //strip trailing comma and new line feed (if any)
+    $createsurvey = rtrim($createsurvey, ",\n");
+
     //Get list of questions for the base language
     $fieldmap=createFieldMap($surveyid);
     foreach ($fieldmap as $arow) //With each question, create the appropriate field(s)