Index: common_functions.php
===================================================================
--- common_functions.php	(revision 9507)
+++ common_functions.php	(working copy)
@@ -3160,26 +3160,22 @@
 
 
         $registerform .= "<tr><td align='right'><input type='hidden' name='lang' value='".$reglang."' /></td><td></td></tr>\n";
-        /*      if(isset($thissurvey['attribute1']) && $thissurvey['attribute1'])
-         {
-         $registerform .= "<tr><td align='right'>".$thissurvey['attribute1'].":</td>\n"
-         ."<td align='left'><input class='text' type='text' name='register_attribute1'";
-         if (isset($_POST['register_attribute1']))
-         {
-         $registerform .= " value='".htmlentities(returnglobal('register_attribute1'),ENT_QUOTES,'UTF-8')."'";
-         }
-         $registerform .= " /></td></tr>\n";
-         }
-         if(isset($thissurvey['attribute2']) && $thissurvey['attribute2'])
-         {
-         $registerform .= "<tr><td align='right'>".$thissurvey['attribute2'].":</td>\n"
-         ."<td align='left'><input class='text' type='text' name='register_attribute2'";
-         if (isset($_POST['register_attribute2']))
-         {
-         $registerform .= " value='".htmlentities(returnglobal('register_attribute2'),ENT_QUOTES,'UTF-8')."'";
-         }
-         $registerform .= " /></td></tr>\n";
-         }        */
+		
+        //GET THE CUSTOM ATTRIBUTES
+        $asExtraAttributes= GetTokenFieldsAndNames($surveyid, true);
+        $asExtraKeys = array_keys($asExtraAttributes);
+
+        foreach ($asExtraKeys as $sKey) 
+        {
+            $registerform .= "<tr><td align='right'>".$asExtraAttributes[$sKey].":</td>\n"
+            ."<td align='left'><input class='text' type='text' name='register_$sKey' ";
+            if (isset($_POST["register_" . $sKey]))
+            {
+                $registerform .=  " value='".htmlentities(returnglobal("register_" . $sKey),ENT_QUOTES,'UTF-8')."'";
+            }
+            $registerform .= " /></td></tr>\n";
+        }
+
         $registerform .= "<tr><td></td><td><input id='registercontinue' class='submit' type='submit' value='".$clang->gT("Continue")."' />"
         ."</td></tr>\n"
         ."</table>\n"
Index: register.php
===================================================================
--- register.php	(revision 9503)
+++ register.php	(working copy)
@@ -107,19 +107,29 @@
 
 $postfirstname=sanitize_xss_string(strip_tags(returnglobal('register_firstname')));
 $postlastname=sanitize_xss_string(strip_tags(returnglobal('register_lastname')));
-/*$postattribute1=sanitize_xss_string(strip_tags(returnglobal('register_attribute1')));
- $postattribute2=sanitize_xss_string(strip_tags(returnglobal('register_attribute2')));   */
 
+//Geting the custom attributes
+$asExtraAttributes= GetTokenFieldsAndNames($surveyid, true);
+$asExtraKeys = array_keys($asExtraAttributes);
+
+$asFields = array($postfirstname, $postlastname, returnglobal('register_email'), 'OK', $newtoken);
+
+$sQuant_params = "";
+$sName_fields = "";
+foreach ($asExtraKeys as $sKey) 
+{
+    $sQuant_params .= ", ?";
+    $sName_fields .= ", " . $sKey;
+    ${"register_" . $sKey} = sanitize_xss_string(strip_tags(returnglobal("register_" . $sKey)));
+    $asFields[] = ${"register_" . $sKey};
+}
+
 //Insert new entry into tokens db
 $query = "INSERT INTO {$dbprefix}tokens_$surveyid\n"
-. "(firstname, lastname, email, emailstatus, token)\n"
-. "VALUES (?, ?, ?, ?, ?)";
-$result = $connect->Execute($query, array($postfirstname,
-$postlastname,
-returnglobal('register_email'),
-                                          'OK', 
-$newtoken)
-//                             $postattribute1,   $postattribute2)
+. "(firstname, lastname, email, emailstatus, token". $sName_fields .")\n"
+. "VALUES (?, ?, ?, ?, ?". $sQuant_params .")"; 
+
+$result = $connect->Execute($query, $asFields) 
 ) or safe_die ($query."<br />".$connect->ErrorMsg());  //Checked - According to adodb docs the bound variables are quoted automatically
 $tid=$connect->Insert_ID("{$dbprefix}tokens_$surveyid","tid");