From 75ec879ff9bb928c1ccac9e1cfab1585795ce34c Mon Sep 17 00:00:00 2001
From: reliberate <git@reliberate.com>
Date: Thu, 7 Apr 2016 12:00:19 -0600
Subject: [PATCH] Theme: Integrate settings to customize the style of edit form
 tables (label, field, heading and row cells). Editor: Prevent / (slashes) in
 clip name. Dialplan Editor: Code cleanup, and minor adjustments for theme
 compatibility. Functions: Add option to check_str() to skip string trim.

---
 app/dialplan/dialplan_edit.php  |  46 +++-------
 app/edit/clipadd.php            |   5 ++
 app/edit/clipupdate.php         |   8 +-
 resources/functions.php         |   5 +-
 themes/default/app_defaults.php | 152 +++++++++++++++++++++++++++++++-
 themes/default/template.php     | 129 +++++++++++++++------------
 6 files changed, 250 insertions(+), 95 deletions(-)

diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php
index 25b3b7082a..2b5329623b 100644
--- a/app/dialplan/dialplan_edit.php
+++ b/app/dialplan/dialplan_edit.php
@@ -497,12 +497,6 @@ else {
 
 	//dialplan details
 	if ($action == "update") {
-
-		//define the alternating row styles
-			$c = 0;
-			$row_style["0"] = "row_style0";
-			$row_style["1"] = "row_style1";
-
 		?>
 		<!--javascript to change select to input and back again-->
 			<script language="javascript">
@@ -521,7 +515,7 @@ else {
 		//display the results
 			if ($result_count > 0) {
 
-				echo "<table width='100%' border='0' cellpadding='0' cellspacing='2' style='margin: -2px; border-collapse: separate; border-spacing: 2px;'>\n";
+				echo "<table width='100%' border='0' cellpadding='0' cellspacing='0' style='margin: -2px; border-spacing: 2px;'>\n";
 
 				$x = 0;
 				foreach($details as $group) {
@@ -553,22 +547,8 @@ else {
 							$dialplan_detail_group = $row['dialplan_detail_group'];
 							$dialplan_detail_order = $row['dialplan_detail_order'];
 
-						//view
-							/*
-							echo "<tr >\n";
-							echo "	<td valign='top' class='vtable'>&nbsp;&nbsp;".$row['dialplan_detail_tag']."</td>\n";
-							echo "	<td valign='top' class='vtable'>&nbsp;&nbsp;".$row['dialplan_detail_type']."</td>\n";
-							echo "	<td valign='top' class='vtable'>&nbsp;&nbsp;".wordwrap($row['dialplan_detail_data'],180,"<br>",1)."</td>\n";
-							echo "	<td valign='top' class='vtable'>&nbsp;&nbsp;".$row['dialplan_detail_break']."</td>\n";
-							echo "	<td valign='top' class='vtable'>&nbsp;&nbsp;".$row['dialplan_detail_inline']."</td>\n";
-							echo "	<td valign='top' class='vtable'>&nbsp;&nbsp;".$row['dialplan_detail_group']."</td>\n";
-							echo "	<td valign='top' class='vtable'>&nbsp;&nbsp;".$row['dialplan_detail_order']."</td>\n";
-							echo "	<td valign='top' align='right' nowrap='nowrap'>\n";
-							echo "		<a href='dialplan_detail_edit.php?id=".$row['dialplan_detail_uuid']."&dialplan_uuid=".$dialplan_uuid."&app_uuid=".$app_uuid."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
-							echo "		<a href='dialplan_detail_delete.php?id=".$row['dialplan_detail_uuid']."&dialplan_uuid=".$dialplan_uuid."&app_uuid=".$app_uuid."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
-							echo "	</td>\n";
-							echo "</tr>\n";
-							*/
+						//no border on last row
+							$no_border = ($index == 999) ? "border: none;" : null;
 
 						//begin the row
 							echo "<tr>\n";
@@ -587,7 +567,7 @@ else {
 							}
 						//tag
 							$selected = "selected=\"selected\" ";
-							echo "<td class='vtablerow' onclick=\"label_to_form('label_dialplan_detail_tag_".$x."','dialplan_detail_tag_".$x."');\" nowrap='nowrap'>\n";
+							echo "<td class='vtablerow' style='".$no_border."' onclick=\"label_to_form('label_dialplan_detail_tag_".$x."','dialplan_detail_tag_".$x."');\" nowrap='nowrap'>\n";
 							if ($element['hidden']) {
 								echo "	<label id=\"label_dialplan_detail_tag_".$x."\">".$dialplan_detail_tag."</label>\n";
 							}
@@ -600,7 +580,7 @@ else {
 							echo "	</select>\n";
 							echo "</td>\n";
 						//type
-							echo "<td class='vtablerow' onclick=\"label_to_form('label_dialplan_detail_type_".$x."','dialplan_detail_type_".$x."');\" nowrap='nowrap'>\n";
+							echo "<td class='vtablerow' style='".$no_border."' onclick=\"label_to_form('label_dialplan_detail_type_".$x."','dialplan_detail_type_".$x."');\" nowrap='nowrap'>\n";
 							if ($element['hidden']) {
 								echo "	<label id=\"label_dialplan_detail_type_".$x."\">".$dialplan_detail_type."</label>\n";
 							}
@@ -656,7 +636,7 @@ else {
 							//echo "	<input type='button' id='btn_select_to_input_dialplan_detail_type' class='btn' style='visibility:hidden;' name='' alt='".$text['button-back']."' onclick='change_to_input(document.getElementById(\"dialplan_detail_type\"));this.style.visibility = \"hidden\";' value='&#9665;'>\n";
 							echo "</td>\n";
 						//data
-							echo "<td class='vtablerow' onclick=\"label_to_form('label_dialplan_detail_data_".$x."','dialplan_detail_data_".$x."');\" style='width: 100%; max-width: 150px; overflow: hidden; _text-overflow: ellipsis; white-space: nowrap;' nowrap='nowrap'>\n";
+							echo "<td class='vtablerow' onclick=\"label_to_form('label_dialplan_detail_data_".$x."','dialplan_detail_data_".$x."');\" style='".$no_border." width: 100%; max-width: 150px; overflow: hidden; _text-overflow: ellipsis; white-space: nowrap;' nowrap='nowrap'>\n";
 							if ($element['hidden']) {
 								$dialplan_detail_data_mod = $dialplan_detail_data;
 								if ($dialplan_detail_type == 'bridge') {
@@ -677,10 +657,10 @@ else {
 								}
 								echo "	<label id=\"label_dialplan_detail_data_".$x."\">".htmlspecialchars($dialplan_detail_data_mod)."</label>\n";
 							}
-							echo "	<input id='dialplan_detail_data_".$x."' name='dialplan_details[".$x."][dialplan_detail_data]' class='formfld' type='text' style='width: 100%; min-width: 100%; max-width: 100%; ".$element['visibility']."' placeholder='' value=\"".htmlspecialchars($dialplan_detail_data)."\">\n";
+							echo "	<input id='dialplan_detail_data_".$x."' name='dialplan_details[".$x."][dialplan_detail_data]' class='formfld' type='text' style='width: calc(100% - 2px); min-width: calc(100% - 2px); max-width: calc(100% - 2px); ".$element['visibility']."' placeholder='' value=\"".htmlspecialchars($dialplan_detail_data)."\">\n";
 							echo "</td>\n";
 						//break
-							echo "<td class='vtablerow' onclick=\"label_to_form('label_dialplan_detail_break_".$x."','dialplan_detail_break_".$x."');\" nowrap='nowrap'>\n";
+							echo "<td class='vtablerow' style='".$no_border."' onclick=\"label_to_form('label_dialplan_detail_break_".$x."','dialplan_detail_break_".$x."');\" nowrap='nowrap'>\n";
 							if ($element['hidden']) {
 								echo "	<label id=\"label_dialplan_detail_break_".$x."\">".$dialplan_detail_break."</label>\n";
 							}
@@ -693,7 +673,7 @@ else {
 							echo "	</select>\n";
 							echo "</td>\n";
 						//inline
-							echo "<td class='vtablerow' style='text-align: center;' onclick=\"label_to_form('label_dialplan_detail_inline_".$x."','dialplan_detail_inline_".$x."');\" nowrap='nowrap'>\n";
+							echo "<td class='vtablerow' style='".$no_border." text-align: center;' onclick=\"label_to_form('label_dialplan_detail_inline_".$x."','dialplan_detail_inline_".$x."');\" nowrap='nowrap'>\n";
 							if ($element['hidden']) {
 								echo "	<label id=\"label_dialplan_detail_inline_".$x."\">".$dialplan_detail_inline."</label>\n";
 							}
@@ -704,7 +684,7 @@ else {
 							echo "	</select>\n";
 							echo "</td>\n";
 						//group
-							echo "<td class='vtablerow' style='text-align: center;' onclick=\"label_to_form('label_dialplan_detail_group_".$x."','dialplan_detail_group_".$x."');\" nowrap='nowrap'>\n";
+							echo "<td class='vtablerow' style='".$no_border." text-align: center;' onclick=\"label_to_form('label_dialplan_detail_group_".$x."','dialplan_detail_group_".$x."');\" nowrap='nowrap'>\n";
 							if ($element['hidden']) {
 								echo "	<label id=\"label_dialplan_detail_group_".$x."\">".$dialplan_detail_group."</label>\n";
 							}
@@ -724,7 +704,7 @@ else {
 							*/
 							echo "</td>\n";
 						//order
-							echo "<td class='vtablerow' style='text-align: center;' onclick=\"label_to_form('label_dialplan_detail_order_".$x."','dialplan_detail_order_".$x."');\" nowrap='nowrap'>\n";
+							echo "<td class='vtablerow' style='".$no_border." text-align: center;' onclick=\"label_to_form('label_dialplan_detail_order_".$x."','dialplan_detail_order_".$x."');\" nowrap='nowrap'>\n";
 							if ($element['hidden']) {
 								echo "	<label id=\"label_dialplan_detail_order_".$x."\">".$dialplan_detail_order."</label>\n";
 							}
@@ -759,13 +739,9 @@ else {
 							echo "	</td>\n";
 						//end the row
 							echo "</tr>\n";
-							if ($index != 999) {
-								echo "<tr><td colspan='7' style='margin: 0; padding: 0;'>".(img_spacer('100%', '1px', 'border-bottom: 1px solid #e5e9f0; margin: 0; padding: 0; display: block;'))."</td></tr>";
-							}
 						//increment the value
 							$x++;
 					}
-					if ($c==0) { $c=1; } else { $c=0; }
 					$x++;
 				} //end foreach
 				unset($sql, $result, $row_count);
diff --git a/app/edit/clipadd.php b/app/edit/clipadd.php
index 94166ef8df..0a3ed79d23 100644
--- a/app/edit/clipadd.php
+++ b/app/edit/clipadd.php
@@ -48,6 +48,11 @@ if (count($_POST)>0) {
 	$clip_order = check_str($_POST["clip_order"]);
 	if (strlen($clip_order) == 0) { $clip_order = 0; }
 
+	//no slashes
+	$clip_name = str_replace('/', '|', $clip_name);
+	$clip_name = str_replace('\\', '|', $clip_name);
+
+	//sql insert
 	$sql = "insert into v_clips ";
 	$sql .= "(";
 	$sql .= "clip_uuid, ";
diff --git a/app/edit/clipupdate.php b/app/edit/clipupdate.php
index a17ad25825..d7816b3d23 100644
--- a/app/edit/clipupdate.php
+++ b/app/edit/clipupdate.php
@@ -42,11 +42,15 @@ if (count($_POST)>0) {
 	$clip_uuid = check_str($_POST["id"]);
 	$clip_name = check_str($_POST["clip_name"]);
 	$clip_folder = check_str($_POST["clip_folder"]);
-	$clip_text_start = check_str($_POST["clip_text_start"]);
-	$clip_text_end = check_str($_POST["clip_text_end"]);
+	$clip_text_start = check_str($_POST["clip_text_start"], false);
+	$clip_text_end = check_str($_POST["clip_text_end"], false);
 	$clip_desc = check_str($_POST["clip_desc"]);
 	$clip_order = check_str($_POST["clip_order"]);
 
+	//no slashes
+	$clip_name = str_replace('/', '|', $clip_name);
+	$clip_name = str_replace('\\', '|', $clip_name);
+
 	//sql update
 	$sql  = "update v_clips set ";
 	$sql .= "clip_name = '$clip_name', ";
diff --git a/resources/functions.php b/resources/functions.php
index 145338210b..703d61a71e 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -53,7 +53,7 @@
 	}
 
 	if (!function_exists('check_str')) {
-		function check_str($string) {
+		function check_str($string, $trim = true) {
 			global $db_type, $db;
 			//when code in db is urlencoded the ' does not need to be modified
 			if ($db_type == "sqlite") {
@@ -83,7 +83,8 @@
 					$string = str_replace($search, $replace, $string);
 				}
 			}
-			return trim($string); //remove white space
+			$string = ($trim) ? trim($string) : $string;
+			return $string;
 		}
 	}
 
diff --git a/themes/default/app_defaults.php b/themes/default/app_defaults.php
index 3968f26782..f6b2770790 100644
--- a/themes/default/app_defaults.php
+++ b/themes/default/app_defaults.php
@@ -180,7 +180,7 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'body_color';
 		$array[$x]['default_setting_name'] = 'text';
-		$array[$x]['default_setting_value'] = '#fffff';
+		$array[$x]['default_setting_value'] = '#ffffff';
 		$array[$x]['default_setting_enabled'] = 'false';
 		$array[$x]['default_setting_description'] = 'Set then body background color (and opacity) of the content.';
 		$x++;
@@ -748,6 +748,156 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_value'] = '#a4aebf';
 		$array[$x]['default_setting_enabled'] = 'false';
 		$array[$x]['default_setting_description'] = 'Set the hover color (and opacity) of the Dashboard block footer bar dots.';
+		$x++;
+		/* form table elements */
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_padding';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '7px 8px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the padding of the form label cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_background_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#e5e9f0';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the background color (and opacity) of the form label cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_border_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#ffffff';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the bottom-border color (and opacity) of the form label cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_border_radius';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '4px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the border radius of the form label cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '9pt';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text size of the form label.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_text_font';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'Arial';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text font of the form label.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#000000';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text color (and opacity) of the form label.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_required_background_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#e5e9f0';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the background color of the required form label cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_required_border_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#cbcfd5';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the right-border color (and opacity) of the required form label cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_required_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#000000';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text color (and opacity) of the required form label.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_label_required_text_weight';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'bold';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text weight of the required form label.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_field_padding';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '6px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the padding of the form field cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_field_background_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#ffffff';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the background color (and opacity) of the form field cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_field_border_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#e5e9f0';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the bottom-border color (and opacity) of the form field cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_field_border_radius';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '0';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the border radius of the form label cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_field_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '8pt';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the size of text in the form field cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_field_text_font';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'Arial';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the font of text in the form field cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_field_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#666666';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the color (and opacity) of text in the form field cell.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_heading_padding';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '8px 8px 4px 8px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the padding of form column headings.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_row_padding';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '3px 0';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the padding of form row cells.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'form_table_row_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '9pt';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the size of text in the form rows.';
+		$x++;
+
 
 	//get an array of the default settings
 		$sql = "select * from v_default_settings ";
diff --git a/themes/default/template.php b/themes/default/template.php
index b33c53e487..3f43a4a73b 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -479,7 +479,6 @@
 		-moz-opacity: 1.0;
 		}
 
-
 /* DOMAIN SELECTOR ***********************************************************/
 
 	#domains_container {
@@ -823,72 +822,92 @@
 		white-space: nowrap;
 		}
 
-	.vncell {
-		border-bottom: 1px solid #fff;
-		background-color: #e5e9f0;
-		padding: 8px;
+	/* form: label/field format */
+	.vncell { /* form_label */
+		background: <?php echo ($_SESSION['theme']['form_table_label_background_color']['text'] != '') ? $_SESSION['theme']['form_table_label_background_color']['text'] : '#e5e9f0'; ?>;
+		border-radius: <?php echo ($_SESSION['theme']['form_table_label_border_radius']['text'] != '') ? $_SESSION['theme']['form_table_label_border_radius']['text'] : '4px'; ?>;
+		border-right: 3px solid <?php echo ($_SESSION['theme']['form_table_label_background_color']['text'] != '') ? $_SESSION['theme']['form_table_label_background_color']['text'] : '#e5e9f0'; ?>;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['form_table_label_border_color']['text'] != '') ? $_SESSION['theme']['form_table_label_border_color']['text'] : '#ffffff'; ?>;
+		padding: <?php echo ($_SESSION['theme']['form_table_label_padding']['text'] != '') ? $_SESSION['theme']['form_table_label_padding']['text'] : '7px 8px'; ?>;
 		text-align: right;
-		color: #000;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-		border-radius: 4px;
-		border-right: 3px solid #e5e9f0;
+		color: <?php echo ($_SESSION['theme']['form_table_label_text_color']['text'] != '') ? $_SESSION['theme']['form_table_label_text_color']['text'] : '#000000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['form_table_label_text_font']['text'] != '') ? $_SESSION['theme']['form_table_label_text_font']['text'] : 'Arial'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['form_table_label_text_size']['text'] != '') ? $_SESSION['theme']['form_table_label_text_size']['text'] : '9pt'; ?>;
 		}
 
-	.vncellreq {
-		border-bottom: 1px solid #fff;
-		background-color: #e5e9f0;
-		padding: 8px;
+	.vncellreq { /* form_label_required */
+		background: <?php echo ($_SESSION['theme']['form_table_label_required_background_color']['text'] != '') ? $_SESSION['theme']['form_table_label_required_background_color']['text'] : '#e5e9f0'; ?>;
+		border-radius: <?php echo ($_SESSION['theme']['form_table_label_border_radius']['text'] != '') ? $_SESSION['theme']['form_table_label_border_radius']['text'] : '4px'; ?>;
+		border-right: 3px solid <?php echo ($_SESSION['theme']['form_table_label_required_border_color']['text'] != '') ? $_SESSION['theme']['form_table_label_required_border_color']['text'] : '#cbcfd5'; ?>;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['form_table_label_border_color']['text'] != '') ? $_SESSION['theme']['form_table_label_border_color']['text'] : '#ffffff'; ?>;
+		padding: <?php echo ($_SESSION['theme']['form_table_label_padding']['text'] != '') ? $_SESSION['theme']['form_table_label_padding']['text'] : '7px 8px'; ?>;
 		text-align: right;
-		font-weight: bold;
-		color: #000;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-		border-radius: 4px;
-		border-right: 3px solid #cbcfd5;
+		color: <?php echo ($_SESSION['theme']['form_table_label_required_text_color']['text'] != '') ? $_SESSION['theme']['form_table_label_required_text_color']['text'] : '#000000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['form_table_label_text_font']['text'] != '') ? $_SESSION['theme']['form_table_label_text_font']['text'] : 'Arial'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['form_table_label_text_size']['text'] != '') ? $_SESSION['theme']['form_table_label_text_size']['text'] : '9pt'; ?>;
+		font-weight: <?php echo ($_SESSION['theme']['form_table_label_required_text_weight']['text'] != '') ? $_SESSION['theme']['form_table_label_required_text_weight']['text'] : 'bold'; ?>;
 		}
 
-	.vncellcol {
-		background-color: #e5e9f0;
-		padding: 8px;
-		padding-bottom: 6px;
+	.vtable { /* form_field */
+		background: <?php echo ($_SESSION['theme']['form_table_field_background_color']['text'] != '') ? $_SESSION['theme']['form_table_field_background_color']['text'] : '#ffffff'; ?>;
+		border-radius: <?php echo ($_SESSION['theme']['form_table_field_border_radius']['text'] != '') ? $_SESSION['theme']['form_table_field_border_radius']['text'] : '0'; ?>;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['form_table_field_border_color']['text'] != '') ? $_SESSION['theme']['form_table_field_border_color']['text'] : '#e5e9f0'; ?>;
+		padding: <?php echo ($_SESSION['theme']['form_table_field_padding']['text'] != '') ? $_SESSION['theme']['form_table_field_padding']['text'] : '6px'; ?>;
 		text-align: left;
-		color: #000;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-		border-radius: 4px;
-		border-bottom: 3px solid #e5e9f0;
-		}
-
-	.vncellcolreq {
-		background-color: #e5e9f0;
-		padding: 8px;
-		padding-bottom: 6px;
-		text-align: left;
-		font-weight: bold;
-		color: #000;
-		-moz-border-radius: 4px;
-		-webkit-border-radius: 4px;
-		border-radius: 4px;
-		border-bottom: 3px solid #cbcfd5;
-		}
-
-	.vtable {
-		border-bottom: 1px solid #e5e9f0;
-		color: #666;
-		font-size: 8pt;
-		text-align: left;
-		padding: 7px;
-		background-color: #fff;
 		vertical-align: middle;
+		color: <?php echo ($_SESSION['theme']['form_table_field_text_color']['text'] != '') ? $_SESSION['theme']['form_table_field_text_color']['text'] : '#666666'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['form_table_field_text_font']['text'] != '') ? $_SESSION['theme']['form_table_field_text_font']['text'] : 'Arial'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['form_table_field_text_size']['text'] != '') ? $_SESSION['theme']['form_table_field_text_size']['text'] : '8pt'; ?>;
 		}
 
-	.vtablerow {
-		color: #666;
+	/* form: heading/row format */
+	.vncellcol { /* form_heading */
+		background: <?php echo ($_SESSION['theme']['form_table_label_background_color']['text'] != '') ? $_SESSION['theme']['form_table_label_background_color']['text'] : '#e5e9f0'; ?>;
+		border-radius: <?php echo ($_SESSION['theme']['form_table_label_border_radius']['text'] != '') ? $_SESSION['theme']['form_table_label_border_radius']['text'] : '4px'; ?>;
+		border-bottom: 3px solid <?php echo ($_SESSION['theme']['form_table_label_background_color']['text'] != '') ? $_SESSION['theme']['form_table_label_background_color']['text'] : '#e5e9f0'; ?>;
+		padding: <?php echo ($_SESSION['theme']['form_table_heading_padding']['text'] != '') ? $_SESSION['theme']['form_table_heading_padding']['text'] : '8px 8px 4px 8px'; ?>;
+		text-align: left;
+		color: <?php echo ($_SESSION['theme']['form_table_label_text_color']['text'] != '') ? $_SESSION['theme']['form_table_label_text_color']['text'] : '#000000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['form_table_label_text_font']['text'] != '') ? $_SESSION['theme']['form_table_label_text_font']['text'] : 'Arial'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['form_table_label_text_size']['text'] != '') ? $_SESSION['theme']['form_table_label_text_size']['text'] : '9pt'; ?>;
+		}
+
+	.vncellcolreq { /* form_heading_required */
+		background: <?php echo ($_SESSION['theme']['form_table_label_background_color']['text'] != '') ? $_SESSION['theme']['form_table_label_background_color']['text'] : '#e5e9f0'; ?>;
+		border-radius: <?php echo ($_SESSION['theme']['form_table_label_border_radius']['text'] != '') ? $_SESSION['theme']['form_table_label_border_radius']['text'] : '4px'; ?>;
+		border-bottom: 3px solid <?php echo ($_SESSION['theme']['form_table_label_required_border_color']['text'] != '') ? $_SESSION['theme']['form_table_label_required_border_color']['text'] : '#cbcfd5'; ?>;
+		padding: <?php echo ($_SESSION['theme']['form_table_heading_padding']['text'] != '') ? $_SESSION['theme']['form_table_heading_padding']['text'] : '8px 8px 4px 8px'; ?>;
+		text-align: left;
+		color: <?php echo ($_SESSION['theme']['form_table_label_required_text_color']['text'] != '') ? $_SESSION['theme']['form_table_label_required_text_color']['text'] : '#000000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['form_table_label_text_font']['text'] != '') ? $_SESSION['theme']['form_table_label_text_font']['text'] : 'Arial'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['form_table_label_text_size']['text'] != '') ? $_SESSION['theme']['form_table_label_text_size']['text'] : '9pt'; ?>;
+		font-weight: <?php echo ($_SESSION['theme']['form_table_label_required_text_weight']['text'] != '') ? $_SESSION['theme']['form_table_label_required_text_weight']['text'] : 'bold'; ?>;
+		}
+
+	.vtablerow { /* form_row */
+		<?php
+		// determine cell height by padding
+		$total_vertical_padding = 6; //default px
+		if ($_SESSION['theme']['form_table_row_padding']['text'] != '') {
+			$form_table_row_padding = $_SESSION['theme']['form_table_row_padding']['text'];
+			$form_table_row_padding = str_replace('px', '', $form_table_row_padding);
+			$form_table_row_paddings = explode(' ', $form_table_row_padding);
+			switch (sizeof($form_table_row_paddings)) {
+				case 4: $total_vertical_padding = ($form_table_row_paddings[0] + $form_table_row_paddings[2]); break;
+				default: $total_vertical_padding = ($form_table_row_paddings[0] * 2);
+			}
+		}
+		?>
+		height: <?php echo (30 + $total_vertical_padding); ?>px;
+		background: <?php echo ($_SESSION['theme']['form_table_field_background_color']['text'] != '') ? $_SESSION['theme']['form_table_field_background_color']['text'] : '#ffffff'; ?>;
+		border-radius: <?php echo ($_SESSION['theme']['form_table_field_border_radius']['text'] != '') ? $_SESSION['theme']['form_table_field_border_radius']['text'] : '0'; ?>;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['form_table_field_border_color']['text'] != '') ? $_SESSION['theme']['form_table_field_border_color']['text'] : '#e5e9f0'; ?>;
+		padding: <?php echo ($_SESSION['theme']['form_table_row_padding']['text'] != '') ? $_SESSION['theme']['form_table_row_padding']['text'] : ($total_vertical_padding/2).'px 0'; ?>;
 		text-align: left;
-		background-color: #fff;
 		vertical-align: middle;
-		height: 33px;
+		color: <?php echo ($_SESSION['theme']['form_table_field_text_color']['text'] != '') ? $_SESSION['theme']['form_table_field_text_color']['text'] : '#666666'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['form_table_field_text_font']['text'] != '') ? $_SESSION['theme']['form_table_field_text_font']['text'] : 'Arial'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['form_table_row_text_size']['text'] != '') ? $_SESSION['theme']['form_table_row_text_size']['text'] : '9pt'; ?>;
 		}
 
 	.row_style0 {