interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.2.0

Browse Source
This commit is contained in:
Bastian Allgeier
2019-06-25 09:56:08 +02:00
parent 9e18cf635d
commit 9c89153d35
296 changed files with 14408 additions and 2504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
kirby/src/Toolkit/Html.php
View File

@@ -10,9 +10,9 @@ use Kirby\Http\Url;
*
* @package Kirby Toolkit
* @author Bastian Allgeier <bastian@getkirby.com>
* @link http://getkirby.com
* @copyright Bastian Allgeier
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @license https://opensource.org/licenses/MIT
*/
class Html
{
@@ -52,7 +52,7 @@ class Html
}
/**
* Generates an a tag
* Generates an `a` tag
*
* @param string $href The url for the `a` tag
* @param mixed $text The optional text. If `null`, the url will be used as text
@@ -61,20 +61,15 @@ class Html
*/
public static function a(string $href = null, $text = null, array $attr = []): string
{
$attr = array_merge(['href' => $href], $attr);
if (empty($text) === true) {
$text = $attr['href'];
if (Str::startsWith($href, 'mailto:')) {
return static::email($href, $text, $attr);
}
if (is_string($text) === true && Str::isUrl($text) === true) {
$text = Url::short($text);
if (Str::startsWith($href, 'tel:')) {
return static::tel($href, $text, $attr);
}
// add rel=noopener to target blank links to improve security
$attr['rel'] = static::rel($attr['rel'] ?? null, $attr['target'] ?? null);
return static::tag('a', $text, $attr);
return static::link($href, $text, $attr);
}
/**
@@ -167,7 +162,7 @@ class Html
* @param array $attr Additional attributes for the tag
* @return string the generated html
*/
public static function email(string $email, string $text = null, array $attr = []): string
public static function email(string $email, $text = null, array $attr = []): string
{
if (empty($email) === true) {
return '';
@@ -327,6 +322,32 @@ class Html
return in_array(strtolower($tag), $void);
}
/**
* Generates an `a` link tag
*
* @param string $href The url for the `a` tag
* @param mixed $text The optional text. If `null`, the url will be used as text
* @param array $attr Additional attributes for the tag
* @return string the generated html
*/
public static function link(string $href = null, $text = null, array $attr = []): string
{
$attr = array_merge(['href' => $href], $attr);
if (empty($text) === true) {
$text = $attr['href'];
}
if (is_string($text) === true && Str::isUrl($text) === true) {
$text = Url::short($text);
}
// add rel=noopener to target blank links to improve security
$attr['rel'] = static::rel($attr['rel'] ?? null, $attr['target'] ?? null);
return static::tag('a', $text, $attr);
}
/**
* Add noopeener noreferrer to rels when target is `_blank`
*
@@ -398,7 +419,7 @@ class Html
$text = $tel;
}
return static::a('tel:' . $number, $text, $attr);
return static::link('tel:' . $number, $text, $attr);
}
/**