更新至V1.69,更新内容在笔记中查看

This commit is contained in:
小胡
2023-01-16 17:15:55 +08:00
Unverified
parent 0cfb087f02
commit e4fe5aebad
6 changed files with 435 additions and 148 deletions

View File

@@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) {
define('CORE_VERSION', '2.02');
define('CORE_RELEASE', '20180909');
define('CORE_FIXBUG' , '20000000');
define('CORE_XHVERSION', '1.68');
define('CORE_XHRELEASE', '20220125');
define('CORE_XHFIXBUG' , '20220125');
define('CORE_XHVERSION', '1.69');
define('CORE_XHRELEASE', '20220116');
define('CORE_XHFIXBUG' , '20220116');
}

View File

@@ -1,148 +1,93 @@
<!--{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_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>
<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>
<!--{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="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 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>
<!--{if $_G['setting']['pwdsafety']}-->
<script type="text/javascript" src="user/scripts/md5.js?{VERHASH}" reload="1"></script>
<!--{/if}-->
<script type="text/javascript">
</div>
<script src="static/bootstrap/js/bootstrap.min.js?{VERHASH}"></script>
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}-->

View File

@@ -49,10 +49,14 @@ if ($_GET['type'] == "login") {
$openid = $_SESSION['openid'];
$uinfo = $_SESSION['uinfo'];
}
if (!DB::result_first("select COUNT(*) from %t where openid=%d", array('user_qqconnect', $openid))) {
include template('qqcallback');
exit();
}
if (!DB::result_first("select COUNT(*) from %t where openid=%d", array('user_qqconnect', $openid))) {
if ($_G['setting']['qq_bind']==1){
include template('qqcallback');
exit();
}else {
dheader("Location: user.php?mod=qqlogin&type=newuser");
}
}
session_unset();
$user = C::t('user_qqconnect') -> fetch_by_openid($openid);
if ($user['status'] == -2) {

View File

@@ -39,8 +39,8 @@ $seccodecheck = $setting['seccodestatus'] & 1;
//判断是否提交
if(!submitcheck('regsubmit', 0, $seccodecheck)) {
//应用注册页挂载点
Hook::listen('appregister');
//应用注册页挂载点
Hook::listen('appregister');
$bbrules = $setting['bbrules'];
$regname =$setting['regname'];
@@ -57,6 +57,11 @@ if(!submitcheck('regsubmit', 0, $seccodecheck)) {
$dreferer = dreferer();
include template('register');
exit();
//QQ登陆相关
@session_start();
$qqopenid = $_SESSION['openid'] ? $_SESSION['openid'] :'';
$qquinfo = $_SESSION['uinfo'] ? $_SESSION['uinfo'] :'';
include template($this->template);
}else{
Hook::listen('check_val',$_GET);//用户数据验证钩子,用户注册资料信息提交验证

View File

@@ -0,0 +1,240 @@
<!--{template common/header_simple_start}-->
<link href="static/css/common.css?{VERHASH}" rel="stylesheet" media="all">
<!--[if lt IE 9]>
<script src="static/js/jquery.placeholder.js" type="text/javascript"></script>
<![endif]-->
<style>
html body {
overflow: hidden
}
.mainContainer {
overflow-x: hidden;
overflow-y: auto;
position: relative;
z-index: 10;
background: url(dzz/images/b.gif);
}
.modal-content {
position: absolute;
width: auto;
margin: 10px;
left: 0;
top: 0;
right: 0;
z-index: 900;
text-shadow: 1px 1px 1px #FFF;
background-color: RGBA(255, 255, 255, 0.9);
}
.ie8 .modal-content {
width: 350px;
margin: 10px;
position: absolute;
right: 80px;
top: 80px;
z-index: 900;
left: auto;
background-color: RGBA(255, 255, 255, 0.9);
}
@media (min-width: 510px) {
.modal-content {
width: 350px;
position: absolute;
right: 80px;
top: 80px;
z-index: 900;
left: auto;
background-color: RGBA(255, 255, 255, 0.9);
}
}
@media (min-width: 768px) {
.modal-content {
width: 350px;
margin: 0;
position: absolute;
top: 80px;
right: 80px;
left: auto;
z-index: 900;
background-color: RGBA(255, 255, 255, 0.9);
}
}
.form-login .form-group-lg {
margin-bottom: 20px;
}
.form-login .form-group-lg .form-control {
padding: 10px 16px;
height: 46px;
}
.siteinfo {
padding: 50px 20px 20px 50px;
opacity: 0.9;
font-weight: 700;
text-shadow: 1px 1px 1px #000;
color: #FFF;
}
.siteinfo-title {
font-size: 40px;
padding-bottom: 20px;
}
.siteinfo-subtitle {
font-size: 30px;
padding-bottom: 20px;
}
</style>
<script type="text/javascript" src="dzz/scripts/imgReady.js"></script>
<!--{template common/header_simple_end}-->
<!--{eval $loginhash = 'L'.random(4);}-->
<!--{template common/beijing}-->
<div class="mainContainer clearfix">
<!--文字层-->
<div class="siteinfo">
<div class="siteinfo-title"> $_G['setting']['loginset']['title'] </div>
<div class="siteinfo-subtitle"> $_G['setting']['loginset']['subtitle'] </div>
</div>
<div class="modal-content">
<div id="main_message">
<div id="layer_login_$loginhash">
<div class="modal-header" style="border-bottom:1px solid #DDD;">
<h4 class="modal-title text-center">
<p><img class="img-circle" style="width:30px;height:30px" src="$uinfo[figureurl]" /></p>
<div>$uinfo[nickname]</div>
</h4>
</div>
<div class="modal-body" style="font-size:14px;padding:10px 30px 10px 30px;">
<form method="post" name="login " id="loginform_$loginhash" class="form-login" role="form">
<input type="hidden" name="formhash" value="{FORMHASH}" />
<p>
{lang binding_for_account}
</p>
<div class="form-group form-group-lg">
<input type="text" class="form-control" id="email_$loginhash" placeholder="{lang email_username}" name="email" autocomplete="off">
</div>
<div class="form-group form-group-lg">
<input type="password" class="form-control " id="password3_$loginhash" placeholder="{lang user_login_password}" name="password" onfocus="clearpwd()" autocomplete="off">
</div>
<div class="form-group form-group-lg">
<label class="checlbox checkbox-inline"><input type="checkbox" name="cookietime" id="cookietime_$loginhash" value="2592000" $cookietimecheck />{lang automatic_login_within_thirtydays}</label>
</div>
<div class="form-group form-group-lg last">
<button class="btn btn-primary btn-block" type="submit" name="loginsubmit" value="true"><strong style="line-height:30px;">{lang bundle_empty}</strong></button>
</div>
</form>
</div>
<div class="modal-footer">
<a class="" tabindex="-1" href="user.php?mod=register" <!--{if !empty($_GET[ 'inajax'])}-->onclick="_login.register();return false;"
<!--{/if}-->title="{lang register_new_account_bound}">{lang register_new_account}</a>
</div>
<!--{if $_G['setting']['pwdsafety']}-->
<script type="text/javascript" src="dzz/scripts/md5.js?{VERHASH}" reload="1"></script>
<!--{/if}-->
</div>
</div>
<div class="nfl" id="main_succeed" style="display: none">
<div class="modal-body">
<div class="alert_right">
<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>
</div>
</div>
<script type="text/javascript">
var clientHeight, clientWidth;
var width, height;
function setHeightCenter(flag) {
clientWidth = document.documentElement.clientWidth;
clientHeight = document.documentElement.clientHeight;
var modalHeight = jQuery('.modal-content').outerHeight(true);
jQuery('.mainContainer').css('height', clientHeight);
if(jQuery('.ie8').length) {
if(clientWidth < 430) {
jQuery('.modal-content').css({ 'top': 0, 'width': 'auto', 'margin': '10px', 'left': 0, 'right': 0 });
} else if(clientWidth < 768) {
jQuery('.modal-content').css({ 'top': '80px', 'width': '350px', 'margin': '0', 'left': 'auto', 'right': '80px' });
} else {
jQuery('.modal-content').css({ 'top': '80px', 'width': '350px', 'margin': '0', 'left': 'auto', 'right': '80px' });
}
}
var top = (clientHeight - modalHeight) / 2;
if(top > 100) top = 100;
if(top > 10) jQuery('.modal-content').css('top', top);
else jQuery('.modal-content').css('top', 10);
}
var pwdclear = 1;
function initinput_login() {
document.body.focus();
if($('loginform_$loginhash')) {
$('loginform_$loginhash').email.focus();
}
}
function clearpwd() {
if(pwdclear) {
$('password3_$loginhash').value = '';
}
pwdclear = 0;
}
function setImage() {
clientWidth = document.documentElement.clientWidth;
clientHeight = document.documentElement.clientHeight;
var r0 = clientWidth / clientHeight;
var r1 = width / height;
if(r0 > r1) { //width充满
w = clientWidth;
h = w * (height / width);
} else {
h = clientHeight;
w = h * (width / height);
}
document.getElementById('imgbg').style.width = w + 'px';
document.getElementById('imgbg').style.height = h + 'px';
}
var Timer = null;
window.onresize = function() {
if(Timer) window.clearTimeout(Timer);
Timer = window.setTimeout(function() { setHeightCenter();
setImage(); }, 50);
}
jQuery(document).ready(function(e) {
setHeightCenter(true);
initinput_login();
if($('imgbg')) {
imgReady($('imgbg').src, function() {
width = this.width;
height = this.height;
});
}
if(jQuery('.ie8,.ie9').length) { //ie8模拟placeholder;
jQuery(':input[placeholder]').each(function() {
jQuery(this).placeholder();
});
}
});
</script>
<script src="static/bootstrap/js/bootstrap.min.js?{VERHASH}"></script>
<!--{template common/footer}-->

View File

@@ -0,0 +1,93 @@
<!--{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>
<!--{template common/header_simple_end}-->
<!--{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>
<!--{template common/footer}-->