forked from GNUsocial/gnu-social
common_to_alphanumeric added, filtering Notice->source in classic layout
This commit is contained in:
parent
844fe3924e
commit
15ab9ff9e3
@ -552,6 +552,11 @@ abstract class ActivityHandlerPlugin extends Plugin
|
|||||||
if ($nli->notice->scope != 0 && $nli->notice->scope != 1) {
|
if ($nli->notice->scope != 0 && $nli->notice->scope != 1) {
|
||||||
$class .= ' limited-scope';
|
$class .= ' limited-scope';
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
$class .= ' notice-source-'.common_to_alphanumeric($this->notice->source);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
// either source or what we filtered out was a zero-length string
|
||||||
|
}
|
||||||
$nli->out->elementStart('li', array('class' => $class,
|
$nli->out->elementStart('li', array('class' => $class,
|
||||||
'id' => 'notice-' . $id));
|
'id' => 'notice-' . $id));
|
||||||
}
|
}
|
||||||
|
@ -227,8 +227,10 @@ class NoticeListItem extends Widget
|
|||||||
if ($this->notice->scope != 0 && $this->notice->scope != 1) {
|
if ($this->notice->scope != 0 && $this->notice->scope != 1) {
|
||||||
$class .= ' limited-scope';
|
$class .= ' limited-scope';
|
||||||
}
|
}
|
||||||
if (!empty($this->notice->source)) {
|
try {
|
||||||
$class .= ' notice-source-'.$this->notice->source;
|
$class .= ' notice-source-'.common_to_alphanumeric($this->notice->source);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
// either source or what we filtered out was a zero-length string
|
||||||
}
|
}
|
||||||
$id_prefix = (strlen($this->id_prefix) ? $this->id_prefix . '-' : '');
|
$id_prefix = (strlen($this->id_prefix) ? $this->id_prefix . '-' : '');
|
||||||
$this->out->elementStart($this->item_tag, array('class' => $class,
|
$this->out->elementStart($this->item_tag, array('class' => $class,
|
||||||
|
@ -580,6 +580,15 @@ function common_canonical_email($email)
|
|||||||
return $email;
|
return $email;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function common_to_alphanumeric($str)
|
||||||
|
{
|
||||||
|
$filtered = preg_replace('/[^A-Za-z0-9]\s*/', '', $str);
|
||||||
|
if (strlen($filtered) < 1) {
|
||||||
|
throw new Exception('Filtered string was zero-length.');
|
||||||
|
}
|
||||||
|
return $filtered;
|
||||||
|
}
|
||||||
|
|
||||||
function common_purify($html)
|
function common_purify($html)
|
||||||
{
|
{
|
||||||
require_once INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php';
|
require_once INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php';
|
||||||
|
Loading…
Reference in New Issue
Block a user