use common_purify to purify HTML, one function to rule them all
This commit is contained in:
parent
3dce6d9f6a
commit
0deaf6c50c
|
@ -405,7 +405,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
|
|||
|
||||
// Get (safe!) HTML and text versions of the content
|
||||
|
||||
$rendered = $this->purify($sourceContent);
|
||||
$rendered = common_purify($sourceContent);
|
||||
$content = common_strip_html($rendered);
|
||||
|
||||
$shortened = $this->auth_user->shortenLinks($content);
|
||||
|
@ -504,13 +504,4 @@ class ApiTimelineUserAction extends ApiBareAuthAction
|
|||
|
||||
return $saved;
|
||||
}
|
||||
|
||||
function purify($content)
|
||||
{
|
||||
require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
|
||||
|
||||
$config = array('safe' => 1,
|
||||
'deny_attribute' => 'id,style,on*');
|
||||
return htmLawed($content, $config);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -213,7 +213,7 @@ class ActivityImporter extends QueueHandler
|
|||
|
||||
// Get (safe!) HTML and text versions of the content
|
||||
|
||||
$rendered = $this->purify($sourceContent);
|
||||
$rendered = common_purify($sourceContent);
|
||||
$content = common_strip_html($rendered);
|
||||
|
||||
$shortened = $user->shortenLinks($content);
|
||||
|
@ -338,15 +338,4 @@ class ActivityImporter extends QueueHandler
|
|||
|
||||
return array($groups, $replies);
|
||||
}
|
||||
|
||||
|
||||
function purify($content)
|
||||
{
|
||||
require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
|
||||
|
||||
$config = array('safe' => 1,
|
||||
'deny_attribute' => 'id,style,on*');
|
||||
|
||||
return htmLawed($content, $config);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -117,10 +117,10 @@ class Blog_entry extends Managed_DataObject
|
|||
$be->id = (string) new UUID();
|
||||
$be->profile_id = $profile->id;
|
||||
$be->title = $title; // Note: not HTML-protected
|
||||
$be->content = self::purify($content);
|
||||
$be->content = common_purify($content);
|
||||
|
||||
if (array_key_exists('summary', $options)) {
|
||||
$be->summary = self::purify($options['summary']);
|
||||
$be->summary = common_purify($options['summary']);
|
||||
} else {
|
||||
// Already purified
|
||||
$be->summary = self::summarize($be->content);
|
||||
|
@ -241,18 +241,4 @@ class Blog_entry extends Managed_DataObject
|
|||
|
||||
return $obj;
|
||||
}
|
||||
|
||||
/**
|
||||
* Clean up input HTML
|
||||
*/
|
||||
static function purify($html)
|
||||
{
|
||||
require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
|
||||
|
||||
$config = array('safe' => 1,
|
||||
'deny_attribute' => 'id,style,on*');
|
||||
$pure = htmLawed($html, $config);
|
||||
|
||||
return $pure;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -621,7 +621,7 @@ class Ostatus_profile extends Managed_DataObject
|
|||
|
||||
// Get (safe!) HTML and text versions of the content
|
||||
|
||||
$rendered = $this->purify($sourceContent);
|
||||
$rendered = common_purify($sourceContent);
|
||||
$content = common_strip_html($rendered);
|
||||
|
||||
$shortened = common_shorten_links($content);
|
||||
|
@ -788,7 +788,7 @@ class Ostatus_profile extends Managed_DataObject
|
|||
|
||||
// Get (safe!) HTML and text versions of the content
|
||||
|
||||
$rendered = $this->purify($sourceContent);
|
||||
$rendered = common_purify($sourceContent);
|
||||
$content = common_strip_html($rendered);
|
||||
|
||||
$shortened = common_shorten_links($content);
|
||||
|
@ -914,17 +914,6 @@ class Ostatus_profile extends Managed_DataObject
|
|||
return $saved;
|
||||
}
|
||||
|
||||
/**
|
||||
* Clean up HTML
|
||||
*/
|
||||
protected function purify($html)
|
||||
{
|
||||
require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
|
||||
$config = array('safe' => 1,
|
||||
'deny_attribute' => 'id,style,on*');
|
||||
return htmLawed($html, $config);
|
||||
}
|
||||
|
||||
/**
|
||||
* Filters a list of recipient ID URIs to just those for local delivery.
|
||||
* @param Profile local profile of sender
|
||||
|
|
Loading…
Reference in New Issue
Block a user