completly rewritten uietemplate::process_show to not longer need to work recursively and be able to do input-checks later on

etemplate/inc/class.boetemplate.inc.php

@@ -340,53 +340,58 @@
 			        ($function == '' || $GLOBALS['phpgw_info']['etemplate']['extension'][$type]->public_functions[$function]);
 		}
 
-		function extensionPreProcess(&$cell,&$value,&$readonlys)
+		function extensionPreProcess($type,$name,&$value,&$cell,&$readonlys)
 		/*
 		@function extensionPreProcess
 		@syntax extensionPreProcess(&$cell,&$value,&$readonlys)
+		@param $type of the extension
+		@param $name form-name of this widget/field (used as a unique index into extension_data)
 		@param &$cell table-cell on which the extension operates
 		@param &$value value of the extensions content(-array)
 		@param &$readonlys value of the extensions readonly-setting(-array)
 		@abstract executes the pre_process-function of the extension $cell[]type]
 		*/
 		{
-			if (!$this->haveExtension($type = $cell['type']))
+			if (!$this->haveExtension($type))
 			{
 				return False;
 			}
-			return $GLOBALS['phpgw_info']['etemplate']['extension'][$type]->pre_process($cell,$value,
+			return $GLOBALS['phpgw_info']['etemplate']['extension'][$type]->pre_process($name,$value,$cell,$readonlys,
-				$GLOBALS['phpgw_info']['etemplate']['extension_data'][$type][$cell['name']],$readonlys,$this);
+				$GLOBALS['phpgw_info']['etemplate']['extension_data'][$name],$this);
 		}
 
-		function extensionPostProcess(&$cell,&$value)
+		function extensionPostProcess($type,$name,&$value,$value_in)
 		/*
 		@function extensionPostProcess
 		@syntax extensionPostProcess(&$cell,&$value)
+		@param $type of the extension
+		@param $name form-name of this widget/field (used as a unique index into extension_data)
+		@param &$value value of the extensions content(-array)
 		@abstract executes the post_process-function of the extension $cell[type]
 		*/
 		{
-			if (!$this->haveExtension($type = $cell['type'],'post_process'))
+			if (!$this->haveExtension($type,'post_process'))
 			{
 				return False;
 			}
-			return $GLOBALS['phpgw_info']['etemplate']['extension'][$type]->post_process($cell,$value,
+			return $GLOBALS['phpgw_info']['etemplate']['extension'][$type]->post_process($name,$value,
-				$GLOBALS['phpgw_info']['etemplate']['extension_data'][$type][$cell['name']],
+				$GLOBALS['phpgw_info']['etemplate']['extension_data'][$name],
-				$GLOBALS['phpgw_info']['etemplate']['loop'],$this);
+				$GLOBALS['phpgw_info']['etemplate']['loop'],$this,$value_in);
 		}
 
-		function extensionRender(&$cell,$form_name,&$value,$readonly)
+		function extensionRender($type,$name,&$value,&$cell,$readonly)
 		/*
 		@function extensionRender
 		@syntax extensionRender(&$cell,$form_name,&$value,$readonly)
 		@abstract executes the render-function of the extension $cell[type]
 		*/
 		{
-			if (!$this->haveExtension($type = $cell['type'],'render'))
+			if (!$this->haveExtension($type,'render'))
 			{
 				return False;
 			}
-			return $GLOBALS['phpgw_info']['etemplate']['extension'][$type]->render($cell,$form_name,$value,$readonly,
+			return $GLOBALS['phpgw_info']['etemplate']['extension'][$type]->render($cell,$name,$value,$readonly,
-				$GLOBALS['phpgw_info']['etemplate']['extension_data'][$type][$cell['name']],$this);
+				$GLOBALS['phpgw_info']['etemplate']['extension_data'][$name],$this);
 		}
 
 		/*!
@@ -424,7 +429,12 @@
 			}
 			eval($code = str_replace(']',"']",str_replace('[',"['",$code)));
 
-			//echo "set_array: $code = '$val'\n";
+			//echo "set_array: $code = '$val'<br>\n";
+		}
+
+		function unset_array(&$arr,$idx)
+		{
+			$this->set_array($arr,$idx,0,False);
 		}
 
 		function &get_array(&$arr,$idx)
@@ -432,7 +442,7 @@
 			if (ereg('^([^[]*)(\\[.*\\])$',$idx,$regs))	// idx contains array-index
 			{
 				eval($code = str_replace(']',"']",str_replace('[',"['",'$val = &$arr['.$regs[1].']'.$regs[2].';')));
-				//echo "get_array: $code = '$val'\n";
+				//echo "get_array: $code = '$val'<br>\n";
 			}
 			else
 			{
@@ -446,15 +456,14 @@
 		@syntax complete_array_merge( $old,$new )
 		@author ralfbecker
 		@abstract merges $old and $new, content of $new has precedence over $old
-		@discussion THIS IS NOT THE SAME AS PHP4: array_merge (as it calls itself recursive for values which are arrays,
+		@discussion THIS IS NOT THE SAME AS PHP4: array_merge (as it calls itself recursive for values which are arrays.
-		@discussion if there key does NOT start with a '_' (array_merge just overwrites the old (sub)array)
 		*/
 		function complete_array_merge($old,$new)
 		{
 			@reset($new);
 			while (list($k,$v) = @each($new))
 			{
-				if (!is_array($v) || !isset($old[$k]) || $k[0] == '_')
+				if (!is_array($v) || !isset($old[$k]))
 				{
 					$old[$k] = $v;
 				}

etemplate/inc/class.date_widget.inc.php

@@ -44,8 +44,9 @@
 			return 0;
 		}
 
-		function pre_process(&$cell,&$value,&$extension_data,&$readonlys,&$tmpl)
+		function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
 		{
+			$extension_data = $cell['size'];
 			if ($cell['size'] != '')
 			{
 				$date = split('[/.-]',$value);
@@ -77,7 +78,7 @@
 			return $this->$func($cell,$form_name,$value,$readonly,$tmpl);
 		}
 
-		function post_process(&$cell,&$value,&$extension_data,&$loop,&$tmpl)
+		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl)
 		{
 			if (!isset($value))
 			{
@@ -93,15 +94,15 @@
 				{
 					$value['Y'] = date('Y');
 				}
-				if ($cell['size'] == '')
+				if ($extension_data)
 				{
 					$value = mktime(0,0,0,$value['m'],$value['d'],$value['Y']);
 				}
 				else
 				{
-					for ($n = 0,$str = ''; $n < strlen($cell['size']); ++$n)
+					for ($n = 0,$str = ''; $n < strlen($extension_data); ++$n)
 					{
-						if (strstr('Ymd',$c = $cell['size'][$n]))
+						if (strstr('Ymd',$c = $extension_data[$n]))
 						{
 							$str .= sprintf($c=='Y'?'%04d':'%02d',$value[$c]);
 						}

etemplate/inc/class.datefield_widget.inc.php

@@ -30,8 +30,10 @@
 		{
 		}
 
-		function pre_process(&$cell,&$value,&$extension_data,&$readonlys,&$tmpl)
+		function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
 		{
+			$extension_data = $cell['size'];
+
 			if ($cell['size'] != '')
 			{
 				$date = split('[/.-]',$value);
@@ -69,7 +71,7 @@
 			return True;	// extra Label is ok
 		}
 
-		function post_process(&$cell,&$value,&$extension_data,&$loop,&$tmpl)
+		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl)
 		{
 			if (!isset($value))
 			{
@@ -96,15 +98,15 @@
 				{
 					$value['Y'] += $value['Y'] < 30 ? 2000 : 1900;
 				}
-				if ($cell['size'] == '')
+				if (empty($extension_data))
 				{
 					$value = mktime(0,0,0,$value['m'],$value['d'],$value['Y']);
 				}
 				else
 				{
-					for ($n = 0,$str = ''; $n < strlen($cell['size']); ++$n)
+					for ($n = 0,$str = ''; $n < strlen($extension_data); ++$n)
 					{
-						if (strstr('Ymd',$c = $cell['size'][$n]))
+						if (strstr('Ymd',$c = $extension_data[$n]))
 						{
 							$str .= sprintf($c=='Y'?'%04d':'%02d',$value[$c]);
 						}

etemplate/inc/class.nextmatch_widget.inc.php

@@ -31,28 +31,33 @@
 		{
 		}
 
-		function pre_process(&$cell,&$value,&$extension_data,&$readonlys,&$tmpl)
+		function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
 		{
 			//echo "<p>nextmatch_widget.pre_process: value = "; _debug_array($value);
 			// save values in persistent extension_data to be able use it in post_process
-			$extension_data = $value;
+			//$extension_data = $value;
 
 			list($app,$class,$method) = explode('.',$value['get_rows']);
 			$obj = CreateObject($app.'.'.$class);
+			if (!is_object($obj))
+			{
+				echo "<p>nextmatch_widget::pre_process($name): '$value[get_rows]' is no valid method !!!</p>\n";
+				return;
+			}
 			$total = $value['total'] = $obj->$method($value,$value['rows'],$readonlys['rows']);
 			if ($value['start'] > $total)
 			{
-				$extension_data['start'] = $value['start'] = 0;
+				$value['start'] = 0;
 				$total = $obj->$method($value,$value['rows'],$readonlys['rows']);
 			}
-			$extension_data['total'] = $total;
+			if ($cell['size'])	// template name can be supplied either in $value['template'] or the options-field
-
-			if ($cell['size'])
 			{
 				$value['template'] = $cell['size'];
 			}
-			$value['template'] = new etemplate($value['template'],$tmpl->as_array());
+			if (!is_object($value['template']))
-
+			{
+				$value['template'] = new etemplate($value['template'],$tmpl->as_array());
+			}
 			$nextmatch = new etemplate('etemplate.nextmatch_widget');
 
 			if ($value['no_cat'])
@@ -82,18 +87,16 @@
 			$cell['name'] = $nextmatch->name;
 			$cell['label'] = $cell['help'] = '';
 
+			$extension_data = $value;
+
 			return False;	// NO extra Label
 		}
 
-		function post_process(&$cell,&$value,&$extension_data,&$loop,&$tmpl)
+		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl)
 		{
 			//echo "<p>nextmatch_widget.post_process: value = "; _debug_array($value);
-
 			$old_value = $extension_data;
 
-			list($value['cat_id']) = $value['cat_id'];
-			list($value['filter']) = $value['filter'];
-			list($value['filter2'])= $value['filter2'];
 			$value['start'] = $old_value['start'];	// need to be set, to be reported back
 			$max   = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
 

etemplate/inc/class.tab_widget.inc.php

@@ -31,7 +31,7 @@
 		{
 		}
 
-		function pre_process(&$cell,&$value,&$extension_data,&$readonlys,&$tmpl)
+		function pre_process($form_name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
 		{
 			$labels = explode('|',$cell['label']);
 			$helps = explode('|',$cell['help']);
@@ -47,10 +47,10 @@
 			while (list($k,$name) = each($names))
 			{
 				$tcell = $tabs->empty_cell();
-				if (is_array($value['_tab_widget']) && $value['_tab_widget'][$name][0])
+				if ($extension_data == $name)
 				{
 					// save selected tab in persistent extension_data to use it in post_process
-					$extension_data = $selected_tab = $name;
+					$selected_tab = $name;
 					$tcell['obj'] = &$tab_active;
 					$tcell['name'] = $tab_active->name;
 				}
@@ -60,8 +60,8 @@
 					$tcell['name'] = $tab->name;
 				}
 				$tcell['type'] = 'template';
-				$tcell['size'] = "_tab_widget[$name]";
+				$tcell['size'] = $cell['name']/*form_name*/.'['.$name.']';
-				$value['_tab_widget'][$name] = array(
+				$value[$name] = array(
 					'name'  => $name,
 					'label' => $labels[$k],
 					'help'  => $helps[$k]
@@ -98,22 +98,18 @@
 			return False;	// NO extra Label
 		}
 
-		function post_process(&$cell,&$value,&$extension_data,&$loop,&$tmpl)
+		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl)
 		{
-			$old_value = array(
+			//echo "<p>tab_widget::post_process($name): value = "; _debug_array($value);
-				'_tab_widget' => array(
+			if (is_array($value))
-					$extension_data => array(True)
-			));
-			$this->pre_process($cell,$old_value,$extension_data,$dummy,$tmpl);
-
-			if (is_array($value['_tab_widget']))
 			{
-				while (list($key,$val) = each($value['_tab_widget']))
+				reset($value);
+				list($tab,$button) = each($value);
+				list(,$button) = each($button);
+				if ($button)
 				{
-					if (is_array($val) && $val[0])
+					$extension_data = $tab;
-					{
+					$loop = True;
-						$loop = True;
-					}
 				}
 			}
 			return True;

etemplate/inc/class.uietemplate.inc.php

@@ -103,12 +103,14 @@
 			$id = $this->appsession_id();
 			$GLOBALS['phpgw_info']['etemplate']['loop'] = False;
 			$GLOBALS['phpgw_info']['etemplate']['form_options'] = '';	// might be set in show
+			$GLOBALS['phpgw_info']['etemplate']['to_process'] = array();
 			$html .= ($this->stable ? $this->html->nextMatchStyles()."\n\n" : ''). // so they get included once
 				$this->html->form($this->include_java_script() .
-					$this->show($this->complete_array_merge($content,$changes),$sel_options,$readonlys,'exec'),
+					$this->show($this->complete_array_merge($content,$changes),$sel_options,$readonlys,'exec'),array(
-					array('etemplate_exec_id' => $id,'app' => $GLOBALS['phpgw_info']['flags']['currentapp']),
+						'etemplate_exec_id' => $id,
-					'/etemplate/process_exec.php','','eTemplate',$GLOBALS['phpgw_info']['etemplate']['form_options']);
+						'etemplate_exec_app' => $GLOBALS['phpgw_info']['flags']['currentapp']
-
+					),'/etemplate/process_exec.php','','eTemplate',$GLOBALS['phpgw_info']['etemplate']['form_options']);
+			//_debug_array($GLOBALS['phpgw_info']['etemplate']['to_process']);
 			list($width,$height,,,,,$overflow) = explode(',',$this->size);
 			if ($overflow)
 			{
@@ -121,6 +123,7 @@
 				'sel_options' => $sel_options,
 				'preserv' => $preserv,
 				'extension_data' => $GLOBALS['phpgw_info']['etemplate']['extension_data'],
+				'to_process' => $GLOBALS['phpgw_info']['etemplate']['to_process'],
 				'java_script' => $GLOBALS['phpgw_info']['etemplate']['java_script'],
 				'method' => $method
 			),$id);
@@ -161,7 +164,7 @@
 			$GLOBALS['phpgw_info']['etemplate']['java_script'] = $session_data['java_script'] || $GLOBALS['HTTP_POST_VARS']['java_script'];
 			//echo "globals[java_script] = '".$GLOBALS['phpgw_info']['etemplate']['java_script']."', session_data[java_script] = '".$session_data['java_script']."', HTTP_POST_VARS[java_script] = '".$GLOBALS['HTTP_POST_VARS']['java_script']."'\n";
 			//echo "process_exec($this->name) content ="; _debug_array($content);
-			$this->process_show($content,$session_data['readonlys']);
+			$this->process_show($content,$session_data['to_process'],'exec');
 
 			//echo "process_exec($this->name) process_show(content) ="; _debug_array($content);
 			//echo "process_exec($this->name) session_data[changes] ="; _debug_array($session_data['changes']);
@@ -197,7 +200,7 @@
 		@param $show_xxx row,col name/index for name expansion
 		@result the generated HTML
 		*/
-		function show($content,$sel_options='',$readonlys='',$cname='cont',$show_c=0,$show_row=0)
+		function show($content,$sel_options='',$readonlys='',$cname='',$show_c=0,$show_row=0)
 		{
 			if (!$sel_options)
 			{
@@ -339,11 +342,11 @@
 			}
 			$name = $this->expand_name($cell['name'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
 
-			if (strstr($name,'|'))	// extension which uses whole content array
+			/*if (strstr($name,'|'))	// extension which uses whole content array
 			{
 				$value = $content;
 			}
-			elseif (ereg('^([^[]*)(\\[.*\\])$',$name,$regs))	// name contains array-index
+			else*/if (ereg('^([^[]*)(\\[.*\\])$',$name,$regs))	// name contains array-index
 			{
 				$form_name = $cname == '' ? $name : $cname.'['.$regs[1].']'.$regs[2];
 				eval(str_replace(']',"']",str_replace('[',"['",'$value = $content['.$regs[1].']'.$regs[2].';')));
@@ -371,14 +374,14 @@
 
 			if (!$this->types[$cell['type']] && $this->haveExtension($cell['type'],'pre_process'))
 			{
-				$type = $cell['type'];
+				$ext_type = $cell['type'];
-				$extra_label = $this->extensionPreProcess($cell,$value,$readonlys[$name]);
+				$extra_label = $this->extensionPreProcess($ext_type,$form_name,$value,$cell,$readonlys[$name]);
-				//echo "<p>$type::pre_process"; _debug_array($cell);
+
-				if (strstr($name,'|'))
+				/*if (strstr($name,'|'))
 				{
 					$content = $this->complete_array_merge($content,$value);
 				}
-				elseif (!$regs)
+				else*/if (!$regs)
 				{
 					$content[$name] = $value;	// set result for template
 				}
@@ -442,11 +445,14 @@
 					{
 						$html .= $this->html->input($form_name,$value,'',
 							$options.$this->html->formatOptions($cell['size'],'SIZE,MAXLENGTH'));
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					}
 					break;
 				case 'textarea':	// Multiline Text Input, size: [rows][,cols]
 					$html .= $this->html->textarea($form_name,$value,
 						$options.$this->html->formatOptions($cell['size'],'ROWS,COLS'));
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'checkbox':
 					if ($value)
@@ -454,6 +460,8 @@
 						$options .= ' CHECKED';
 					}
 					$html .= $this->html->input($form_name,'1','CHECKBOX',$options);
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'radio':		// size: value if checked
 					if ($value == $cell['size'])
@@ -461,6 +469,8 @@
 						$options .= ' CHECKED';
 					}
 					$html .= $this->html->input($form_name,$cell['size'],'RADIO',$options);
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'button':
 					if ($this->java_script() && $cell['onchange'])
@@ -478,6 +488,8 @@
 							$this->html->image(substr($this->name,0,strpos($this->name,'.')),$ro_img);
 					}
 					$extra_label = False;
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'hrule':
 					$html .= $this->html->hr($cell['size']);
@@ -515,7 +527,7 @@
 					{
 						if ($span == '' && isset($content[$idx]['span']))
 						{	// this allows a colspan in autorepeated cells like the editor
-							$span = explode(',',$content[$idx]['span']); $span = $span[0];
+							list($span) = explode(',',$content[$idx]['span']);
 							if ($span == 'all')
 							{
 								$span = 1 + $content['cols'] - $show_c;
@@ -549,25 +561,39 @@
 					}
 					$html .= $this->sbox->getArrayItem($form_name.'[]',$value,$sel_options,$cell['no_lang'],
 						$options,$cell['size']);
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'select-percent':
 					$html .= $this->sbox->getPercentage($form_name,$value,$options);
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'select-priority':
 					$html .= $this->sbox->getPriority($form_name,$value,$options);
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'select-access':
 					$html .= $this->sbox->getAccessList($form_name,$value,$options);
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'select-country':
 					$html .= $this->sbox->getCountry($form_name,$value,$options);
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'select-state':
 					$html .= $this->sbox->list_states($form_name,$value);  // no helptext - old Function!!!
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'select-cat':
 					$html .= $this->sbox->getCategory($form_name.'[]',$value,$cell['size'] >= 0,
 						False,$cell['size'],$options);
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'select-account':
 					$type = substr(strstr($cell['size'],','),1);
@@ -576,6 +602,8 @@
 						$type = 'accounts';	// default is accounts
 					}
 					$html .= $this->sbox->getAccount($form_name.'[]',$value,2,$type,0+$cell['size'],$options);
+					if (!$readonly)
+						$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
 					break;
 				case 'image':
 					$image = $this->html->image(substr($this->name,0,strpos($this->name,'.')),
@@ -588,11 +616,13 @@
 					$html .= $this->html->input($form_name,'','file');
 					$GLOBALS['phpgw_info']['etemplate']['form_options'] =
 						"enctype=\"multipart/form-data\" onSubmit=\"set_element2(this,'$path','$form_name')\"";
+					$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = $cell['type'];
+					$GLOBALS['phpgw_info']['etemplate']['to_process'][$path] = 'file-path';
 					break;
 				default:
-					if ($this->haveExtension($cell['type'],'render'))
+					if ($ext_type && $this->haveExtension($ext_type,'render'))
 					{
-						$html .= $this->extensionRender($cell,$form_name,$value,$readonly);
+						$html .= $this->extensionRender($ext_type,$form_name,$value,$cell,$readonly);
 					}
 					else
 					{
@@ -600,6 +630,10 @@
 					}
 					break;
 			}
+			if ($ext_type && !$readonly)	// extension-processing need to be after all other
+			{
+				$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = 'ext-'.$ext_type;
+			}
 			if ($extra_label && ($label != '' || $html == ''))
 			{
 				if (strlen($label) > 1 && !$cell['no_lang'])
@@ -624,126 +658,71 @@
 			return $html;
 		}
 
+
 		/*!
 		@function process_show
 		@abstract makes necessary adjustments on HTTP_POST_VARS after a eTemplate / form gots submitted
 		@discussion This is only an internal function, dont call it direct use only exec
-		@discussion process_show recursivly calls itself for the included eTemplates.
+		@discussion Process_show uses a list of input-fields/widgets generated by show.
-		@param $vars HTTP_POST_VARS on first call, later (deeper recursions) subscripts of it
+		@param $content HTTP_POST_VARS[$cname]
-		@param $readonly array with cell- / var-names which should NOT return content (this is to workaround browsers who not understand READONLY correct)
+		@param $to_process list of widgets/form-fields to process
 		@param $cname basename of our returnt content (same as in call to show)
 		@result the adjusted content (by using the var-param &$content)
 		*/
-		function process_show(&$content,$readonlys='')
+		function process_show(&$content,$to_process,$cname='')
 		{
-			if (!$readonlys)
-			{
-				$readonlys = array();
-			}
 			if (!isset($content) || !is_array($content))
 			{
 				return;
 			}
 			if ($this->debug >= 1 || $this->debug == $this->name && $this->name)
 			{
-				echo "<p>process_show($this->name) start: content ="; _debug_array($content);
+				echo "<p>process_show($this->name) start: content ="; _debug_array($GLOBALS['HTTP_POST_VARS']/*$content*/);
 			}
-			reset($this->data);
+			$content_in = $cname ? array($cname => $content) : $content;
-			if (isset($this->data[0]))
+			$content = array();
+			reset($to_process);
+			while (list($form_name,$type) = each($to_process))
 			{
-				each($this->data);	// skip width
+				$value = $this->get_array($content_in,$form_name);
+				list($type,$sub) = explode('-',$type);
+				switch ($type)
+				{
+					case 'ext':
+						$this->extensionPostProcess($sub,$form_name,$this->get_array($content,$form_name),$value);
+						break;
+					case 'text':
+					case 'textarea':
+						if (isset($value))
+						{
+							$value = stripslashes($value);
+						}
+						$this->set_array($content,$form_name,$value);
+						break;
+					case 'button':
+						if ($value)
+						{
+							$this->set_array($content,$form_name,$value);
+						}
+						break;
+					case 'select':
+						$this->set_array($content,$form_name,is_array($value) ? implode(',',$value) : $value);
+						break;
+					case 'checkbox':
+						if (!isset($value))	// checkbox was not checked
+						{
+							$value = 0;			// need to be reported too
+						}
+						$this->set_array($content,$form_name,$value);
+						break;
+					default:
+						$this->set_array($content,$form_name,$value);
+						break;
+				}
 			}
-			for ($r = 0; True /*list($row,$cols) = each($this->data)*/; ++$r)
+			if ($cname)
 			{
-				if (!(list($r_key) = each($this->data)))	// no further row
+				$content = $content[$cname];
-				{
-					//list($nul,$cell) = each($cols); reset($cols);
-					if ((!$this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname) ||
-						$idx_cname == '' || !$this->isset_array($content,$idx)) &&
-						(!$this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname) ||
-						$idx_cname == '' || !$this->isset_array($content,$idx)))
-					{
-						break;	// no auto-row-repeat
-					}
-				}
-				else
-				{
-					$cols = &$this->data[$r_key];
-				}
-				$row = 1+$r;
-				reset($cols);
-				for ($c = 0; True /*list($col,$cell) = each($cols)*/; ++$c)
-				{
-					//$old_cell = $cell;
-					if (!(list($c_key/*,$cell*/) = each($cols)))	// no further cols
-					{
-						//$cell = $old_cell;
-						if (!$this->autorepeat_idx($cell,$c,$r,$idx,$idx_cname,True) ||
-							$idx_cname == '' || !$this->isset_array($content,$idx))
-						{
-							break;	// no auto-col-repeat
-						}
-					}
-					else
-					{
-						$cell = &$cols[$c_key];
-						$this->autorepeat_idx($cell,$c,$r,$idx,$idx_cname,True); // get idx_cname
-					}
-					$col = $this->num2chrs($c);
-
-					$name = $this->expand_name($cell['name'],$c,$r);
-					$readonly = $cell['readonly'] || $readonlys[$name] || $readonlys['__ALL__'] ||
-						$cell['type'] == 'label' || $cell['type'] == 'image' || $cell['type'] == 'raw' ||
-						$cell['type'] == 'hrule';
-
-					if ($idx_cname == '' && $cell['type'] == 'template' || strstr($name,'|'))	// only templates or extensions
-					{
-						if ($readonly && !isset($readonlys['__ALL__']))		// can't unset whole content!!!
-						{
-							$readonlys['__ALL__'] = True;
-							$this->process_show_cell($cell,$name,$c,$r,$readonlys,$content);
-							unset($readonlys['__ALL__']);		// unset it after or everything gets set readonly
-						}
-						else
-						{
-							$this->process_show_cell($cell,$name,$c,$r,$readonlys,$content);
-						}
-					}
-					elseif (ereg('^([^[]*)\\[(.*)\\]$',$idx_cname,$regs))	// name contains array-index
-					{
-						/*  Attention: the unsets here and in the next else are vor two reasons:
-						*  1) some browsers does NOT understand the READONLY-tag and sent content back
-						*     this has to be unset, as we only report no-readonly fields
-						*  2) php has a fault / feature :-) that it set unset array-elements passed as
-						*     variable / changeable (&$var) to a function, this messes up a lot, as we
-						*     depend on the fact variables are set or not for the autorepeat. To work
-						*     around that, process_show_cell reports back if a variable is set or not
-						*     via the returnvalue and we unset it or even the parent if is was not set.
-						*/
-						$parent_isset = isset($content[$regs[1]]);
-
-						if ($readonly || !$this->process_show_cell($cell,$name,$c,$r,
-								$readonlys[$regs[1]][$regs[2]],$content[$regs[1]][$regs[2]]))
-						{
-							if (!$parent_isset)
-							{
-								unset($content[$regs[1]]);
-							}
-							else
-							{
-								unset($content[$regs[1]][$regs[2]]);
-							}
-						}
-					}
-					else
-					{
-						if ($readonly || !$this->process_show_cell($cell,$name,$c,$r,
-								$readonlys[$idx_cname],$content[$idx_cname]))
-						{
-							unset($content[$idx_cname]);
-						}
-					}
-				}
 			}
 			if ($this->debug >= 2 || $this->debug == $this->name && $this->name)
 			{
@@ -751,118 +730,6 @@
 			}
 		}
 
-		/*!
-		@function process_show_cell
-		@syntax process_show_cell( $cell,$name,$c,$r,$readonlys,&$value )
-		@author ralfbecker
-		@abstract makes necessary adjustments on $value eTemplate / form gots submitted
-		@discussion This is only an internal function, dont call it direct use only exec
-		@discussion process_show recursivly calls itself for the included eTemplates.
-		@param $cell processed cell
-		@param $name expanded name of cell
-		@param $c,$r col,row index
-		@param $readonlys readonlys-array to pass on for templates
-		@param &$value value to change
-		@result if $value is set
-		*/
-		function process_show_cell($cell,$name,$c,$r,$readonlys,&$value)
-		{
-			if (is_array($cell['type']))
-			{
-				$cell['type'] = $cell['type'][0];
-			}
-			if ($this->debug >= 3 || $this->debug == $this->name || $this->debug == $cell['type'])
-			{
-				if (is_object($name))
-				{
-					$name = $name->name;
-				}
-				echo "<p>process_show_cell(c=$c, r=$r, name='$name',type='${cell['type']}') start: isset(value)=".(0+isset($value)).", value=";
-				if (is_array($value))
-				{
-					_debug_array($value);
-				}
-				else
-				{
-					echo "'$value'</p>\n";
-				}
-			}
-			if ($this->haveExtension($cell['type'],'post_process'))
-			{
-				if ($this->debug > 1 || $this->debug && $this->debug == $this->name)
-				{
-					echo "<p>value for $cell[type]::post_process: "; _debug_array($value);
-				}
-				$this->extensionPostProcess($cell,$value);
-
-				if ($this->debug > 1 || $this->debug && $this->debug == $this->name)
-				{
-					echo "<p>value after $cell[type]::post_process: ";
-					if (is_array($value))
-					{
-						_debug_array($value);
-					}
-					else
-					{
-						echo "'$value'</p>";
-					}
-				}
-			}
-			switch ($cell['type'])
-			{
-				case 'int':
-				case 'float':
-					list($min,$max) = explode(',',$cell['size']);
-					/*
-					* TO DO: number- and range-check, if not enshured by java-script
-					*/
-					break;
-				case 'text':
-				case 'textarea':
-					if (isset($value))
-					{
-						$value = stripslashes($value);
-					}
-					break;
-				case 'checkbox':
-					if (!isset($value))	// checkbox was not checked
-					{
-						$value = 0;			// need to be reported too
-					}
-					break;
-				case 'template':
-					if (!is_object($cell['obj']))
-					{
-						$cell['obj'] = new etemplate($cell['name'],$this->as_array());
-					}
-					//$templ = is_object($cell['name']) ? $cell['name'] : new etemplate($cell['name'],$this->as_array());
-					$cell['obj']->process_show($value,$readonlys);
-					break;
-				case 'select':
-				case 'select-cat':
-				case 'select-account':
-					if (is_array($value))
-					{
-						$value = count($value) <= 1 ? $value[0] : implode(',',$value);
-					}
-					break;
-				default: // do nothing, $value is correct as is
-			}
-			if ($this->debug >= 3 || $this->debug == $this->name || $this->debug == $cell['type'])
-			{
-				echo "<p>process_show_cell(name='$name',type='${cell['type']}) end: isset(value)=".(0+isset($value)).", value=";
-				if (is_array($value))
-				{
-					_debug_array($value);
-				}
-				else
-				{
-					echo "'$value'</p>\n";
-				}
-			}
-			return isset($value);
-		}
-
 		/*!
 		@function java_script
 		@syntax java_script( $consider_not_tested_as_enabled = True )

etemplate/inc/class.xslt_widget.inc.php

@@ -24,7 +24,8 @@
 	{
 		var $public_functions = array(
 			'pre_process' => True,
-			'render' => True
+			'render' => True,
+			'post_process' => True
 		);
 		var $human_name = 'XSLT Template';	// this is the name for the editor
 
@@ -44,7 +45,7 @@
 			return 0;
 		}
 
-		function pre_process(&$cell,&$value,&$extension_data,&$readonlys,&$tmpl)
+		function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
 		{
 			return False;	// no extra label
 		}
@@ -94,4 +95,11 @@
 			));
 			return $this->xslttemplates->parse();
 		}
+
+		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
+		{
+			//echo "<p>xslt_widget.post_process: $name = "; _debug_array($value_in);
+
+			$value = $value_in;
+		}
 	}