adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating HtmlHelper::meta(), closes #3223, #3224, #3225, tests added

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6206 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-12-22 23:36:24 +00:00
parent 63a4e2e899
commit eebdb12eaa
2 changed files with 78 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,8 @@ class HtmlHelper extends AppHelper {
* @var array
*/
var $tags = array(
'metalink' => '<link href="%s" title="%s"%s />',
'meta' => '<meta%s/>',
'metalink' => '<link href="%s"%s/>',
'link' => '<a href="%s"%s>%s</a>',
'mailto' => '<a href="mailto:%s" %s>%s</a>',
'form' => '<form %s>',
@ -184,43 +185,61 @@ class HtmlHelper extends AppHelper {
}
}
/**
* Creates a link to an external resource
* Creates a link to an external resource and handles basic meta tags
*
* @param string $title The title of the external resource
* @param mixed $url The address of the external resource
* @param mixed $url The address of the external resource or string for content attribute
* @param array $attributes Other attributes for the generated tag. If the type attribute is html, rss, atom, or icon, the mime-type is returned.
* @param boolean $inline If set to false, the generated tag appears in the head tag of the layout.
* @return string
*/
function meta($title = null, $url = null, $attributes = array(), $inline = true) {
function meta($type = null, $url = null, $attributes = array(), $inline = true) {
if (!is_array($type)) {
$types = array(
'html' => 'text/html',
'rss' => 'application/rss+xml',
'atom' => 'application/atom+xml',
'icon' => 'image/x-icon'
'rss' => array('type' => 'application/rss+xml', 'rel' => 'alternate', 'title' => $type, 'link' => $url),
'atom' => array('type' => 'application/atom+xml', 'title' => $type, 'link' => $url),
'icon' => array('type' => 'image/x-icon', 'rel' => 'icon', 'link' => $url),
'keywords' => array('name' => 'keywords', 'content' => $url),
'description' => array('name' => 'description', 'content' => $url),
);
if (!isset($attributes['type']) && is_array($url) && isset($url['ext'])) {
if (in_array($url['ext'], array_keys($types))) {
$attributes['type'] = $url['ext'];
if ($type === 'icon' && $url === null) {
$types['icon']['link'] = $this->webroot('favicon.ico');
}
if (isset($types[$type])) {
$type = $types[$type];
} elseif (!isset($types['type']) && !isset($attributes['type']) && $url !== null) {
if (is_array($url) && isset($url['ext'])) {
$type = $types[$url['ext']];
} else {
$attributes['type'] = 'rss';
$type = $types['rss'];
}
} elseif (isset($attributes['type']) && isset($types[$attributes['type']])) {
$type = $types[$attributes['type']];
}
} else {
if ($url !== null) {
$inline = $url;
}
} elseif (!isset($attributes['type'])) {
$attributes['type'] = 'rss';
}
if (isset($attributes['type']) && in_array($attributes['type'], array_keys($types))) {
$attributes['type'] = $types[$attributes['type']];
}
$attributes = array_merge($type, $attributes);
if (!isset($attributes['rel'])) {
$attributes['rel'] = 'alternate';
if (isset($attributes['link'])) {
if (isset($attributes['rel']) && $attributes['rel'] === 'icon') {
$attributes['rel'] = 'shortcut icon';
$out .= sprintf($this->tags['metalink'], $attributes['link'], $this->_parseAttributes($attributes, array('link')));
} else {
$attributes['link'] = $this->url($attributes['link'], true);
}
$out = sprintf($this->tags['metalink'], $attributes['link'], $this->_parseAttributes($attributes, array('link')));
} else {
$out = sprintf($this->tags['meta'], $this->_parseAttributes($attributes, array('type')));
}
$out = $this->output(sprintf($this->tags['metalink'], $this->url($url, true), $title, $this->_parseAttributes($attributes)));
if ($inline) {
return $out;
return $this->output($out);
} else {
$view =& ClassRegistry::getObject('view');
$view->addScript($out);
@ -528,7 +547,7 @@ class HtmlHelper extends AppHelper {
* @access public
*/
function nestedList($list, $attributes = array(), $itemAttributes = array(), $tag = 'ul') {
if(is_string($attributes)) {
if (is_string($attributes)) {
$tag = $attributes;
$attributes = array();
}

34
cake/tests/cases/libs/view/helpers/html.test.php
View file

@ -212,6 +212,40 @@ class HtmlHelperTest extends UnitTestCase {
$this->assertPattern('/<li[^<>]*class="item"[^<>]*>Item 5\s*<ul[^<>]*class="list"[^<>]*>\s*<li[^<>]*class="item"[^<>]*>Item 5.1<\/li>\s*<li[^<>]*class="item"[^<>]*>Item 5.2<\/li>\s*<\/ul>\s*<\/li>/', $result);
}
function testMeta() {
$result = $this->Html->meta('this is an rss feed', array('controller'=> 'posts', 'ext' => 'rss'));
$this->assertPattern('/^<link[^<>]+href=".*\/posts\.rss"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+rel="alternate"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+type="application\/rss\+xml"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+title="this is an rss feed"\/>$/', $result);
$result = $this->Html->meta('rss', array('controller'=> 'posts', 'ext' => 'rss'), array('title' => 'this is an rss feed'));
$this->assertPattern('/^<link[^<>]+href=".*\/posts\.rss"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+rel="alternate"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+type="application\/rss\+xml"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+title="this is an rss feed"\/>$/', $result);
$result = $this->Html->meta('icon', 'favicon.ico');
$this->assertPattern('/^<link[^<>]+href=".*favicon\.ico"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+type="image\/x-icon"[^<>]+/', $result);
$this->assertPattern('/^<link[^<>]+rel="icon"\/>[^<>]*/', $result);
$this->assertPattern('/<link[^<>]+rel="shortcut icon"\/>[^<>]*/', $result);
$result = $this->Html->meta('keywords', 'these, are, some, meta, keywords');
$this->assertPattern('/^<meta[^<>]+name="keywords"[^<>]+\/>$/', $result);
$this->assertPattern('/^<meta[^<>]+content="these, are, some, meta, keywords"\/>$/', $result);
$result = $this->Html->meta('description', 'this is the meta description');
$this->assertPattern('/^<meta[^<>]+name="description"[^<>]+\/>$/', $result);
$this->assertPattern('/^<meta[^<>]+content="this is the meta description"\/>$/', $result);
$result = $this->Html->meta(array('name' => 'ROBOTS', 'content' => 'ALL'));
$this->assertPattern('/^<meta[^<>]+name="ROBOTS"[^<>]+\/>$/', $result);
$this->assertPattern('/^<meta[^<>]+content="ALL"\/>$/', $result);
}
function tearDown() {
unset($this->Html);
}