mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Form handler - missing optional id attribute for inputs of type hidden

Browse Source
This commit is contained in:
secretr
2009-01-28 14:57:27 +00:00
parent e084a82757
commit 7549e547ad
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
e107_handlers/form_handler.php
View File

@@ -9,8 +9,8 @@
* Form Handler * Form Handler
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
* $Revision: 1.22 $ * $Revision: 1.23 $
* $Date: 2009-01-20 22:59:39 $ * $Date: 2009-01-28 14:57:27 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -150,7 +150,7 @@ class e_form
return "<input type='checkbox' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />"; return "<input type='checkbox' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
} }
function checkbox_switch($name, $value, $checked = false, $label = '') function checkbox_switch($name, $value, $checked = false, $label = '')
{ {
return $this->checkbox($name, $value, $checked).$this->label($label ? $label : LAN_ENABLED, $name, $value); return $this->checkbox($name, $value, $checked).$this->label($label ? $label : LAN_ENABLED, $name, $value);
@@ -161,17 +161,17 @@ class e_form
$selector = 'jstarget:'.$selector; $selector = 'jstarget:'.$selector;
return $this->checkbox($name, $selector, false, array('id'=>false,'class'=>'checkbox toggle-all')); return $this->checkbox($name, $selector, false, array('id'=>false,'class'=>'checkbox toggle-all'));
} }
function uc_checkbox($name, $current_value, $uc_options, $field_options = array()) function uc_checkbox($name, $current_value, $uc_options, $field_options = array())
{ {
if(!is_array($field_options)) parse_str($field_options, $field_options); if(!is_array($field_options)) parse_str($field_options, $field_options);
return ' return '
<div class="check-block"> <div class="check-block">
'.$this->_uc->vetted_tree($name, array($this, '_uc_checkbox_cb'), $current_value, $uc_options, $field_options).' '.$this->_uc->vetted_tree($name, array($this, '_uc_checkbox_cb'), $current_value, $uc_options, $field_options).'
</div> </div>
'; ';
} }
function _uc_checkbox_cb($treename, $classnum, $current_value, $nest_level, $field_options) function _uc_checkbox_cb($treename, $classnum, $current_value, $nest_level, $field_options)
{ {
if($classnum == e_UC_BLANK) if($classnum == e_UC_BLANK)
@@ -183,16 +183,16 @@ class e_form
if($nest_level == 0) if($nest_level == 0)
{ {
$class = " strong"; $class = " strong";
} }
else else
{ {
$style = " style='text-indent:" . (1.2 * $nest_level) . "em'"; $style = " style='text-indent:" . (1.2 * $nest_level) . "em'";
} }
$descr = varset($field_options['description']) ? ' <span class="smalltext">('.$this->_uc->uc_get_classdescription($classnum).')</span>' : ''; $descr = varset($field_options['description']) ? ' <span class="smalltext">('.$this->_uc->uc_get_classdescription($classnum).')</span>' : '';
return "<div class='field-spacer{$class}'{$style}>".$this->checkbox($treename.'[]', $classnum, in_array($classnum, $tmp), $field_options).$this->label($this->_uc->uc_get_classname($classnum).$descr, $treename.'[]', $classnum)."</div>\n"; return "<div class='field-spacer{$class}'{$style}>".$this->checkbox($treename.'[]', $classnum, in_array($classnum, $tmp), $field_options).$this->label($this->_uc->uc_get_classname($classnum).$descr, $treename.'[]', $classnum)."</div>\n";
} }
function radio($name, $value, $checked = false, $options = array()) function radio($name, $value, $checked = false, $options = array())
{ {
$options['checked'] = $checked; //comes as separate argument just for convenience $options['checked'] = $checked; //comes as separate argument just for convenience
@@ -235,7 +235,7 @@ class e_form
$options = $this->format_options('select', $name, $options); $options = $this->format_options('select', $name, $options);
return "<select name='{$name}'".$this->get_attributes($options, $name).">"; return "<select name='{$name}'".$this->get_attributes($options, $name).">";
} }
function selectbox($name, $option_array, $selected = false, $options = array()) function selectbox($name, $option_array, $selected = false, $options = array())
{ {
return $this->select_open($name, $options)."\n".$this->option_multi($option_array, $selected)."\n".$this->select_close(); return $this->select_open($name, $options)."\n".$this->option_multi($option_array, $selected)."\n".$this->select_close();
@@ -245,7 +245,7 @@ class e_form
{ {
return $this->select_open($name, $select_options)."\n".$this->_uc->vetted_tree($name, array($this, '_uc_select_cb'), $current_value, $uc_options, $opt_options)."\n".$this->select_close(); return $this->select_open($name, $select_options)."\n".$this->_uc->vetted_tree($name, array($this, '_uc_select_cb'), $current_value, $uc_options, $opt_options)."\n".$this->select_close();
} }
// Callback for vetted_tree - Creates the option list for a selection box // Callback for vetted_tree - Creates the option list for a selection box
function _uc_select_cb($treename, $classnum, $current_value, $nest_level) function _uc_select_cb($treename, $classnum, $current_value, $nest_level)
{ {
@@ -257,17 +257,17 @@ class e_form
{ {
$prefix = ''; $prefix = '';
$style = "font-weight:bold; font-style: italic;"; $style = "font-weight:bold; font-style: italic;";
} }
elseif($nest_level == 1) elseif($nest_level == 1)
{ {
$prefix = '&nbsp;&nbsp;'; $prefix = '&nbsp;&nbsp;';
$style = "font-weight:bold"; $style = "font-weight:bold";
} }
else else
{ {
$prefix = '&nbsp;&nbsp;'.str_repeat('--', $nest_level - 1).'&gt;'; $prefix = '&nbsp;&nbsp;'.str_repeat('--', $nest_level - 1).'&gt;';
$style = ''; $style = '';
} }
return $this->option($prefix.$this->_uc->uc_get_classname($classnum), $classnum, in_array($classnum, $tmp), "style={$style}")."\n"; return $this->option($prefix.$this->_uc->uc_get_classname($classnum), $classnum, in_array($classnum, $tmp), "style={$style}")."\n";
} }
@@ -283,7 +283,7 @@ class e_form
$options = $this->format_options('option', '', $options); $options = $this->format_options('option', '', $options);
return "<option value='{$value}'".$this->get_attributes($options).">{$option_name}</option>"; return "<option value='{$value}'".$this->get_attributes($options).">{$option_name}</option>";
} }
function option_multi($option_array, $selected = false, $options = array()) function option_multi($option_array, $selected = false, $options = array())
{ {
if(is_string($option_array)) parse_str($option_array, $option_array); if(is_string($option_array)) parse_str($option_array, $option_array);
@@ -364,7 +364,7 @@ class e_form
if(!$this->_tabindex_enabled) return 0; if(!$this->_tabindex_enabled) return 0;
return $this->_tabindex_counter; return $this->_tabindex_counter;
} }
function resetTabindex($reset = 0) function resetTabindex($reset = 0)
{ {
$this->_tabindex_counter = $reset; $this->_tabindex_counter = $reset;
@@ -507,7 +507,7 @@ class e_form
switch ($type) { switch ($type) {
case 'hidden': case 'hidden':
$def_options = array('disabled' => false, 'other' => ''); $def_options = array('id' => false, 'disabled' => false, 'other' => '');
break; break;
case 'text': case 'text':