--- t3lib/class.t3lib_tceforms_fe_original.php	2009-01-02 13:29:43.000000000 -0600
+++ t3lib/class.t3lib_tceforms_fe.php	2009-01-02 13:31:49.000000000 -0600
@@ -11,8 +65,8 @@
 	 * @param	string		The string to wrap
 	 * @return	string
 	 */
-	function wrapLabels($str)	{
-		return '<font face="verdana" size="1" color="black">'.$str.'</font>';
+	public function wrapLabels($str) {
+		return '<font face="verdana" size="1" color="black">' . $str . '</font>';
 	}
 
 	/**
@@ -21,20 +75,19 @@
 	 * @param	array		The palette array to print
 	 * @return	string		HTML output
 	 */
-	function printPalette($palArr)	{
-		$out='';
-		reset($palArr);
-		$bgColor=' bgcolor="#D6DAD0"';
-		while(list(,$content)=each($palArr))	{
-			$hRow[]='<td'.$bgColor.'><font face="verdana" size="1">&nbsp;</font></td><td nowrap="nowrap"'.$bgColor.'><font color="#666666" face="verdana" size="1">'.$content['NAME'].'</font></td>';
-			$iRow[]='<td valign="top">'.
-						'<img name="req_'.$content['TABLE'].'_'.$content['ID'].'_'.$content['FIELD'].'" src="clear.gif" width="10" height="10" alt="" />'.
-						'<img name="cm_'.$content['TABLE'].'_'.$content['ID'].'_'.$content['FIELD'].'" src="clear.gif" width="7" height="10" alt="" />'.
-						'</td><td nowrap="nowrap" valign="top">'.$content['ITEM'].$content['HELP_ICON'].'</td>';
+	public function printPalette(array $paletteArray) {
+		$out = '';
+		$bgColor = ' bgcolor="#D6DAD0"';
+		foreach($paletteArray as $content) {
+			$hRow[] = '<td' . $bgColor . '><font face="verdana" size="1">&nbsp;</font></td><td nowrap="nowrap"' . $bgColor . '><font color="#666666" face="verdana" size="1">' . $content['NAME'] . '</font></td>';
+			$iRow[] = '<td valign="top">' .
+						'<img name="req_' . $content['TABLE'].'_' . $content['ID'] . '_' . $content['FIELD'] . '" src="clear.gif" width="10" height="10" alt="" />' .
+						'<img name="cm_' . $content['TABLE'].'_' . $content['ID'] . '_' . $content['FIELD'] . '" src="clear.gif" width="7" height="10" alt="" />' .
+						'</td><td nowrap="nowrap" valign="top">' . $content['ITEM'] . $content['HELP_ICON'] . '</td>';
 		}
-		$out='<table border="0" cellpadding="0" cellspacing="0">
-			<tr><td><img src="clear.gif" width="'.intval($this->paletteMargin).'" height="1" alt="" /></td>'.implode('',$hRow).'</tr>
-			<tr><td></td>'.implode('',$iRow).'</tr>
+		$out = '<table border="0" cellpadding="0" cellspacing="0">
+			<tr><td><img src="clear.gif" width="' . intval($this->paletteMargin) . '" height="1" alt="" /></td>' . implode('', $hRow) . '</tr>
+			<tr><td></td>' . implode('', $iRow) . '</tr>
 		</table>';
 
 		return $out;
@@ -46,8 +99,8 @@
 	 *
 	 * @return	void
 	 */
-	function setFancyDesign()	{
-		$this->fieldTemplate='
+	public function setFancyDesign() {
+		$this->fieldTemplate = '
 	<tr>
 		<td nowrap="nowrap" bgcolor="#F6F2E6">###FIELD_HELP_ICON###<font face="verdana" size="1" color="black"><b>###FIELD_NAME###</b></font>###FIELD_HELP_TEXT###</td>
 	</tr>
@@ -55,13 +108,13 @@
 		<td nowrap="nowrap" bgcolor="#ABBBB4"><img name="req_###FIELD_TABLE###_###FIELD_ID###_###FIELD_FIELD###" src="clear.gif" width="10" height="10" alt="" /><img name="cm_###FIELD_TABLE###_###FIELD_ID###_###FIELD_FIELD###" src="clear.gif" width="7" height="10" alt="" /><font face="verdana" size="1" color="black">###FIELD_ITEM###</font>###FIELD_PAL_LINK_ICON###</td>
 	</tr>	';
 
-		$this->totalWrap='<table border="0" cellpadding="1" cellspacing="0" bgcolor="black"><tr><td><table border="0" cellpadding="2" cellspacing="0">|</table></td></tr></table>';
+		$this->totalWrap = '<table border="0" cellpadding="1" cellspacing="0" bgcolor="black"><tr><td><table border="0" cellpadding="2" cellspacing="0">|</table></td></tr></table>';
 
-		$this->palFieldTemplate='
+		$this->palFieldTemplate = '
 	<tr>
 		<td nowrap="nowrap" bgcolor="#ABBBB4"><font face="verdana" size="1" color="black">###FIELD_PALETTE###</font></td>
 	</tr>	';
-		$this->palFieldTemplateHeader='
+		$this->palFieldTemplateHeader = '
 	<tr>
 		<td nowrap="nowrap" bgcolor="#F6F2E6"><font face="verdana" size="1" color="black"><b>###FIELD_HEADER###</b></font></td>
 	</tr>	';