From 7265fae386fcedb98416481c327906d7bc2c3845 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Wed, 28 Jan 2009 05:59:23 +0000
Subject: [PATCH] BUGFIX Fixed checkboxes checked by default MINOR Code
 formatting cleanup MINOR Fixed undefined variable errors and PHP notices

---
 code/editor/EditableCheckboxGroupField.php | 36 +++++++++-------------
 code/editor/EditableCheckboxOption.php     |  6 ++--
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/code/editor/EditableCheckboxGroupField.php b/code/editor/EditableCheckboxGroupField.php
index 21bcb51..1ed2704 100755
--- a/code/editor/EditableCheckboxGroupField.php
+++ b/code/editor/EditableCheckboxGroupField.php
@@ -56,31 +56,32 @@ class EditableCheckboxGroupField extends EditableFormField {
 		$fieldSet = $this->Options();
 		
 		$deletedOptions = explode( ',', $data['Deleted'] );
-		
+		$optionNumber = 0;
 		
 		// store default, etc
-		foreach( $fieldSet as $option ) {
-			if( $deletedOptions && array_search( $option->ID, $deletedOptions ) !== false ) {
+		foreach($fieldSet as $option) {
+			if($deletedOptions && array_search($option->ID, $deletedOptions) !== false) {
 				$option->delete();
 				continue;
 			}
 			
-			if( $data[$option->ID] )
+			if($data[$option->ID]) {
 				$option->populateFromPostData( $data[$option->ID] );
+			}
 				
 			unset( $data[$option->ID] );
 		}
 		
-		foreach( $data as $tempID => $optionData ) {
-			
-			if( !$tempID || !is_array( $optionData ) || empty( $optionData ) || !preg_match('/^_?\d+$/', $tempID ) )
+		foreach($data as $tempID => $optionData) {
+			if(!$tempID || !is_array($optionData) || empty($optionData) || !preg_match('/^_?\d+$/', $tempID)) {
 				continue;
+			}
 			
 			// what will we name the new option?
 			$newOption = new EditableCheckboxOption();
-			$newOption->Name =  'option' . (string)$optionNumber++;
+			$newOption->Name = 'option' . (string)$optionNumber++;
 			$newOption->ParentID = $this->ID;
-			$newOption->populateFromPostData( $optionData );
+			$newOption->populateFromPostData($optionData);
 		}
 	}
 	
@@ -105,23 +106,13 @@ class EditableCheckboxGroupField extends EditableFormField {
 		return $this->createField( true );
 	}
 	
-	function createField( $asFilter = false ) {
+	function createField($asFilter = false) {
 		$optionSet = $this->Options();
 		$options = array();
 		
-		if( $asFilter )
-			$options['-1'] = '(Any)';
+		$optionMap = ($optionSet) ? $optionSet->map('ID', 'Title') : array();
 		
-		$defaultOption = '-1';
-		
-		/*foreach( $optionSet as $option ) {
-			$options[$option->Title] = $option->Title;
-		}*/
-		
-		// return radiofields
-		$checkboxSet = new CheckboxSetField( $this->Name, $this->Title, $optionSet, $optionSet );
-			
-		return $checkboxSet;
+		return new CheckboxSetField($this->Name, $this->Title, $optionMap);
 	}
 	
 	function getValueFromData($data) {
@@ -129,6 +120,7 @@ class EditableCheckboxGroupField extends EditableFormField {
 			return "";
 		}
 		
+		$result = '';
 		$entries = $data[$this->Name];
 		
 		if(!is_array($data[$this->Name])) {
diff --git a/code/editor/EditableCheckboxOption.php b/code/editor/EditableCheckboxOption.php
index 1f8e7f0..24a4f3f 100755
--- a/code/editor/EditableCheckboxOption.php
+++ b/code/editor/EditableCheckboxOption.php
@@ -34,9 +34,11 @@ class EditableCheckboxOption extends DataObject {
 		return "Fields[{$this->ParentID}][{$this->ID}]";
 	}
 
-	function populateFromPostData( $data ) {
+	function populateFromPostData($data) {
 		$this->Title = $data['Title'];
-		$this->setField('Default', $data['Default']);
+		if(isset($data['Default'])) {
+			$this->setField('Default', $data['Default']);
+		}
 		$this->Sort = $data['Sort'];
 		$this->write();
 	}