adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating FormHelper::submit() to handle images, deprecated FormHelper::submitImage(), added tests, closes #3741

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6161 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-12-15 18:46:02 +00:00
parent c4eb4caef8
commit f0f5d1ca09
2 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -920,7 +920,10 @@ class FormHelper extends AppHelper {
/**
* Creates a submit button element.
*
* @param string $caption The label appearing on the button
* @param string $caption The label appearing on the button OR
* if string contains :// or the extension .jpg, .jpe, .jpeg, .gif, .png use an image
* if the extension exists, AND the first character is /, image is relative to webroot,
* OR if the first character is not /, image is relative to webroot/img,
* @param array $options
* @return string A HTML submit button
*/
@ -928,9 +931,8 @@ class FormHelper extends AppHelper {
if (!$caption) {
$caption = __('Submit', true);
}
$options['value'] = $caption;
$secured = null;
$secured = null;
if (isset($this->params['_Token']) && !empty($this->params['_Token'])) {
$secured = $this->secure($this->fields);
$this->fields = array();
@ -952,7 +954,22 @@ class FormHelper extends AppHelper {
} elseif (is_array($div)) {
$divOptions = array_merge(array('class' => 'submit'), $div);
}
$out = $secured . $this->output(sprintf($this->Html->tags['submit'], $this->_parseAttributes($options, null, '', ' ')));
$out = $secured;
if (strpos($caption, '://') !== false) {
$out .= $this->output(sprintf($this->Html->tags['submitimage'], $caption, $this->_parseAttributes($options, null, '', ' ')));
} elseif (preg_match('/\.(jpg|jpe|jpeg|gif|png)$/', $caption)) {
if ($caption{0} !== '/') {
$url = $this->webroot(IMAGES_URL . $caption);
} else {
$caption = trim($caption, '/');
$url = $this->webroot($caption);
}
$out .= $this->output(sprintf($this->Html->tags['submitimage'], $url, $this->_parseAttributes($options, null, '', ' ')));
} else {
$options['value'] = $caption;
$out .= $this->output(sprintf($this->Html->tags['submit'], $this->_parseAttributes($options, null, '', ' ')));
}
if (isset($divOptions)) {
$out = $this->Html->div($divOptions['class'], $out, $divOptions);
@ -967,6 +984,7 @@ class FormHelper extends AppHelper {
* @return string HTML submit image element
*/
function submitImage($path, $options = array()) {
trigger_error("FormHelper::submitImage() is deprecated. Use \$form->submit('path/to/img.gif')", E_USER_WARNING);
if (strpos($path, '://')) {
$url = $path;
} else {

14
cake/tests/cases/libs/view/helpers/form.test.php
View file

@ -1139,6 +1139,20 @@ class FormHelperTest extends CakeTestCase {
$result = $this->Form->submit('Next >', array('escape' => false));
$this->assertPattern('/^<div\s+class="submit"><input type="submit"[^<>]+value="Next >"[^<>]+\/><\/div>$/', $result);
$result = $this->Form->submit('http://example.com/cake.power.gif');
$this->assertEqual('<div class="submit"><input type="image" src="http://example.com/cake.power.gif" /></div>', $result);
$result = $this->Form->submit('/relative/cake.power.gif');
$this->assertEqual('<div class="submit"><input type="image" src="relative/cake.power.gif" /></div>', $result);
$result = $this->Form->submit('cake.power.gif');
$this->assertEqual('<div class="submit"><input type="image" src="img/cake.power.gif" /></div>', $result);
$result = $this->Form->submit('Not.an.image');
$this->assertEqual('<div class="submit"><input type="submit" value="Not.an.image" /></div>', $result);
}
function testFormCreate() {