Index: trunk/kernel/units/general/custom_fields.php
===================================================================
diff -u -r1566 -r2285
--- trunk/kernel/units/general/custom_fields.php	(.../custom_fields.php)	(revision 1566)
+++ trunk/kernel/units/general/custom_fields.php	(.../custom_fields.php)	(revision 2285)
@@ -1,27 +1,36 @@
 <?php
 
-class InpCustomFieldsHelper extends kDBBase {
+/**
+ * Enter description here...
+ *
+ * @todo rewrite
+ */
+class InpCustomFieldsHelper extends kHelper {
 	
 	function GetValuesHash($values_list)
 	{
 		$optionValuesStr = $this->ParseConfigSQL($values_list);
-		$optionValuesTmp=explode(',', $optionValuesStr);	
-		$optionValues=array();
-		foreach ($optionValuesTmp as $optionValue){
-			list($key, $val) = @explode("=", $optionValue);
-			
-			if (substr($val,0,1)=="+")
-				$val = substr($val, 1);
-			else
-				$val = $this->Application->Phrase($val);
-			
-			$optionValues[$key]=$val;
+		$optionValuesTmp = explode(',', $optionValuesStr);	
+		$optionValues = Array();
+		foreach($optionValuesTmp as $optionValue)
+		{
+			list($key, $val) = explode('=', $optionValue);
+			$val = (substr($val,0,1) == '+') ? substr($val, 1) : $this->Application->Phrase($val);
+			$optionValues[$key] = $val;
 		}
 		return $optionValues;
 	}
 
-	function ParseConfigSQL($valueString){
-		$string = trim(str_replace("<PREFIX>",TABLE_PREFIX,$valueString));
+	/**
+	 * Replace SQL's in valueList with appropriate queried values
+	 *
+	 * @param string $valueString
+	 * @return string
+	 * @todo Fully rewrite !!!
+	 */
+	function ParseConfigSQL($valueString)
+	{
+		$string = trim( str_replace('<PREFIX>', TABLE_PREFIX, $valueString) );
 
 		preg_match_all("|\{(.*)\}|U", $string, $embedded_vars, PREG_SET_ORDER);
 		
@@ -32,40 +41,39 @@
 		Will output: what to output if Hello is set
 		*/
 		
-		if (sizeof($embedded_vars)>0){
-			for ($i=0; $i<sizeof($embedded_vars); $i++){
+		if($embedded_vars)
+		{
+			for($i = 0; $i < count($embedded_vars); $i++)
+			{
 				$embedded_var = $embedded_vars[$i][1];
 				$embedded_var_src = $embedded_vars[$i][0];
 				
 				list($var_name, $pattern) = explode('|', $embedded_var);
 				eval('$var_value = (isset('.$var_name.')?'.$var_name.':false);');
 				
-				if ($var_value !== false){
+				if ($var_value !== false)
+				{
 					$pattern = str_replace($var_name, $var_value, $pattern);
 					$string = str_replace($embedded_var_src, $pattern, $string);
 				}
-				else {
+				else
+				{
 					$string = str_replace($embedded_var_src, '', $string);
 				}
-				
-				
 			}
 		}		
 		
-		$start = strpos($string,"<SQL");
+		$start = strpos($string,'<SQL');
 		
-		if (substr($string,$start+4,1)=="+"){
-			$plus = '+';
-		}
-		else {
-			$plus = '';
-		}
+		$plus = (substr($string,$start+4,1) == '+') ? '+' : '';
 				
-		while($start){
+		while($start)
+		{
 			$skip_length = 5 + strlen($plus);
 			
-			$end = strpos($string,"</SQL>");
-			if(!$end){
+			$end = strpos($string, '</SQL>');
+			if(!$end)
+			{
 				$end = strlen($string);
 			}
 			$len = $end - $start;
@@ -82,29 +90,20 @@
 		  	$chunk2=substr($string,$end+$skip_length+1);
 			$s = $chunk1.$sql_val.$chunk2;
 			
-			
 			$string = $s;
 			
-			$start = strpos($string,"<SQL");
-			
-			if (substr($string,$start+4,1)=="+"){
-				$plus = '+';
-			}
-			else {
-				$plus = '';
-			}
-			 
+			$start = strpos($string, '<SQL');
+			$plus = (substr($string,$start+4,1) == '+') ? '+' : '';
 		}
 		return $string;
 	}
 
 	function QueryConfigSQL($sql, $plus = '')
 	{
-		$db =& $this->Application->GetADODBConnection();
-
-		$valArray=$db->Query($sql);
-		for ($i=0; $i<sizeof($valArray); $i++){
-			$valArray[$i] = $valArray[$i]['OptionName']."=".$plus.$valArray[$i]['OptionValue'];
+		$valArray = $this->Conn->Query($sql);
+		for($i=0; $i<sizeof($valArray); $i++)
+		{
+			$valArray[$i] = $valArray[$i]['OptionName'].'='.$plus.$valArray[$i]['OptionValue'];
 			$valArray[$i] = str_replace(',', ';', $valArray[$i]);
 		}
 		return implode(',', $valArray);