diff --git a/admin/appmarket/default.php b/admin/appmarket/default.php
index ffc5bf5..d0451f5 100644
--- a/admin/appmarket/default.php
+++ b/admin/appmarket/default.php
@@ -61,7 +61,7 @@ $keyword = trim($_GET['keyword']);
 
 $page = empty($_GET['page']) ? 1 : intval($_GET['page']);
 $perpage = 20;
-$gets = array('mod' => 'app', 'op' => 'default', 'keyword' => $keyword, 'depid' => $depid, 'group' => $group, 'position' => $position, );
+$gets = array('mod' => 'appmarket', 'op' => 'default', 'keyword' => $keyword, 'depid' => $depid, 'group' => $group, 'position' => $position, );
 $theurl = BASESCRIPT . "?" . url_implode($gets);
 $refer = urlencode($theurl . '&page=' . $page);
 
diff --git a/admin/setting/index.php b/admin/setting/index.php
index 93bb7a7..93df2af 100644
--- a/admin/setting/index.php
+++ b/admin/setting/index.php
@@ -175,7 +175,6 @@ if (!submitcheck('settingsubmit')) {
 		$setting['mail'] = dunserialize($setting['mail']);
 		$oldsmtp = $settingnew['mail']['mailsend'] == 3 ? $settingnew['mail']['smtp'] : $settingnew['mail']['esmtp'];
 		$deletesmtp = $settingnew['mail']['mailsend'] != 1 ? ($settingnew['mail']['mailsend'] == 3 ? $settingnew['mail']['smtp']['delete'] : $settingnew['mail']['esmtp']['delete']) : array();
-    $setting['tzxxyjtz'] = intval($settingnew['tzxxyjtz']);
 		$settingnew['mail']['smtp'] = array();
 		foreach ($oldsmtp as $id => $value) {
 			if ((empty($deletesmtp) || !in_array($id, $deletesmtp)) && !empty($value['server']) && !empty($value['port'])) {
diff --git a/admin/setting/template/main.htm b/admin/setting/template/main.htm
index d5b958e..94caaf5 100644
--- a/admin/setting/template/main.htm
+++ b/admin/setting/template/main.htm
@@ -557,7 +557,6 @@
     <form id="cpform" action="{BASESCRIPT}?mod=setting" class="form-horizontal-left" method="post" name="cpform">
       <input type="hidden" value="{FORMHASH}" name="formhash">
       <input type="hidden" value="mail" name="operation">
-      <input type="hidden" value="tzxxyjtz" name="operation">
       <dl>
         <dt>{lang administrator_email}:</dt>
         <dd class="clearfix">
@@ -662,10 +661,10 @@
         <dt>通知消息是否邮件通知:</dt>
         <dd class="clearfix">
           <label class="radio-inline ">
-            <input type="radio" name="settingnew[tzxxyjtz]" value="1" checked>{lang yes}
+            <input type="radio" name="settingnew[mail][tzxxyjtz]" value="1" checked>{lang yes}
           </label>&nbsp;&nbsp;
           <label class="radio-inline ">
-            <input type="radio" name="settingnew[tzxxyjtz]" value="0"<!--{if !$setting[tzxxyjtz]}-->checked<!--{/if}-->>{lang no}
+            <input type="radio" name="settingnew[mail][tzxxyjtz]" value="0"<!--{if !$setting[mail][tzxxyjtz]}-->checked<!--{/if}-->>{lang no}
           </label>
         </dd>
         <dd class="clearfix"><span class="help-block ">如果未配置邮件服务器，请不要启用，以免造成系统卡顿</span></dd>
diff --git a/user/login/template/login_single.htm b/user/login/template/login_single.htm
index 6e48c00..34a9433 100644
--- a/user/login/template/login_single.htm
+++ b/user/login/template/login_single.htm
@@ -1,23 +1,23 @@
 <!--{template common/header_simple_start}-->
 <link href="static/css/common.css?{VERHASH}" rel="stylesheet" media="all">
 <link href="static/css/checkbox.css?{VERHASH}" rel="stylesheet">
-<link href="user/login/images/login_single.css?{VERHASH}" rel="stylesheet" />
+<link href="user/login/images/login_single1.css?{VERHASH}" rel="stylesheet" />
 <!--[if lt IE 9]>
   <script src="static/js/jquery.placeholder.js" type="text/javascript"></script>
 <![endif]-->
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{template common/header_simple_end}-->
-<!--{if !$_G['setting']['bbclosed']}-->
+<!--{if $_G['setting']['bbclosed']}-->
 <nav class="navbar navbar-inverse resNav bs-top-container" >
 	<div class="resNav-item resNav-left">     
     	<ul class="nav navbar-nav navbar-nav-left">
           <li>
           <a class="site" href="{$_G[siteurl]}"><span class="site-logo">
-          <!--{if $_G['setting']['sitelogo']}-->
-            <img src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'';}" style="max-height:30px;">
-            <!--{else}-->
-            <img src="static/image/common/logo.png" style="max-height:30px;">
-          <!--{/if}-->
+            <!--{if $_G['setting']['sitelogo']}-->
+              <img src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'';}" style="max-height:30px;">
+			  <!--{else}-->
+              <img src="static/image/common/logo.png" style="max-height:30px;">
+			  <!--{/if}-->
               </span><span class="site-name">$_G['setting']['sitename']</span></a>
           </li>
       </ul>
@@ -26,74 +26,74 @@
 <!--{/if}-->
 <!--{eval $loginhash = 'L'.random(4);}-->
 <!--{template common/beijing}-->
+
 <div class="mainContainer" id="main_message">
-  <table width="100%" height="100%">
-    <tr>
-      <td align="center" valign="middle">
-          <div class="modal-content">
-              <div class="brand">
-              <!--{if $_G['setting']['sitelogo']}-->
-              <img src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'';}">
-                  <!--{else}-->
-              <img src="static/image/common/logo.png">
-                  <!--{/if}-->
-              </div>
-            <!--{if !$_G['setting']['bbclosed']}-->
-            <!--{if $_G[setting][loginset][title]}-->
-            <div class="main-title">$_G[setting][loginset][title]</div>
-            <!--{/if}--> 
-            <!--{if $_G[setting][loginset][subtitle]}-->
-            <div class="sub-title">$_G[setting][loginset][subtitle]</div>
-            <!--{/if}-->
-            <form method="post"  name="login" id="loginform_$loginhash" class="loginForm" role="form" onsubmit="{if $_G['setting']['pwdsafety']}pwmd5('password3_$loginhash');{/if}pwdclear = 1; loginsub('loginform_$loginhash', 'returnmessage_$loginhash');return false;"  action="user.php?mod=login&op=logging&action=login&loginsubmit=yes{if !empty($_GET['handlekey'])}&handlekey=$_GET[handlekey]{/if}{if isset($_GET['frommessage'])}&frommessage{/if}&loginhash=$loginhash">
-              <input type="hidden" name="formhash" value="{FORMHASH}" />
-              <input type="hidden" name="referer" value="{$referer}" />
-              <!--{if $auth}-->
-              <input type="hidden" name="auth" value="$auth" />
-              <!--{else}--> 
-                <input type="text" class="form-control" id="email_$loginhash" placeholder="{lang email_username}" name="email"  autocomplete="off">
-                <input type="text" class="form-control" id="password3_$loginhash" placeholder="{lang user_login_password}" name="password" onfocus="this.type='password'" autocomplete="off">
-              <!--{/if}-->
-              <!--{if $seccodecheck}-->
-              <div class="form-group seccode-wrapper clearfix"> 
-              <!--{template common/seccheck}--> 
-              </div>
-              <!--{/if}-->
-                <div class="checkbox-custom checkbox-primary pull-left">
-                  <input type="checkbox" name="cookietime" id="cookietime_$loginhash" value="2592000" $cookietimecheck />
-                  <label for="cookietime_$loginhash">{lang automatic_login_within_thirtydays}</label>
-                </div>
-                <a class="pull-right"  href="admin.php">管理员登录</a> <span class="spacer  pull-right">|</span>
-                <!--{if $_G['setting']['regstatus']>0}--> 
-                <a  class="pull-right"  href="user.php?mod=register&referer={eval echo urlencode($referer);}"  <!--{if !empty($_GET['inajax'])}-->onclick="_login.register($referer);return false;"<!--{/if}--> title="$_G['setting']['reglinkname']">$_G['setting']['reglinkname']</a> 
-                <span class="spacer  pull-right">|</span> 
-                <!--{/if}--> 
-                <a class="pull-right"  href="user.php?mod=login&op=logging&action=lostpasswd">{lang getpassword}</a> 
-              <div style="padding-top:15px;margin-top:15px;border-top:1px solid #DDD;text-align: left;">
-                <span class="third-login-header">{lang other_login}：</span>
-                <a class="pull-right"  href="admin.php">管理员登录</a>
-                <!--{if $_G['setting']['qq_login']>0}-->
-                <a class="qqlogin" style="margin:0 5px" href="user.php?mod=qqlogin" title="{lang qq_login}">
-                    <img src="user/images/qq.png" height="24" />
-                </a>
-                <!--{/if}-->
-              </div>
-              <div class="third-wrapper clearfix">
-                <!--{hook third_login}-->
-              </div>
-                <p class="error-msg text-danger" id="returnmessage_$loginhash"></p>
-                <!--{if $_G['setting'][loginset][youkedenlu]}--> 
-                <a href="$_G['siteurl']" class="btn btn-lg btn-primary btn-block">游客访问</a>
-                <!--{/if}--> 
-                <button class="btn btn-lg btn-primary btn-block" type="submit" name="loginsubmit" value="true">{lang login_empty}</button>
-            </form>
-          <div class="copyright-container">
-            <!--{template common/copyright}-->
-          </div>
+   <div class="modal-content">
+    <div class="brand">
+    <!--{if $_G['setting']['sitelogo']}-->
+    <img src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'';}">
+        <!--{else}-->
+    <img src="static/image/common/logo.png">
+        <!--{/if}-->
+    </div>
+    <!--{if !$_G['setting']['bbclosed']}-->
+    <!--{if $_G[setting][loginset][title]}-->
+    <div class="main-title">$_G[setting][loginset][title]</div>
+    <!--{/if}--> 
+    <!--{if $_G[setting][loginset][subtitle]}-->
+    <div class="sub-title">$_G[setting][loginset][subtitle]</div>
+    <!--{/if}-->
+    <form method="post"  name="login" id="loginform_$loginhash" class="loginForm" role="form" onsubmit="{if $_G['setting']['pwdsafety']}pwmd5('password3_$loginhash');{/if}pwdclear = 1; loginsub('loginform_$loginhash', 'returnmessage_$loginhash');return false;"  action="user.php?mod=login&op=logging&action=login&loginsubmit=yes{if !empty($_GET['handlekey'])}&handlekey=$_GET[handlekey]{/if}{if isset($_GET['frommessage'])}&frommessage{/if}&loginhash=$loginhash">
+      <input type="hidden" name="formhash" value="{FORMHASH}" />
+      <input type="hidden" name="referer" value="{$referer}" />
+      <!--{if $auth}-->
+      <input type="hidden" name="auth" value="$auth" />
+      <!--{else}-->
+      <div class="form-group">
+        <input type="text" class="form-control" id="email_$loginhash" placeholder="{lang email_username}" name="email"  autocomplete="off">
+      </div>
+      <div class="form-group">
+        <input type="text" class="form-control" id="password3_$loginhash" placeholder="{lang user_login_password}" name="password" onfocus="this.type='password'" autocomplete="off">
+      </div>
+      <!--{/if}-->
+      <!--{if $seccodecheck}-->
+      <div class="form-group seccode-wrapper clearfix"> 
+      <!--{template common/seccheck}--> 
+      </div>
+      <!--{/if}-->
+      <div class="form-group  clearfix">
+        <div class="checkbox-custom checkbox-primary pull-left">
+          <input type="checkbox" name="cookietime" id="cookietime_$loginhash" value="2592000" $cookietimecheck />
+          <label for="cookietime_$loginhash">{lang automatic_login_within_thirtydays}</label>
         </div>
-      </td>
-    </tr>
-  </table>
+        <!--{if $_G['setting']['regstatus']>0}--> 
+        <a  class="pull-right"  href="user.php?mod=register&referer={eval echo urlencode($referer);}"  <!--{if !empty($_GET['inajax'])}-->onclick="_login.register($referer);return false;"<!--{/if}--> title="$_G['setting']['reglinkname']">$_G['setting']['reglinkname']</a> 
+        <span class="spacer  pull-right">|</span> 
+        <!--{/if}--> 
+        <a class="pull-right"  href="user.php?mod=login&op=logging&action=lostpasswd">{lang getpassword}</a> 
+      </div>
+      <div style="padding-top:15px;text-align: left;">
+          <span class="third-login-header">{lang other_login}：</span>
+          <a class="pull-right"  href="admin.php">管理员登录</a>
+          <!--{if $_G['setting']['qq_login']>0}-->
+          <a class="qqlogin" style="margin:0 5px" href="user.php?mod=qqlogin" title="{lang qq_login}">
+              <img src="user/images/qq.png" height="24" />
+          </a>
+          <!--{/if}-->
+      </div>
+      <div class="third-wrapper clearfix">
+        <!--{hook third_login}-->
+      </div>
+        <p class="error-msg text-danger" id="returnmessage_$loginhash"></p>
+        <!--{if $_G['setting'][loginset][youkedenlu]}--> 
+        <a href="$_G['siteurl']" class="btn btn-lg btn-primary btn-block">游客访问</a>
+        <!--{/if}--> 
+        <button class="btn btn-lg btn-primary btn-block" type="submit" name="loginsubmit" value="true">{lang login_empty}</button>
+    </form>
+    <div class="copyright-container">
+      <!--{template common/copyright}-->
+    </div>
+  </div>
 </div>
 <div class="nfl" id="main_succeed" style="display: none;text-align: center;">
 	<div class="modal-body">
diff --git a/user/login/template/login_single1.htm b/user/login/template/login_single1.htm
index e9aa4b1..34a9433 100644
--- a/user/login/template/login_single1.htm
+++ b/user/login/template/login_single1.htm
@@ -1,93 +1,148 @@
 <!--{template common/header_simple_start}-->
 <link href="static/css/common.css?{VERHASH}" rel="stylesheet" media="all">
-<script src="user/scripts/register.js?{VERHASH}"></script>
-<style>
-	body {
-		background: rgb(58, 110, 165);
-	}
-	
-	.col-sm-4 .help-block {
-		margin-bottom: 0;
-	}
-	
-	.middle-box {
-		padding: 15px;
-		width: 350px;
-		margin: 10px;
-		width: auto;
-		border: 1px solid #ddd;
-		background-color: RGBA(255, 255, 255, 0.9);
-		box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
-		border-radius: 5px;
-	}
-	
-	.middle-box h3 {
-		text-shadow: 1px 1px 1px #FFF;
-	}
-	
-	.bindContainer {
-		margin: 20px auto 0 auto;
-	}
-	
-	.bindContainer .tip {
-		text-shadow: 1px 1px 1px #FFF;
-		padding: 10px;
-	}
-	.mainContainer{
-		animation-duration: 800ms;
-    position: relative;
-    animation-fill-mode: both;
-    z-index: 10;
-    height: 100%;
-    text-align: center;
-    overflow: auto;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
-    align-content: center;
-    justify-content: center;
-    margin: 0;
-    padding: 0;
-	}
-</style>
+<link href="static/css/checkbox.css?{VERHASH}" rel="stylesheet">
+<link href="user/login/images/login_single1.css?{VERHASH}" rel="stylesheet" />
+<!--[if lt IE 9]>
+  <script src="static/js/jquery.placeholder.js" type="text/javascript"></script>
+<![endif]-->
+<script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{template common/header_simple_end}-->
+<!--{if $_G['setting']['bbclosed']}-->
+<nav class="navbar navbar-inverse resNav bs-top-container" >
+	<div class="resNav-item resNav-left">     
+    	<ul class="nav navbar-nav navbar-nav-left">
+          <li>
+          <a class="site" href="{$_G[siteurl]}"><span class="site-logo">
+            <!--{if $_G['setting']['sitelogo']}-->
+              <img src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'';}" style="max-height:30px;">
+			  <!--{else}-->
+              <img src="static/image/common/logo.png" style="max-height:30px;">
+			  <!--{/if}-->
+              </span><span class="site-name">$_G['setting']['sitename']</span></a>
+          </li>
+      </ul>
+  </div>
+</nav>
+<!--{/if}-->
+<!--{eval $loginhash = 'L'.random(4);}-->
 <!--{template common/beijing}-->
-<div class="mainContainer" id="main_message">
-<div class="middle-box">
-	<div class="bindTitle text-center">
-		<div><img style="width:100px;height:100px" src="$uinfo[figureurl_qq_2]"></div>
-		<h3>$uinfo['nickname']</h3>
-	</div>
-	<div class="bindContainer clearfix">
-		<div class="alert alert-info" role="alert" style="padding:10px"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {lang please_bound_then_account}</div>
-		<form class="m-t" name="f" method="post" action="user.php?mod=qqlogin&type=olduser">
-			<div class="form-group  form-group-lg">
-				<input type="text" class="form-control" name="userinfo[email]" id="user" placeholder="{lang login_email_username}" required="required" />
-			</div>
-			<div class="form-group form-group-lg">
-				<input type="password" name="userinfo[pw]" id="password" class="form-control" placeholder="{lang login_password}" required="required" />
-			</div>
-			<div class="form-group  form-group-lg">
-				<input type="submit" value="{lang login_bound}" class="btn btn-success btn-block" style="line-height:30px;">
-			</div>
-			<div class="form-group form-group-lg clearfix" style="margin-top:10px;margin-bottom:0">
-				<!--{if $_G['setting']['qq_bind']}-->
-				<div class="col-xs-12">
-					<a href="user.php?mod=register&agree=1" class="btn btn-info btn-block">{lang register_binding}</a>
-				</div>
-				<!--{else}-->
-				<div class="col-xs-6">
-					<a href="user.php?mod=register&agree=1" class="btn btn-info btn-block">{lang register_binding}</a>
-				</div>
-				<div class="col-xs-6">
-					<a href="user.php?mod=qqlogin&type=newuser" class="btn btn-default btn-block">{lang landing_directly}</a>
-				</div>
-				<!--{/if}-->
-			</div>
-		</form>
-	</div>
-</div>
-</div>
-<script src="static/bootstrap/js/bootstrap.min.js?{VERHASH}"></script>
 
+<div class="mainContainer" id="main_message">
+   <div class="modal-content">
+    <div class="brand">
+    <!--{if $_G['setting']['sitelogo']}-->
+    <img src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'';}">
+        <!--{else}-->
+    <img src="static/image/common/logo.png">
+        <!--{/if}-->
+    </div>
+    <!--{if !$_G['setting']['bbclosed']}-->
+    <!--{if $_G[setting][loginset][title]}-->
+    <div class="main-title">$_G[setting][loginset][title]</div>
+    <!--{/if}--> 
+    <!--{if $_G[setting][loginset][subtitle]}-->
+    <div class="sub-title">$_G[setting][loginset][subtitle]</div>
+    <!--{/if}-->
+    <form method="post"  name="login" id="loginform_$loginhash" class="loginForm" role="form" onsubmit="{if $_G['setting']['pwdsafety']}pwmd5('password3_$loginhash');{/if}pwdclear = 1; loginsub('loginform_$loginhash', 'returnmessage_$loginhash');return false;"  action="user.php?mod=login&op=logging&action=login&loginsubmit=yes{if !empty($_GET['handlekey'])}&handlekey=$_GET[handlekey]{/if}{if isset($_GET['frommessage'])}&frommessage{/if}&loginhash=$loginhash">
+      <input type="hidden" name="formhash" value="{FORMHASH}" />
+      <input type="hidden" name="referer" value="{$referer}" />
+      <!--{if $auth}-->
+      <input type="hidden" name="auth" value="$auth" />
+      <!--{else}-->
+      <div class="form-group">
+        <input type="text" class="form-control" id="email_$loginhash" placeholder="{lang email_username}" name="email"  autocomplete="off">
+      </div>
+      <div class="form-group">
+        <input type="text" class="form-control" id="password3_$loginhash" placeholder="{lang user_login_password}" name="password" onfocus="this.type='password'" autocomplete="off">
+      </div>
+      <!--{/if}-->
+      <!--{if $seccodecheck}-->
+      <div class="form-group seccode-wrapper clearfix"> 
+      <!--{template common/seccheck}--> 
+      </div>
+      <!--{/if}-->
+      <div class="form-group  clearfix">
+        <div class="checkbox-custom checkbox-primary pull-left">
+          <input type="checkbox" name="cookietime" id="cookietime_$loginhash" value="2592000" $cookietimecheck />
+          <label for="cookietime_$loginhash">{lang automatic_login_within_thirtydays}</label>
+        </div>
+        <!--{if $_G['setting']['regstatus']>0}--> 
+        <a  class="pull-right"  href="user.php?mod=register&referer={eval echo urlencode($referer);}"  <!--{if !empty($_GET['inajax'])}-->onclick="_login.register($referer);return false;"<!--{/if}--> title="$_G['setting']['reglinkname']">$_G['setting']['reglinkname']</a> 
+        <span class="spacer  pull-right">|</span> 
+        <!--{/if}--> 
+        <a class="pull-right"  href="user.php?mod=login&op=logging&action=lostpasswd">{lang getpassword}</a> 
+      </div>
+      <div style="padding-top:15px;text-align: left;">
+          <span class="third-login-header">{lang other_login}：</span>
+          <a class="pull-right"  href="admin.php">管理员登录</a>
+          <!--{if $_G['setting']['qq_login']>0}-->
+          <a class="qqlogin" style="margin:0 5px" href="user.php?mod=qqlogin" title="{lang qq_login}">
+              <img src="user/images/qq.png" height="24" />
+          </a>
+          <!--{/if}-->
+      </div>
+      <div class="third-wrapper clearfix">
+        <!--{hook third_login}-->
+      </div>
+        <p class="error-msg text-danger" id="returnmessage_$loginhash"></p>
+        <!--{if $_G['setting'][loginset][youkedenlu]}--> 
+        <a href="$_G['siteurl']" class="btn btn-lg btn-primary btn-block">游客访问</a>
+        <!--{/if}--> 
+        <button class="btn btn-lg btn-primary btn-block" type="submit" name="loginsubmit" value="true">{lang login_empty}</button>
+    </form>
+    <div class="copyright-container">
+      <!--{template common/copyright}-->
+    </div>
+  </div>
+</div>
+<div class="nfl" id="main_succeed" style="display: none;text-align: center;">
+	<div class="modal-body">
+  		<div class="alert_right" style="display: inline-block;">
+    		<div id="succeedmessage"></div>
+    		<div id="succeedlocation" class="alert_btnleft"></div>
+    		<p class="alert_btnleft"><a id="succeedmessage_href" href="javascript:;">{lang message_forward}</a></p>
+  		</div>
+	</div>
+</div>
+<!--{if $_G['setting']['pwdsafety']}--> 
+<script type="text/javascript" src="user/scripts/md5.js?{VERHASH}" reload="1"></script> 
+<!--{/if}--> 
+<script type="text/javascript">
+
+var pwdclear = 1;
+function initinput_login() {
+	document.body.focus();
+	<!--{if !$auth}-->
+		if(document.getElementById('loginform_$loginhash')) {
+			document.getElementById('loginform_$loginhash').email.focus();
+		}
+	<!--{/if}-->
+}
+
+function clearpwd(self) {
+	self.type='password';
+	if(pwdclear) {
+		document.getElementById('password3_$loginhash').value = '';
+	}
+	pwdclear = 0;
+}
+
+jQuery(document).ready(function(e) {
+	initinput_login();
+	if(jQuery('.ie8,.ie9').length){ //ie8模拟placeholder;
+		jQuery(':input[placeholder]').each(function(){
+			jQuery(this).placeholder();
+		});
+	}
+});
+
+</script>
+<!--{else}-->
+<div class="main-title">$_G[setting][closedreason]</div>
+		<div class="sub-title"><a class="btn btn-lg btn-primary btn-block" href="admin.php">管理员登录</a><div class="copyright-container">
+		<!--{template common/copyright}-->
+		</div></div>
+		
+<!--{/if}-->
+<script src="static/bootstrap/js/bootstrap.min.js?{VERHASH}"></script> 
 <!--{template common/footer}-->
\ No newline at end of file
diff --git a/user/profile/template/left.htm b/user/profile/template/left.htm
index 350e1bc..c09806b 100644
--- a/user/profile/template/left.htm
+++ b/user/profile/template/left.htm
@@ -13,7 +13,7 @@
 	   <!--{/if}-->
 	   <!--{/loop}-->
      <!--{else}-->
-     <script type="text/javascript">showDialog('<!--{if $verify[verify1]==-1}-->您提交的实名认证审核失败，请重新提交认证<!--{elseif $verify[uid]}-->您的实名认证信息已提交，请耐心等待核核<!--{else}-->请先完成实名认证<!--{/if}-->',"right",'系统提示')</script>
+     <script type="text/javascript">showDialog('<!--{if $verify[verify1]==-1}-->您提交的实名认证审核失败，请重新提交认证<!--{elseif $verify[uid]}-->您的实名认证信息已提交，请耐心等待审核<!--{else}-->请先完成实名认证<!--{/if}-->',"right",'系统提示')</script>
      <li class="active">
 	       <a href="user.php?mod=profile&vid=1">实名认证</a>
      </li>
diff --git a/user/qqlogin.php b/user/qqlogin.php
index 28cc255..cb25872 100644
--- a/user/qqlogin.php
+++ b/user/qqlogin.php
@@ -61,7 +61,7 @@ if ($_GET['type'] == "login") {
 	$user = C::t('user_qqconnect') -> fetch_by_openid($openid);
 	if ($user['status'] == -2) {
 		showmessage('user_stopped_please_admin');
-	} elseif ($_G['setting']['bbclosed'] > 0 && $user['adminid'] != 1) {
+	} elseif ($_G['setting']['bbclosed'] && $user['adminid'] != 1) {
 		showmessage('site_closed_please_admin');
 	}
 	setloginstatus($user, $_GET['cookietime'] ? 2592000 : 0);
@@ -147,7 +147,7 @@ if ($_GET['type'] == "login") {
 	if (isemail($userinfo['email'])) {
 		$user = C::t('user') -> fetch_by_email($userinfo['email']);
 	} else {
-		$user = C::t('user') -> fetch_by_nickname($userinfo['email']);
+		$user = C::t('user') -> fetch_by_username($userinfo['username']);
 	};
 	if (!$user) {
 		showmessage('username_or_password_error', $_G['siteurl'] . 'user.php?mod=qqlogin&type=callback');