From d11e205ca590333b43946ee0393f6e4e1c330ad1 Mon Sep 17 00:00:00 2001
From: Satoshi Sahara <sahara.satoshi@gmail.com>
Date: Mon, 7 Sep 2020 23:17:49 +0900
Subject: [PATCH] consistent html_buildlist() usage

see usage of html_buildlist in plugin acl (admin and action component)
---
 inc/Ajax.php     |  3 ++-
 inc/Ui/Index.php | 40 +++++++++++++++++++---------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/inc/Ajax.php b/inc/Ajax.php
index c97bd09dc..f1aea7d93 100644
--- a/inc/Ajax.php
+++ b/inc/Ajax.php
@@ -326,7 +326,8 @@ class Ajax {
         foreach (array_keys($data) as $item) {
             $data[$item]['level'] = $lvl + 1;
         }
-        echo (new Ui\Index)->buildIndexList($data);
+        $idx = new Ui\Index;
+        echo html_buildlist($data, 'idx', [$idx,'formatListItem'], [$idx,'tagListItem']);
     }
 
     /**
diff --git a/inc/Ui/Index.php b/inc/Ui/Index.php
index 87de2c519..d2cbfccb1 100644
--- a/inc/Ui/Index.php
+++ b/inc/Ui/Index.php
@@ -34,37 +34,35 @@ class Index extends Ui
      */
     public function show()
     {
-        global $conf;
-        global $ID;
-
-        $ns  = cleanID($this->ns);
-        if (empty($ns)){
-            $ns = getNS($ID);
-            if ($ns === false) $ns = '';
-        }
-        $ns  = utf8_encodeFN(str_replace(':', '/', $ns));
-
         // print intro
         print p_locale_xhtml('index');
 
-        print '<div id="index__tree" class="index__tree">';
-
-        $data = array();
-        search($data, $conf['datadir'], 'search_index', array('ns' => $ns));
-        print $this->buildIndexList($data);
-
-        print '</div>';
+        print $this->sitemap();
     }
 
     /**
-     * Build html of unordered list of index items
+     * Build html of sitemap, unordered list of pages under the namespace
      *
-     * @param array $data  array with item arrays
      * @return string
      */
-    public function buildIndexList($data)
+    public function sitemap()
     {
-        return html_buildlist($data, 'idx', [$this,'formatListItem'], [$this,'tagListItem']);
+        global $conf;
+        global $ID;
+
+        $ns = cleanID($this->ns);
+        if (empty($ns)){
+            $ns = getNS($ID);
+            if ($ns === false) $ns = '';
+        }
+        $ns = utf8_encodeFN(str_replace(':', '/', $ns));
+        $data = array();
+        search($data, $conf['datadir'], 'search_index', array('ns' => $ns));
+
+        $html = '<div id="index__tree" class="index__tree">'
+              . html_buildlist($data, 'idx', [$this,'formatListItem'], [$this,'tagListItem'])
+              . '</div>';
+        return $html;
     }
 
     /**
-- 
2.11.4.GIT