Protect code HTML
This commit is contained in:
parent
b9f8294140
commit
cbfe6ea431
4 changed files with 39 additions and 4 deletions
|
@ -20,7 +20,7 @@ class Hashtag {
|
||||||
/**
|
/**
|
||||||
* Filter to save #tags as real WordPress tags
|
* Filter to save #tags as real WordPress tags
|
||||||
*
|
*
|
||||||
* @param int $id the rev-id
|
* @param int $id the rev-id
|
||||||
* @param WP_Post $post the post
|
* @param WP_Post $post the post
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
|
@ -44,6 +44,16 @@ class Hashtag {
|
||||||
*/
|
*/
|
||||||
public static function the_content( $the_content ) {
|
public static function the_content( $the_content ) {
|
||||||
$protected_tags = array();
|
$protected_tags = array();
|
||||||
|
$the_content = preg_replace_callback(
|
||||||
|
'#<(code|textarea|style)\b[^>]*>.*?</\1[^>]*>#i',
|
||||||
|
function( $m ) use ( &$protected_tags ) {
|
||||||
|
$c = count( $protected_tags );
|
||||||
|
$protect = '!#!#PROTECT' . $c . '#!#!';
|
||||||
|
$protected_tags[ $protect ] = $m[0];
|
||||||
|
return $protect;
|
||||||
|
},
|
||||||
|
$the_content
|
||||||
|
);
|
||||||
$the_content = preg_replace_callback(
|
$the_content = preg_replace_callback(
|
||||||
'#<[^>]+>#i',
|
'#<[^>]+>#i',
|
||||||
function( $m ) use ( &$protected_tags ) {
|
function( $m ) use ( &$protected_tags ) {
|
||||||
|
|
|
@ -24,6 +24,16 @@ class Mention {
|
||||||
*/
|
*/
|
||||||
public static function the_content( $the_content ) {
|
public static function the_content( $the_content ) {
|
||||||
$protected_tags = array();
|
$protected_tags = array();
|
||||||
|
$the_content = preg_replace_callback(
|
||||||
|
'#<(code|textarea|style)\b[^>]*>.*?</\1[^>]*>#i',
|
||||||
|
function( $m ) use ( &$protected_tags ) {
|
||||||
|
$c = count( $protected_tags );
|
||||||
|
$protect = '!#!#PROTECT' . $c . '#!#!';
|
||||||
|
$protected_tags[ $protect ] = $m[0];
|
||||||
|
return $protect;
|
||||||
|
},
|
||||||
|
$the_content
|
||||||
|
);
|
||||||
$the_content = preg_replace_callback(
|
$the_content = preg_replace_callback(
|
||||||
'#<a.*?href=[^>]+>.*?</a>#i',
|
'#<a.*?href=[^>]+>.*?</a>#i',
|
||||||
function( $m ) use ( &$protected_tags ) {
|
function( $m ) use ( &$protected_tags ) {
|
||||||
|
@ -68,7 +78,7 @@ class Mention {
|
||||||
/**
|
/**
|
||||||
* Extract the mentions from the post_content.
|
* Extract the mentions from the post_content.
|
||||||
*
|
*
|
||||||
* @param array $mentions The already found mentions.
|
* @param array $mentions The already found mentions.
|
||||||
* @param string $post_content The post content.
|
* @param string $post_content The post content.
|
||||||
* @return mixed The discovered mentions.
|
* @return mixed The discovered mentions.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -5,6 +5,7 @@ class Test_Activitypub_Hashtag extends WP_UnitTestCase {
|
||||||
*/
|
*/
|
||||||
public function test_the_content( $content, $content_with_hashtag ) {
|
public function test_the_content( $content, $content_with_hashtag ) {
|
||||||
\wp_create_term( 'object', 'post_tag' );
|
\wp_create_term( 'object', 'post_tag' );
|
||||||
|
\wp_create_term( 'ccc', 'post_tag' );
|
||||||
$object = \get_term_by( 'name', 'object', 'post_tag' );
|
$object = \get_term_by( 'name', 'object', 'post_tag' );
|
||||||
$link = \get_term_link( $object, 'post_tag' );
|
$link = \get_term_link( $object, 'post_tag' );
|
||||||
|
|
||||||
|
@ -14,6 +15,15 @@ class Test_Activitypub_Hashtag extends WP_UnitTestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function the_content_provider() {
|
public function the_content_provider() {
|
||||||
|
$code = '<code>text with some #object and <a> tag inside</code>';
|
||||||
|
$style = <<<ENDSTYLE
|
||||||
|
<style type="text/css">
|
||||||
|
<![[
|
||||||
|
color: #ccc;
|
||||||
|
]]>
|
||||||
|
</style>
|
||||||
|
ENDSTYLE;
|
||||||
|
$textarea = '<textarea name="test" rows="20">color: #ccc</textarea>';
|
||||||
return array(
|
return array(
|
||||||
array( 'test', 'test' ),
|
array( 'test', 'test' ),
|
||||||
array( '#test', '#test' ),
|
array( '#test', '#test' ),
|
||||||
|
@ -27,6 +37,9 @@ class Test_Activitypub_Hashtag extends WP_UnitTestCase {
|
||||||
array( '<div>#object</div>', '<div>#object</div>' ),
|
array( '<div>#object</div>', '<div>#object</div>' ),
|
||||||
array( '<a>#object</a>', '<a>#object</a>' ),
|
array( '<a>#object</a>', '<a>#object</a>' ),
|
||||||
array( '<div style="color: #ccc;">object</a>', '<div style="color: #ccc;">object</a>' ),
|
array( '<div style="color: #ccc;">object</a>', '<div style="color: #ccc;">object</a>' ),
|
||||||
|
array( $code, $code ),
|
||||||
|
array( $style, $style ),
|
||||||
|
array( $textarea, $textarea ),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
class Test_Activitypub_Mention extends ActivityPub_TestCase_Cache_HTTP {
|
class Test_Activitypub_Mention extends ActivityPub_TestCase_Cache_HTTP {
|
||||||
public static $users = array(
|
public static $users = array(
|
||||||
'username@example.org' => array(
|
'username@example.org' => array(
|
||||||
'url' => 'https://example.org/users/username',
|
'url' => 'https://example.org/users/username',
|
||||||
'name' => 'username',
|
'name' => 'username',
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
/**
|
/**
|
||||||
|
@ -18,12 +18,14 @@ class Test_Activitypub_Mention extends ActivityPub_TestCase_Cache_HTTP {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function the_content_provider() {
|
public function the_content_provider() {
|
||||||
|
$code = 'hallo <code>@username@example.org</code> test';
|
||||||
return array(
|
return array(
|
||||||
array( 'hallo @username@example.org test', 'hallo <a rel="mention" class="u-url mention" href="https://example.org/users/username">@<span>username</span></a> test' ),
|
array( 'hallo @username@example.org test', 'hallo <a rel="mention" class="u-url mention" href="https://example.org/users/username">@<span>username</span></a> test' ),
|
||||||
array( 'hallo @pfefferle@notiz.blog test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@<span>pfefferle</span></a> test' ),
|
array( 'hallo @pfefferle@notiz.blog test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@<span>pfefferle</span></a> test' ),
|
||||||
array( 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@<span>pfefferle</span>@notiz.blog</a> test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@<span>pfefferle</span>@notiz.blog</a> test' ),
|
array( 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@<span>pfefferle</span>@notiz.blog</a> test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@<span>pfefferle</span>@notiz.blog</a> test' ),
|
||||||
array( 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@pfefferle@notiz.blog</a> test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@pfefferle@notiz.blog</a> test' ),
|
array( 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@pfefferle@notiz.blog</a> test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/author/matthias-pfefferle/">@pfefferle@notiz.blog</a> test' ),
|
||||||
array( 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/@pfefferle/">@pfefferle@notiz.blog</a> test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/@pfefferle/">@pfefferle@notiz.blog</a> test' ),
|
array( 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/@pfefferle/">@pfefferle@notiz.blog</a> test', 'hallo <a rel="mention" class="u-url mention" href="https://notiz.blog/@pfefferle/">@pfefferle@notiz.blog</a> test' ),
|
||||||
|
array( $code, $code ),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue