extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-03 20:09:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

added radio validation to etemplate_widget_checkbox, as they are nearly identical

Browse Source
This commit is contained in:
Ralf Becker 2011-08-21 14:03:52 +00:00
parent 5bc3844be8
commit db9434d8e6
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etemplate/inc/class.etemplate_widget.inc.php
View File

@ -14,6 +14,7 @@
// include only widgets which can't be autoloaded (or contain sub-widgets which cant) // include only widgets which can't be autoloaded (or contain sub-widgets which cant)
require_once EGW_INCLUDE_ROOT.'/etemplate/inc/class.etemplate_widget_textbox.inc.php'; require_once EGW_INCLUDE_ROOT.'/etemplate/inc/class.etemplate_widget_textbox.inc.php';
require_once EGW_INCLUDE_ROOT.'/etemplate/inc/class.etemplate_widget_grid.inc.php'; require_once EGW_INCLUDE_ROOT.'/etemplate/inc/class.etemplate_widget_grid.inc.php';
require_once EGW_INCLUDE_ROOT.'/etemplate/inc/class.etemplate_widget_checkbox.inc.php';
/** /**
* eTemplate widget baseclass * eTemplate widget baseclass

17
etemplate/inc/class.etemplate_widget_checkbox.inc.php
View File

@ -23,12 +23,16 @@ class etemplate_widget_button extends etemplate_widget
* *
* @var string|array * @var string|array
*/ */
protected $legacy_options = 'set_val,unset_val,ro_true,ro_false'; protected $legacy_options = array(
'checkbox' => 'set_val,unset_val,ro_true,ro_false',
'radio' => 'set_val,ro_true,ro_false',
);
/** /**
* Validate input * Validate input
* *
* In case of multiple checkboxes using the same name ending in [], each widget only validates it's own value! * In case of multiple checkboxes using the same name ending in [], each widget only validates it's own value!
* Same is true for the radio buttons of a radio-group sharing the same name.
* *
* @param string $cname current namespace * @param string $cname current namespace
* @param array $content * @param array $content
@ -39,7 +43,7 @@ class etemplate_widget_button extends etemplate_widget
{ {
$form_name = self::form_name($cname, $this->id); $form_name = self::form_name($cname, $this->id);
if (($multiple = substr($form_name, -2) == '[]')) if (($multiple = substr($form_name, -2) == '[]') && $this->type == 'checkbox')
{ {
$form_name = substr($form_name, 0, -2); $form_name = substr($form_name, 0, -2);
} }
@ -56,8 +60,8 @@ class etemplate_widget_button extends etemplate_widget
// defaults for set and unset values // defaults for set and unset values
if (!$this->attrs['set_val'] && !$this->attrs['unset_val']) if (!$this->attrs['set_val'] && !$this->attrs['unset_val'])
{ {
$this->attrs['set_val'] = true; $this->attrs['set_val'] = 1;
$this->attrs['unset_val'] = false; $this->attrs['unset_val'] = 0;
} }
if (in_array((string)$this->attrs['set_value'], (array)$value)) if (in_array((string)$this->attrs['set_value'], (array)$value))
{ {
@ -71,6 +75,10 @@ class etemplate_widget_button extends etemplate_widget
$valid = $this->attrs['set_val']; $valid = $this->attrs['set_val'];
} }
} }
elseif ($this->type == 'radio')
{
if (!isset($valid)) $valid = ''; // do not overwrite value of an other radio-button of the same group (identical name)!
}
else // if checkbox is not checked, html returns nothing: eTemplate returns unset_val (default false) else // if checkbox is not checked, html returns nothing: eTemplate returns unset_val (default false)
{ {
if ($multiple) if ($multiple)
@ -86,3 +94,4 @@ class etemplate_widget_button extends etemplate_widget
} }
} }
} }
etemplate_widget::registerWidget('etemplate_widget_checkbox', array('checkbox', 'radio'));