Index: branches/RC/kernel/include/config.php
===================================================================
diff -u -N -r8929 -r10924
--- branches/RC/kernel/include/config.php	(.../config.php)	(revision 8929)
+++ branches/RC/kernel/include/config.php	(.../config.php)	(revision 10924)
@@ -26,7 +26,7 @@
 	function Load()
 	{
       if(is_object($this->adodbConnection))
-      {      
+      {
           LogEntry("Config Load Start\n");
           $sql = "select VariableName, VariableValue from ".GetTablePrefix()."ConfigurationValues";
     	  $rs = $this->adodbConnection->Execute($sql);
@@ -46,7 +46,7 @@
               $rs->MoveNext();
             $count++;
     	  }
-          LogEntry("Config Load End - $count Variables\n");         
+          LogEntry("Config Load End - $count Variables\n");
       }
       unset($this->m_DirtyFields);
       $this->m_IsDirty=false;
@@ -74,7 +74,7 @@
 	function Set($property, $value,$type=0,$force=FALSE)
 	{
 	  if(is_array($this->config) && strlen($property)>0)
-	  {	
+	  {
 	    if(array_key_exists($property,$this->config))
 	    {
 	      $current = $this->config[$property];
@@ -89,7 +89,7 @@
 	  $this->m_IsDirty = ($this->m_IsDirty or $changed or $force);
 	  if($changed || $force)
 	  {
-            $this->m_DirtyFields[$property] = $value;                      
+            $this->m_DirtyFields[$property] = $value;
 	  }
 	  $this->m_VarType[$property] = $type;
 	}
@@ -105,8 +105,8 @@
 //                $sql = sprintf("UPDATE ".GetTablePrefix()."ConfigurationValues SET VariableValue=%s WHERE VariableName=%s",                             $this->adodbConnection->qstr($value), $this->adodbConnection->qstr($field));
                 $sql = 'UPDATE '.GetTablePrefix().'ConfigurationValues SET VariableValue="'.addslashes($value).'" WHERE VariableName="'.addslashes($field).'"';
                 // echo $sql."<br>\n";
-              
-                $rs = $this->adodbConnection->execute($sql);                        
+
+                $rs = $this->adodbConnection->execute($sql);
 	      }
         }
   	  }
@@ -123,12 +123,12 @@
     function GetDirtySessionValues($VarType)
     {
         $result = array();
-        
+
         if(is_array($this->m_DirtyFields))
-        {        
+        {
           foreach($this->m_DirtyFields as $property=>$values)
           {
-           if($this->m_VarType[$property]==$VarType)	                        
+           if($this->m_VarType[$property]==$VarType)
                 $result[$property] = $values;
           }
         }
@@ -147,35 +147,35 @@
 				$result[$config_var] = $var_value;
 		}
 		return $result;
-	}    
+	}
 }/* clsConfig */
 
 /*
 To create the configuration forms in the admin section, populate the table ConfigurationAdmin and
 ConfigurationValues.
-    
-    The tables are fairly straight-forward.  The fields of concern in the ConfigurationValues table is 
-ModuleOwner and Section.  ModuleOwner should either be the module name or In-Portal for kernel related stuff.  
+
+    The tables are fairly straight-forward.  The fields of concern in the ConfigurationValues table is
+ModuleOwner and Section.  ModuleOwner should either be the module name or In-Portal for kernel related stuff.
 (Items which should appear under 'System Configuration').
-    
-    The Section field determines the NavMenu section the value is associated with. For example, 
+
+    The Section field determines the NavMenu section the value is associated with. For example,
 in-portal:configure_general refers to items listed under System Configuration->General.
 
-    In the ConfigurationAdmin table, ensure the VariableName field is the same as the one in ConfigurationValues 
+    In the ConfigurationAdmin table, ensure the VariableName field is the same as the one in ConfigurationValues
 (this is the field that creates the natural join.)  The prompt field is the text displayed to the left of the form element
 in the table.  This should contain LANGUAGE ELEMENT IDENTIFIERS that are plugged into the Language function.
 
-    The element_type field describes the type of form element is associated with this item.  Possible values are: 
+    The element_type field describes the type of form element is associated with this item.  Possible values are:
         - text : textbox
         - checkbox : a simple checkbox
         - select : creates a dropdown box. In this case, the ValueList field should be populated with a comma-separated list
                    in name=value,name=value format   (each element is translated to:
                     <option VALUE="[value]">[name]</option>
-                  
+
                     To add dynamic data to this list, enclose an SQL statement with <SQL></SQL> tags for example:
                     <SQL>SELECT FieldLabel as OptionName, FieldName as OptionValue FROM <prefix>CustomField WHERE <prefix>.CustomFieldType=3></SQL>
-                    
-                    note the specific field labels OptionName and OptionValue.  They are required by the parser. 
+
+                    note the specific field labels OptionName and OptionValue.  They are required by the parser.
                     use the <prefix> tag to insert the system's table prefix into the sql statement as appropriate
 
 */
@@ -185,27 +185,27 @@
   var $heading;
   var $prompt;
   var $ElementType;
-  var $ValueList; /* comma-separated list in name=value pair format*/  
+  var $ValueList; /* comma-separated list in name=value pair format*/
   var $ValidationRules;
   var $default_value;
   var $adodbConnection;
   var $NextItem=NULL;
   var $Section;
-  
+
   var $DisplayOrder = null;
-  
+
   var $TabIndex = 0;
-  
+
   /**
    * Application instance
    *
    * @var kApplication
    */
   var $Application = null;
-  
+
   function clsConfigAdminItem($config_name=NULL)
-  {   
-	$this->Application =& kApplication::Instance();      
+  {
+	$this->Application =& kApplication::Instance();
       $this->adodbConnection = &GetADODBConnection();
   	if ($config_name) {
           $this->LoadSetting($config_name);
@@ -223,7 +223,7 @@
           $this->prompt = $rs->fields["prompt"];
           $this->ElementType = $rs->fields["element_type"];
           $this->ValidationRules=$rs->fields["validation"];
-          $this->default_value = $rs->fields["VariableValue"];  
+          $this->default_value = $rs->fields["VariableValue"];
           $this->ValueList=$rs->fields["ValueList"];
           $this->Section = $rs->fields["Section"];
           $this->DisplayOrder = $rs->fields['DisplayOrder'];
@@ -234,14 +234,14 @@
   {
   		$cf_helper =& $this->Application->recallObject('InpCustomFieldsHelper');
 	  	/* @var $cf_helper InpCustomFieldsHelper */
-	  	
-	  	return $cf_helper->GetValuesHash($string);
+
+	  	return $cf_helper->GetValuesHash($string, ',');
   }
 
 	function ItemFormElement($StartFrom=1)
   	{
-    	global $objConfig;    
-    
+    	global $objConfig;
+
     	if(!$this->TabIndex) $this->TabIndex = $StartFrom;
 
     	$o = '';
@@ -251,32 +251,32 @@
     	}
     	$this->default_value = inp_htmlize($this->default_value);
     	$validation_rule = $this->ValidationRules ? ' ValidationType="'.$this->ValidationRules.'" ' : '';
-    	
+
     	switch($this->ElementType)
     	{
       		case 'text':
         		$o .= '<input type="text" tabindex="'.($this->TabIndex++).'" name="'.$this->name.'" ';
         		$o .= 'value="'.$this->default_value.'"'.$validation_rule.'>';
       			break;
-      			
+
       		case 'checkbox':
         		$o .= '<input type="checkbox" name="'.$this->name.'" tabindex="'.($this->TabIndex++).'"'.$validation_rule;
         		$o .= $this->default_value ? ' checked>' : '>';
       			break;
-      			
+
     		case 'password':
     			/* To exclude config form from populating with Root (md5) password */
     			if( $this->Section == 'in-portal:configure_users' ) $this->default_value = '';
-    		
+
 		        $o .= '<input type="password" tabindex="'.($this->TabIndex++).'" name="'.$this->name.'" ';
 		        $o .= 'value="'.$this->default_value.'">';
     			break;
-    			
+
     		case 'textarea':
         		$o .= '<textarea tabindex="'.($this->TabIndex++).'" '.$this->ValueList.' name="'.$this->name.'"'.$validation_rule.'>'.$this->default_value.'</textarea>';
     			break;
-    			
-    		case 'label':         
+
+    		case 'label':
 				if ($this->default_value) {
 					$tag_params = clsHtmlTag::ParseAttributes($this->ValueList);
 					if (isset($tag_params['cut_first'])) {
@@ -293,7 +293,7 @@
 					}
 				}
 				break;
-      		
+
 			case 'radio':
             	$radioname = $this->name;
             	$this->TabIndex++;
@@ -305,22 +305,22 @@
             	}
             	$this->TabIndex++;
       			break;
-      			
+
       		case 'select':
         		$o .= '<select name="'.$this->name.'" tabindex="'.($this->TabIndex++).'"'.$validation_rule.'>';
         		$values = $this->GetValues($this->ValueList);
-        				
+
         		foreach ($values as $option_id => $option_name) {
         			$selected = $this->default_value == $option_id ? ' selected' : '';
     				$o .= '<option value="'.$option_id.'" '.$selected.'>'.$option_name.'</option>';
         		}
         		$o .= '</select>';
         		break;
-        	
+
         	case 'multiselect':
         		$o .= '<select id="'.$this->name.'_select" tabindex="'.($this->TabIndex++).'" onchange="update_multiple_options(\''.$this->name.'\');" multiple>';
         		$values = $this->GetValues($this->ValueList);
-        		
+
         		$selected_values = explode('|', substr($this->default_value, 1, -1) );
         		foreach ($values as $option_id => $option_name) {
         			$selected = in_array($option_id, $selected_values) ? ' selected' : '';
@@ -339,7 +339,7 @@
   }
 }
 
-class clsConfigAdmin 
+class clsConfigAdmin
 {
   var $module;
   var $section;
@@ -359,32 +359,32 @@
       unset($this->Items);
       $this->Items = array();
   }
-  
+
   function NumItems()
   {
         if(is_array($this->Items))
         {
             return count($this->Items);
         }
         else
-            return 0;  	
+            return 0;
   }
 
   function LoadItems($CheckNextItems=TRUE, $inst=FALSE)
   {
       $this->Clear();
       if(!$inst)
-      {      
-        $sql = "SELECT * FROM ".GetTablePrefix()."ConfigurationAdmin INNER JOIN ".GetTablePrefix()."ConfigurationValues Using(VariableName) 
+      {
+        $sql = "SELECT * FROM ".GetTablePrefix()."ConfigurationAdmin INNER JOIN ".GetTablePrefix()."ConfigurationValues Using(VariableName)
                 WHERE ModuleOwner='".$this->module."' AND Section='".$this->section."' ORDER BY DisplayOrder ASC";
       }
       else
       {
 
-          $sql = "SELECT * FROM ".GetTablePrefix()."ConfigurationAdmin INNER JOIN ".GetTablePrefix()."ConfigurationValues Using(VariableName) 
+          $sql = "SELECT * FROM ".GetTablePrefix()."ConfigurationAdmin INNER JOIN ".GetTablePrefix()."ConfigurationValues Using(VariableName)
                   WHERE ModuleOwner='".$this->module."' AND Section='".$this->section."' AND Install=1 ORDER BY DisplayOrder ASC";
       }
-	  if( $GLOBALS['debuglevel'] ) echo $sql."<br>\n"; 
+	  if( $GLOBALS['debuglevel'] ) echo $sql."<br>\n";
       $adodbConnection = &GetADODBConnection();
       $rs = $adodbConnection->Execute($sql);
       $i = null;
@@ -393,8 +393,8 @@
       {
           $data = $rs->fields;
           if(is_object($i) && $CheckNextItems)
-          {          
-            $last = $i->prompt;            
+          {
+            $last = $i->prompt;
             unset($i);
           }
           $i = new clsConfigAdminItem(NULL);
@@ -407,15 +407,15 @@
           $i->ValidationRules = isset($data['validaton']) ? $data['validaton'] : '';
           $i->Section = $data["Section"];
           $i->DisplayOrder = $data['DisplayOrder'];
-          
+
           if(strlen($last)>0)
-          {          
+          {
             if($i->prompt==$last)
-            {           
+            {
               $this->Items[count($this->Items)-1]->NextItem=$i;
             }
             else
-            { 
+            {
               $i->NextItem=NULL;
               array_push($this->Items,$i);
             }
@@ -427,25 +427,25 @@
           }
           //unset($i);
           $rs->MoveNext();
-      }      
+      }
   }
 
   function SaveItems($POSTVARS, $force=FALSE)
   {
       global $objConfig;
-      
+
       foreach($this->Items as $i)
-      {               	  
+      {
           if($i->ElementType != "label")
 		  {
 			  if($i->ElementType != "checkbox")
-			  {        			  	
+			  {
 				$objConfig->Set($i->name,stripslashes($POSTVARS[$i->name]));
 			  }
 			  else
-			  {          
+			  {
 				if($POSTVARS[$i->name]=="on")
-				{            
+				{
 					$value=1;
 				}
 				else