fix article detail click to go

fengr06 · fengr06 · commit dc19369bdd06 · 2019-01-11T00:02:13.000+08:00
diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
@@ -130,20 +130,40 @@ public function show(Request $request, $id)
             $input = $comment ? $comment : $input;
         }
 
-
         preg_match_all('#<h2>(.*)</h2>#', $article->content_html, $outline);
-        $outline = $outline[1];
-        $preg = "#<h([0-9])>(.*?)</h([0-9])>#";
+        $out = $outline[1];
+        $outline = [];
+        foreach ($out as $k => $v) {
+            $outline[$k]['name'] = $v;
+            $outline[$k]['id'] = $this->formatContent($v);
+        }
+
+        $preg = "#<h([0-9])>(.*)</h([0-9])>#";
         $replace = '<h$1 id="$2">$2</h$1>';
-        $content = preg_replace($preg, $replace, $article->content_html);
+        $content = preg_replace_callback($preg, function ($matches) {
+            $title = $matches[2];
+            $title = $this->formatContent($title);
+            $h2 = '<h' . $matches[1] . ' id= \'' . $title . '\'>' . $matches[2] . '</h' . $matches[1] . '>';
+            return $h2;
+        }, $article->content_html);
 
-//        $parse = new \Parsedown();
-//        echo $parse->text($article->content_markdown);
-//        $article->content_html = $parse->text($article->content_markdown);
-//        exit;
         $article->content_html = $content;
         $tags = $article->tags;
         return view(env('BLOG_THEME') . '.articles.show', compact('article', 'comments', 'input', 'count', 'outline', 'tags', 'articleCount', 'catesCount', 'tagsCount'));
     }
 
+
+    public function formatContent($content)
+    {
+        // Filter 英文标点符号
+        $content = preg_replace("/[[:punct:]]/i", " ", $content);
+        // Filter 中文标点符号
+        mb_regex_encoding('utf-8');
+        $char = "。、！？：；﹑•＂…‘’“”〝〞∕¦‖—　〈〉﹞﹝「」‹›〖〗】【»«』『〕〔》《﹐¸﹕︰﹔！¡？¿﹖﹌﹏﹋＇´ˊˋ―﹫︳︴¯＿￣﹢﹦﹤‐­˜﹟﹩﹠﹪﹡﹨﹍﹉﹎﹊ˇ︵︶︷︸︹︿﹀︺︽︾ˉ﹁﹂﹃﹄︻︼（）";
+        $content = mb_ereg_replace("[" . $char . "]", " ", $content, "UTF-8");
+        // Filter 连续空格
+        $content = preg_replace('# #', '', $content);
+        return $content;
+    }
+
 }
diff --git a/resources/views/next/articles/show.blade.php b/resources/views/next/articles/show.blade.php
@@ -329,7 +329,7 @@ class="vat"
                     <div class="site-author motion-element" itemprop="author" itemscope=""
                          itemtype="">
                         <img class="site-author-image" itemprop="image" src="/next/images/avatar.jpg" alt="MrCoder">
-                        <p class="site-author-name" itemprop="name">FrCoder</p>
+                        <p class="site-author-name" itemprop="name">MrCoder</p>
                         <p class="site-description motion-element"
                            itemprop="description">@yield('title', setting('web_name', 'Laravel'))</p>
                     </div>
@@ -383,8 +383,8 @@ class="vat"
                             @if($outline)
                                 @foreach($outline as $k => $item)
                             <li class="nav-item nav-level-1">
-                                <a class="nav-link" href="#{{$item}}">
-                                    <span class="nav-number">{{$k+1}}.</span> <span class="nav-text">{{$item}}</span>
+                                <a class="nav-link" href="#{{$item['id']}}">
+                                    <span class="nav-number">{{$k+1}}.</span> <span class="nav-text">{{$item['name']}}</span>
                                 </a>
                             </li>
                                 @endforeach
