adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Un-requiring model name parameter in FormHelper::create(), and moving date/time option data to FormHelper

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4119 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-12-22 05:23:07 +00:00
parent 90a78232ed
commit 02ec1887ce
2 changed files with 79 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
cake/libs/view/helpers/form.php
View file

@ -60,6 +60,11 @@ class FormHelper extends AppHelper {
var $Html = null;
var $__options = array(
'day' => array(), 'minute' => array(), 'hour' => array(),
'month' => array(), 'year' => array(), 'meridian' => array()
);
/**
* Returns an HTML FORM element.
*
@ -69,9 +74,12 @@ class FormHelper extends AppHelper {
* @return string An formatted opening FORM tag.
*/
function create($model = null, $options = array()) {
if (empty($model) || is_string($model)) {
$models = $this->params['models'];
$model = $models[0];
if (is_array($model) && empty($options)) {
$options = $model;
}
if (empty($model) || is_array($model)) {
$model = $this->params['models'][0];
}
if (ClassRegistry::isKeySet($model)) {
@ -303,7 +311,17 @@ class FormHelper extends AppHelper {
$label = $options['label'];
unset($options['label']);
}
$out = $this->label(null, $label);
if (is_array($label)) {
$labelText = null;
if (isset($label['text'])) {
$labelText = $label['text'];
unset($label['text']);
}
$out = $this->label(null, $labelText, $label);
$label = $labelText;
} elseif ($label != false) {
$out = $this->label(null, $label);
}
$error = null;
if (isset($options['error'])) {
@ -516,7 +534,9 @@ class FormHelper extends AppHelper {
if ($this->tagIsInvalid()) {
$attributes = $this->addClass($attributes, 'form-error');
}
if(!is_array($options)) {
if (is_string($options) && isset($this->__options[$options])) {
$options = $this->__generateOptions($options);
} elseif(!is_array($options)) {
$options = array();
}
if (isset($attributes['type'])) {
@ -590,6 +610,49 @@ class FormHelper extends AppHelper {
return array_reverse($select, true);
}
/**
* Generates option lists for common <select /> menus
*
* @return void
*/
function __generateOptions($name) {
if (!empty($this->options[$name])) {
return $this->options[$name];
}
$data = array();
switch ($name) {
case 'minute':
for($i = 0; $i < 60; $i++) {
$data[$i] = sprintf('%02d', $i);
}
break;
case 'hour':
for($i = 0; $i < 31; $i++) {
$data[sprintf('%02d', $i)] = $i;
}
break;
case 'meridian':
$data = array('am' => 'am', 'pm' => 'pm');
break;
case 'day':
for($i = 0; $i < 31; $i++) {
$data[sprintf('%02d', $i)] = $i;
}
break;
case 'month':
break;
case 'year':
$current = intval(date('Y'));
for ($i = ($current - 20); $i < ($current + 20); $i++) {
$data[$i] = $i;
}
break;
}
$this->__options[$name] = $data;
return $this->__options[$name];
}
/**
* @deprecated
* @see FormHelper::input()

11
cake/libs/view/helpers/html.php
View file

@ -283,6 +283,17 @@ class HtmlHelper extends AppHelper {
$view->addScript($out);
}
}
/**
* Builds CSS style data from an array of CSS properties
*
* @param array $data
* @return string CSS styling data
*/
function style($data) {
if (!is_array($data)) {
return $data;
}
}
/**
* @deprecated
* @see FormHelper::submit