diff --git a/admin/file-upload-js.php b/admin/file-upload-js.php
index e48013be..84356446 100644
--- a/admin/file-upload-js.php
+++ b/admin/file-upload-js.php
@@ -120,11 +120,10 @@ $(document).ready(function() {
     $('#tab-files').bind('init', function () {
         var uploader = new plupload.Uploader({
             browse_button   :   $('.upload-file').get(0),
-            url             :   '<?php $options->index('/action/upload'
+            url             :   '<?php $security->index('/action/upload'
                 . (isset($fileParentContent) ? '?cid=' . $fileParentContent->cid : '')); ?>',
-            runtimes        :   'html5,flash,silverlight,html4',
+            runtimes        :   'html5,flash,html4',
             flash_swf_url   :   '<?php $options->adminUrl('js/Moxie.swf'); ?>',
-            silverlight_xap_url     :   '<?php $options->adminUrl('js/Moxie.xap'); ?>',
             drop_element    :   $('.upload-area').get(0),
             filters         :   {
                 max_file_size       :   '<?php echo $phpMaxFilesize ?>',
diff --git a/admin/js/Moxie.xap b/admin/js/Moxie.xap
deleted file mode 100644
index 3a9f389f..00000000
Binary files a/admin/js/Moxie.xap and /dev/null differ
diff --git a/admin/media.php b/admin/media.php
index 64cae0f1..ce6be16d 100644
--- a/admin/media.php
+++ b/admin/media.php
@@ -144,10 +144,9 @@ $(document).ready(function() {
 
     var uploader = new plupload.Uploader({
         browse_button   :   $('.upload-file').get(0),
-        url             :   '<?php $options->index('/action/upload?do=modify&cid=' . $attachment->cid); ?>',
-        runtimes        :   'html5,flash,silverlight,html4',
+        url             :   '<?php $security->index('/action/upload?do=modify&cid=' . $attachment->cid); ?>',
+        runtimes        :   'html5,flash,html4',
         flash_swf_url   :   '<?php $options->adminUrl('js/Moxie.swf'); ?>',
-        silverlight_xap_url     :   '<?php $options->adminUrl('js/Moxie.xap'); ?>',
         drop_element    :   $('.upload-area').get(0),
         filters         :   {
             max_file_size       :   '<?php echo $phpMaxFilesize ?>',
diff --git a/usr/plugins/HelloWorld/Plugin.php b/usr/plugins/HelloWorld/Plugin.php
index d71e1f8b..6425858a 100644
--- a/usr/plugins/HelloWorld/Plugin.php
+++ b/usr/plugins/HelloWorld/Plugin.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Hello World
  * 
diff --git a/usr/themes/default/404.php b/usr/themes/default/404.php
index db69e372..6a2a2105 100644
--- a/usr/themes/default/404.php
+++ b/usr/themes/default/404.php
@@ -1,3 +1,4 @@
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <?php $this->need('header.php'); ?>
 
     <div class="col-mb-12 col-tb-8 col-tb-offset-2">
diff --git a/usr/themes/default/archive.php b/usr/themes/default/archive.php
index 25d2a7d6..cc5f9911 100644
--- a/usr/themes/default/archive.php
+++ b/usr/themes/default/archive.php
@@ -1,3 +1,4 @@
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <?php $this->need('header.php'); ?>
 
     <div class="col-mb-12 col-8" id="main" role="main">
diff --git a/usr/themes/default/comments.php b/usr/themes/default/comments.php
index cbd4fe7f..709d0b91 100644
--- a/usr/themes/default/comments.php
+++ b/usr/themes/default/comments.php
@@ -1,3 +1,4 @@
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <div id="comments">
     <?php $this->comments()->to($comments); ?>
     <?php if ($comments->have()): ?>
diff --git a/usr/themes/default/footer.php b/usr/themes/default/footer.php
index eb9a9ad1..347cd197 100644
--- a/usr/themes/default/footer.php
+++ b/usr/themes/default/footer.php
@@ -1,5 +1,5 @@
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 
-            
         </div><!-- end .row -->
     </div>
 </div><!-- end #body -->
diff --git a/usr/themes/default/functions.php b/usr/themes/default/functions.php
index 0e63bb92..77b4855f 100644
--- a/usr/themes/default/functions.php
+++ b/usr/themes/default/functions.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 
 function themeConfig($form) {
     $logoUrl = new Typecho_Widget_Helper_Form_Element_Text('logoUrl', NULL, NULL, _t('站点LOGO地址'), _t('在这里填入一个图片URL地址, 以在网站标题前加上一个LOGO'));
diff --git a/usr/themes/default/header.php b/usr/themes/default/header.php
index 00b9b836..efabbedd 100644
--- a/usr/themes/default/header.php
+++ b/usr/themes/default/header.php
@@ -1,3 +1,4 @@
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <!DOCTYPE HTML>
 <html class="no-js">
 <head>
diff --git a/usr/themes/default/index.php b/usr/themes/default/index.php
index 0fb21899..495d426a 100644
--- a/usr/themes/default/index.php
+++ b/usr/themes/default/index.php
@@ -7,7 +7,8 @@
  * @version 1.2
  * @link http://typecho.org
  */
- 
+
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
  $this->need('header.php');
  ?>
 
diff --git a/usr/themes/default/page.php b/usr/themes/default/page.php
index b0f365a1..8f1cd6f6 100644
--- a/usr/themes/default/page.php
+++ b/usr/themes/default/page.php
@@ -1,3 +1,4 @@
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <?php $this->need('header.php'); ?>
 
 <div class="col-mb-12 col-8" id="main" role="main">
diff --git a/usr/themes/default/post.php b/usr/themes/default/post.php
index fe0d2e72..3732c9ff 100644
--- a/usr/themes/default/post.php
+++ b/usr/themes/default/post.php
@@ -1,3 +1,4 @@
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <?php $this->need('header.php'); ?>
 
 <div class="col-mb-12 col-8" id="main" role="main">
diff --git a/usr/themes/default/sidebar.php b/usr/themes/default/sidebar.php
index d10e8aad..d546eb69 100644
--- a/usr/themes/default/sidebar.php
+++ b/usr/themes/default/sidebar.php
@@ -1,3 +1,4 @@
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <div class="col-mb-12 col-offset-1 col-3 kit-hidden-tb" id="secondary" role="complementary">
     <?php if (!empty($this->options->sidebarBlock) && in_array('ShowRecentPosts', $this->options->sidebarBlock)): ?>
     <section class="widget">
@@ -24,10 +25,7 @@
     <?php if (!empty($this->options->sidebarBlock) && in_array('ShowCategory', $this->options->sidebarBlock)): ?>
     <section class="widget">
 		<h3 class="widget-title"><?php _e('分类'); ?></h3>
-        <ul class="widget-list">
-            <?php $this->widget('Widget_Metas_Category_List')
-            ->parse('<li><a href="{permalink}">{name}</a> ({count})</li>'); ?>
-        </ul>
+        <?php $this->widget('Widget_Metas_Category_List')->listCategories('wrapClass=widget-list'); ?>
 	</section>
     <?php endif; ?>
 
diff --git a/usr/themes/default/style.css b/usr/themes/default/style.css
index 1d7c7907..01b84bfc 100644
--- a/usr/themes/default/style.css
+++ b/usr/themes/default/style.css
@@ -336,6 +336,11 @@ textarea {
   margin: 5px 0;
   line-height: 1.5;
 }
+
+.widget-list li ul {
+  margin-left: 15px;
+}
+
 .widget-list a:hover {
 }
 
diff --git a/var/IXR/Client.php b/var/IXR/Client.php
index 89f1cc15..30098b4b 100644
--- a/var/IXR/Client.php
+++ b/var/IXR/Client.php
@@ -7,27 +7,6 @@
    Made available under the Artistic License: http://www.opensource.org/licenses/artistic-license.php
 */
 
-/** IXR值 */
-require_once 'IXR/Value.php';
-
-/** IXR消息 */
-require_once 'IXR/Message.php';
-
-/** IXR请求体 */
-require_once 'IXR/Request.php';
-
-/** IXR错误 */
-require_once 'IXR/Error.php';
-
-/** IXR日期 */
-require_once 'IXR/Date.php';
-
-/** IXR Base64编码 */
-require_once 'IXR/Base64.php';
-
-/** Typecho_Http_Client */
-require_once 'Typecho/Http/Client.php';
-
 /**
  * IXR客户端
  * reload by typecho team(http://www.typecho.org)
diff --git a/var/IXR/ClientMulticall.php b/var/IXR/ClientMulticall.php
index 24f91148..6433bdb2 100644
--- a/var/IXR/ClientMulticall.php
+++ b/var/IXR/ClientMulticall.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /*
    IXR - The Inutio XML-RPC Library - (c) Incutio Ltd 2002
    Version 1.61 - Simon Willison, 11th July 2003 (htmlentities -> htmlspecialchars)
@@ -7,9 +8,6 @@
    Made available under the Artistic License: http://www.opensource.org/licenses/artistic-license.php
 */
 
-/** IXR_Clinet */
-require_once 'IXR/Clinet.php';
-
 /**
  * IXR客户端
  *
diff --git a/var/IXR/Exception.php b/var/IXR/Exception.php
index 9fad4473..682c42a2 100644
--- a/var/IXR/Exception.php
+++ b/var/IXR/Exception.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /*
    IXR - The Inutio XML-RPC Library - (c) Incutio Ltd 2002
    Version 1.61 - Simon Willison, 11th July 2003 (htmlentities -> htmlspecialchars)
diff --git a/var/IXR/IntrospectionServer.php b/var/IXR/IntrospectionServer.php
index b8664c97..664302c9 100644
--- a/var/IXR/IntrospectionServer.php
+++ b/var/IXR/IntrospectionServer.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /*
    IXR - The Inutio XML-RPC Library - (c) Incutio Ltd 2002
    Version 1.61 - Simon Willison, 11th July 2003 (htmlentities -> htmlspecialchars)
@@ -7,9 +8,6 @@
    Made available under the Artistic License: http://www.opensource.org/licenses/artistic-license.php
 */
 
-/** IXR_Server */
-require_once 'IXR/Server.php';
-
 /**
  * IXR服务器
  *
diff --git a/var/IXR/Server.php b/var/IXR/Server.php
index a7fce2b3..b3d47a2b 100644
--- a/var/IXR/Server.php
+++ b/var/IXR/Server.php
@@ -7,24 +7,6 @@
    Made available under the Artistic License: http://www.opensource.org/licenses/artistic-license.php
 */
 
-/** IXR值 */
-require_once 'IXR/Value.php';
-
-/** IXR消息 */
-require_once 'IXR/Message.php';
-
-/** IXR请求体 */
-require_once 'IXR/Request.php';
-
-/** IXR错误 */
-require_once 'IXR/Error.php';
-
-/** IXR日期 */
-require_once 'IXR/Date.php';
-
-/** IXR Base64编码 */
-require_once 'IXR/Base64.php';
-
 /**
  * IXR服务器
  *
diff --git a/var/Typecho/Db/Adapter/Exception.php b/var/Typecho/Db/Adapter/Exception.php
index fc628e2a..d4f51884 100644
--- a/var/Typecho/Db/Adapter/Exception.php
+++ b/var/Typecho/Db/Adapter/Exception.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Db/Adapter/Mysql.php b/var/Typecho/Db/Adapter/Mysql.php
index 13bf577d..e64559ac 100644
--- a/var/Typecho/Db/Adapter/Mysql.php
+++ b/var/Typecho/Db/Adapter/Mysql.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Db/Adapter/Pdo.php b/var/Typecho/Db/Adapter/Pdo.php
index b9261cce..c19eff77 100644
--- a/var/Typecho/Db/Adapter/Pdo.php
+++ b/var/Typecho/Db/Adapter/Pdo.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Db/Adapter/Pdo/Mysql.php b/var/Typecho/Db/Adapter/Pdo/Mysql.php
index 71047e2b..cf8269df 100644
--- a/var/Typecho/Db/Adapter/Pdo/Mysql.php
+++ b/var/Typecho/Db/Adapter/Pdo/Mysql.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Db/Adapter/Pdo/Pgsql.php b/var/Typecho/Db/Adapter/Pdo/Pgsql.php
index 6618b140..90ca1c8d 100644
--- a/var/Typecho/Db/Adapter/Pdo/Pgsql.php
+++ b/var/Typecho/Db/Adapter/Pdo/Pgsql.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Db/Adapter/Pdo/SQLite.php b/var/Typecho/Db/Adapter/Pdo/SQLite.php
index 445852a2..108d14d5 100644
--- a/var/Typecho/Db/Adapter/Pdo/SQLite.php
+++ b/var/Typecho/Db/Adapter/Pdo/SQLite.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Db/Adapter/Pgsql.php b/var/Typecho/Db/Adapter/Pgsql.php
index e5a394fa..e711f4df 100644
--- a/var/Typecho/Db/Adapter/Pgsql.php
+++ b/var/Typecho/Db/Adapter/Pgsql.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Db/Adapter/SQLite.php b/var/Typecho/Db/Adapter/SQLite.php
index 318fbc6c..123aa2ab 100644
--- a/var/Typecho/Db/Adapter/SQLite.php
+++ b/var/Typecho/Db/Adapter/SQLite.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Db/Exception.php b/var/Typecho/Db/Exception.php
index e16954aa..460c70c0 100644
--- a/var/Typecho/Db/Exception.php
+++ b/var/Typecho/Db/Exception.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Db/Query/Exception.php b/var/Typecho/Db/Query/Exception.php
index 57a97512..45460213 100644
--- a/var/Typecho/Db/Query/Exception.php
+++ b/var/Typecho/Db/Query/Exception.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Http/Client/Adapter/Curl.php b/var/Typecho/Http/Client/Adapter/Curl.php
index 5fda3906..89d3f6ee 100644
--- a/var/Typecho/Http/Client/Adapter/Curl.php
+++ b/var/Typecho/Http/Client/Adapter/Curl.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * CURL适配器
  *
diff --git a/var/Typecho/Http/Client/Adapter/Socket.php b/var/Typecho/Http/Client/Adapter/Socket.php
index 2406f608..aa5c15cc 100644
--- a/var/Typecho/Http/Client/Adapter/Socket.php
+++ b/var/Typecho/Http/Client/Adapter/Socket.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Socket适配器
  *
diff --git a/var/Typecho/Http/Client/Exception.php b/var/Typecho/Http/Client/Exception.php
index 98a896ff..f79b63af 100644
--- a/var/Typecho/Http/Client/Exception.php
+++ b/var/Typecho/Http/Client/Exception.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Plugin/Exception.php b/var/Typecho/Plugin/Exception.php
index fc3c4ff5..617c75e9 100644
--- a/var/Typecho/Plugin/Exception.php
+++ b/var/Typecho/Plugin/Exception.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Request.php b/var/Typecho/Request.php
index 6b4e4a7a..0d702489 100644
--- a/var/Typecho/Request.php
+++ b/var/Typecho/Request.php
@@ -152,6 +152,34 @@ class Typecho_Request
         return $value;
     }
 
+    /**
+     * 检查ip地址是否合法
+     *
+     * @param string $ip ip地址
+     * @return boolean
+     */
+    private function _checkIp($ip)
+    {
+        if (function_exists('filter_var')) {
+            return filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)
+                || filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
+        }
+
+        return preg_match("/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $ip)
+            || preg_match("/^[0-9a-f:]+$/i", $ip);
+    }
+
+    /**
+     * 检查ua是否合法
+     *
+     * @param $agent ua字符串
+     * @return boolean
+     */
+    private function _checkAgent($agent)
+    {
+        return preg_match("/^[_a-z0-9- ,:;=#@\.\(\)\/\+\*\?]+$/i", $agent);
+    }
+
     /**
      * 设置过滤器
      *
@@ -592,21 +620,27 @@ class Typecho_Request
      */
     public function setIp($ip = NULL)
     {
-        switch (true) {
-            case NULL !== $this->getServer('HTTP_X_FORWARDED_FOR'):
-                list($this->_ip) = array_map('trim', explode(',', $this->getServer('HTTP_X_FORWARDED_FOR')));
-                return;
-            case NULL !== $this->getServer('HTTP_CLIENT_IP'):
-                $this->_ip = $this->getServer('HTTP_CLIENT_IP');
-                return;
-            case NULL !== $this->getServer('REMOTE_ADDR'):
-                $this->_ip = $this->getServer('REMOTE_ADDR');
-                return;
-            default:
-                break;
+        if (!empty($ip)) {
+            $this->_ip = $ip;
+        } else {
+            switch (true) {
+                case NULL !== $this->getServer('HTTP_X_FORWARDED_FOR'):
+                    list($this->_ip) = array_map('trim', explode(',', $this->getServer('HTTP_X_FORWARDED_FOR')));
+                    break;
+                case NULL !== $this->getServer('HTTP_CLIENT_IP'):
+                    $this->_ip = $this->getServer('HTTP_CLIENT_IP');
+                    break;
+                case NULL !== $this->getServer('REMOTE_ADDR'):
+                    $this->_ip = $this->getServer('REMOTE_ADDR');
+                    break;
+                default:
+                    break;
+            }
         }
 
-        $this->_ip = 'unknown';
+        if (empty($this->_ip) || !self::_checkIp($this->_ip)) {
+            $this->_ip = 'unknown';
+        }
     }
 
     /**
@@ -633,7 +667,8 @@ class Typecho_Request
      */
     public function setAgent($agent = NULL)
     {
-        $this->_agent = (NULL === $agent) ? $this->getServer('HTTP_USER_AGENT') : $agent;
+        $agent = (NULL === $agent) ? $this->getServer('HTTP_USER_AGENT') : $agent;
+        $this->_agent = self::_checkAgent($agent) ? $agent : '';
     }
 
     /**
diff --git a/var/Typecho/Router/Exception.php b/var/Typecho/Router/Exception.php
index 7ba8aaf5..ebd76adb 100644
--- a/var/Typecho/Router/Exception.php
+++ b/var/Typecho/Router/Exception.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Widget/Exception.php b/var/Typecho/Widget/Exception.php
index 2746c2f8..d3587c9b 100644
--- a/var/Typecho/Widget/Exception.php
+++ b/var/Typecho/Widget/Exception.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Widget/Helper/Form.php b/var/Typecho/Widget/Helper/Form.php
index 99102b74..a0e4afe3 100644
--- a/var/Typecho/Widget/Helper/Form.php
+++ b/var/Typecho/Widget/Helper/Form.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 表单处理帮手
  *
diff --git a/var/Typecho/Widget/Helper/Form/Element.php b/var/Typecho/Widget/Helper/Form/Element.php
index 7e631240..f4807e85 100644
--- a/var/Typecho/Widget/Helper/Form/Element.php
+++ b/var/Typecho/Widget/Helper/Form/Element.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 表单元素抽象帮手
  *
diff --git a/var/Typecho/Widget/Helper/Form/Element/Checkbox.php b/var/Typecho/Widget/Helper/Form/Element/Checkbox.php
index e3eceb18..8ae5265a 100644
--- a/var/Typecho/Widget/Helper/Form/Element/Checkbox.php
+++ b/var/Typecho/Widget/Helper/Form/Element/Checkbox.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 多选框帮手
  *
diff --git a/var/Typecho/Widget/Helper/Form/Element/Fake.php b/var/Typecho/Widget/Helper/Form/Element/Fake.php
index c9fef6e9..248d9356 100644
--- a/var/Typecho/Widget/Helper/Form/Element/Fake.php
+++ b/var/Typecho/Widget/Helper/Form/Element/Fake.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 虚拟域帮手类
  *
diff --git a/var/Typecho/Widget/Helper/Form/Element/Hidden.php b/var/Typecho/Widget/Helper/Form/Element/Hidden.php
index e4b051dd..382d0bb1 100644
--- a/var/Typecho/Widget/Helper/Form/Element/Hidden.php
+++ b/var/Typecho/Widget/Helper/Form/Element/Hidden.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 隐藏域帮手类
  *
diff --git a/var/Typecho/Widget/Helper/Form/Element/Password.php b/var/Typecho/Widget/Helper/Form/Element/Password.php
index cfa50adf..21481b78 100644
--- a/var/Typecho/Widget/Helper/Form/Element/Password.php
+++ b/var/Typecho/Widget/Helper/Form/Element/Password.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 密码输入表单项帮手
  *
diff --git a/var/Typecho/Widget/Helper/Form/Element/Radio.php b/var/Typecho/Widget/Helper/Form/Element/Radio.php
index a97c9699..c487b79f 100644
--- a/var/Typecho/Widget/Helper/Form/Element/Radio.php
+++ b/var/Typecho/Widget/Helper/Form/Element/Radio.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 单选框帮手
  *
diff --git a/var/Typecho/Widget/Helper/Form/Element/Select.php b/var/Typecho/Widget/Helper/Form/Element/Select.php
index ea8dd942..e589990c 100644
--- a/var/Typecho/Widget/Helper/Form/Element/Select.php
+++ b/var/Typecho/Widget/Helper/Form/Element/Select.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 下拉选择框帮手
  *
diff --git a/var/Typecho/Widget/Helper/Form/Element/Submit.php b/var/Typecho/Widget/Helper/Form/Element/Submit.php
index cb110e9e..1272f7cf 100644
--- a/var/Typecho/Widget/Helper/Form/Element/Submit.php
+++ b/var/Typecho/Widget/Helper/Form/Element/Submit.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 提交按钮表单项帮手
  *
diff --git a/var/Typecho/Widget/Helper/Form/Element/Text.php b/var/Typecho/Widget/Helper/Form/Element/Text.php
index ddd221c5..390d3efc 100644
--- a/var/Typecho/Widget/Helper/Form/Element/Text.php
+++ b/var/Typecho/Widget/Helper/Form/Element/Text.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 文字输入表单项帮手
  *
diff --git a/var/Typecho/Widget/Helper/Form/Element/Textarea.php b/var/Typecho/Widget/Helper/Form/Element/Textarea.php
index 0d4a7ac4..b984bdc1 100644
--- a/var/Typecho/Widget/Helper/Form/Element/Textarea.php
+++ b/var/Typecho/Widget/Helper/Form/Element/Textarea.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 多行文字域帮手
  *
diff --git a/var/Typecho/Widget/Helper/PageNavigator/Box.php b/var/Typecho/Widget/Helper/PageNavigator/Box.php
index f152a992..486ede3d 100644
--- a/var/Typecho/Widget/Helper/PageNavigator/Box.php
+++ b/var/Typecho/Widget/Helper/PageNavigator/Box.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Typecho/Widget/Helper/PageNavigator/Classic.php b/var/Typecho/Widget/Helper/PageNavigator/Classic.php
index c416d5d7..d90bba09 100644
--- a/var/Typecho/Widget/Helper/PageNavigator/Classic.php
+++ b/var/Typecho/Widget/Helper/PageNavigator/Classic.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Abstract.php b/var/Widget/Abstract.php
index d8dfb328..103387e0 100644
--- a/var/Widget/Abstract.php
+++ b/var/Widget/Abstract.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 纯数据抽象组件
  *
diff --git a/var/Widget/Abstract/Comments.php b/var/Widget/Abstract/Comments.php
index d6eeb9f1..7f2a6382 100644
--- a/var/Widget/Abstract/Comments.php
+++ b/var/Widget/Abstract/Comments.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Abstract/Contents.php b/var/Widget/Abstract/Contents.php
index 0968dcd0..9f0517f2 100644
--- a/var/Widget/Abstract/Contents.php
+++ b/var/Widget/Abstract/Contents.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
@@ -140,6 +141,22 @@ class Widget_Abstract_Contents extends Widget_Abstract
         return $this->pluginHandle(__CLASS__)->contentEx($content, $this);
     }
 
+    /**
+     * 输出文章的第一行作为摘要
+     *
+     * @return string
+     */
+    protected function ___summary()
+    {
+        $content = $this->content;
+        $parts = preg_split("/<\/\s*(?:p|blockquote|q|pre)\s*>/i", $content, 2);
+        if (!empty($parts)) {
+            $content = $parts[0] . '</p>';
+        }
+
+        return $content;
+    }
+
     /**
      * 锚点id
      *
diff --git a/var/Widget/Abstract/Metas.php b/var/Widget/Abstract/Metas.php
index df86c484..08a9256b 100644
--- a/var/Widget/Abstract/Metas.php
+++ b/var/Widget/Abstract/Metas.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 描述性数据
  *
diff --git a/var/Widget/Abstract/Options.php b/var/Widget/Abstract/Options.php
index 91d02323..1b8a7996 100644
--- a/var/Widget/Abstract/Options.php
+++ b/var/Widget/Abstract/Options.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 全局选项
  *
diff --git a/var/Widget/Abstract/Users.php b/var/Widget/Abstract/Users.php
index 2e3570f3..6643fb01 100644
--- a/var/Widget/Abstract/Users.php
+++ b/var/Widget/Abstract/Users.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 用户抽象组件
  *
diff --git a/var/Widget/Ajax.php b/var/Widget/Ajax.php
index f77b5439..4775c617 100644
--- a/var/Widget/Ajax.php
+++ b/var/Widget/Ajax.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 异步调用组件
  *
diff --git a/var/Widget/Archive.php b/var/Widget/Archive.php
index 5c4193d4..0de43aae 100644
--- a/var/Widget/Archive.php
+++ b/var/Widget/Archive.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Comments/Admin.php b/var/Widget/Comments/Admin.php
index b9145a4b..776ff8cc 100644
--- a/var/Widget/Comments/Admin.php
+++ b/var/Widget/Comments/Admin.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Comments/Archive.php b/var/Widget/Comments/Archive.php
index c3d64971..5f0c810e 100644
--- a/var/Widget/Comments/Archive.php
+++ b/var/Widget/Comments/Archive.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 评论归档
  *
diff --git a/var/Widget/Comments/Edit.php b/var/Widget/Comments/Edit.php
index e1da513f..c98869c2 100644
--- a/var/Widget/Comments/Edit.php
+++ b/var/Widget/Comments/Edit.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Comments/Ping.php b/var/Widget/Comments/Ping.php
index e8568ec9..1dd1c2fe 100644
--- a/var/Widget/Comments/Ping.php
+++ b/var/Widget/Comments/Ping.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 回响归档
  *
diff --git a/var/Widget/Comments/Recent.php b/var/Widget/Comments/Recent.php
index c3b3dc61..56ce4ce2 100644
--- a/var/Widget/Comments/Recent.php
+++ b/var/Widget/Comments/Recent.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Contents/Attachment/Admin.php b/var/Widget/Contents/Attachment/Admin.php
index 77e31acc..e1e57f9b 100644
--- a/var/Widget/Contents/Attachment/Admin.php
+++ b/var/Widget/Contents/Attachment/Admin.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 文件管理列表
  *
diff --git a/var/Widget/Contents/Attachment/Edit.php b/var/Widget/Contents/Attachment/Edit.php
index 841a7109..b4b706c5 100644
--- a/var/Widget/Contents/Attachment/Edit.php
+++ b/var/Widget/Contents/Attachment/Edit.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 编辑文章
  *
diff --git a/var/Widget/Contents/Attachment/Related.php b/var/Widget/Contents/Attachment/Related.php
index 1e28f636..d90ac865 100644
--- a/var/Widget/Contents/Attachment/Related.php
+++ b/var/Widget/Contents/Attachment/Related.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 文章相关文件
  *
diff --git a/var/Widget/Contents/Attachment/Unattached.php b/var/Widget/Contents/Attachment/Unattached.php
index e7717052..768bb430 100644
--- a/var/Widget/Contents/Attachment/Unattached.php
+++ b/var/Widget/Contents/Attachment/Unattached.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 没有关联的文件
  *
diff --git a/var/Widget/Contents/Page/Admin.php b/var/Widget/Contents/Page/Admin.php
index c478f162..e65abfc6 100644
--- a/var/Widget/Contents/Page/Admin.php
+++ b/var/Widget/Contents/Page/Admin.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 独立页面管理列表
  *
diff --git a/var/Widget/Contents/Page/Edit.php b/var/Widget/Contents/Page/Edit.php
index 91918ab4..ba6f6588 100644
--- a/var/Widget/Contents/Page/Edit.php
+++ b/var/Widget/Contents/Page/Edit.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 编辑页面
  *
diff --git a/var/Widget/Contents/Page/List.php b/var/Widget/Contents/Page/List.php
index 84d49da0..92580f2f 100644
--- a/var/Widget/Contents/Page/List.php
+++ b/var/Widget/Contents/Page/List.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 独立页面列表
  *
diff --git a/var/Widget/Contents/Post/Admin.php b/var/Widget/Contents/Post/Admin.php
index dcf8bedd..ae6a1415 100644
--- a/var/Widget/Contents/Post/Admin.php
+++ b/var/Widget/Contents/Post/Admin.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 文章管理列表
  *
diff --git a/var/Widget/Contents/Post/Date.php b/var/Widget/Contents/Post/Date.php
index 233c467d..e3de4fb6 100644
--- a/var/Widget/Contents/Post/Date.php
+++ b/var/Widget/Contents/Post/Date.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 按日期归档列表组件
  *
diff --git a/var/Widget/Contents/Post/Edit.php b/var/Widget/Contents/Post/Edit.php
index 39f3811b..7d021264 100644
--- a/var/Widget/Contents/Post/Edit.php
+++ b/var/Widget/Contents/Post/Edit.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 编辑文章
  *
diff --git a/var/Widget/Contents/Post/Recent.php b/var/Widget/Contents/Post/Recent.php
index c5bd24a9..5645acf7 100644
--- a/var/Widget/Contents/Post/Recent.php
+++ b/var/Widget/Contents/Post/Recent.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 最新文章
  *
diff --git a/var/Widget/Contents/Related.php b/var/Widget/Contents/Related.php
index befc220a..15edbdd9 100644
--- a/var/Widget/Contents/Related.php
+++ b/var/Widget/Contents/Related.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 相关内容
  *
diff --git a/var/Widget/Contents/Related/Author.php b/var/Widget/Contents/Related/Author.php
index f803188d..a1f571d1 100644
--- a/var/Widget/Contents/Related/Author.php
+++ b/var/Widget/Contents/Related/Author.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 相关内容
  *
diff --git a/var/Widget/Do.php b/var/Widget/Do.php
index 13f608e8..445c3e0d 100644
--- a/var/Widget/Do.php
+++ b/var/Widget/Do.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/ExceptionHandle.php b/var/Widget/ExceptionHandle.php
index dee72dc6..d2f2fc8b 100644
--- a/var/Widget/ExceptionHandle.php
+++ b/var/Widget/ExceptionHandle.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Feedback.php b/var/Widget/Feedback.php
index 83b3fa4b..0489ef7c 100644
--- a/var/Widget/Feedback.php
+++ b/var/Widget/Feedback.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 反馈提交
  *
diff --git a/var/Widget/Init.php b/var/Widget/Init.php
index 549bb1e4..28a4c46f 100644
--- a/var/Widget/Init.php
+++ b/var/Widget/Init.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Login.php b/var/Widget/Login.php
index 112072a7..d3de316c 100644
--- a/var/Widget/Login.php
+++ b/var/Widget/Login.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 登录动作
  *
diff --git a/var/Widget/Logout.php b/var/Widget/Logout.php
index c8984743..a1b7d866 100644
--- a/var/Widget/Logout.php
+++ b/var/Widget/Logout.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 登出动作
  *
diff --git a/var/Widget/Menu.php b/var/Widget/Menu.php
index fec75083..bd053199 100644
--- a/var/Widget/Menu.php
+++ b/var/Widget/Menu.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Metas/Category/Admin.php b/var/Widget/Metas/Category/Admin.php
index c0703b78..e5795b6e 100644
--- a/var/Widget/Metas/Category/Admin.php
+++ b/var/Widget/Metas/Category/Admin.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 
 /**
  * Widget_Metas_Category_Admin  
diff --git a/var/Widget/Metas/Category/Edit.php b/var/Widget/Metas/Category/Edit.php
index 2dcdec7a..a63fa6f4 100644
--- a/var/Widget/Metas/Category/Edit.php
+++ b/var/Widget/Metas/Category/Edit.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 编辑分类
  *
@@ -199,7 +200,9 @@ class Widget_Metas_Category_Edit extends Widget_Abstract_Metas implements Widget
             $name->addRule('required', _t('必须填写分类名称'));
             $name->addRule(array($this, 'nameExists'), _t('分类名称已经存在'));
             $name->addRule(array($this, 'nameToSlug'), _t('分类名称无法被转换为缩略名'));
+            $name->addRule('xssCheck', _t('请不要在分类名称中使用特殊字符'));
             $slug->addRule(array($this, 'slugExists'), _t('缩略名已经存在'));
+            $slug->addRule('xssCheck', _t('请不要在缩略名中使用特殊字符'));
         }
 
         if ('update' == $action) {
diff --git a/var/Widget/Metas/Category/List.php b/var/Widget/Metas/Category/List.php
index 65ef7228..ba5595ac 100644
--- a/var/Widget/Metas/Category/List.php
+++ b/var/Widget/Metas/Category/List.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 分类输出
  *
@@ -36,12 +37,12 @@ class Widget_Metas_Category_List extends Widget_Abstract_Metas
     private $_treeViewCategories = array();
 
     /**
-     * _singleCategoryOptions  
+     * _categoryOptions
      * 
      * @var mixed
      * @access private
      */
-    private $_singleCategoryOptions = NULL;
+    private $_categoryOptions = NULL;
 
     /**
      * 顶层分类
@@ -132,26 +133,24 @@ class Widget_Metas_Category_List extends Widget_Abstract_Metas
     /**
      * 列出分类回调
      * 
-     * @param mixed $singleCategoryOptions 
      * @access private
-     * @return void
      */
     private function treeViewCategoriesCallback()
     {
-        $singleCategoryOptions = $this->_singleCategoryOptions;
+        $categoryOptions = $this->_categoryOptions;
         if ($this->_customTreeViewCategoriesCallback) {
-            return treeViewCategories($this, $singleCategoryOptions);
+            return treeViewCategories($this, $categoryOptions);
         }
 
         $classes = array();
 
-        if ($singleCategoryOptions->itemClass) {
+        if ($categoryOptions->itemClass) {
             $classes[] = $singleCommentOptions->itemClass;
         }
 
         $classes[] = 'category-level-' . $this->levels;
 
-        echo '<' . $singleCategoryOptions->itemTag . ' class="'
+        echo '<' . $categoryOptions->itemTag . ' class="'
             . implode(' ', $classes);
         
         if ($this->levels > 0) {
@@ -163,12 +162,12 @@ class Widget_Metas_Category_List extends Widget_Abstract_Metas
 
         echo '"><a href="' . $this->permalink . '">' . $this->name . '</a>';
 
-        if ($singleCategoryOptions->showCount) {
-            printf($singleCategoryOptions->countTemplate, intval($this->count));
+        if ($categoryOptions->showCount) {
+            printf($categoryOptions->countTemplate, intval($this->count));
         }
 
-        if ($singleCategoryOptions->showFeed) {
-            printf($singleCategoryOptions->feedTemplate, $this->feedUrl);
+        if ($categoryOptions->showFeed) {
+            printf($categoryOptions->feedTemplate, $this->feedUrl);
         }
 
         if ($this->children) {
@@ -181,9 +180,9 @@ class Widget_Metas_Category_List extends Widget_Abstract_Metas
     /**
      * 预处理分类迭代
      * 
-     * @param array $categories 
+     * @param array $categories
+     * @param array $parents
      * @access private
-     * @return void
      */
     private function levelWalkCallback(array $categories, $parents = array())
     {
@@ -252,8 +251,8 @@ class Widget_Metas_Category_List extends Widget_Abstract_Metas
             $this->sequence ++;
 
             //在子评论之前输出
-            echo '<' . $this->_singleCategoryOptions->wrapTag . (empty($this->_singleCategoryOptions->wrapClass) 
-                ? '' : ' class="' . $this->_singleCategoryOptions->wrapClass . '"') . '>';
+            echo '<' . $this->_categoryOptions->wrapTag . (empty($this->_categoryOptions->wrapClass)
+                ? '' : ' class="' . $this->_categoryOptions->wrapClass . '"') . '>';
 
             foreach ($children as $child) {
                 $this->row = $child;
@@ -262,7 +261,7 @@ class Widget_Metas_Category_List extends Widget_Abstract_Metas
             }
 
             //在子评论之后输出
-            echo '</' . $this->_singleCategoryOptions->wrapTag . '>';
+            echo '</' . $this->_categoryOptions->wrapTag . '>';
 
             $this->sequence --;
         }
@@ -270,15 +269,16 @@ class Widget_Metas_Category_List extends Widget_Abstract_Metas
 
     /**
      * treeViewCategories  
-     * 
+     *
+     * @param $categoryOptions 输出选项
      * @access public
      * @return void
      */
-    public function listCategories($singleCategoryOptions = NULL)
+    public function listCategories($categoryOptions = NULL)
     {
         //初始化一些变量
-        $this->_singleCategoryOptions = Typecho_Config::factory($singleCategoryOptions);
-        $this->_singleCategoryOptions->setDefault(array(
+        $this->_categoryOptions = Typecho_Config::factory($categoryOptions);
+        $this->_categoryOptions->setDefault(array(
             'wrapTag'           =>  'ul',
             'wrapClass'         =>  '',
             'itemTag'           =>  'li',
@@ -290,18 +290,18 @@ class Widget_Metas_Category_List extends Widget_Abstract_Metas
         ));
 
         // 插件插件接口
-        $this->pluginHandle()->trigger($plugged)->listCategories($this->_singleCategoryOptions, $this);
+        $this->pluginHandle()->trigger($plugged)->listCategories($this->_categoryOptions, $this);
 
         if (!$plugged) {
             $this->stack = $this->getCategories($this->_top);
 
             if ($this->have()) { 
-                echo '<' . $this->_singleCategoryOptions->wrapTag . (empty($this->_singleCategoryOptions->wrapClass) 
-                    ? '' : ' class="' . $this->_singleCategoryOptions->wrapClass . '"') . '>';
+                echo '<' . $this->_categoryOptions->wrapTag . (empty($this->_categoryOptions->wrapClass)
+                    ? '' : ' class="' . $this->_categoryOptions->wrapClass . '"') . '>';
                 while ($this->next()) {
                     $this->treeViewCategoriesCallback();
                 }
-                echo '</' . $this->_singleCategoryOptions->wrapTag . '>';
+                echo '</' . $this->_categoryOptions->wrapTag . '>';
             }
 
             $this->stack = $this->_map;
diff --git a/var/Widget/Metas/Tag/Admin.php b/var/Widget/Metas/Tag/Admin.php
index c83bfddc..9c7fcb85 100644
--- a/var/Widget/Metas/Tag/Admin.php
+++ b/var/Widget/Metas/Tag/Admin.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 标签云
  *
diff --git a/var/Widget/Metas/Tag/Cloud.php b/var/Widget/Metas/Tag/Cloud.php
index 3d28f9b2..92de3503 100644
--- a/var/Widget/Metas/Tag/Cloud.php
+++ b/var/Widget/Metas/Tag/Cloud.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 标签云
  *
diff --git a/var/Widget/Metas/Tag/Edit.php b/var/Widget/Metas/Tag/Edit.php
index c2afb0e7..d8beb1d5 100644
--- a/var/Widget/Metas/Tag/Edit.php
+++ b/var/Widget/Metas/Tag/Edit.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 标签编辑
  *
@@ -181,7 +182,9 @@ class Widget_Metas_Tag_Edit extends Widget_Abstract_Metas implements Widget_Inte
             $name->addRule('required', _t('必须填写标签名称'));
             $name->addRule(array($this, 'nameExists'), _t('标签名称已经存在'));
             $name->addRule(array($this, 'nameToSlug'), _t('标签名称无法被转换为缩略名'));
+            $name->addRule('xssCheck', _t('请不要标签名称中使用特殊字符'));
             $slug->addRule(array($this, 'slugExists'), _t('缩略名已经存在'));
+            $slug->addRule('xssCheck', _t('请不要在缩略名中使用特殊字符'));
         }
 
         if ('update' == $action) {
diff --git a/var/Widget/Notice.php b/var/Widget/Notice.php
index d9c32df6..40edf6d2 100644
--- a/var/Widget/Notice.php
+++ b/var/Widget/Notice.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Options.php b/var/Widget/Options.php
index d52146c0..a893f019 100644
--- a/var/Widget/Options.php
+++ b/var/Widget/Options.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 全局选项
  *
diff --git a/var/Widget/Options/Discussion.php b/var/Widget/Options/Discussion.php
index 99a5aa20..74bdfacc 100644
--- a/var/Widget/Options/Discussion.php
+++ b/var/Widget/Options/Discussion.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 评论设置
  *
diff --git a/var/Widget/Options/General.php b/var/Widget/Options/General.php
index 21353f5f..f8e89269 100644
--- a/var/Widget/Options/General.php
+++ b/var/Widget/Options/General.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 基本设置
  *
diff --git a/var/Widget/Options/Permalink.php b/var/Widget/Options/Permalink.php
index f235f39d..e545b074 100644
--- a/var/Widget/Options/Permalink.php
+++ b/var/Widget/Options/Permalink.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 基本设置
  *
diff --git a/var/Widget/Options/Reading.php b/var/Widget/Options/Reading.php
index 0a4db64f..20ef9b68 100644
--- a/var/Widget/Options/Reading.php
+++ b/var/Widget/Options/Reading.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 文章阅读设置
  *
diff --git a/var/Widget/Plugins/Config.php b/var/Widget/Plugins/Config.php
index 61e2b2a9..25fb0d75 100644
--- a/var/Widget/Plugins/Config.php
+++ b/var/Widget/Plugins/Config.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Plugins/Edit.php b/var/Widget/Plugins/Edit.php
index a8534abd..b50bfe70 100644
--- a/var/Widget/Plugins/Edit.php
+++ b/var/Widget/Plugins/Edit.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 插件管理
  *
diff --git a/var/Widget/Plugins/List.php b/var/Widget/Plugins/List.php
index 13095853..a1d64b00 100644
--- a/var/Widget/Plugins/List.php
+++ b/var/Widget/Plugins/List.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Plugins/List/Activated.php b/var/Widget/Plugins/List/Activated.php
index db7921b5..daa663ae 100644
--- a/var/Widget/Plugins/List/Activated.php
+++ b/var/Widget/Plugins/List/Activated.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Plugins/List/Deactivated.php b/var/Widget/Plugins/List/Deactivated.php
index 77f174b3..1bdf1f4f 100644
--- a/var/Widget/Plugins/List/Deactivated.php
+++ b/var/Widget/Plugins/List/Deactivated.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Register.php b/var/Widget/Register.php
index 0570f898..a9480b84 100644
--- a/var/Widget/Register.php
+++ b/var/Widget/Register.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 注册组件
  *
diff --git a/var/Widget/Security.php b/var/Widget/Security.php
index a51777ee..a3aacc4b 100644
--- a/var/Widget/Security.php
+++ b/var/Widget/Security.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 
 /**
  * 安全选项组件
diff --git a/var/Widget/Service.php b/var/Widget/Service.php
index 01338666..ff291acd 100644
--- a/var/Widget/Service.php
+++ b/var/Widget/Service.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 通用异步服务
  *
diff --git a/var/Widget/Stat.php b/var/Widget/Stat.php
index b4af58ba..de3cc506 100644
--- a/var/Widget/Stat.php
+++ b/var/Widget/Stat.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 全局统计
  *
diff --git a/var/Widget/Themes/Config.php b/var/Widget/Themes/Config.php
index 9d77ebec..a5080443 100644
--- a/var/Widget/Themes/Config.php
+++ b/var/Widget/Themes/Config.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Themes/Edit.php b/var/Widget/Themes/Edit.php
index 30bbceb0..332072b9 100644
--- a/var/Widget/Themes/Edit.php
+++ b/var/Widget/Themes/Edit.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 编辑风格
  *
diff --git a/var/Widget/Themes/Files.php b/var/Widget/Themes/Files.php
index 750e4ab7..fa9ddec0 100644
--- a/var/Widget/Themes/Files.php
+++ b/var/Widget/Themes/Files.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 风格文件列表
  *
diff --git a/var/Widget/Themes/List.php b/var/Widget/Themes/List.php
index 9720c594..cd86c91d 100644
--- a/var/Widget/Themes/List.php
+++ b/var/Widget/Themes/List.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 风格列表
  *
diff --git a/var/Widget/Upgrade.php b/var/Widget/Upgrade.php
index 45847e5c..5373863b 100644
--- a/var/Widget/Upgrade.php
+++ b/var/Widget/Upgrade.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 升级动作
  *
diff --git a/var/Widget/Upload.php b/var/Widget/Upload.php
index e22127e3..f8547a6a 100644
--- a/var/Widget/Upload.php
+++ b/var/Widget/Upload.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 上传动作
  *
@@ -64,6 +65,7 @@ class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface
      */
     private static function getSafeName(&$name)
     {
+        $name = str_replace(array('"', '<', '>'), '', $name);
         $name = str_replace('\\', '/', $name);
         $name = false === strpos($name, '/') ? ('a' . $name) : str_replace('/', '/a', $name);
         $info = pathinfo($name);
@@ -413,6 +415,7 @@ class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface
     public function action()
     {
         if ($this->user->pass('contributor', true) && $this->request->isPost()) {
+            $this->security->protect();
             if ($this->request->is('do=modify&cid')) {
                 $this->modify();
             } else {
diff --git a/var/Widget/User.php b/var/Widget/User.php
index 333f3866..89fb42aa 100644
--- a/var/Widget/User.php
+++ b/var/Widget/User.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 
 /**
  * 当前登录用户
@@ -123,6 +124,10 @@ class Widget_User extends Typecho_Widget
         ->where((strpos($name, '@') ? 'mail' : 'name') . ' = ?', $name)
         ->limit(1));
 
+        if (empty($user)) {
+            return false;
+        }
+
         $hashValidate = $this->pluginHandle()->trigger($hashPluggable)->hashValidate($password, $user['password']);
         if (!$hashPluggable) {
             $hashValidate = Typecho_Common::hashValidate($password, $user['password']);
diff --git a/var/Widget/Users/Admin.php b/var/Widget/Users/Admin.php
index 7762e41f..6f6a432c 100644
--- a/var/Widget/Users/Admin.php
+++ b/var/Widget/Users/Admin.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *
diff --git a/var/Widget/Users/Author.php b/var/Widget/Users/Author.php
index 79d73b1b..e8e8fb44 100644
--- a/var/Widget/Users/Author.php
+++ b/var/Widget/Users/Author.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 相关内容
  *
diff --git a/var/Widget/Users/Edit.php b/var/Widget/Users/Edit.php
index 78e9d6ae..16a2c638 100644
--- a/var/Widget/Users/Edit.php
+++ b/var/Widget/Users/Edit.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 编辑用户
  *
diff --git a/var/Widget/Users/Profile.php b/var/Widget/Users/Profile.php
index a995600f..80b6b8ec 100644
--- a/var/Widget/Users/Profile.php
+++ b/var/Widget/Users/Profile.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * 编辑用户
  *
diff --git a/var/Widget/XmlRpc.php b/var/Widget/XmlRpc.php
index 02d9e75d..a43d2513 100644
--- a/var/Widget/XmlRpc.php
+++ b/var/Widget/XmlRpc.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 /**
  * Typecho Blog Platform
  *