--- send_core.php.orig	2008-03-20 01:01:53.000000000 -0500
+++ send_core.php	2008-03-20 02:07:32.000000000 -0500
@@ -1221,10 +1221,48 @@
   ';
 
   $any = 0;
+  
+  
+  /* Fetch the current values of the checkboxgroup critera
+  ~ Rolan 3/20/08
+  Note: the user interface isn't completely intuitive anymore in that
+  you can't remove critera by simply unchecking "Use this one []."
+  Also, the radio button can not be unselected if there is only 1 critera option.
+  The only way to remove a checkboxgroup/selection list is to unselect all the options
+  then click "Save Changes"
+  */
+  $attribute_content_request = Sql_Query("select userselection from $tables[message] where id=$id");
+  $attribute_content = Sql_Fetch_array($attribute_content_request);
+  // print_r($attribute_content);
+  $tmp=$attribute_content['userselection'];
+  if (strpos($tmp,'table2')) {
+      $pieces=explode('and table2',$tmp);
+  }
+  else {
+      $pieces[]=$tmp;
+  }
+  $i=1;
+  foreach ($pieces as $piece) {
+      $parts=explode("find_in_set('",$piece);
+      array_shift($parts); // we don't need the junk from the first element.
+      // print "<pre>parts $i:".print_r($parts,TRUE).'</pre>';
+      foreach ($parts as $bits) {
+          list($critid,$trash)=explode("'",$bits);
+          $criteria_value[$i][]=$critid;
+      }
+      $i++;
+  }
+  // print_r($criteria_value);
+          
+          
+  
+  
+  
   for ($i=1;$i<=NUMCRITERIAS;$i++) {
+    if ($criteria_value[$i]) {$checked='checked';} else {$checked='';} 
     $criteria_content .= sprintf('<tr><td colspan=2><hr><h3>%s %d</h3></td>
-    <td>%s <input type=checkbox name="use[%d]"></tr>',$GLOBALS['I18N']->get('criterion'),$i,
-    $GLOBALS['I18N']->get('usethisone'),$i);
+    <td>%s <input type=checkbox name="use[%d]" %s></tr>',$GLOBALS['I18N']->get('criterion'),$i,
+    $GLOBALS['I18N']->get('usethisone'),$i,$checked);
     $attributes_request = Sql_Query("select * from $tables[attribute]");
     while ($attribute = Sql_Fetch_array($attributes_request)) {
       $criteria_content .= "\n\n";
@@ -1246,12 +1284,15 @@
           $some = 0;
           $thisone = "";
           $values_request = Sql_Query("select * from $table_prefix"."listattr_".$attribute["tablename"]);
-          $thisone .= sprintf ('<tr><td valign=top><input type="radio" name="criteria[%d]" value="%d"> %s</td>
+          if ($criteria_value[$i]) {$checked='checked';} else {$checked='';}
+          $thisone .= sprintf ('<tr><td valign=top><input type="radio" name="criteria[%d]" value="%d"%s> %s</td>
                   <td valign=top><b>%s</b></td><td><select name="attr%d%d[]" size=4 multiple>',
-                  $i,$attribute["id"],strip_tags($attribute["name"]),$GLOBALS['I18N']->get('is'),$attribute["id"],$i);
+                  $i,$attribute["id"],$checked,strip_tags($attribute["name"]),$GLOBALS['I18N']->get('is'),$attribute["id"],$i);
           while ($value = Sql_Fetch_array($values_request)) {
             $some =1;
-            $thisone .= sprintf ('<option value="%d">%s',$value["id"],$value["name"]);
+            // print "<pre>checking for {$value["id"]} in $i  ".print_r($critera_value[$i],TRUE).'</pre>';
+            if (in_array($value["id"],$criteria_value[$i])) { $selected=' selected';} else {$selected='';}
+            $thisone .= sprintf ('<option value="%d"%s>%s',$value["id"],$selected,$value["name"]);
           }
           $thisone .= "</select></td></tr>";
           if ($some)

--- import1.php.orig	2008-04-24 12:24:10.000000000 -0500
+++ import1.php	2008-04-24 13:05:32.000000000 -0500
@@ -218,9 +218,11 @@
 
           # add the attributes for this user
           reset($attributes);
-          while (list($attr,$value) = each($attributes))
+          while (list($attr,$value) = each($attributes)) {
+              if (is_array($value)) {$value=implode(',',$value);}  // if we are using a checkbox group type, this needs to be broken out into individual values.
             Sql_query(sprintf('replace into %s (attributeid,userid,value) values("%s","%s","%s")',
-              $tables["user_attribute"],$attr,$userid,addslashes($value)));
+          $tables["user_attribute"],$attr,$userid,addslashes($value)));
+          }
         }
 
         #add this user to the lists identified