Strip newlines in static context (some socials convert \n to <br> and…

… displays them).
Avatar4eg · Aug 11, 2016 · 9040c61 · 9040c61
1 parent 919f5ea
commit 9040c61
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/src/Listener/AddClientAssets.php b/src/Listener/AddClientAssets.php
@@ -17,6 +17,9 @@ public function subscribe(Dispatcher $events)
         $events->listen(ConfigureLocales::class, [$this, 'addLocales']);
     }
 
+    /**
+     * @param ConfigureClientView $event
+     */
     public function addAssets(ConfigureClientView $event)
     {
         if($event->isForum()) {
@@ -35,6 +38,9 @@ public function addAssets(ConfigureClientView $event)
         }
     }
 
+    /**
+     * @param ConfigureLocales $event
+     */
     public function addLocales(ConfigureLocales $event)
     {
         foreach (new DirectoryIterator(__DIR__ .'/../../locale') as $file) {

diff --git a/src/Listener/AddHeadData.php b/src/Listener/AddHeadData.php
@@ -41,12 +41,18 @@ public function __construct(SettingsRepositoryInterface $settings, UrlGenerator
         $this->urlGenerator = $urlGenerator;
     }
 
+    /**
+     * @param Dispatcher $events
+     */
     public function subscribe(Dispatcher $events)
     {
         $events->listen(ConfigureClientView::class, [$this, 'addMetaTags']);
         $events->listen(PrepareApiData::class, [$this, 'addDiscussionMetaTags']);
     }
-
+
+    /**
+     * @param ConfigureClientView $event
+     */
     public function addMetaTags(ConfigureClientView $event)
     {
         if ($event->isForum()) {
@@ -63,7 +69,7 @@ public function addMetaTags(ConfigureClientView $event)
             if ($this->openGraph || $this->twitterCard) {
                 $dataTitle = htmlspecialchars($this->settings->get('welcome_title'), ENT_QUOTES|ENT_HTML5|ENT_DISALLOWED|ENT_SUBSTITUTE, 'UTF-8');
                 $dataUrl = $this->urlGenerator->toBase();
-                $dataDescription = htmlspecialchars($this->settings->get('forum_description'), ENT_QUOTES|ENT_HTML5|ENT_DISALLOWED|ENT_SUBSTITUTE, 'UTF-8');
+                $dataDescription = $this->plainText($this->settings->get('forum_description'), 150);
             }
 
             if ($this->openGraph) {
@@ -82,6 +88,9 @@ public function addMetaTags(ConfigureClientView $event)
         }
     }
 
+    /**
+     * @param PrepareApiData $event
+     */
     public function addDiscussionMetaTags(PrepareApiData $event)
     {
         if ($this->clientView && $event->isController(ShowDiscussionController::class)) {
@@ -91,9 +100,7 @@ public function addDiscussionMetaTags(PrepareApiData $event)
                 $dataUrl = $this->urlGenerator->toRoute('discussion', ['id' => $event->data->id]);
             }
             if ($event->data->startPost) {
-                $dataDescription = strip_tags($event->data->startPost->content);
-                $dataDescription = strlen($dataDescription) > 150 ? substr($dataDescription, 0, 150) . '...' : $dataDescription;
-                $dataDescription = htmlspecialchars($dataDescription, ENT_QUOTES|ENT_HTML5|ENT_DISALLOWED|ENT_SUBSTITUTE, 'UTF-8');
+                $dataDescription = $this->plainText($event->data->startPost->content, 150);
             }
 
             //$this->clientView->addHeadString('<meta name="description" content="' . $dataDescription . '"/>', 'description');
@@ -109,4 +116,21 @@ public function addDiscussionMetaTags(PrepareApiData $event)
             }
         }
     }
+
+    /**
+     * @param string $text
+     * @param int|null $length
+     * @return string
+     */
+    protected function plainText($text, $length = null)
+    {
+        $text = strip_tags($text);
+        $text = preg_replace('/\s+/', ' ', $text);
+        $text = htmlspecialchars($text, ENT_QUOTES|ENT_HTML5|ENT_DISALLOWED|ENT_SUBSTITUTE, 'UTF-8');
+        if ($length !== null) {
+            $text = strlen($text) > $length ? substr($text, 0, $length) . '...' : $text;
+        }
+
+        return $text;
+    }
 }