Overview
Comment: | Go around PHP 8.1 warnings |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | templates |
Files: | files | file ages | folders |
SHA3-256: |
beb24cd76ec426753f9dc2cac82d7027 |
User & Date: | bohwaz on 2022-07-09 23:54:06 |
Other Links: | branch diff | manifest | tags |
Context
2022-07-09
| ||
23:54 | Restrict access to forms check-in: 1a6a5f14ca user: bohwaz tags: templates | |
23:54 | Go around PHP 8.1 warnings check-in: beb24cd76e user: bohwaz tags: templates | |
23:53 | Make sure block parameter for restrict section is working correctly check-in: 03154de456 user: bohwaz tags: templates | |
Changes
Modified src/include/lib/Garradin/UserTemplate/CommonModifiers.php from [296d96b3c2] to [6815eee84a].
︙ | ︙ | |||
409 410 411 412 413 414 415 | $attributes_string = implode(' ', $attributes_string); if ($type == 'radio-btn') { $radio = self::formInput(array_merge($params, ['type' => 'radio', 'label' => null, 'help' => null])); $out = sprintf('<dd class="radio-btn">%s <label for="f_%s_%s"><div><h3>%s</h3>%s</div></label> | | | | | | | 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 | $attributes_string = implode(' ', $attributes_string); if ($type == 'radio-btn') { $radio = self::formInput(array_merge($params, ['type' => 'radio', 'label' => null, 'help' => null])); $out = sprintf('<dd class="radio-btn">%s <label for="f_%s_%s"><div><h3>%s</h3>%s</div></label> </dd>', $radio, htmlspecialchars((string)$name), htmlspecialchars((string)$value), htmlspecialchars((string)$label), isset($params['help']) ? '<p class="help">' . htmlspecialchars($params['help']) . '</p>' : ''); return $out; } if ($type == 'select') { $input = sprintf('<select %s>', $attributes_string); foreach ($options as $_key => $_value) { $input .= sprintf('<option value="%s"%s>%s</option>', $_key, $current_value == $_key ? ' selected="selected"' : '', htmlspecialchars((string)$_value)); } $input .= '</select>'; } elseif ($type == 'select_groups') { $input = sprintf('<select %s>', $attributes_string); foreach ($options as $optgroup => $suboptions) { $input .= sprintf('<optgroup label="%s">', htmlspecialchars((string)$optgroup)); foreach ($suboptions as $_key => $_value) { $input .= sprintf('<option value="%s"%s>%s</option>', $_key, $current_value == $_key ? ' selected="selected"' : '', htmlspecialchars((string)$_value)); } $input .= '</optgroup>'; } $input .= '</select>'; } elseif ($type == 'textarea') { $input = sprintf('<textarea %s>%s</textarea>', $attributes_string, htmlspecialchars((string)$current_value)); } elseif ($type == 'list') { $multiple = !empty($attributes['multiple']); $values = ''; $delete_btn = self::button(['shape' => 'delete']); if (null !== $current_value && is_iterable($current_value)) { foreach ($current_value as $v => $l) { $values .= sprintf('<span class="label"><input type="hidden" name="%s[%s]" value="%s" /> %3$s %s</span>', htmlspecialchars((string)$name), htmlspecialchars((string)$v), htmlspecialchars((string)$l), $multiple ? $delete_btn : ''); } } $button = self::button([ 'shape' => $multiple ? 'plus' : 'menu', 'label' => $multiple ? 'Ajouter' : 'Sélectionner', 'required' => $attributes['required'] ?? null, |
︙ | ︙ | |||
474 475 476 477 478 479 480 | $current_value = ''; } $currency = Config::getInstance()->get('monnaie'); $input = sprintf('<nobr><input type="text" pattern="-?[0-9]*([.,][0-9]{1,2})?" inputmode="decimal" size="8" class="money" %s value="%s" /><b>%s</b></nobr>', $attributes_string, htmlspecialchars($current_value), $currency); } else { | | | | 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 | $current_value = ''; } $currency = Config::getInstance()->get('monnaie'); $input = sprintf('<nobr><input type="text" pattern="-?[0-9]*([.,][0-9]{1,2})?" inputmode="decimal" size="8" class="money" %s value="%s" /><b>%s</b></nobr>', $attributes_string, htmlspecialchars($current_value), $currency); } else { $value = isset($attributes['value']) ? '' : sprintf(' value="%s"', htmlspecialchars((string)$current_value)); $input = sprintf('<input type="%s" %s %s />', $type, $attributes_string, $value); } // No label? then we only want the input without the widget if (empty($label)) { if (!array_key_exists('label', $params) && ($type == 'radio' || $type == 'checkbox')) { $input .= sprintf('<label for="%s"></label>', $attributes['id']); } return $input; } if ($type == 'file') { $input .= sprintf('<input type="hidden" name="MAX_FILE_SIZE" value="%d" id="f_maxsize" />', Utils::return_bytes(Utils::getMaxUploadSize())); } $input .= $suffix; $label = sprintf('<label for="%s">%s</label>', $attributes['id'], htmlspecialchars((string)$label)); if ($type == 'radio' || $type == 'checkbox') { $out = sprintf('<dd>%s %s', $input, $label); if (isset($help)) { $out .= sprintf(' <em class="help">(%s)</em>', htmlspecialchars($help)); } |
︙ | ︙ |