Fix trimming of site name with html entities

iMattPro · iMattPro · commit 5562c033bbe2 · 2024-12-05T08:01:59.000-08:00
diff --git a/event/listener.php b/event/listener.php
@@ -211,7 +211,7 @@ public function pwa_icon_name($value, $key)
 	 */
 	public function pwa_short_sitename($value, $key)
 	{
-		$placeholder = $this->trim_shortname(ext::decode_entities($this->config['sitename']));
+		$placeholder = $this->trim_shortname($this->config['sitename']);
 
 		return '<input id="' . $key . '" type="text" size="40" maxlength="12" name="config[' . $key . ']" value="' . $value . '" placeholder="' . $placeholder . '">';
 	}
@@ -366,6 +366,6 @@ protected function can_use_notifications()
 	 */
 	protected function trim_shortname($name)
 	{
-		return utf8_substr($name, 0, 12);
+		return htmlspecialchars(utf8_substr(ext::decode_entities($name, ENT_QUOTES), 0, 12), ENT_QUOTES, 'UTF-8');
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ public function pwa_icon_name($value, $key)`
`211`	`211`	`*/`
`212`	`212`	`public function pwa_short_sitename($value, $key)`
`213`	`213`	`{`
`214`		`- $placeholder = $this->trim_shortname(ext::decode_entities($this->config['sitename']));`
	`214`	`+ $placeholder = $this->trim_shortname($this->config['sitename']);`
`215`	`215`
`216`	`216`	`return '<input id="' . $key . '" type="text" size="40" maxlength="12" name="config[' . $key . ']" value="' . $value . '" placeholder="' . $placeholder . '">';`
`217`	`217`	`}`
`@@ -366,6 +366,6 @@ protected function can_use_notifications()`
`366`	`366`	`*/`
`367`	`367`	`protected function trim_shortname($name)`
`368`	`368`	`{`
`369`		`- return utf8_substr($name, 0, 12);`
	`369`	`+ return htmlspecialchars(utf8_substr(ext::decode_entities($name, ENT_QUOTES), 0, 12), ENT_QUOTES, 'UTF-8');`
`370`	`370`	`}`
`371`	`371`	`}`