From 68a02a01a086bbb1b8128ea2744439de84873d11 Mon Sep 17 00:00:00 2001 From: Brennan Thompson Date: Mon, 21 Oct 2013 18:27:11 -0600 Subject: Removed extra from $name, since it does not follow the format of other form_ helpers. Form helpers use $extra as a string. On the form_input for example, the $extra is a string but placing extra in the first parameter results in an attribute on the resulting element called 'extra', whereas the drop down it does not. $extra is now passed along as works just as all other form_ methods do. --- system/helpers/form_helper.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 0cc5bd157..4700da7d7 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -316,9 +316,8 @@ if ( ! function_exists('form_dropdown')) { isset($name['options']) OR $name['options'] = array(); isset($name['selected']) OR $name['selected'] = array(); - isset($name['extra']) OR $name['extra'] = array(); - return form_dropdown($name['name'], $name['options'], $name['selected'], $name['extra']); + return form_dropdown($name['name'], $name['options'], $name['selected'], $extra); } is_array($selected) OR $selected = array($selected); -- cgit v1.2.3-24-g4f1b From 40cd60024d4b18fd26a6cc17ed37cbcc403569e8 Mon Sep 17 00:00:00 2001 From: Brennan Thompson Date: Fri, 14 Feb 2014 12:06:38 -0700 Subject: Made form_dropdown compatible with the other form helper methods --- system/helpers/form_helper.php | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 40852faf8..54e2401be 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -303,22 +303,21 @@ if ( ! function_exists('form_dropdown')) /** * Drop-down Menu * - * @param mixed $name + * @param mixed $data * @param mixed $options * @param mixed $selected * @param mixed $extra * @return string */ - function form_dropdown($name = '', $options = array(), $selected = array(), $extra = '') + function form_dropdown($data = '', $options = array(), $selected = array(), $extra = '') { - // If name is really an array then we'll call the function again using the array - if (is_array($name) && isset($name['name'])) + $name = ! is_array($data) ? $data : ''; + $defaults = array('name' => ( $name)); + + if ( is_array($data) && isset($data['selected'])) { - isset($name['options']) OR $name['options'] = array(); - isset($name['selected']) OR $name['selected'] = array(); - isset($name['extra']) OR $name['extra'] = ''; - - return form_dropdown($name['name'], $name['options'], $name['selected'], $name['extra']); + $selected = $data['selected']; + unset($data['selected']); // selects don't have a selected attribute } is_array($selected) OR $selected = array($selected); @@ -328,13 +327,17 @@ if ( ! function_exists('form_dropdown')) { $selected = array($_POST[$name]); } - - $extra = _attributes_to_string($extra); - + + if ( is_array($data) && isset($data['options'])) + { + $options = $data['options']; + unset($data['options']); // selects don't use an options attribute + } + $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; - - $form = '\n"; + foreach ($options as $key => $val) { $key = (string) $key; @@ -352,7 +355,7 @@ if ( ! function_exists('form_dropdown')) { $sel = in_array($optgroup_key, $selected) ? ' selected="selected"' : ''; $form .= '\n"; + .(string) $optgroup_val."\n"; } $form .= "\n"; @@ -360,11 +363,11 @@ if ( ! function_exists('form_dropdown')) else { $form .= '\n"; + .(in_array($key, $selected) ? ' selected="selected"' : '').'>' + .(string) $val."\n"; } } - + return $form."\n"; } } -- cgit v1.2.3-24-g4f1b From 06a0d625beed35d23ede1b599e4ef532a0f819f9 Mon Sep 17 00:00:00 2001 From: Brennan Thompson Date: Fri, 14 Feb 2014 12:17:48 -0700 Subject: Fix for selected being NULL from set_value --- system/helpers/form_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 54e2401be..31c274ced 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -314,7 +314,7 @@ if ( ! function_exists('form_dropdown')) $name = ! is_array($data) ? $data : ''; $defaults = array('name' => ( $name)); - if ( is_array($data) && isset($data['selected'])) + if ( is_array($data) AND isset($data['selected']) AND $data['selected'] !== NULL) { $selected = $data['selected']; unset($data['selected']); // selects don't have a selected attribute -- cgit v1.2.3-24-g4f1b From 5c2a6bb7daf97195296291e6a12ac7340de42554 Mon Sep 17 00:00:00 2001 From: Brennan Thompson Date: Fri, 14 Feb 2014 13:16:37 -0700 Subject: Removed space for travis ci checks --- system/helpers/form_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 31c274ced..23ce9d12d 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -336,7 +336,7 @@ if ( ! function_exists('form_dropdown')) $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; - $form = '\n"; foreach ($options as $key => $val) { -- cgit v1.2.3-24-g4f1b From 87f6000df9b54c7b624a213eddd629ab0121963a Mon Sep 17 00:00:00 2001 From: Brennan Thompson Date: Fri, 14 Feb 2014 14:03:25 -0700 Subject: Actual fix for extra whitespace --- system/helpers/form_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 23ce9d12d..0f85fdedd 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -336,7 +336,7 @@ if ( ! function_exists('form_dropdown')) $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; - $form = '\n"; foreach ($options as $key => $val) { -- cgit v1.2.3-24-g4f1b From 21ef97ecfaef8392ded81606ada2e4bbdc7e064c Mon Sep 17 00:00:00 2001 From: Brennan Thompson Date: Sun, 16 Feb 2014 11:01:03 -0700 Subject: Dropdown should match style guide now. --- system/helpers/form_helper.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 0f85fdedd..9fd5d1e61 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -287,6 +287,8 @@ if ( ! function_exists('form_multiselect')) */ function form_multiselect($name = '', $options = array(), $selected = array(), $extra = '') { + $extra = _attributes_to_string($extra); + if ( ! strpos($extra, 'multiple')) { $extra .= ' multiple="multiple"'; @@ -333,10 +335,14 @@ if ( ! function_exists('form_dropdown')) $options = $data['options']; unset($data['options']); // selects don't use an options attribute } + + is_array($options) OR $options = array($options); + + $extra = _attributes_to_string($extra); $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; - $form = '\n"; foreach ($options as $key => $val) { @@ -925,7 +931,7 @@ if ( ! function_exists('_attributes_to_string')) if (is_string($attributes)) { - return ' '.$attributes; + return $attributes; } return FALSE; -- cgit v1.2.3-24-g4f1b From 7a772e5b4a145eef7457d5a1667d716348ea071b Mon Sep 17 00:00:00 2001 From: Brennan Thompson Date: Sun, 16 Feb 2014 19:22:54 -0700 Subject: Removed non permitted changes --- system/helpers/form_helper.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 9fd5d1e61..2c1a639df 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -287,8 +287,6 @@ if ( ! function_exists('form_multiselect')) */ function form_multiselect($name = '', $options = array(), $selected = array(), $extra = '') { - $extra = _attributes_to_string($extra); - if ( ! strpos($extra, 'multiple')) { $extra .= ' multiple="multiple"'; @@ -931,7 +929,7 @@ if ( ! function_exists('_attributes_to_string')) if (is_string($attributes)) { - return $attributes; + return ' '.$attributes; } return FALSE; -- cgit v1.2.3-24-g4f1b From c8ba6630167df5682fc0be2ae2d1352554374d1f Mon Sep 17 00:00:00 2001 From: Brennan Thompson Date: Sun, 16 Feb 2014 19:36:00 -0700 Subject: Updated code to match style guide --- system/helpers/form_helper.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 2c1a639df..03839e0ed 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -312,9 +312,9 @@ if ( ! function_exists('form_dropdown')) function form_dropdown($data = '', $options = array(), $selected = array(), $extra = '') { $name = ! is_array($data) ? $data : ''; - $defaults = array('name' => ( $name)); + $defaults = array('name' => $name); - if ( is_array($data) AND isset($data['selected']) AND $data['selected'] !== NULL) + if (is_array($data) && isset($data['selected']) && $data['selected'] !== NULL) { $selected = $data['selected']; unset($data['selected']); // selects don't have a selected attribute @@ -328,7 +328,7 @@ if ( ! function_exists('form_dropdown')) $selected = array($_POST[$name]); } - if ( is_array($data) && isset($data['options'])) + if (is_array($data) && isset($data['options'])) { $options = $data['options']; unset($data['options']); // selects don't use an options attribute -- cgit v1.2.3-24-g4f1b From 82c78a9c70e65793b7590ebe049e5d2632d04504 Mon Sep 17 00:00:00 2001 From: Brennan Thompson Date: Mon, 17 Feb 2014 10:02:19 -0700 Subject: Removed extra spaces and irrelevant condition --- system/helpers/form_helper.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 03839e0ed..da4646dd1 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -313,8 +313,8 @@ if ( ! function_exists('form_dropdown')) { $name = ! is_array($data) ? $data : ''; $defaults = array('name' => $name); - - if (is_array($data) && isset($data['selected']) && $data['selected'] !== NULL) + + if (is_array($data) && isset($data['selected'])) { $selected = $data['selected']; unset($data['selected']); // selects don't have a selected attribute @@ -327,7 +327,7 @@ if ( ! function_exists('form_dropdown')) { $selected = array($_POST[$name]); } - + if (is_array($data) && isset($data['options'])) { $options = $data['options']; @@ -335,13 +335,13 @@ if ( ! function_exists('form_dropdown')) } is_array($options) OR $options = array($options); - + $extra = _attributes_to_string($extra); - + $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; - + $form = '\n"; } } -- cgit v1.2.3-24-g4f1b From 1d03ef480c52546f6016cfda98dd82f341197a17 Mon Sep 17 00:00:00 2001 From: Brennan Thompson Date: Mon, 17 Feb 2014 12:08:22 -0700 Subject: Removed extra space, condensed $defaults --- system/helpers/form_helper.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index da4646dd1..a724406f0 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -311,8 +311,7 @@ if ( ! function_exists('form_dropdown')) */ function form_dropdown($data = '', $options = array(), $selected = array(), $extra = '') { - $name = ! is_array($data) ? $data : ''; - $defaults = array('name' => $name); + $defaults = array('name' => is_array($data) ? '' : $data); if (is_array($data) && isset($data['selected'])) { @@ -336,11 +335,11 @@ if ( ! function_exists('form_dropdown')) is_array($options) OR $options = array($options); - $extra = _attributes_to_string($extra); + $extra = _attributes_to_string($extra); $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; - $form = '\n"; foreach ($options as $key => $val) { -- cgit v1.2.3-24-g4f1b