More fixes in relation bug #632, title assiment takes datestamp, refu…

…rl, ipaddr fields into account now.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2821 b72ed6b6-b9f8-46b5-92b4-906544132732

admin/exportresults.php

@@ -615,16 +615,19 @@
 {
 	$flarray=explode($separator, $firstline);
 	$fli=0;
-	foreach ($flarray as $fl)
+	//die(print_r($fieldmap)."\n".print_r($firstline));
+	$y=1;
+	for ($x=0; $x<count($fieldmap); $x++)
 	{
-		if ($fl != "id")
+		if ($fieldmap[$x]['fieldname'] != "datestamp" && $fieldmap[$x]['fieldname'] != "ipaddr" && $fieldmap[$x]['fieldname'] != "refurl")
 		{
-			$fieldmap[$fli]['title']=$fl;
-			$fli++;
+			$fieldmap[$x]['title']=$flarray[$y];
+			$y++;
 		}
 	}
 }
-elseif ($type == "xls")
+else
+if ($type == "xls")
 {
 	//var_dump ($firstline);
     $flarray=explode($separator, $firstline);
@@ -743,6 +746,7 @@
 			$fieldinfo=$field->name;
 			if ($fieldinfo != "startlanguge" && $fieldinfo != "id" && $fieldinfo != "datestamp" && $fieldinfo != "ipaddr"&& $fieldinfo != "token" && $fieldinfo != "firstname" && $fieldinfo != "lastname" && $fieldinfo != "email" && $fieldinfo != "attribute_1" && $fieldinfo != "attribute_2")
 			{
+				//die(print_r($fieldmap));
 				$fielddata=arraySearchByKey($fieldinfo, $fieldmap, "fieldname", 1);
 				$fqid=$fielddata['qid'];
 				$ftype=$fielddata['type'];
@@ -780,6 +784,9 @@
 						case "email":
 						$ftitle=$clang->gT("Email").":";
 						break;
+						case "id":
+						$ftitle=$clang->gT("ID").":";
+						break;
 						case "token":
 						$ftitle=$clang->gT("Token").":";
 						break;