fix 预定义文件显示问题

WangNingkai · Nov 6, 2018 · 7aa7a52 · 7aa7a52
1 parent c4e230f
commit 7aa7a52
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/app/Helpers/Tool.php b/app/Helpers/Tool.php
@@ -338,20 +338,6 @@ public static function filterFolder($items)
         return $items;
     }
 
-    /**
-     * 过滤指定文件
-     * @param $items
-     * @param $itemName
-     * @return mixed
-     */
-    public static function filterFiles($items, $itemName)
-    {
-        if (is_array($itemName)) {
-            array_except($items, $itemName);
-        } else unset($items[$itemName]);
-        return $items;
-    }
-
     /**
      * 过滤禁用目录
      * @param $items

diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php
@@ -115,7 +115,7 @@ public function list(Request $request)
         $head = array_key_exists('HEAD.md', $origin_items) ? Tool::markdown2Html(Tool::getFileContent($origin_items['HEAD.md']['@microsoft.graph.downloadUrl'])) : '';
         $readme = array_key_exists('README.md', $origin_items) ? Tool::markdown2Html(Tool::getFileContent($origin_items['README.md']['@microsoft.graph.downloadUrl'])) : '';
         $path_array = $origin_path ? explode('/', $origin_path) : [];
-        if (!session()->has('LogInfo')) $origin_items = Tool::filterFiles($origin_items, ['README.md', 'HEAD.md', '.password', '.deny']);
+        if (!session()->has('LogInfo')) $origin_items = array_except($origin_items, ['README.md', 'HEAD.md', '.password', '.deny']);
         $items = Tool::paginate($origin_items, 20);
         return view('one', compact('items', 'origin_items', 'origin_path', 'path_array', 'head', 'readme', 'hasImage'));
     }