minor tweaks for addon support

leagueofbeards · Dec 16, 2011 · e129bc6 · e129bc6
1 parent f34b3fb
commit e129bc6
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/Formbuilder/Formbuilder.php b/Formbuilder/Formbuilder.php
@@ -46,7 +46,7 @@ public function __construct($form = false){
 		// Set the serialized structure if it's provided
 		// otherwise, store the source
 		if(array_key_exists('form_structure', $form)){
-			$form['form_structure'] = json_decode($form['form_structure']);
+			$form['form_structure'] = $this->objectToArray( json_decode($form['form_structure']) );
 			$this->_form_array = $form;
 		}
 		else if(array_key_exists('frmb', $form)){
@@ -109,7 +109,7 @@ public function generate_html($form_action = false){
 		if(is_array($this->_form_array['form_structure'])){
 
 			$html .= '<form class="frm-bldr" method="post" action="'.$form_action.'">' . "\n";
-			$html .= '<ol>'."\n";
+			$html .= '<ol class="frmb">'."\n";
 
 			foreach($this->_form_array['form_structure'] as $field){
 				$html .= $this->loadField((array)$field);
@@ -448,7 +448,7 @@ protected function loadSelectBox($field){
 	 * @return string
 	 * @access protected
 	 */
-	private function elemId($label, $prepend = false){
+	protected function elemId($label, $prepend = false){
 		if(is_string($label)){
 			$prepend = is_string($prepend) ? $this->elemId($prepend).'-' : false;
 			return $prepend.strtolower( preg_replace("/[^A-Za-z0-9_]/", "", str_replace(" ", "_", $label) ) );
@@ -466,5 +466,32 @@ private function elemId($label, $prepend = false){
 	protected function getPostValue($key){
 		return array_key_exists($key, $_POST) ? $_POST[$key] : false;
 	}
+
+
+	/**
+	 * Converts an object into an array
+	 * @param type $object
+	 * @return type 
+	 */
+	protected function objectToArray($object) {
+		if (is_object($object)) {
+			foreach ($object as $key => $value) {
+				if(is_object($value)){
+					$array[$key] = $this->objectToArray($value);
+				} else {
+					$array[$key] = $value;
+				}
+			}
+		}
+		else if(is_array($object)){
+			foreach ($object as $key => $value) {
+				$array[$key] = $this->objectToArray($value);
+			}
+		}
+		else {
+			$array = $object;
+		}
+		return $array;
+	}
 }
 ?>
diff --git a/css/jquery.formbuilder.css b/css/jquery.formbuilder.css
@@ -114,4 +114,7 @@ ul.frmb {
 .del-button {
 	float: right;
 	margin-right: 10px;
-}
+}
+
+/* html display helpers */
+textarea, .multi-row span { display: block; }
diff --git a/example-html.php b/example-html.php
@@ -3,6 +3,7 @@
 	<head>
 		<title>jQuery FormBuilder Demo (Output)</title>
 		<meta charset="utf-8" />
+		<link href="../../../css/jquery.formbuilder.css" media="screen" rel="stylesheet" />
 	</head>
 	<body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     	<head>
     		<title>jQuery FormBuilder Demo (Output)</title>
     		<meta charset="utf-8" />
+    		<link href="../../../css/jquery.formbuilder.css" media="screen" rel="stylesheet" />
     	</head>
     	<body>
@@ Expand Down @@