From f96eb7c26b7d9da7dc9b230d7dc7493eec2f1c10 Mon Sep 17 00:00:00 2001
From: Kraity <kraits@qq.com>
Date: Thu, 12 Aug 2021 22:14:23 +0800
Subject: [PATCH] update configuration and management

---
 Abstract.php |  82 +++++++++-
 Action.php   |  67 ++++----
 Archive.php  |   9 --
 Option.php   |  10 +-
 Plugin.php   |  80 +---------
 Themes.php   | 429 +++++++++++++++------------------------------------
 6 files changed, 251 insertions(+), 426 deletions(-)

diff --git a/Abstract.php b/Abstract.php
index 993631d..af1533b 100644
--- a/Abstract.php
+++ b/Abstract.php
@@ -168,7 +168,7 @@ public function ___deviceTag()
         if (preg_match('/Nabo\/([^\s|;]+)/i', $this->agent, $regs)) {
             return '南博 ' . $regs[1];
         }
-        return $this->deviceInfo();
+        return $this->deviceInfo;
     }
 
     /**
@@ -184,7 +184,7 @@ public function ___deviceInfo()
         if (preg_match('/\(.*;\s(.*)\sBuild.*\)/i', $this->agent, $regs)) {
             return $regs[1];
         }
-        return $this->deviceOs();
+        return $this->deviceOs;
     }
 
     /**
@@ -214,6 +214,7 @@ public function avatar($size = null, $rating = null, $default = null)
 
     /**
      * 动态创建时间
+     *
      * @param null $format
      */
     public function date($format = NULL)
@@ -223,6 +224,7 @@ public function date($format = NULL)
 
     /**
      * 动态创建时间
+     *
      * @param null $format
      */
     public function created($format = NULL)
@@ -232,6 +234,7 @@ public function created($format = NULL)
 
     /**
      * 动态更新时间
+     *
      * @param null $format
      */
     public function modified($format = NULL)
@@ -253,4 +256,79 @@ public function navigator($prev = '&laquo;', $next = '&raquo;', $splitPage = 3,
     {
         $this->archive->pageNav($prev, $next, $splitPage, $splitWord, $template);
     }
+
+    /**
+     * @param Widget_Archive $archive
+     * @param Typecho_Db_Query $select
+     * @throws Typecho_Db_Exception
+     * @throws Typecho_Exception
+     */
+    public static function archiveQuery($archive, $select)
+    {
+        $db = Typecho_Db::get();
+        if (strpos($archive->parameter->type, 'index') !== 0) {
+            $db->fetchAll($select, [$archive, 'push']);
+            return;
+        }
+
+        $option = Typecho_Widget::widget('Dynamics_Option');
+        if (empty($option->allowIndex)) {
+            $db->fetchAll($select, [$archive, 'push']);
+            return;
+        }
+
+        $dynamicNum = $db->fetchObject($db->select(array('COUNT(DISTINCT table.dynamics.did)' => 'num'))
+            ->from('table.dynamics')
+            ->where('table.dynamics.status = ?', 'publish')
+            ->cleanAttribute('group'))->num;
+        if (empty($dynamicNum)) {
+            $db->fetchAll($select, [$archive, 'push']);
+            return;
+        }
+
+        $dynamicSize = 5;
+        $archive->parameter->pageSize += $dynamicSize;
+
+        $article = $select->prepare($select);
+        $dynamic = $db->select('table.dynamics.did as cid', 'null as title', 'null as slug', 'table.dynamics.created', 'table.dynamics.authorId',
+            'table.dynamics.modified', "'dynamic' as type", 'table.dynamics.status', 'table.dynamics.text', '0 as commentsNum', '0 as order',
+            'null as template', 'null as password', '0 as allowComment', '0 as allowPing', '0 as allowFeed', '0 as parent')
+            ->from('table.dynamics')
+            ->where('table.dynamics.status = ?', 'publish')
+            ->order('table.dynamics.created', Typecho_Db::SORT_DESC)
+            ->page(isset($archive->request->page) ? $archive->request->page : 1, $dynamicSize);
+        $dynamic = $dynamic->prepare($dynamic);
+
+        $articleNum = $db->fetchObject($archive->getCountSql()
+            ->select(array('COUNT(DISTINCT table.contents.cid)' => 'num'))
+            ->from('table.contents')
+            ->cleanAttribute('group'))->num;
+        $archive->setTotal($articleNum + $dynamicNum);
+
+        $tags = array();
+        $categories = array([
+            'name' => '动态',
+            'permalink' => $option->homepage
+        ]);
+
+        foreach ($db->fetchAll("($article) UNION ($dynamic) ORDER BY created DESC") as $value) {
+            if ($value['type'] == 'dynamic') {
+                $value['title'] = date('m月d日, Y年', $value['created']);
+                $value['tags'] = &$tags;
+                $value['categories'] = &$categories;
+                $value['permalink'] = $option->applyUrl($value['cid']);
+                $value['isMarkdown'] = true;
+
+                $value['date'] = new Typecho_Date($value['created']);
+                $value['year'] = $value['date']->year;
+                $value['month'] = $value['date']->month;
+                $value['day'] = $value['date']->day;
+
+                $archive->length++;
+                $archive->stack[] = $value;
+            } else {
+                $archive->push($value);
+            }
+        }
+    }
 }
diff --git a/Action.php b/Action.php
index f85cc12..732f7a4 100644
--- a/Action.php
+++ b/Action.php
@@ -2,7 +2,6 @@
 
 class Dynamics_Action extends Dynamics_Abstract implements Widget_Interface_Do
 {
-
     /**
      * 同步附件
      *
@@ -90,10 +89,12 @@ public static function insertOf($uid, $dynamic)
         $db = Typecho_Db::get();
         $dynamic['authorId'] = $uid;
         $dynamic['agent'] = $_SERVER['HTTP_USER_AGENT'];
+
         $dynamic['did'] = $db->query($db
             ->insert('table.dynamics')
             ->rows($dynamic));
         self::attachOf($dynamic['did'], $dynamic['text']);
+
         return $dynamic;
     }
 
@@ -110,11 +111,13 @@ public static function modifyOf($uid, $dynamic)
     {
         $db = Typecho_Db::get();
         $dynamic['authorId'] = $uid;
+
         $db->query($db
             ->update('table.dynamics')
             ->rows($dynamic)
             ->where('did = ?', $dynamic['did']));
         self::attachOf($dynamic['did'], $dynamic['text']);
+
         return $dynamic;
     }
 
@@ -132,13 +135,15 @@ public static function deleteOf($uid, $list)
     {
         $db = Typecho_Db::get();
         $deleteCount = 0;
+
         foreach ($list as $did) {
             if ($db->query($db->delete('table.dynamics')
-                ->where('authorId', $uid)->where('did = ?', $did))) {
+                ->where('table.dynamics.did = ?', $did))) {
                 $deleteCount++;
+                self::unAttachOf($did);
             }
-            self::unAttachOf($did);
         }
+
         return $deleteCount;
     }
 
@@ -166,18 +171,17 @@ public static function selectOf($uid, $status = null, $pageSize = 10, $currentPa
         $select->order('created', Typecho_Db::SORT_DESC)
             ->page($currentPage, $pageSize);
 
-        $dynamicRough = $db->fetchAll($select);
-
-        $list = [];
+        $data = $db->fetchAll($select);
         $option = Typecho_Widget::widget('Dynamics_Option');
 
-        foreach ($dynamicRough as $dynamic) {
+        $dynamics = [];
+        foreach ($data as $dynamic) {
             $dynamic['title'] = date('m月d日, Y年', $dynamic['created']);
             $dynamic['permalink'] = $option->applyUrl($dynamic['did']);
-            $list[] = $dynamic;
+            $dynamics[] = $dynamic;
         }
 
-        return $list;
+        return $dynamics;
     }
 
     /**
@@ -186,15 +190,14 @@ public static function selectOf($uid, $status = null, $pageSize = 10, $currentPa
      */
     public function addOf()
     {
-        if (!$this->widget('Widget_User')->hasLogin()) {
-            $this->error('请登录后台后重试');
-        }
-
-        $dynamic['text'] = '滴滴打卡';
-        $dynamic['created'] = $date = time();
-        $dynamic['modified'] = $date;
+        $this->user->pass('editor');
+        $dynamic = array(
+            'text' => '滴滴打卡',
+            'created' => $date = time(),
+            'modified' => $date
+        );
 
-        $dynamic = Dynamics_Action::insertOf($this->user->uid, $dynamic);
+        $dynamic = self::insertOf($this->user->uid, $dynamic);
         $dynamic['nickname'] = $this->user->screenName;
 
         $this->success($this->filterParam($dynamic));
@@ -207,10 +210,7 @@ public function addOf()
      */
     public function saveOf()
     {
-        if (!$this->widget('Widget_User')->hasLogin()) {
-            $this->error('请登录后台后重试');
-        }
-
+        $this->user->pass('editor');
         $dynamic = array(
             'did' => $this->request->get('did', 0),
             'text' => $this->request->get('text', '')
@@ -227,19 +227,16 @@ public function saveOf()
      */
     public function listOf()
     {
-        if (!$this->widget('Widget_User')->hasLogin()) {
-            $this->error('请登录后台后重试');
-        }
-        $lid = $this->request->get('lastDid', 0);
-        $size = 10;
+        $this->user->pass('editor');
         $select = $this->db->select('table.dynamics.*, table.users.screenName as nickname')
             ->from('table.dynamics')
-            ->join('table.users', 'table.dynamics.authorId = table.users.uid')
-            ->where('uid = ?', $this->user->uid);
-        if ($lid) {
+            ->join('table.users', 'table.dynamics.authorId = table.users.uid');
+
+        if ($lid = $this->request->get('lastDid', 0)) {
             $select->where('table.dynamics.did < ? ', $lid);
         }
-        $select->order('table.dynamics.did', Typecho_Db::SORT_DESC)->limit($size);
+
+        $select->order('table.dynamics.did', Typecho_Db::SORT_DESC)->limit(10);
         $data = $this->db->fetchAll($select);
 
         $dynamics = [];
@@ -256,15 +253,13 @@ public function listOf()
      */
     public function removeOf()
     {
-        if (!$this->widget('Widget_User')->hasLogin()) {
-            $this->error('请登录后台后重试');
-        }
-        $did = $this->request->get('did', 0);
-        if (empty($did)) {
+        $this->user->pass('editor');
+
+        if (empty($did = $this->request->get('did', 0))) {
             $this->error('动态不存在');
         }
 
-        if (self::deleteOf($this->user->uid, [$did])) {
+        if (self::deleteOf($this->user->uid, array($did))) {
             $this->success();
         } else {
             $this->error('没有可以删除的动态');
diff --git a/Archive.php b/Archive.php
index e2b138f..c5c1f2d 100644
--- a/Archive.php
+++ b/Archive.php
@@ -276,13 +276,4 @@ public function ___description()
     {
         return $this->description ?: $this->options->description;
     }
-
-    /**
-     * 弃用
-     *
-     */
-    public function dispatch()
-    {
-        $this->post();
-    }
 }
diff --git a/Option.php b/Option.php
index 43ff623..1d4027a 100644
--- a/Option.php
+++ b/Option.php
@@ -27,13 +27,11 @@ public function __construct($request, $response, $params = NULL)
         }
 
         if ($this->followPath) {
-            $this->themesPath = '/';
-            $this->themesFile = __TYPECHO_ROOT_DIR__ . __TYPECHO_THEME_DIR__ . $this->themesPath;
-            $this->themesUrl = Typecho_Common::url(__TYPECHO_THEME_DIR__ . "/{$this->themesPath}/", $this->options->index);
+            $this->themesFile = __TYPECHO_ROOT_DIR__ . __TYPECHO_THEME_DIR__ . '/';
+            $this->themesUrl = Typecho_Common::url(__TYPECHO_THEME_DIR__ . '/', $this->options->index);
         } else {
-            $this->themesPath = '/Dynamics/themes/';
-            $this->themesFile = __TYPECHO_ROOT_DIR__ . __TYPECHO_PLUGIN_DIR__ . $this->themesPath;
-            $this->themesUrl = Typecho_Common::url("{$this->themesPath}/", $this->options->pluginUrl);
+            $this->themesFile = __TYPECHO_ROOT_DIR__ . __TYPECHO_PLUGIN_DIR__ . '/Dynamics/themes/';
+            $this->themesUrl = Typecho_Common::url('/Dynamics/themes/', $this->options->pluginUrl);
         }
         $this->homepage = Typecho_Common::url(Dynamics_Plugin::DYNAMICS_ROUTE, $this->options->index);
     }
diff --git a/Plugin.php b/Plugin.php
index 1a4ac40..e9523e7 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -68,8 +68,7 @@ public static function activate()
             throw new Typecho_Plugin_Exception(_t('你的适配器为%s，目前只支持Mysql和SQLite', $adapterName));
         }
 
-        Typecho_Plugin::factory('Widget_Archive')->query = ['Dynamics_Plugin', 'archiveQuery'];
-
+        Typecho_Plugin::factory('Widget_Archive')->query = ['Dynamics_Abstract', 'archiveQuery'];
         Typecho_Plugin::factory('Nabo_Dynamics')->insert = ['Dynamics_Action', 'insertOf'];
         Typecho_Plugin::factory('Nabo_Dynamics')->modify = ['Dynamics_Action', 'modifyOf'];
         Typecho_Plugin::factory('Nabo_Dynamics')->delete = ['Dynamics_Action', 'deleteOf'];
@@ -143,6 +142,13 @@ public static function config(Typecho_Widget_Helper_Form $form)
         $themeConfig = new Typecho_Widget_Helper_Form_Element_Hidden('themeConfig');
         $form->addInput($themeConfig);
 
+        $radio = new Typecho_Widget_Helper_Form_Element_Radio(
+            'allowIndex', array(
+            '0' => '关闭',
+            '1' => '允许',
+        ), '1', '首页插入动态', '启用后博客首页的文章按照时间顺序插入动态');
+        $form->addInput($radio);
+
         $radio = new Typecho_Widget_Helper_Form_Element_Text(
             'archiveId', null, 0,
             '附件归档', '这是动态附件归档的文章(cid), 请认真填写, 若为 0 表示不归档动态里的附件<br/>若动态里引用的文件未归档附件时候, 在<strong>动态发布时候</strong>将这些附件归档在这个文章里, 以防清理未规定附件时候被删掉.');
@@ -266,74 +272,4 @@ public static function personalConfig(Typecho_Widget_Helper_Form $form)
     public static function form($action = NULL)
     {
     }
-
-    /**
-     * @param Widget_Archive $archive
-     * @param Typecho_Db_Query $select
-     * @throws Typecho_Db_Exception
-     * @throws Typecho_Exception
-     */
-    public static function archiveQuery($archive, $select)
-    {
-        $db = Typecho_Db::get();
-        if (strpos($archive->parameter->type, 'index') !== 0) {
-            $db->fetchAll($select, [$archive, 'push']);
-            return;
-        }
-
-        $dynamicNum = $db->fetchObject($db->select(array('COUNT(DISTINCT table.dynamics.did)' => 'num'))
-            ->from('table.dynamics')
-            ->where('table.dynamics.status = ?', 'publish')
-            ->cleanAttribute('group'))->num;
-        if (empty($dynamicNum)) {
-            $db->fetchAll($select, [$archive, 'push']);
-            return;
-        }
-
-        $dynamicSize = 5;
-        $archive->parameter->pageSize += $dynamicSize;
-
-        $article = $select->prepare($select);
-        $dynamic = $db->select('table.dynamics.did as cid', 'null as title', 'null as slug', 'table.dynamics.created', 'table.dynamics.authorId',
-            'table.dynamics.modified', "'dynamic' as type", 'table.dynamics.status', 'table.dynamics.text', '0 as commentsNum', '0 as order',
-            'null as template', 'null as password', '0 as allowComment', '0 as allowPing', '0 as allowFeed', '0 as parent')
-            ->from('table.dynamics')
-            ->where('table.dynamics.status = ?', 'publish')
-            ->order('table.dynamics.created', Typecho_Db::SORT_DESC)
-            ->page(isset($archive->request->page) ? $archive->request->page : 1, $dynamicSize);
-        $dynamic = $dynamic->prepare($dynamic);
-
-        $articleNum = $db->fetchObject($archive->getCountSql()
-            ->select(array('COUNT(DISTINCT table.contents.cid)' => 'num'))
-            ->from('table.contents')
-            ->cleanAttribute('group'))->num;
-        $archive->setTotal($articleNum + $dynamicNum);
-
-        $option = Typecho_Widget::widget('Dynamics_Option');
-        $tags = array();
-        $categories = array([
-            'name' => '动态',
-            'permalink' => $option->homepage
-        ]);
-
-        foreach ($db->fetchAll("($article) UNION ($dynamic) ORDER BY created DESC") as $value) {
-            if ($value['type'] == 'dynamic') {
-                $value['title'] = date('m月d日, Y年', $value['created']);
-                $value['tags'] = &$tags;
-                $value['categories'] = &$categories;
-                $value['permalink'] = $option->applyUrl($value['cid']);
-                $value['isMarkdown'] = true;
-
-                $value['date'] = new Typecho_Date($value['created']);
-                $value['year'] = $value['date']->year;
-                $value['month'] = $value['date']->month;
-                $value['day'] = $value['date']->day;
-
-                $archive->length++;
-                $archive->stack[] = $value;
-            } else {
-                $archive->push($value);
-            }
-        }
-    }
 }
diff --git a/Themes.php b/Themes.php
index 2ad9a42..6cdb434 100644
--- a/Themes.php
+++ b/Themes.php
@@ -2,277 +2,31 @@
 include 'common.php';
 include 'header.php';
 include 'menu.php';
+$option = Typecho_Widget::widget('Dynamics_Option');
 
-class Dynamics_Themes_Files extends Typecho_Widget
+/**
+ * @return bool
+ * @throws Typecho_Exception
+ */
+function existConfig()
 {
-    /**
-     * 当前风格
-     *
-     * @access private
-     * @var string
-     */
-    private $_currentTheme;
-
-    /**
-     * 当前文件
-     *
-     * @access private
-     * @var string
-     */
-    private $_currentFile;
-
-    /**
-     * 执行函数
-     *
-     * @access public
-     * @return void
-     * @throws Typecho_Exception
-     * @throws Typecho_Widget_Exception
-     */
-    public function execute()
-    {
-        /** 管理员权限 */
-        $this->widget('Widget_User')->pass('administrator');
-        $option = $this->widget('Dynamics_Option');
-        $this->_currentTheme = $this->request->filter('slug')->get('theme', $option->theme);
-
-        if (preg_match("/^([_0-9a-z-\.\ ])+$/i", $this->_currentTheme)
-            && is_dir($dir = $option->themesFile($this->_currentTheme))) {
-
-            $files = array_filter(glob($dir . '/*'), function ($path) {
-                return preg_match("/\.(php|js|css|vbs)$/i", $path);
-            });
-
-            $this->_currentFile = $this->request->get('file', 'index.php');
-
-            if (preg_match("/^([_0-9a-z-\.\ ])+$/i", $this->_currentFile)
-                && file_exists($dir . '/' . $this->_currentFile)) {
-                foreach ($files as $file) {
-                    if (file_exists($file)) {
-                        $file = basename($file);
-                        $this->push(array(
-                            'file' => $file,
-                            'theme' => $this->_currentTheme,
-                            'current' => ($file == $this->_currentFile)
-                        ));
-                    }
-                }
-
-                return;
-            }
-        }
-
-        throw new Typecho_Widget_Exception('风格文件不存在', 404);
-    }
-
-    /**
-     * 获取菜单标题
-     *
-     * @access public
-     * @return string
-     */
-    public function getMenuTitle()
-    {
-        return _t('编辑文件 %s', $this->_currentFile);
-    }
-
-    /**
-     * 获取文件内容
-     *
-     * @access public
-     * @return string
-     * @throws Typecho_Exception
-     */
-    public function currentContent()
-    {
-        return htmlspecialchars(file_get_contents($this->widget('Dynamics_Option')
-            ->themesFile($this->_currentTheme, $this->_currentFile)));
-    }
-
-    /**
-     * 获取文件是否可读
-     *
-     * @access public
-     * @return string
-     * @throws Typecho_Exception
-     */
-    public function currentIsWriteable()
-    {
-        return is_writeable($this->widget('Dynamics_Option')
-                ->themesFile($this->_currentTheme, $this->_currentFile)) && !Typecho_Common::isAppEngine()
-            && (!defined('__TYPECHO_THEME_WRITEABLE__') || __TYPECHO_THEME_WRITEABLE__);
-    }
-
-    /**
-     * 获取当前文件
-     *
-     * @access public
-     * @return string
-     */
-    public function currentFile()
-    {
-        return $this->_currentFile;
-    }
-
-    /**
-     * 获取当前风格
-     *
-     * @access public
-     * @return string
-     */
-    public function currentTheme()
-    {
-        return $this->_currentTheme;
-    }
-}
-
-class Dynamics_Themes_List extends Typecho_Widget
-{
-    /**
-     * @return array
-     * @throws Typecho_Exception
-     */
-    protected function getThemes()
-    {
-        return glob($this->widget('Dynamics_Option')->themesFile . '*', GLOB_ONLYDIR);
-    }
-
-    /**
-     * get theme
-     *
-     * @param string $theme
-     * @param mixed $index
-     * @return string
-     */
-    protected function getTheme($theme, $index)
-    {
-        return basename($theme);
-    }
-
-    /**
-     * 执行函数
-     *
-     * @access public
-     * @return void
-     * @throws Typecho_Exception
-     */
-    public function execute()
-    {
-        $themes = $this->getThemes();
-
-        if ($themes) {
-            $options = $this->widget('Widget_Options');
-            $option = $this->widget('Dynamics_Option');
-            $activated = -1;
-            $result = [];
-
-            foreach ($themes as $key => $theme) {
-                $themeFile = $theme . '/index.php';
-                if (file_exists($themeFile)) {
-                    $info = Typecho_Plugin::parseInfo($themeFile);
-                    $info['name'] = $this->getTheme($theme, $key);
-
-                    if ($option->followPath && trim($info['dependence']) != 'Dynamics') {
-                        continue;
-                    }
-
-                    if ($info['activated'] = ($option->theme == $info['name'])) {
-                        $activated = $key;
-                    }
-
-                    $screen = array_filter(glob($theme . '/*'), function ($path) {
-                        return preg_match("/screenshot\.(jpg|png|gif|bmp|jpeg)$/i", $path);
-                    });
-
-                    if ($screen) {
-                        $info['screen'] = $option->themesUrl($info['name'], basename(current($screen)));
-                    } else {
-                        $info['screen'] = Typecho_Common::url('noscreen.png', $options->adminStaticUrl('img'));
-                    }
-                    $result[$key] = $info;
-                }
-            }
+    $option = Typecho_Widget::widget('Dynamics_Option');
+    $configFile = $option->themesFile($option->theme, 'functions.php');
 
-            if ($activated >= 0) {
-                $clone = $result[$activated];
-                unset($result[$activated]);
-                array_unshift($result, $clone);
-            }
-            array_filter($result, array($this, 'push'));
+    if (file_exists($configFile)) {
+        require_once $configFile;
+        if (function_exists('_themeConfig')) {
+            return true;
         }
     }
+    return false;
 }
 
-class Dynamics_Themes_Config extends Widget_Abstract_Options
-{
-    /**
-     * 绑定动作
-     *
-     * @access public
-     * @return void
-     * @throws Typecho_Exception
-     * @throws Typecho_Widget_Exception
-     */
-    public function execute()
-    {
-        $this->user->pass('administrator');
-
-        if (!self::isExists()) {
-            throw new Typecho_Widget_Exception(_t('外观配置功能不存在'), 404);
-        }
-    }
-
-    /**
-     * 配置功能是否存在
-     *
-     * @access public
-     * @return boolean
-     * @throws Typecho_Exception
-     */
-    public static function isExists()
-    {
-        $option = Typecho_Widget::widget('Dynamics_Option');
-        $configFile = $option->themesFile($option->theme, 'functions.php');
-
-        if (file_exists($configFile)) {
-            require_once $configFile;
-            if (function_exists('_themeConfig')) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 配置外观
-     *
-     * @access public
-     * @return Typecho_Widget_Helper_Form
-     * @throws Typecho_Plugin_Exception
-     */
-    public function config()
-    {
-        $form = new Typecho_Widget_Helper_Form($this->security->getIndex('/action/dynamics?do=configTheme'),
-            Typecho_Widget_Helper_Form::POST_METHOD);
-        _themeConfig($form);
-        $inputs = $form->getInputs();
-
-        $themeConfig = $this->options->plugin("Dynamics")->themeConfig;
-        $configs = unserialize($themeConfig);
-        if (!empty($inputs)) {
-            foreach ($inputs as $key => $val) {
-                $form->getInput($key)->value($configs[$key]);
-            }
-        }
-
-        $submit = new Typecho_Widget_Helper_Form_Element_Submit(NULL, NULL, _t('保存设置'));
-        $submit->input->setAttribute('class', 'btn primary');
-        $form->addItem($submit);
-        return $form;
+if ($request->action == 'config'):
+    if (!existConfig()) {
+        throw new Typecho_Widget_Exception(_t('外观配置功能不存在'), 404);
     }
-}
-
-if ($request->action == "config"): ?>
+    ?>
     <div class="main">
         <div class="body container">
             <?php include 'page-title.php'; ?>
@@ -293,18 +47,60 @@ public function config()
                     </ul>
                 </div>
                 <div class="col-mb-12 col-tb-8 col-tb-offset-2" role="form">
-                    <?php Typecho_Widget::widget('Dynamics_Themes_Config')->config()->render(); ?>
+                    <?php $form = new Typecho_Widget_Helper_Form($security->getIndex('/action/dynamics?do=configTheme'),
+                        Typecho_Widget_Helper_Form::POST_METHOD);
+                    _themeConfig($form);
+                    $inputs = $form->getInputs();
+
+                    $themeConfig = $options->plugin('Dynamics')->themeConfig;
+                    $configs = unserialize($themeConfig);
+                    if (!empty($inputs)) {
+                        foreach ($inputs as $key => $val) {
+                            $form->getInput($key)->value($configs[$key]);
+                        }
+                    }
+
+                    $submit = new Typecho_Widget_Helper_Form_Element_Submit(NULL, NULL, _t('保存设置'));
+                    $submit->input->setAttribute('class', 'btn primary');
+                    $form->addItem($submit);
+                    $form->render(); ?>
                 </div>
             </div>
         </div>
     </div>
-<?php
-elseif ($request->action == "editor"):
-    Typecho_Widget::widget('Dynamics_Themes_Files')->to($files);
-    ?>
+<?php elseif ($request->action == 'editor'): ?>
     <div class="main">
         <div class="body container">
-            <?php include 'page-title.php'; ?>
+            <?php include 'page-title.php';
+            $_currentTheme = $request->filter('slug')->get('theme', $option->theme);
+            if (preg_match("/^([_0-9a-z-\.\ ])+$/i", $_currentTheme)
+                && is_dir($dir = $option->themesFile($_currentTheme))) {
+
+                $_files = array_filter(glob($dir . '/*'), function ($path) {
+                    return preg_match("/\.(php|js|css|vbs)$/i", $path);
+                });
+
+                $_currentFile = $request->get('file', 'index.php');
+
+                if (preg_match("/^([_0-9a-z-\.\ ])+$/i", $_currentFile)
+                    && file_exists($dir . '/' . $_currentFile)) {
+                    $files = array();
+                    foreach ($_files as $file) {
+                        if (file_exists($file)) {
+                            $file = basename($file);
+                            $files[] = array(
+                                'file' => $file,
+                                'theme' => $_currentTheme,
+                                'current' => ($file == $_currentFile)
+                            );
+                        }
+                    }
+                }
+            }
+            if (empty($files)) {
+                throw new Typecho_Widget_Exception('风格文件不存在', 404);
+            }
+            ?>
             <div class="row typecho-page-main" role="main">
                 <div class="col-mb-12">
                     <ul class="typecho-option-tabs fix-tabs clearfix">
@@ -313,13 +109,13 @@ public function config()
                         </li>
                         <li class="current"><a
                                     href="<?php $options->adminUrl('extending.php?panel=Dynamics%2FThemes.php&action=editor'); ?>">
-                                <?php if ($options->theme == $files->theme): ?>
+                                <?php if ($options->theme == $_currentTheme): ?>
                                     <?php _e('编辑当前动态主题'); ?>
                                 <?php else: ?>
-                                    <?php _e('编辑%s动态主题', ' <cite>' . $files->theme . '</cite> '); ?>
+                                    <?php _e('编辑%s动态主题', ' <cite>' . $_currentTheme . '</cite> '); ?>
                                 <?php endif; ?>
                             </a></li>
-                        <?php if (Dynamics_Themes_Config::isExists()): ?>
+                        <?php if (existConfig()): ?>
                             <li>
                                 <a href="<?php $options->adminUrl('extending.php?panel=Dynamics%2FThemes.php&action=config'); ?>"><?php _e('设置动态主题'); ?></a>
                             </li>
@@ -332,12 +128,15 @@ public function config()
                         <form method="post" name="theme" id="theme"
                               action="<?php $security->index('/action/dynamics?do=editorTheme'); ?>">
                             <label for="content" class="sr-only"><?php _e('编辑源码'); ?></label>
-                            <textarea name="content" id="content" class="w-100 mono"
-                                      <?php if (!$files->currentIsWriteable()): ?>readonly<?php endif; ?>><?php echo $files->currentContent(); ?></textarea>
+                            <textarea name="content" id="content" class="w-100 mono" <?php
+                            $currentIsWriteable = is_writeable($option->themesFile($_currentTheme, $_currentFile));
+                            if (!$currentIsWriteable): ?>readonly<?php endif; ?>><?= htmlspecialchars(file_get_contents(
+                                    $option->themesFile($_currentTheme, $_currentFile)
+                                )); ?></textarea>
                             <p class="submit">
-                                <?php if ($files->currentIsWriteable()): ?>
-                                    <input type="hidden" name="theme" value="<?php echo $files->currentTheme(); ?>"/>
-                                    <input type="hidden" name="edit" value="<?php echo $files->currentFile(); ?>"/>
+                                <?php if ($currentIsWriteable): ?>
+                                    <input type="hidden" name="theme" value="<?= $_currentTheme ?>"/>
+                                    <input type="hidden" name="edit" value="<?= $_currentFile ?>"/>
                                     <button type="submit" class="btn primary"><?php _e('保存文件'); ?></button>
                                 <?php else: ?>
                                     <em><?php _e('此文件无法写入'); ?></em>
@@ -347,20 +146,17 @@ public function config()
                     </div>
                     <ul class="col-mb-12 col-tb-4 col-3">
                         <li><strong>模板文件</strong></li>
-                        <?php while ($files->next()): ?>
-                            <li<?php if ($files->current): ?> class="current"<?php endif; ?>>
-                                <a href="<?php $options->adminUrl('extending.php?panel=Dynamics%2FThemes.php&action=editor&theme=' . $files->currentTheme() . '&file=' . $files->file); ?>"><?php $files->file(); ?></a>
+                        <?php foreach ($files as $file): ?>
+                            <li<?php if ($file['current']): ?> class="current"<?php endif; ?>>
+                                <a href="<?php $options->adminUrl('extending.php?panel=Dynamics%2FThemes.php&action=editor&theme=' . $files['theme'] . '&file=' . $file['file']); ?>"><?= $file['file']; ?></a>
                             </li>
-                        <?php endwhile; ?>
+                        <?php endforeach; ?>
                     </ul>
                 </div>
             </div>
         </div>
     </div>
-<?php
-else:
-    $option = Typecho_Widget::widget('Dynamics_Option');
-    ?>
+<?php else: ?>
     <div class="main">
         <div class="body container">
             <?php include 'page-title.php'; ?>
@@ -375,7 +171,7 @@ public function config()
                                 <a href="<?php $options->adminUrl('extending.php?panel=Dynamics%2FThemes.php&action=editor'); ?>"><?php _e('编辑动态主题'); ?></a>
                             </li>
                         <?php endif; ?>
-                        <?php if (Dynamics_Themes_Config::isExists()): ?>
+                        <?php if (existConfig()): ?>
                             <li>
                                 <a href="<?php $options->adminUrl('extending.php?panel=Dynamics%2FThemes.php&action=config'); ?>"><?php _e('设置动态主题'); ?></a>
                             </li>
@@ -395,32 +191,64 @@ public function config()
                             </thead>
 
                             <tbody>
-                            <?php Typecho_Widget::widget('Dynamics_Themes_List')->to($themes); ?>
-                            <?php while ($themes->next()): ?>
-                                <tr id="theme-<?php $themes->name(); ?>"
-                                    class="<?php if ($themes->activated): ?>current<?php endif; ?>">
-                                    <td valign="top"><img src="<?php $themes->screen(); ?>"
-                                                          alt="<?php $themes->name(); ?>"/></td>
+                            <?php $result = array();
+                            if ($themes = glob($option->themesFile . '*', GLOB_ONLYDIR)) {
+                                $activated = -1;
+                                foreach ($themes as $key => $theme) {
+                                    $themeFile = $theme . '/index.php';
+                                    if (file_exists($themeFile)) {
+                                        $info = Typecho_Plugin::parseInfo($themeFile);
+                                        $info['name'] = basename($theme);
+                                        if ($option->followPath && trim($info['dependence']) != 'Dynamics') {
+                                            continue;
+                                        }
+                                        if ($info['activated'] = ($option->theme == $info['name'])) {
+                                            $activated = $key;
+                                        }
+                                        $screen = array_filter(glob($theme . '/*'), function ($path) {
+                                            return preg_match("/screenshot\.(jpg|png|gif|bmp|jpeg)$/i", $path);
+                                        });
+                                        if ($screen) {
+                                            $info['screen'] = $option->themesUrl($info['name'], basename(current($screen)));
+                                        } else {
+                                            $info['screen'] = Typecho_Common::url('noscreen.png', $options->adminStaticUrl('img'));
+                                        }
+                                        $result[$key] = $info;
+                                    }
+                                    unset($theme);
+                                }
+
+                                if ($activated >= 0) {
+                                    $clone = $result[$activated];
+                                    unset($result[$activated]);
+                                    array_unshift($result, $clone);
+                                }
+                            }
+                            foreach ($result as $theme): ?>
+                                <tr id="theme-<?= $theme['name']; ?>"
+                                    class="<?php if ($theme['activated']): ?>current<?php endif; ?>">
+                                    <td valign="top"><img src="<?= $theme['screen']; ?>"
+                                                          alt="<?= $theme['name']; ?>"/></td>
                                     <td valign="top">
-                                        <h3><?php '' != $themes->title ? $themes->title() : $themes->name(); ?></h3>
+                                        <h3><?= '' != $theme['title'] ? $theme['title'] : $theme['name']; ?></h3>
                                         <cite>
-                                            <?php if ($themes->author): ?><?php _e('作者'); ?>: <?php if ($themes->homepage): ?><a href="<?php $themes->homepage() ?>"><?php endif; ?><?php $themes->author(); ?><?php if ($themes->homepage): ?></a><?php endif; ?> &nbsp;&nbsp;<?php endif; ?>
-                                            <?php if ($themes->version): ?><?php _e('版本'); ?>: <?php $themes->version() ?><?php endif; ?>
+                                            <?php if ($theme['author']): ?><?php _e('作者'); ?>: <?php if ($theme['homepage']): ?><a href="<?= $theme['homepage'] ?>"><?php endif; ?><?= $theme['author']; ?><?php if ($theme['homepage']): ?></a><?php endif; ?> &nbsp;&nbsp;<?php endif; ?>
+                                            <?php if ($theme['version']): ?><?php _e('版本'); ?>: <?= $theme['version']; ?><?php endif; ?>
                                         </cite>
-                                        <p><?php echo nl2br($themes->description); ?></p>
-                                        <?php if ($option->theme != $themes->name): ?>
+                                        <p><?= nl2br($theme['description']); ?></p>
+                                        <?php if ($option->theme != $theme['name']): ?>
                                             <p>
                                                 <?php if (!defined('__TYPECHO_THEME_WRITEABLE__') || __TYPECHO_THEME_WRITEABLE__): ?>
                                                     <a class="edit"
-                                                       href="<?php $options->adminUrl('extending.php?panel=Dynamics%2FThemes.php&action=editor&theme=' . $themes->name); ?>"><?php _e('编辑'); ?></a> &nbsp;
+                                                       href="<?php $options->adminUrl('extending.php?panel=Dynamics%2FThemes.php&action=editor&theme=' . $theme['name']); ?>"><?php _e('编辑'); ?></a> &nbsp;
                                                 <?php endif; ?>
                                                 <a class="activate"
-                                                   href="<?php $security->index('/action/dynamics?do=changeTheme&change=' . $themes->name); ?>"><?php _e('启用'); ?></a>
+                                                   href="<?php $security->index('/action/dynamics?do=changeTheme&change=' . $theme['name']); ?>"><?php _e('启用'); ?></a>
                                             </p>
                                         <?php endif; ?>
                                     </td>
                                 </tr>
-                            <?php endwhile; ?>
+                            <?php endforeach; ?>
                             </tbody>
                         </table>
                     </div>
@@ -428,7 +256,6 @@ class="<?php if ($themes->activated): ?>current<?php endif; ?>">
             </div>
         </div>
     </div>
-
 <?php
 endif;