mirror of
				https://github.com/smarty-php/smarty.git
				synced 2025-11-03 22:01:36 +01:00 
			
		
		
		
	- fixed spelling, PHPDoc , minor errors, code cleanup
This commit is contained in:
		@@ -2,13 +2,12 @@
 | 
			
		||||
/**
 | 
			
		||||
 * Smarty plugin
 | 
			
		||||
 *
 | 
			
		||||
 * @package Smarty
 | 
			
		||||
 * @package    Smarty
 | 
			
		||||
 * @subpackage PluginsFunction
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Smarty {html_options} function plugin
 | 
			
		||||
 *
 | 
			
		||||
 * Type:     function<br>
 | 
			
		||||
 * Name:     html_options<br>
 | 
			
		||||
 * Purpose:  Prints the list of <option> tags generated from
 | 
			
		||||
@@ -24,16 +23,17 @@
 | 
			
		||||
 * - class      (optional) - string default not set
 | 
			
		||||
 * </pre>
 | 
			
		||||
 *
 | 
			
		||||
 * @link http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
 | 
			
		||||
 *      (Smarty online manual)
 | 
			
		||||
 * @author Monte Ohrt <monte at ohrt dot com>
 | 
			
		||||
 * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
 | 
			
		||||
 * @param array                    $params   parameters
 | 
			
		||||
 * @param Smarty_Internal_Template $template template object
 | 
			
		||||
 * @link     http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
 | 
			
		||||
 *           (Smarty online manual)
 | 
			
		||||
 * @author   Monte Ohrt <monte at ohrt dot com>
 | 
			
		||||
 * @author   Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
 | 
			
		||||
 *
 | 
			
		||||
 * @param array $params parameters
 | 
			
		||||
 *
 | 
			
		||||
 * @return string
 | 
			
		||||
 * @uses smarty_function_escape_special_chars()
 | 
			
		||||
 * @uses     smarty_function_escape_special_chars()
 | 
			
		||||
 */
 | 
			
		||||
function smarty_function_html_options($params, $template)
 | 
			
		||||
function smarty_function_html_options($params)
 | 
			
		||||
{
 | 
			
		||||
    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
 | 
			
		||||
 | 
			
		||||
@@ -72,7 +72,7 @@ function smarty_function_html_options($params, $template)
 | 
			
		||||
                            if (method_exists($_sel, "__toString")) {
 | 
			
		||||
                                $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
 | 
			
		||||
                            } else {
 | 
			
		||||
                                trigger_error("html_options: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
 | 
			
		||||
                                trigger_error("html_options: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
 | 
			
		||||
                                continue;
 | 
			
		||||
                            }
 | 
			
		||||
                        } else {
 | 
			
		||||
@@ -84,14 +84,15 @@ function smarty_function_html_options($params, $template)
 | 
			
		||||
                    if (method_exists($_val, "__toString")) {
 | 
			
		||||
                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
 | 
			
		||||
                    } else {
 | 
			
		||||
                        trigger_error("html_options: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
 | 
			
		||||
                        trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
 | 
			
		||||
                    }
 | 
			
		||||
                } else {
 | 
			
		||||
                    $selected = smarty_function_escape_special_chars((string) $_val);
 | 
			
		||||
                }
 | 
			
		||||
                break;
 | 
			
		||||
 | 
			
		||||
            case 'strict': break;
 | 
			
		||||
            case 'strict':
 | 
			
		||||
                break;
 | 
			
		||||
 | 
			
		||||
            case 'disabled':
 | 
			
		||||
            case 'readonly':
 | 
			
		||||
@@ -106,7 +107,7 @@ function smarty_function_html_options($params, $template)
 | 
			
		||||
 | 
			
		||||
                    break;
 | 
			
		||||
                }
 | 
			
		||||
                // omit break; to fall through!
 | 
			
		||||
            // omit break; to fall through!
 | 
			
		||||
 | 
			
		||||
            default:
 | 
			
		||||
                if (!is_array($_val)) {
 | 
			
		||||
@@ -139,8 +140,8 @@ function smarty_function_html_options($params, $template)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (!empty($name)) {
 | 
			
		||||
        $_html_class = !empty($class) ? ' class="'.$class.'"' : '';
 | 
			
		||||
        $_html_id = !empty($id) ? ' id="'.$id.'"' : '';
 | 
			
		||||
        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
 | 
			
		||||
        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
 | 
			
		||||
        $_html_result = '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -159,13 +160,13 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c
 | 
			
		||||
        } elseif ($_key === $selected) {
 | 
			
		||||
            $_html_result .= ' selected="selected"';
 | 
			
		||||
        }
 | 
			
		||||
        $_html_class = !empty($class) ? ' class="'.$class.' option"' : '';
 | 
			
		||||
        $_html_id = !empty($id) ? ' id="'.$id.'-'.$idx.'"' : '';
 | 
			
		||||
        $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
 | 
			
		||||
        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
 | 
			
		||||
        if (is_object($value)) {
 | 
			
		||||
            if (method_exists($value, "__toString")) {
 | 
			
		||||
                $value = smarty_function_escape_special_chars((string) $value->__toString());
 | 
			
		||||
            } else {
 | 
			
		||||
                trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
 | 
			
		||||
                trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE);
 | 
			
		||||
 | 
			
		||||
                return '';
 | 
			
		||||
            }
 | 
			
		||||
@@ -173,11 +174,11 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c
 | 
			
		||||
            $value = smarty_function_escape_special_chars((string) $value);
 | 
			
		||||
        }
 | 
			
		||||
        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
 | 
			
		||||
        $idx++;
 | 
			
		||||
        $idx ++;
 | 
			
		||||
    } else {
 | 
			
		||||
        $_idx = 0;
 | 
			
		||||
        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx);
 | 
			
		||||
        $idx++;
 | 
			
		||||
        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null, $class, $_idx);
 | 
			
		||||
        $idx ++;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return $_html_result;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user