From 0aa76d751e16443c394d54977634fb2c836a9c3f Mon Sep 17 00:00:00 2001
From: kokororin <i@kotori.love>
Date: Sat, 15 Jul 2017 13:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E7=B1=BB=20Access=5FAutoloader?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Access_Autoloader.php | 28 ++++++++++++++++++++++++++++
 Access_Bootstrap.php  |  5 ++---
 Action.php            |  3 ++-
 Plugin.php            |  3 +--
 4 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 Access_Autoloader.php

diff --git a/Access_Autoloader.php b/Access_Autoloader.php
new file mode 100644
index 0000000..a73e808
--- /dev/null
+++ b/Access_Autoloader.php
@@ -0,0 +1,28 @@
+<?php
+if (!defined('__ACCESS_PLUGIN_ROOT__')) {
+    throw new Exception('Boostrap file not found');
+}
+
+class Access_Autoloader
+{
+    public static function autoloader($class)
+    {
+        if (strpos($class, 'Access') !== 0) {
+            return;
+        }
+
+        $file = __ACCESS_PLUGIN_ROOT__ . '/' . $class . '.php';
+        if (file_exists($file)) {
+            require_once $file;
+        }
+    }
+
+    public static function register()
+    {
+        if (function_exists('spl_autoload_register')) {
+            spl_autoload_register(array('Access_Autoloader', 'autoloader'));
+        } else {
+            throw new Typecho_Plugin_Exception(_t('php版本过低，最低要求>=5.3.0'));
+        }
+    }
+}
diff --git a/Access_Bootstrap.php b/Access_Bootstrap.php
index 2cbf6fc..cd438ef 100644
--- a/Access_Bootstrap.php
+++ b/Access_Bootstrap.php
@@ -1,6 +1,5 @@
 <?php
 define('__ACCESS_PLUGIN_ROOT__', __DIR__);
 
-foreach (glob(__ACCESS_PLUGIN_ROOT__ . '/Access_*.php') as $filePath) {
-    require_once $filePath;
-}
+require_once __ACCESS_PLUGIN_ROOT__ . '/Access_Autoloader.php';
+Access_Autoloader::register();
diff --git a/Action.php b/Action.php
index d7fa0d7..ba7d71b 100644
--- a/Action.php
+++ b/Action.php
@@ -10,7 +10,8 @@ class Access_Action implements Widget_Interface_Do
     {
         $this->response = Typecho_Response::getInstance();
         $this->request = Typecho_Request::getInstance();
-        require_once __DIR__ . '/Access_Bootstrap.php';
+        require_once __DIR__ . '/Access_Autoloader.php';
+        Access_Autoloader::register();
         $this->access = new Access_Core();
     }
 
diff --git a/Plugin.php b/Plugin.php
index dc9a17e..eef729d 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -1,4 +1,5 @@
 <?php
+require_once __DIR__ . '/Access_Bootstrap.php';
 /**
  * 获取访客信息，生成统计图表，由<a href="https://zhaiyiming.com/">@一名宅</a> 部分优化重构。
  *
@@ -131,7 +132,6 @@ class Access_Plugin implements Typecho_Plugin_Interface
             }
             # 处理旧版本数据
             if ($db->fetchRow($db->query("SHOW TABLES LIKE '{$prefix}access';", Typecho_Db::READ))) {
-                require_once __DIR__ . '/Access_Bootstrap.php';
                 $rows = $db->fetchAll($db->select()->from('table.access'));
                 foreach ($rows as $row) {
                     $ua = new Access_UA($row['ua']);
@@ -176,7 +176,6 @@ class Access_Plugin implements Typecho_Plugin_Interface
      */
     public static function backend($archive)
     {
-        require_once __DIR__ . '/Access_Bootstrap.php';
         $access = new Access_Core();
         $config = Typecho_Widget::widget('Widget_Options')->plugin('Access');