WindyMadman/dzzoffice
1
0
Fork 0
mirror of https://github.com/zyx0814/dzzoffice.git synced 2025-04-03 23:31:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复一些已知问题 (#294)

Browse Source
This commit is contained in:
小胡 2025-03-27 09:05:55 +08:00 committed by GitHub
parent 087432fe60
commit 9e819c12e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
52 changed files with 920 additions and 4161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/appmarket/appupgrade.php
View File

@ -16,7 +16,7 @@ $op = isset($_GET['op']) ? $_GET['op'] : '';
//获取所有标签top50；
//$tags = DB::fetch_all("SELECT * FROM %t WHERE hot>0 ORDER BY HOT DESC limit 50", array('app_tag'),'appid');
$keyword = trim($_GET['keyword']);
$keyword = isset($_GET['keyword']) ? trim($_GET['keyword']) : '';
$tagid = intval($_GET['tagid']);
$group = intval($_GET['group']);
$page = empty($_GET['page']) ? 1 : intval($_GET['page']);

2
admin/appmarket/cloudappmarket.php
View File

@ -18,7 +18,7 @@ $cloudurl = APP_CHECK_URL."index.php";
$url=APP_CHECK_URL."market/app/list";//$cloudurl."?mod=dzzmarket&op=index_ajax";
$type=empty($_GET['type'])?1:intval($_GET['type']);
$page = empty($_GET['page'])?1:intval($_GET['page']);
$keyword=trim($_GET['keyword']);
$keyword = isset($_GET['keyword']) ? trim($_GET['keyword']) : '';
$classid=intval($_GET['classid']);
$post_data = array("siteuniqueid"=>$_G["setting"]["siteuniqueid"],"page"=>$page,"type"=>1 );
$json = curlcloudappmarket($url,$post_data);

2
admin/appmarket/default.php
View File

@ -57,7 +57,7 @@ if ($depid && $org = C::t('organization') -> fetch($depid)) {
}
$position = intval($_GET['position']);
$keyword = trim($_GET['keyword']);
$keyword = isset($_GET['keyword']) ? trim($_GET['keyword']) : '';
$page = empty($_GET['page']) ? 1 : intval($_GET['page']);
$perpage = 20;

2
admin/appmarket/index.php
View File

@ -28,7 +28,7 @@ if (submitcheck('appsubmit')) {
//获取所有标签top50；
$tags = DB::fetch_all("SELECT * FROM %t WHERE hot>0 ORDER BY HOT DESC limit 50", array('app_tag'),'tagid');
$keyword = trim($_GET['keyword']);
$keyword = isset($_GET['keyword']) ? trim($_GET['keyword']) : '';
$tagid = intval($_GET['tagid']);
$group = intval($_GET['group']);
$page = empty($_GET['page']) ? 1 : intval($_GET['page']);

8
admin/appmarket/upgrade.php
View File

@ -14,18 +14,18 @@ if(!defined('IN_DZZ') || !defined('IN_ADMIN')) {
//卸载程序；
$applist_midnone=DB::fetch_all("select * from %t where mid=0 ",array('app_market'));
if( $applist_midnone ){
if($applist_midnone){
$dzz_upgrade = new dzz_upgrade_app();
foreach( $applist_midnone as $value){
foreach($applist_midnone as $value){
$url=APP_CHECK_URL."market/app/getmid";//."index.php?mod=dzzmarket&op=index_ajax&operation=getmid";
$post_data = array(
"version"=>$value['version'],
"identifier"=>$value['identifier'],
"app_path"=>$value["app_path"]
);
$json = $dzz_upgrade->curlcloudappmarket($url,$post_data);
$json = $dzz_upgrade->curlcloudappmarket($url,$post_data);
$json = json_decode($json,true);
if( $json["status"]==1){
if($json["status"]==1){
$mid = $json["mid"];
DB::update('app_market',array('mid'=>$mid),"appid=".$value["appid"]);
}

2
admin/appmarket/upgrade_app_ajax.php
View File

@ -549,7 +549,7 @@ elseif($operation == 'cross' || $operation == 'patch'){
);
$re=C::t('app_market')->update( $appid,$map);
updatecache('setting');
updatecache('setting');
$return["url"] = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=check_upgrade&appid='.$appinfo["appid"];
$return["percent"]=100;

2
core/class/class_GifMerge.php
View File

@ -36,7 +36,7 @@ class GifMerge {
var $global_out = array();
var $logical_screen_descriptor = array();
function GifMerge($images, $t1, $t2, $t3, $loop, $dl, $xpos, $ypos, $model) {
function __construct($images, $t1, $t2, $t3, $loop, $dl, $xpos, $ypos, $model) {
if($model) {
$this->mod = $model;
}

2
core/class/class_xml.php
View File

@ -26,7 +26,7 @@ function attribute2arr($values,$data=array() ){
$return = attribute2arr($v["item"]);
if($return) $data[$v['@attributes']["id"]]=$return ;
}
if(count($v['@attributes'])>1){
if (is_array($v['@attributes']) && count($v['@attributes']) > 1) {
$data[$v['@attributes']["id"]]["_attributes"] = $v['@attributes'];
unset($data[$v['@attributes']["id"]]["_attributes"]["id"]);
}

7
core/class/dzz/Hook.php
View File

@ -83,7 +83,7 @@ class Hook
if(is_array($name)){
foreach($name as $val){
$results[$key] = self::exec($val, $tag, $params, $extra,$break);
$results[$key] = self::exec($val,$break, $tag, $params, $extra);
if (false === $results[$key] || $break == true) {
break;
@ -97,7 +97,7 @@ class Hook
}else{
$results[$key] = self::exec($name, $tag, $params, $extra,$break);
$results[$key] = self::exec($name,$break, $tag, $params, $extra);
if (false === $results[$key] || $break == true) {
@ -125,7 +125,8 @@ class Hook
* @param mixed $extra 额外参数
* @return mixed
*/
public static function exec($class, $tag = '', &$params = null,$extra = null,&$break)
public static function exec($class, &$break, $tag = '', &$params = null, $extra = null)
{
if(strpos($class,'|') !== false){//判断是否规定了作用域，并判断作用域确定是否执行钩子
$rangArr = explode('|',$class);

4
core/class/dzz/dzz_io.php
View File

@ -317,7 +317,9 @@ class dzz_io
$relativePath=self::clean(urldecode($relativePath));
if($io=self::initIO($path)) {
$return=$io->uploadStream($file,$name,$path,$relativePath,$content_range);
Hook::listen('createafter_addindex',$return['icoarr'][0]);
if (isset($return['icoarr']) && is_array($return['icoarr']) && count($return['icoarr']) > 0) {
Hook::listen('createafter_addindex', $return['icoarr'][0]);
}
return $return;
}
else return false;

21
core/class/dzz/route.php
View File

@ -5,31 +5,27 @@ use \core as C;
use \core\dzz\Hook as Hook;
use \DB as DB;
use \IO as IO;
class Route{
public static function dzzRoute(&$params,$extra=null,&$break)
{
global $_G,$_config;
$mod = !empty($params[MOULD]) ? $params[MOULD]:$_config['default_mod'];
$op = !empty($params[DIVIDE]) ? $params[DIVIDE]:$_config['default_op'];
define('MOD_PATH',CURSCRIPT.'/'.CURMODULE);
define('MOD_NAME',CURMODULE);
define('MOD_URL',BASESCRIPT.'?mod='.$mod);
define('OP_NAME',$op);
if(empty($mod)){
if($_G['uid']<1 && !defined('ALLOWGUEST') && $_G['setting']['loginset']['available']){
@header("Location: user.php?mod=login".($_GET['referer']?'&referer='.$_GET['referer']:''));
exit();
}
$return = require DZZ_ROOT.'./'.CURSCRIPT.'/'.$op.EXT;
}else{
if(strpos(strtolower($mod),':')!==false){
$patharr=explode(':',$mod);
foreach($patharr as $path){
@ -43,14 +39,11 @@ class Route{
//兼容老版
if(@!file_exists($modfile='./'.CURSCRIPT.'/'.CURSCRIPT.'_'.str_replace(':','/',$mod).EXT)){
showmessage($modfile.lang('file_nonexistence',array('modfile'=>htmlspecialchars($modfile))));
}
}
}else{
if(!preg_match("/^\w+$/i",$mod) && $mod !== '') showmessage('undefined_action');
if(!preg_match("/^\w+$/i",$op)) showmessage('undefined_action');
@ -63,15 +56,9 @@ class Route{
}
}
}
//模块常量
define('MOD_PATH',CURSCRIPT.'/'.CURMODULE);
define('MOD_NAME',CURMODULE);
define('MOD_DIR',dirname($modfile));
define('MOD_URL',BASESCRIPT.'?mod='.$mod);
define('OP_NAME',$op);
// $break = true;
Hook::listen('mod_run');
return DZZ_ROOT.$modfile;

12
core/class/table/table_app_open.php
View File

@ -69,6 +69,7 @@ class table_app_open extends dzz_table
}
public function fetch_all_ext(){
global $_G;
$data = array();
if(($data = $this->fetch_cache('all')) === false) {
$data = array();
@ -77,6 +78,7 @@ class table_app_open extends dzz_table
if($value['appid']){
if($app=C::t('app_market')->fetch_by_appid($value['appid'],false)){
if($app['available']<1) continue;
if(!$_G['uid'] && $app['group'] > 0) continue;
if(!$value['icon']) $value['icon']=$app['appico'];
if(!$value['name']) $value['name']=$app['appname'];
if(!$value['url']) $value['url']=$app['appurl'];
@ -95,19 +97,17 @@ class table_app_open extends dzz_table
}
public function fetch_all_orderby_ext($uid,$ext_all=array()){
$data = array();
$appids=array();
if($config = C::t('user_field')->fetch($uid)){
if($config['applist']){
$appids=explode(',',$config['applist']);
}else{
$appids=array();
}
}
if(!$ext_all) $ext_all=self::fetch_all_ext();
foreach($ext_all as $value){
if($value['appid'] && !in_array($value['appid'],$appids)){
continue;
foreach ($ext_all as $value) {
if ($uid == 0 || (!$value['appid'] || in_array($value['appid'], $appids))) {
$data[$value['ext']][] = $value['extid'];
}
$data[$value['ext']][]=$value['extid'];
}
return $data;

4
core/class/table/table_attachment.php
View File

@ -119,11 +119,11 @@ class table_attachment extends dzz_table
if($filter['aid']){
$where.=" and aid='{$filter['aid']}'";
}
$filter['sizelt']=intval($filter['sizelt']*1024*1024);
$filter['sizelt'] = (isset($filter['sizelt']) ? intval($filter['sizelt']) : 0) * 1024 * 1024;
if($filter['sizelt']>0){
$where.=" and filesize>'{$filter[sizelt]}'";
}
$filter['sizegt']=intval($filter['sizegt']*1024*1024);
$filter['sizelt'] = (isset($filter['sizegt']) ? intval($filter['sizegt']) : 0) * 1024 * 1024;
if($filter['sizegt']>0){
$where .= " and filesize < '{$filter['sizegt']}'";
}

4
core/class/table/table_resources_event.php
View File

@ -76,6 +76,7 @@ class table_resources_event extends dzz_table
$starttime = strtotime($time);
$endtime = $starttime + 3600 * 24;
$events = array();
include_once libfile('function/use');
foreach (DB::fetch_all("select * from %t where gid = %d and dateline > %d and dateline < %d order by dateline desc", array($this->_table, $gid, $starttime, $endtime)) as $v) {
$v['body_data'] = unserialize($v['body_data']);
$v['body_data']['msg'] = self::emoji_decode($v['body_data']['msg']);
@ -108,6 +109,7 @@ class table_resources_event extends dzz_table
return DB::result_first("select count(*) from %t where pfid = %d and rid = '' and `type`= %d", $params);
}
$events = array();
include_once libfile('function/use');
foreach (DB::fetch_all("select * from %t where pfid = %d and rid = '' and `type`= %d order by dateline desc $limitsql", $params) as $v) {
$v['body_data'] = unserialize($v['body_data']);
$v['body_data']['msg'] = self::emoji_decode($v['body_data']['msg']);
@ -138,6 +140,7 @@ class table_resources_event extends dzz_table
}
$uid = array();
$events = array();
include_once libfile('function/use');
foreach (DB::fetch_all("select * from %t where rid = %s and `type`= %d order by dateline desc $limitsql", $params) as $v) {
$v['body_data'] = unserialize($v['body_data']);
$v['body_data']['msg'] = self::emoji_decode($v['body_data']['msg']);
@ -182,6 +185,7 @@ class table_resources_event extends dzz_table
$limitsql = $limit ? DB::limit($start, $limit) : '';
$events = array();
$uids = array();
include_once libfile('function/use');
foreach (DB::fetch_all("select * from %t $wheresql order by dateline desc $limitsql", $params) as $v) {
$v['body_data'] = unserialize($v['body_data']);
$v['body_data']['msg'] = self::emoji_decode($v['body_data']['msg']);

5
core/function/function_core.php
View File

@ -330,8 +330,11 @@ function daddslashes($string, $force = 1)
return $string;
}
function authcode($string, $operation = 'DECODE', $key = '', $expiry = 0, $ckey_length = 4)
function authcode($string = '', $operation = 'DECODE', $key = '', $expiry = 0, $ckey_length = 4)
{
if (!$string) {
return '';
}
//$ckey_length = 4;
$key = md5($key != '' ? $key : getglobal('authkey'));
$keya = md5(substr($key, 0, 16));

2
core/template/default/common/commer_header.htm
View File

@ -55,7 +55,7 @@ _notice.flashTitle=function(flag){
_notice.flashStep++;
if (_notice.flashStep==3) {_notice.flashStep=1;}
if (_notice.flashStep==1) {document.title="【您有新的通知】";}
if (_notice.flashStep==2) {document.title="【$_G[setting][sitename]】";}
if (_notice.flashStep==2) {document.title="【$_G['setting']['sitename']】";}
setTimeout(function(){_notice.flashTitle();},500); //循环
}
</script>

6
core/template/default/common/showmessage.htm
View File

@ -29,13 +29,13 @@
<!--{else}-->
<button class="btn btn-primary btn-jump" onclick="location.href='$url_forward';return false;">{lang return_to_the_naxt_level}<!--{if $param['timeout']}-->（<span class="num">3</span>s）<!--{/if}--></button>
<!--{/if}-->
<button class="btn btn-primary btn-jump" onclick="location.href='$_G['siteurl']';return false;">首页</button>
<button class="btn btn-primary btn-jump" onclick="location.href='/';return false;">首页</button>
<!--{elseif $allowreturn}-->
<script type="text/javascript">
if(history.length > (BROWSER.ie ? 0 : 1)) {
document.write('<a class="btn btn-primary btn-jump" href="javascript:history.back()">返回</a> <a class="btn btn-info" href="$_G['siteurl']">首页</a>');
document.write('<a class="btn btn-primary btn-jump" href="javascript:history.back()">返回</a> <a class="btn btn-info" href="/">首页</a>');
} else {
document.write('<a class="btn btn-primary btn-jump" href="$_G['siteurl']">首页</a>');
document.write('<a class="btn btn-primary btn-jump" href="/">首页</a>');
}
</script>
<!--{/if}-->

2
core/template/lyear/common/copyright.htm
View File

@ -1,4 +1,4 @@
<span>Copyright © 2012-{eval echo dgmdate(TIMESTAMP,'Y');} <a href="http://www.dzzoffice.com" target="_blank" class="dcolor">www.dzzoffice.com</a> All Rights Reserved</span><br><span>Powered By <a href="http://www.dzzoffice.com" target="_blank" class="dcolor">DzzOffice</a>&nbsp;V{eval echo CORE_VERSION}</span>
<!--{if $_G['setting']['sitebeian']}-->
<br>$_G[setting][sitebeian]
<br>$_G['setting']['sitebeian']
<!--{/if}-->

2
core/template/lyear/common/header_common.htm
View File

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset={CHARSET}" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title><!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G[setting][sitename]</title>
<title><!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G['setting']['sitename']</title>
<meta name="keywords" content="{if !empty($_G['setting']['metakeywords'])}{echo htmlspecialchars($_G['setting']['metakeywords'])}{/if}" />
<meta name="description" content="{if !empty($_G['setting']['metadescription'])}{echo htmlspecialchars($_G['setting']['metadescription'])} {/if}" />
<meta name="generator" content="$_G['setting']['sitename']" />

6
core/template/lyear/common/header_simple.htm
View File

@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset={CHARSET}" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title><!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G[setting][sitename]</title>
<title><!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G['setting']['sitename']</title>
<meta name="keywords" content="{if !empty($_G['setting']['metakeywords'])}{echo htmlspecialchars($_G['setting']['metakeywords'])}{/if}" />
<meta name="description" content="{if !empty($_G['setting']['metadescription'])}{echo htmlspecialchars($_G['setting']['metadescription'])} {/if}" />
<meta name="generator" content="$_G['setting']['sitename']" />
@ -22,10 +22,10 @@
<script type="text/javascript" src="static/lyear/js/lyear-loading.js?{VERHASH}" rel="preload"></script>
<script type="text/javascript" src="static/lyear/js/bootstrap-notify.min.js?{VERHASH}" rel="preload"></script>
<script type="text/javascript">
var DZZSCRIPT='{DZZSCRIPT}',LANG='{$_G['language']}', STATICURL = 'static/', IMGDIR = '{$_G['setting']['imgdir']}', VERHASH = '{VERHASH}', charset = '{CHARSET}', dzz_uid = '{$_G['uid']}', cookiepre = '{$_G['config']['cookie']['cookiepre']}', cookiedomain = '{$_G[config]['cookie']['cookiedomain']}', cookiepath = '{$_G['config']['cookie']['cookiepath']}',attackevasive = '{$_G['config']['security']['attackevasive']}', disallowfloat = '{$_G['setting']['disallowfloat']}', REPORTURL = '{$_G['currenturl_encode']}', SITEURL = '{$_G['siteurl']}', JSPATH = '{$_G['setting']['jspath']}',MOD_PATH='{MOD_PATH}',APP_URL='{MOD_URL}',MOD_URL='{MOD_URL}',sitename='{$_G['setting']['sitename']}',ismobile = '{$_G['ismobile']}',data_theme = '{$_G['cookie']['the_site_theme']}',data_sidebarbg = '{$_G['cookie']['the_sidebar_bg']}',data_headerbg = '{$_G['cookie']['the_header_bg']}',data_logobg = '{$_G['cookie']['the_logo_bg']}';
var DZZSCRIPT='{DZZSCRIPT}',LANG='{$_G['language']}', STATICURL = 'static/', IMGDIR = '{$_G['setting']['imgdir']}', VERHASH = '{VERHASH}', charset = '{CHARSET}', dzz_uid = '{$_G['uid']}', cookiepre = '{$_G['config']['cookie']['cookiepre']}', cookiedomain = '{$_G[config]['cookie']['cookiedomain']}', cookiepath = '{$_G['config']['cookie']['cookiepath']}',attackevasive = '{$_G['config']['security']['attackevasive']}', disallowfloat = '{$_G['setting']['disallowfloat']}', REPORTURL = '{$_G['currenturl_encode']}', SITEURL = '{$_G['siteurl']}', JSPATH = '{$_G['setting']['jspath']}',MOD_PATH='{MOD_PATH}',APP_URL='{MOD_URL}',MOD_URL='{MOD_URL}',sitename='{$_G['setting']['sitename']}',ismobile = '{$_G['ismobile']}',data_theme = '{$_G['cookie']['the_site_theme']}';
</script>
<!--{hook header_tpl}-->
</head>
<body id="nv_{$_G['basescript']}" class="$bodyClass"<!--{if !empty($lyeartheme)}--> data-theme="$_G['cookie']['the_site_theme']" data-sidebarbg="$_G['cookie']['the_sidebar_bg']" data-headerbg="$_G['cookie']['the_header_bg']" data-logobg="$_G['cookie']['the_logo_bg']"<!--{/if}-->>
<body id="nv_{$_G['basescript']}" class="$bodyClass"<!--{if !empty($lyeartheme)}--> data-theme="$_G['cookie']['the_site_theme']"<!--{/if}--> style="$bodystyle">
<div id="append_parent" style="z-index:99999;"></div>
<div id="ajaxwaitid" style="z-index:99999;"></div>

153
core/template/lyear/common/header_simple_end.htm
View File

@ -1,5 +1,5 @@
</head>
<body id="nv_{$_G['basescript']}" class="$bodyClass" data-theme="$_G['cookie']['the_site_theme']" data-sidebarbg="$_G['cookie']['the_sidebar_bg']" data-headerbg="$_G['cookie']['the_header_bg']" data-logobg="$_G['cookie']['the_logo_bg']">
<body id="nv_{$_G['basescript']}" class="$bodyClass" data-theme="$_G['cookie']['the_site_theme']" style="$bodystyle">
<div id="append_parent" style="z-index:99999;"></div>
<div id="ajaxwaitid" style="z-index:99999;"></div>
<aside class="bs-left-container">
@ -15,8 +15,6 @@
</div>
</div>
</aside>
<div class="left-drager">
</div>
<header class="bs-top-container">
<nav class="navbar navbar-expand-lg navbar-light">
<div class="container-fluid">
@ -35,152 +33,9 @@
<ul class="navbar-right d-flex align-items-center">
<!--{template lyear:lyear_header_right}-->
<!--切换主题配色-->
<li class="dropdown dropdown-skin">
<a data-bs-toggle="dropdown" class="nav-link">
<i class="mdi mdi-palette fs-4"></i>
<li>
<a class="nav-link theme-toggle-btn mdi <!--{if $_G['cookie']['the_site_theme'] =='dark'}-->mdi-power-sleep<!--{else}-->mdi-white-balance-sunny<!--{/if}--> fs-4" href="javascript:;" title="切换主题">
</a>
<ul class="dropdown-menu dropdown-menu-end" data-stopPropagation="true">
<li class="lyear-skin-title"><p>主题</p></li>
<li class="lyear-skin-li clearfix">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_1" value="default" checked="checked">
<label class="form-check-label" for="site_theme_1"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_2" value="translucent-green">
<label class="form-check-label" for="site_theme_2"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_3" value="translucent-blue">
<label class="form-check-label" for="site_theme_3"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_4" value="translucent-yellow">
<label class="form-check-label" for="site_theme_4"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_5" value="translucent-red">
<label class="form-check-label" for="site_theme_5"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_6" value="translucent-pink">
<label class="form-check-label" for="site_theme_6"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_7" value="translucent-cyan">
<label class="form-check-label" for="site_theme_7"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_8" value="dark">
<label class="form-check-label" for="site_theme_8"></label>
</div>
</li>
<li class="lyear-skin-title"><p>LOGO</p></li>
<li class="lyear-skin-li clearfix">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_1" value="default" checked="checked">
<label class="form-check-label" for="logo_bg_1"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_2" value="color_2">
<label class="form-check-label" for="logo_bg_2"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_3" value="color_3">
<label class="form-check-label" for="logo_bg_3"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_4" value="color_4">
<label class="form-check-label" for="logo_bg_4"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_5" value="color_5">
<label class="form-check-label" for="logo_bg_5"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_6" value="color_6">
<label class="form-check-label" for="logo_bg_6"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_7" value="color_7">
<label class="form-check-label" for="logo_bg_7"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_8" value="color_8">
<label class="form-check-label" for="logo_bg_8"></label>
</div>
</li>
<li class="lyear-skin-title"><p>头部</p></li>
<li class="lyear-skin-li clearfix">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_1" value="default" checked="checked">
<label class="form-check-label" for="header_bg_1"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_2" value="color_2">
<label class="form-check-label" for="header_bg_2"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_3" value="color_3">
<label class="form-check-label" for="header_bg_3"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_4" value="color_4">
<label class="form-check-label" for="header_bg_4"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_5" value="color_5">
<label class="form-check-label" for="header_bg_5"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_6" value="color_6">
<label class="form-check-label" for="header_bg_6"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_7" value="color_7">
<label class="form-check-label" for="header_bg_7"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_8" value="color_8">
<label class="form-check-label" for="header_bg_8"></label>
</div>
</li>
<li class="lyear-skin-title"><p>侧边栏</p></li>
<li class="lyear-skin-li clearfix">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_1" value="default" checked="checked">
<label class="form-check-label" for="sidebar_bg_1"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_2" value="color_2">
<label class="form-check-label" for="sidebar_bg_2"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_3" value="color_3">
<label class="form-check-label" for="sidebar_bg_3"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_4" value="color_4">
<label class="form-check-label" for="sidebar_bg_4"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_5" value="color_5">
<label class="form-check-label" for="sidebar_bg_5"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_6" value="color_6">
<label class="form-check-label" for="sidebar_bg_6"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_7" value="color_7">
<label class="form-check-label" for="sidebar_bg_7"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_8" value="color_8">
<label class="form-check-label" for="sidebar_bg_8"></label>
</div>
</li>
</ul>
</li>
<!--{if !$_G['setting']['bbclosed'] || !$_G['adminid'] ==0}-->
<li>
@ -242,7 +97,7 @@
_notice.flashStep++;
if (_notice.flashStep==3) {_notice.flashStep=1;}
if (_notice.flashStep==1) {document.title="【您有新的通知】";}
if (_notice.flashStep==2) {document.title="【$_G[setting][sitename]】";}
if (_notice.flashStep==2) {document.title="【$_G['setting']['sitename']】";}
setTimeout(function(){_notice.flashTitle();},500); //循环
}
</script>

153
core/template/lyear/common/header_simple_noleft_end.htm
View File

@ -1,9 +1,7 @@
</head>
<body id="nv_{$_G['basescript']}" class="$bodyClass" data-theme="$_G['cookie']['the_site_theme']" data-sidebarbg="$_G['cookie']['the_sidebar_bg']" data-headerbg="$_G['cookie']['the_header_bg']" data-logobg="$_G['cookie']['the_logo_bg']">
<body id="nv_{$_G['basescript']}" class="$bodyClass" data-theme="$_G['cookie']['the_site_theme']">
<div id="append_parent" style="z-index:99999;"></div>
<div id="ajaxwaitid" style="z-index:99999;"></div>
<div class="left-drager">
</div>
<header class="bs-top-container" style="display: flex;padding-left: 0;">
<!--{template lyear:lyear_header_left}-->
<nav class="navbar navbar-expand-lg navbar-light">
@ -16,152 +14,9 @@
<ul class="navbar-right d-flex align-items-center">
<!--{template lyear:lyear_header_right}-->
<!--切换主题配色-->
<li class="dropdown dropdown-skin">
<a data-bs-toggle="dropdown" class="nav-link">
<i class="mdi mdi-palette fs-4"></i>
<li>
<a class="nav-link theme-toggle-btn mdi <!--{if $_G['cookie']['the_site_theme'] =='dark'}-->mdi-power-sleep<!--{else}-->mdi-white-balance-sunny<!--{/if}--> fs-4" href="javascript:;" title="切换主题">
</a>
<ul class="dropdown-menu dropdown-menu-end" data-stopPropagation="true">
<li class="lyear-skin-title"><p>主题</p></li>
<li class="lyear-skin-li clearfix">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_1" value="default" checked="checked">
<label class="form-check-label" for="site_theme_1"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_2" value="translucent-green">
<label class="form-check-label" for="site_theme_2"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_3" value="translucent-blue">
<label class="form-check-label" for="site_theme_3"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_4" value="translucent-yellow">
<label class="form-check-label" for="site_theme_4"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_5" value="translucent-red">
<label class="form-check-label" for="site_theme_5"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_6" value="translucent-pink">
<label class="form-check-label" for="site_theme_6"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_7" value="translucent-cyan">
<label class="form-check-label" for="site_theme_7"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="site_theme" id="site_theme_8" value="dark">
<label class="form-check-label" for="site_theme_8"></label>
</div>
</li>
<li class="lyear-skin-title"><p>LOGO</p></li>
<li class="lyear-skin-li clearfix">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_1" value="default" checked="checked">
<label class="form-check-label" for="logo_bg_1"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_2" value="color_2">
<label class="form-check-label" for="logo_bg_2"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_3" value="color_3">
<label class="form-check-label" for="logo_bg_3"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_4" value="color_4">
<label class="form-check-label" for="logo_bg_4"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_5" value="color_5">
<label class="form-check-label" for="logo_bg_5"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_6" value="color_6">
<label class="form-check-label" for="logo_bg_6"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_7" value="color_7">
<label class="form-check-label" for="logo_bg_7"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="logo_bg" id="logo_bg_8" value="color_8">
<label class="form-check-label" for="logo_bg_8"></label>
</div>
</li>
<li class="lyear-skin-title"><p>头部</p></li>
<li class="lyear-skin-li clearfix">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_1" value="default" checked="checked">
<label class="form-check-label" for="header_bg_1"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_2" value="color_2">
<label class="form-check-label" for="header_bg_2"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_3" value="color_3">
<label class="form-check-label" for="header_bg_3"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_4" value="color_4">
<label class="form-check-label" for="header_bg_4"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_5" value="color_5">
<label class="form-check-label" for="header_bg_5"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_6" value="color_6">
<label class="form-check-label" for="header_bg_6"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_7" value="color_7">
<label class="form-check-label" for="header_bg_7"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="header_bg" id="header_bg_8" value="color_8">
<label class="form-check-label" for="header_bg_8"></label>
</div>
</li>
<li class="lyear-skin-title"><p>侧边栏</p></li>
<li class="lyear-skin-li clearfix">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_1" value="default" checked="checked">
<label class="form-check-label" for="sidebar_bg_1"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_2" value="color_2">
<label class="form-check-label" for="sidebar_bg_2"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_3" value="color_3">
<label class="form-check-label" for="sidebar_bg_3"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_4" value="color_4">
<label class="form-check-label" for="sidebar_bg_4"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_5" value="color_5">
<label class="form-check-label" for="sidebar_bg_5"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_6" value="color_6">
<label class="form-check-label" for="sidebar_bg_6"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_7" value="color_7">
<label class="form-check-label" for="sidebar_bg_7"></label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="sidebar_bg" id="sidebar_bg_8" value="color_8">
<label class="form-check-label" for="sidebar_bg_8"></label>
</div>
</li>
</ul>
</li>
<!--{if !$_G['setting']['bbclosed'] || !$_G['adminid'] ==0}-->
<li>
@ -227,7 +82,7 @@ _notice.flashTitleRun = true;
_notice.flashStep++;
if (_notice.flashStep==3) {_notice.flashStep=1;}
if (_notice.flashStep==1) {document.title="【您有新的通知】";}
if (_notice.flashStep==2) {document.title="【$_G[setting][sitename]】";}
if (_notice.flashStep==2) {document.title="【$_G['setting']['sitename']】";}
setTimeout(function(){_notice.flashTitle();},500); //循环
}
</script>

5
core/template/lyear/common/header_simple_start.htm
View File

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset={CHARSET}" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title><!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G[setting][sitename]</title>
<title><!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G['setting']['sitename']</title>
<meta name="keywords" content="{if !empty($_G['setting']['metakeywords'])}{echo htmlspecialchars($_G['setting']['metakeywords'])}{/if}" />
<meta name="description" content="{if !empty($_G['setting']['metadescription'])}{echo htmlspecialchars($_G['setting']['metadescription'])} {/if}" />
<meta name="generator" content="$_G['setting']['sitename']" />
@ -21,10 +21,9 @@
<script type="text/javascript" src="static/lyear/js/jquery.min.js?{VERHASH}" rel="preload"></script>
<script type="text/javascript" src="static/lyear/js/common.js?{VERHASH}" rel="preload"></script>
<script type="text/javascript" src="static/lyear/js/lyear-loading.js?{VERHASH}" rel="preload"></script>
<script type="text/javascript" src="static/lyear/js/jquery.leftDrager.js?{VERHASH}" rel="preload"></script>
<script type="text/javascript" src="static/lyear/js/bootstrap-notify.min.js?{VERHASH}" rel="preload"></script>
<script type="text/javascript">
var DZZSCRIPT='{DZZSCRIPT}',LANG='{$_G['language']}', STATICURL = 'static/', IMGDIR = '{$_G['setting']['imgdir']}', VERHASH = '{VERHASH}', charset = '{CHARSET}', dzz_uid = '{$_G['uid']}', cookiepre = '{$_G['config']['cookie']['cookiepre']}', cookiedomain = '{$_G[config]['cookie']['cookiedomain']}', cookiepath = '{$_G['config']['cookie']['cookiepath']}',attackevasive = '{$_G['config']['security']['attackevasive']}', disallowfloat = '{$_G['setting']['disallowfloat']}', REPORTURL = '{$_G['currenturl_encode']}', SITEURL = '{$_G['siteurl']}', JSPATH = '{$_G['setting']['jspath']}',MOD_PATH='{MOD_PATH}',APP_URL='{MOD_URL}',MOD_URL='{MOD_URL}',sitename='{$_G['setting']['sitename']}',ismobile = '{$_G['ismobile']}',data_theme = '{$_G['cookie']['the_site_theme']}',data_sidebarbg = '{$_G['cookie']['the_sidebar_bg']}',data_headerbg = '{$_G['cookie']['the_header_bg']}',data_logobg = '{$_G['cookie']['the_logo_bg']}';
var DZZSCRIPT='{DZZSCRIPT}',LANG='{$_G['language']}', STATICURL = 'static/', IMGDIR = '{$_G['setting']['imgdir']}', VERHASH = '{VERHASH}', charset = '{CHARSET}', dzz_uid = '{$_G['uid']}', cookiepre = '{$_G['config']['cookie']['cookiepre']}', cookiedomain = '{$_G[config]['cookie']['cookiedomain']}', cookiepath = '{$_G['config']['cookie']['cookiepath']}',attackevasive = '{$_G['config']['security']['attackevasive']}', disallowfloat = '{$_G['setting']['disallowfloat']}', REPORTURL = '{$_G['currenturl_encode']}', SITEURL = '{$_G['siteurl']}', JSPATH = '{$_G['setting']['jspath']}',MOD_PATH='{MOD_PATH}',APP_URL='{MOD_URL}',MOD_URL='{MOD_URL}',sitename='{$_G['setting']['sitename']}',ismobile = '{$_G['ismobile']}',data_theme = '{$_G['cookie']['the_site_theme']}';
</script>
<!--{hook header_tpl}-->
<script type="text/javascript">

2
core/template/lyear/common/lyear_about.htm
View File

@ -45,7 +45,7 @@
<div class="copyright text-muted text-center">
Copyright ©2012-{eval echo dgmdate(TIMESTAMP,'Y');} <a href="http://www.dzzoffice.com" target="_blank" class="dcolor">DzzOffice</a> All Rights Reserved
<!--{if $_G['setting']['sitebeian']}-->
<br>$_G[setting][sitebeian]
<br>$_G['setting']['sitebeian']
<!--{/if}-->
</div>
<!--{template common/footer_ajax}-->

10
core/template/lyear/common/lyear_header_right.htm
View File

@ -1,10 +0,0 @@
<!--{if $_GET['op']=='view'}-->
<!--{if $perm>1 || $news['authorid']==$_G[uid]}-->
<li>
<a href="{MOD_URL}&op=edit&newid=$news[newid]" title="{lang edit}" class="nav-link"><i class="mdi mdi-pencil fs-4"></i></a>
</li>
<li class="border-end">
<a href="javascript:;" title="{lang delete}" newid="$news[newid]" onclick="news_dl(this)" class="nav-link"><i class="mdi mdi-delete fs-4"></i></a>
</li>
<!--{/if}-->
<!--{/if}-->

2
core/template/lyear/common/safechk.htm
View File

@ -1,7 +1,7 @@
<div class="row mb-3" id="verify-type">
<label class="col-sm-2" for="chktype" required>验证方式</label>
<div class="col-sm-10">
<select name="chktype" id="chktype" class="form-select" >
<select name="chktype" id="chktype" class="form-select">
<!--{if $chkarr['emailstatus'] && $chkarr['email']}-->
<option value="email">$hideemail 验证</option>
<!--{/if}-->

25
core/template/lyear/common/seccheck.htm
View File

@ -12,19 +12,20 @@
<input name="sechash" type="hidden" value="$sechash" />
<!--{if $sectpl}-->
<!--{if $seccodecheck}-->
<div class="seccode-wrapper seccode_type_{$_G[setting][seccodedata][type]}">
<div class="input-group mb-3">
<span class="input-group-text" id="checkseccodeverify_$sechash"></span>
<input name="seccodeverify" class="form-control" id="seccodeverify_$sechash" type="text" autocomplete="off" style="{if $_G[setting][seccodedata][type] != 1}ime-mode:disabled;{/if}" onblur="checksec('code', '$sechash')" placeholder="{lang seccode}" />
<span class="input-group-text" id="basic-addon2">{$sectplcode[2]}
<span id="seccode_$sechash"></span>
<a tabindex="-1" href="javascript:;" onclick="updateseccode('$sechash');doane(event);" class="seccode-refresh-guide"><span class="dzz dzz-refresh"></span></a>
<!--{if $secshow}--><script type="text/javascript" reload="1">updateseccode('$sechash');</script><!--{/if}-->
$sectplcode[3]</span>
<span class="help-msg"></span>
<div class="has-feedback row seccode-wrapper seccode_type_{$_G['setting']['seccodedata']['type']}">
<div class="col-7">
<span class="form-control-feedback" aria-hidden="true" id="checkseccodeverify_$sechash"></span>
<input type="text" name="seccodeverify" class="form-control" id="seccodeverify_$sechash" autocomplete="off" style="{if $_G['setting']['seccodedata']['type'] != 1}ime-mode:disabled;{/if}" onblur="checksec('code', '$sechash')" placeholder="{lang seccode}">
</div>
</div>
<div class="col-5 text-right" id="basic-addon2" style="display: flex;align-items: center;flex-wrap: wrap;">
{$sectplcode[2]}
<span id="seccode_$sechash"></span>
<a tabindex="-1" href="javascript:;" onclick="updateseccode('$sechash');doane(event);" class="seccode-refresh-guide"><span class="dzz dzz-refresh"></span></a>
<!--{if $secshow}--><script type="text/javascript" reload="1">updateseccode('$sechash');</script><!--{/if}-->
$sectplcode[3]</span>
<span class="help-msg"></span>
</div>
</div>
<!--{/if}-->
<!--{/if}-->
<!--{/block}-->

6
core/template/lyear/common/showmessage.htm
View File

@ -30,13 +30,13 @@
<!--{else}-->
<button class="btn btn-primary" onclick="location.href='$url_forward';return false;">{lang return_to_the_naxt_level}<!--{if $param['timeout']}-->（<span class="num">3</span>s）<!--{/if}--></button>
<!--{/if}-->
<button class="btn btn-primary" onclick="location.href='$_G['siteurl']';return false;">首页</button>
<button class="btn btn-primary" onclick="location.href='/';return false;">首页</button>
<!--{elseif $allowreturn}-->
<script type="text/javascript">
if(history.length > (BROWSER.ie ? 0 : 1)) {
document.write('<a class="btn btn-primary" href="javascript:history.back()">返回</a> <a class="btn btn-info" href="$_G['siteurl']">首页</a>');
document.write('<a class="btn btn-primary" href="javascript:history.back()">返回</a> <a class="btn btn-info" href="/">首页</a>');
} else {
document.write('<a class="btn btn-primary" href="$_G['siteurl']">首页</a>');
document.write('<a class="btn btn-primary" href="/">首页</a>');
}
</script>
<!--{/if}-->

4
dzz/comment/template/lyear/lyear_reply_item.htm
View File

@ -1,14 +1,14 @@
<li class="itemfeed cmt_fed" id="comment_$value1[cid]">
<a name="comment_anchor_$value1[cid]"></a>
<div class="d-flex lyear-message-item">
<a href="user.php?uid=$value1[authorid]" class="img-avatar-48" title="$value1[author]" hidefocus="true" target="_blank">{eval echo avatar_block($value1[authorid],'','img-avatar img-avatar-48');}</a>
<a href="user.php?uid=$value1[authorid]" class="img-avatar-48" title="$value1[author]" hidefocus="true" target="_blank">{eval echo avatar_block($value1['authorid'],'','img-avatar img-avatar-48');}</a>
<div class="flex-grow-1 ms-2">
<a href="user.php?uid=$value1[authorid]" title="$value1[author]" class="avatar_mcfed" hidefocus="true" target="_blank"><strong>$value1[author]</strong></a>
<!--{if $value1['rpost']}-->
<span class="text-muted m-1">{lang reply}</span>
<a href="user.php?uid=$value1[rpost][authorid]" title="$value1[rpost][author]" class="avatar_mcfed" hidefocus="true" target="_blank"><strong>$value1[rpost][author]</strong></a>
<!--{/if}-->
<div class="text-muted">$value1[dateline] $value1[xtllq] <!--{if $_G[adminid]==1}-->$value1[ip]<!--{/if}-->
<div class="text-muted">$value1['dateline'] $value1[xtllq] <!--{if $_G[adminid]==1}-->$value1[ip]<!--{/if}-->
<span class="float-end">
<!--{if $_G['uid']==$value1[authorid] || $_G[adminid]==1}-->
<a href="javascript:void(0);" class="dcolor" onclick="feed_delete('$value1[cid]','comment_$value1[cid]','$value1[pcid]')"><i class="mdi mdi-delete"></i>&nbsp;{lang delete}</a>

8
dzz/comment/template/lyear/lyear_thread_item.htm
View File

@ -1,12 +1,12 @@
<li class="itemfeed" id="comment_$value[cid]">
<a name="comment_$value[cid]"></a>
<div class="d-flex lyear-message-item">
<a href="user.php?uid=$value[authorid]" class="img-avatar-48" title="$value[author]" hidefocus="true" target="_blank">{eval echo avatar_block($value[authorid],'','img-avatar img-avatar-48');}</a>
<a href="user.php?uid=$value['authorid']" class="img-avatar-48" title="$value[author]" hidefocus="true" target="_blank">{eval echo avatar_block($value['authorid'],'','img-avatar img-avatar-48');}</a>
<div class="flex-grow-1 ms-2">
<a href="user.php?uid=$value[authorid]" title="$value[author]" hidefocus="true" target="_blank"><strong>$value[author]</strong></a>
<div class="text-muted">$value[dateline] $value[xtllq] <!--{if $_G[adminid]==1}-->$value[ip]<!--{/if}-->
<a href="user.php?uid=$value['authorid']" title="$value[author]" hidefocus="true" target="_blank"><strong>$value[author]</strong></a>
<div class="text-muted">$value['dateline'] $value[xtllq] <!--{if $_G[adminid]==1}-->$value[ip]<!--{/if}-->
<span class="float-end">
<!--{if $_G['uid']==$value[authorid] || $_G[adminid]==1}-->
<!--{if $_G['uid']==$value['authorid'] || $_G[adminid]==1}-->
<a href="javascript:void(0);" class="dcolor" onclick="feed_delete('$value[cid]','comment_$value[cid]')"><i class="mdi mdi-delete"></i>&nbsp;{lang delete}</a>
<!--{/if}-->
<!--{if $_G['uid']>0}-->

4
dzz/comment/template/reply_item.htm
View File

@ -2,7 +2,7 @@
<a name="comment_anchor_$value1[cid]"></a>
<div class="item_cfed">
<div class="left_icfed">
<a href="user.php?uid=$value1[authorid]" title="" hidefocus="true"> {eval echo avatar_block($value[authorid]);} </a>
<a href="user.php?uid=$value1[authorid]" title="" hidefocus="true"> {eval echo avatar_block($value['authorid']);} </a>
</div>
<div class="right_icfed">
<div class="master_cfed">
@ -97,7 +97,7 @@
<!--{/if}-->
</ul>
</div>
<span class="time_acfed">$value1[xtllq] <!--{if $_G[adminid]==1}-->$value1[ip]<!--{/if}--> $value1[dateline]</span> </div>
<span class="time_acfed">$value1[xtllq] <!--{if $_G[adminid]==1}-->$value1[ip]<!--{/if}--> $value1['dateline']</span> </div>
</div>
</div>
</div>

8
dzz/comment/template/thread_item.htm
View File

@ -1,12 +1,12 @@
<div class="itemfeed " id="comment_$value[cid]">
<a name="comment_$value[cid]"></a>
<div class="left_ifed">
<a href="user.php?uid=$value[authorid]" title="$value[author]" hidefocus="true">{eval echo avatar_block($value[authorid]);}</a>
<a href="user.php?uid=$value['authorid']" title="$value[author]" hidefocus="true">{eval echo avatar_block($value['authorid']);}</a>
</div>
<div class="right_ifed">
<div class="main_fed">
<div class="source_fed">
<a href="user.php?uid=$value[authorid]" title="$value[author]" hidefocus="true" class="appuser_sfed skip_mmfed">$value[author]</a><span class="cont_sfed">{lang talk}：</span> </div>
<a href="user.php?uid=$value['authorid']" title="$value[author]" hidefocus="true" class="appuser_sfed skip_mmfed">$value[author]</a><span class="cont_sfed">{lang talk}：</span> </div>
<div class="master_mfed"> <span class="lquote_mmfed"></span><span class="content_mmfed">$value[message]</span><span class="rquote_mmfed"></span> </div>
<div class="attachment_fed">
<!--{loop $value[attachs] $attach}-->
@ -74,7 +74,7 @@
<div class="action_mfed clearfix">
<div class="btn_amfed">
<ul>
<!--{if $_G['uid']==$value[authorid] || $_G[adminid]==1}-->
<!--{if $_G['uid']==$value['authorid'] || $_G[adminid]==1}-->
<li class="more_bamfed">
<a hidefocus="true" class="dcolor" href="javascript:void(0);" onclick="feed_delete('$value[cid]','comment_$value[cid]')">{lang delete}</a>
</li>
@ -87,7 +87,7 @@
<!--{/if}-->
</ul>
</div>
$value[xtllq] <!--{if $_G[adminid]==1}-->$value[ip]<!--{/if}--> $value[dateline]</div>
$value[xtllq] <!--{if $_G[adminid]==1}-->$value[ip]<!--{/if}--> $value['dateline']</div>
</div>
<div id="comment_reply_{$value[cid]}" class="comment_ifed">
<!--{if $value[replies]>0}-->

12
dzz/dzzvote/template/lyear/lyear_vote_ajax.htm
View File

@ -301,7 +301,7 @@
<div class="col">
<div class="progress">
<!--{if $value[number]}-->
{eval $progressvalue = floor(($value[number]/$votetotal)*100);}
{eval $progressvalue = floor(($value['number']/$votetotal)*100);}
<!--{else}-->
{eval $progressvalue = '0';}
<!--{/if}-->
@ -319,7 +319,7 @@
<a href="$value[url]" target="_blank" target="_blank"><img src="$value[img]" alt="$value['content']"></a>
<div class="progress mt-2 mb-2">
<!--{if $value[number]}-->
{eval $progressvalue = floor(($value[number]/$votetotal)*100);}
{eval $progressvalue = floor(($value['number']/$votetotal)*100);}
<!--{else}-->
{eval $progressvalue = '0';}
<!--{/if}-->
@ -360,7 +360,7 @@
<div class="col">
<div class="progress">
<!--{if $value[number]}-->
{eval $progressvalue = floor(($value[number]/$votetotal)*100);}
{eval $progressvalue = floor(($value['number']/$votetotal)*100);}
<!--{else}-->
{eval $progressvalue = '0';}
<!--{/if}-->
@ -389,7 +389,7 @@
<a href="$value[url]" target="_blank" target="_blank"><img src="$value[img]" alt="$value['content']"></a>
<div class="progress mt-2 mb-2">
<!--{if $value[number]}-->
{eval $progressvalue = floor(($value[number]/$votetotal)*100);}
{eval $progressvalue = floor(($value['number']/$votetotal)*100);}
<!--{else}-->
{eval $progressvalue = '0';}
<!--{/if}-->
@ -493,7 +493,7 @@
<div class="col">
<div class="progress">
<!--{if $value[number]}-->
{eval $progressvalue = floor(($value[number]/$votetotal)*100);}
{eval $progressvalue = floor(($value['number']/$votetotal)*100);}
<!--{else}-->
{eval $progressvalue = '0';}
<!--{/if}-->
@ -511,7 +511,7 @@
<a href="$value[url]" target="_blank" target="_blank"><img src="$value[img]" alt="$value['content']"></a>
<div class="progress mt-2 mb-2">
<!--{if $value[number]}-->
{eval $progressvalue = floor(($value[number]/$votetotal)*100);}
{eval $progressvalue = floor(($value['number']/$votetotal)*100);}
<!--{else}-->
{eval $progressvalue = '0';}
<!--{/if}-->

12
dzz/dzzvote/template/vote_ajax.htm
View File

@ -318,7 +318,7 @@
<div class="col-sm-8 checkbox"> $value[content] </div>
<div class="col-sm-4">
<div class="progress">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value['number']/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value['number']/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value['number']/$votetotal)*100);}% </div>
</div>
</div>
</div>
@ -333,7 +333,7 @@
</div>
<div class="caption text-center" style="">
<div class="progress">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value['number']/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value['number']/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value['number']/$votetotal)*100);}% </div>
</div>
<div class="content">$value['content']</div>
</div>
@ -374,7 +374,7 @@
</div>
<div class="col-sm-4">
<div class="progress">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value['number']/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value['number']/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value['number']/$votetotal)*100);}% </div>
</div>
</div>
<!--{/if}-->
@ -406,7 +406,7 @@
</div>
<div class="caption text-center" style="">
<div class="progress">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value['number']/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value['number']/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value['number']/$votetotal)*100);}% </div>
</div>
<div class="content">$value['content']</div>
</div>
@ -508,7 +508,7 @@
<div class="col-sm-8 checkbox"> $value[content] </div>
<div class="col-sm-4">
<div class="progress">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value['number']/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value['number']/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value['number']/$votetotal)*100);}% </div>
</div>
</div>
</div>
@ -523,7 +523,7 @@
</div>
<div class="caption text-center" style="">
<div class="progress">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value['number']/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value['number']/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value['number']/$votetotal)*100);}% </div>
</div>
<div class="content">$value['content']</div>
</div>

2
dzz/orguser/ajax.php
View File

@ -372,7 +372,7 @@ if ($do == 'upload') {//上传图片文件
if (C::t('organization') -> setFolderAvailableByOrgid($orgid, intval($_GET['available']))) {
exit(json_encode(array('msg' => 'success')));
} else {
exit(json_encode(array('error' => lang('unable_set'))));
exit(json_encode(array('error' => lang('unable_set').'，如果上级没有开启目录共享，下级无法开启')));
}
} elseif ($do == 'folder_indesk') {
$orgid = intval($_GET['orgid']);

2
dzz/share/index.php
View File

@ -92,7 +92,7 @@ if ($do == 'getinfo') {
exit($jsonReturn);
} elseif (isset($_G['setting']['template']) && $_G['setting']['template'] == 'lyear') {
} else {
$keyword = trim($_GET['keyword']);
$keyword = isset($_GET['keyword']) ? trim($_GET['keyword']) : '';
$username = trim($_GET['username']);
$asc = isset($_GET['asc']) ? intval($_GET['asc']) : 1;
$uid = intval($_GET['uid']);

3
share.php
View File

@ -13,7 +13,8 @@ define('CURSCRIPT', 'dzz');
require './core/coreBase.php';
$dzz = C::app();
$dzz->init();
if(!$path=dzzdecode(trim($_GET['s']))){
$s = isset($_GET['s']) ? trim($_GET['s']) : '';
if(!$path=dzzdecode($s)){
exit('Access Denied');
}
if (isset($_GET['sid'])) {

2
static/lyear/css/animate.min.css vendored
View File

File diff suppressed because one or more lines are too long

18
static/lyear/css/bootstrap.min.css vendored
View File

@ -1095,10 +1095,10 @@ textarea.form-control-lg{min-height:calc(1.5em + 1rem + 2px)}
.modal-sm{max-width:300px}
}@media (min-width:992px){.modal-lg,.modal-xl{max-width:800px}
.modal-dialog{width:700px;margin:25px auto}
.notify{width:400px}
}@media (min-width:1200px){.modal-xl{max-width:1140px}
.modal-dialog{width:800px;max-width: 800px;}
.notify{width:500px}
}@media (min-width:1200px){.modal-xl{max-width:1140px}
.modal-dialog{width: 900px;max-width: 900px;}
}.modal-fullscreen{width:100vw;max-width:none;height:100%;margin:0}
.modal-fullscreen-btn{border:none;background-color:transparent;color:#000;opacity:0.6;font-size:22px;line-height:1.3;font-weight:700;margin:-0.5rem -0.5rem -0.5rem auto}
.modal-fullscreen-btn .mdi:before{width:1.5rem;height:1.5rem;vertical-align:middle;content:"\f0293";line-height:1}
@ -1266,7 +1266,7 @@ textarea.form-control-lg{min-height:calc(1.5em + 1rem + 2px)}
}@media (min-width:768px){.sticky-md-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}
}@media (min-width:992px){.sticky-lg-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}
}@media (min-width:1200px){.sticky-xl-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}
}@media (min-width:1400px){.sticky-xxl-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}.modal-dialog{max-width: 900px;width: 900px;}
}@media (min-width:1400px){.sticky-xxl-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}
}.hstack{display:flex;flex-direction:row;align-items:center;align-self:stretch}
.vstack{display:flex;flex:1 1 auto;flex-direction:column;align-self:stretch}
.visually-hidden,.visually-hidden-focusable:not(:focus):not(:focus-within){position:absolute !important;width:1px !important;height:1px !important;padding:0 !important;margin:-1px !important;overflow:hidden !important;clip:rect(0,0,0,0) !important;white-space:nowrap !important;border:0 !important}
@ -1540,7 +1540,7 @@ textarea.form-control-lg{min-height:calc(1.5em + 1rem + 2px)}
.text-success{--bs-text-opacity:1;color:rgba(var(--bs-success-rgb),var(--bs-text-opacity)) !important}
.text-info{--bs-text-opacity:1;color:rgba(var(--bs-info-rgb),var(--bs-text-opacity)) !important}
.text-warning{--bs-text-opacity:1;color:rgba(var(--bs-warning-rgb),var(--bs-text-opacity)) !important}
.text-danger{--bs-text-opacity:1;color:rgba(var(--bs-danger-rgb),var(--bs-text-opacity)) !important}
.has-error,.help-msg,.text-danger{--bs-text-opacity:1;color:rgba(var(--bs-danger-rgb),var(--bs-text-opacity)) !important}
.text-light{--bs-text-opacity:1;color:rgba(var(--bs-light-rgb),var(--bs-text-opacity)) !important}
.text-dark{--bs-text-opacity:1;color:rgba(var(--bs-dark-rgb),var(--bs-text-opacity)) !important}
.text-black{--bs-text-opacity:1;color:rgba(var(--bs-black-rgb),var(--bs-text-opacity)) !important}
@ -1554,7 +1554,7 @@ textarea.form-control-lg{min-height:calc(1.5em + 1rem + 2px)}
.text-opacity-50{--bs-text-opacity:0.5}
.text-opacity-75{--bs-text-opacity:0.75}
.text-opacity-100{--bs-text-opacity:1}
.bg{background-color:rgba(var(--bs-black-rgb),.175);border-radius:var(--radius)}
.bg{background-color:#eee;border-radius:var(--radius)}
.hbg:hover{background-color:rgba(var(--bs-black-rgb),.175);border-radius:var(--radius)}
.bg-primary{--bs-bg-opacity:1;background-color:rgba(var(--bs-primary-rgb),var(--bs-bg-opacity)) !important}
.bg-secondary{--bs-bg-opacity:1;background-color:rgba(var(--bs-secondary-rgb),var(--bs-bg-opacity)) !important}
@ -2531,4 +2531,10 @@ textarea.form-control-lg{min-height:calc(1.5em + 1rem + 2px)}
.img-avatar-more span{position:absolute;top:0;left:0;right:0;bottom:0;color:rgba(255,255,255,0.8);border-radius:100%;background-color:rgba(0,0,0,0.5);-webkit-transition:0.3s ease;transition:0.3s ease}
.img-avatar-more:hover span{color:#fff;background-color:rgba(0,0,0,0.65)}
[data-provide~="img-avatar-more"] ~ .img-avatar{display:none!important}
#ajaxwaitid{border-color:var(--bs-border-color);box-shadow:0 0.125rem 0.75rem rgba(var(--bs-dark-rgb),.0375);border-radius:0.125rem;font-size:.875rem;pointer-events:auto;background-color:rgba(255,255,255,.85);background-clip:padding-box;border:1px solid rgba(0,0,0,.1);box-shadow:0 0.5rem 1rem rgba(0,0,0,.15);border-radius:0.25rem;position:absolute;right:0}
#ajaxwaitid{border-color:var(--bs-border-color);box-shadow:0 0.125rem 0.75rem rgba(var(--bs-dark-rgb),.0375);border-radius:0.125rem;font-size:.875rem;pointer-events:auto;background-color:rgba(255,255,255,.85);background-clip:padding-box;border:1px solid rgba(0,0,0,.1);box-shadow:0 0.5rem 1rem rgba(0,0,0,.15);border-radius:0.25rem;position:absolute;right:0}
.signin-form .has-feedback{position:relative}
.signin-form .has-feedback .form-control{padding-left:36px}
.signin-form .has-feedback .mdi{position:absolute;top:0;left:0;right:auto;width:36px;height:36px;line-height:36px;z-index:4;color:#dcdcdc;display:block;text-align:center;pointer-events:none}
.has-feedback.row .mdi{left:15px}
.flex-container{display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;}
.notify{border-color:var(--bs-border-color);box-shadow:0 0 10px 4px rgba(0,0,0,.1);border-radius:8px;max-width:400px;font-size:.875rem;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:0 solid #d3d4d3}

1647
static/lyear/css/style.min.css vendored
View File

File diff suppressed because it is too large Load Diff

9
static/lyear/js/bootstrap-notify.min.js vendored
View File

File diff suppressed because one or more lines are too long

2372
static/lyear/js/common.js
View File

File diff suppressed because one or more lines are too long

184
static/lyear/js/jquery.leftDrager.js
View File

@ -1,184 +0,0 @@
/*
* @copyright Leyun internet Technology(Shanghai)Co.,Ltd
* @license http://www.dzzoffice.com/licenses/license.txt
* @package DzzOffice
* @link http://www.dzzoffice.com
* @author zyx(zyx@dzz.cc)
*/
(function($)
{
//左右分栏时，调用此，可以实现点击隐藏左侧分栏，拖动改变左侧分栏的宽度
$.fn.leftDrager_layout = function(resizefunc,options)
{
var opt={
'cookieid':null, //记忆左侧大小和关闭状态的cookie标志符
'cookietime':60*60*24*30,
'leftHide':1024
}
options=$.extend(opt,options);
var $this=$(this);
var $leftContainer=$('.bs-left-container');
var $mainContainer=$('.bs-main-container');
var $middleconMenu=$('.middleconMenu');
var $topContainer=$('.bs-top-container');
var oleft=((options.cookieid && getcookie(options.cookieid+'_width'))?parseInt(getcookie(options.cookieid+'_width')):$leftContainer.outerWidth(true))|| 0;
var left=oleft;
var clientWidth = document.documentElement.clientWidth;
var setPosition=function(xx,flag){
xx=xx*1;
if(flag===true){
if(xx<10){
left=oleft;
dragerClick('hide');
return;
}else{
dragerClick('show');
}
}
/*判断最小宽度*/
var mainWidth=$mainContainer.outerWidth(true);
var minWidth=parseInt($mainContainer.css('minWidth')) ||0;
if(mainWidth-xx<minWidth){
xx=mainWidth-minWidth;
}
left=xx;
if(flag===true){
oleft=left;
}
$leftContainer.css('width',left);
$mainContainer.css('paddingLeft',left);
$middleconMenu.css('left',left+5);
$topContainer.css('paddingLeft',left);
var currentRightWidth = mainWidth - xx;
$mainContainer.trigger('leftDrager_layout.changeWidthValue',[currentRightWidth]);
$this.css('left',left);
if(options.cookieid){
setcookie(options.cookieid+'_width',left,options.cookietime);
}
};
var dragerClick=function(flag,nocookie){
if(flag==='hide'){
$mainContainer.css('paddingLeft',0);
$middleconMenu.css('left',left+5);
$topContainer.css('paddingLeft',0);
$this.css({'left':0,'cursor':'default'});
if(options.cookieid && !nocookie) setcookie(options.cookieid+'_isshow','hide',options.cookietime);
}else if(flag==='show'){
$leftContainer.css({width:left,'display':'block'});
$mainContainer.css('paddingLeft',document.documentElement.clientWidth<opt.leftHide?0:left);
$middleconMenu.css('left',left+5);
$topContainer.css('paddingLeft',document.documentElement.clientWidth<opt.leftHide?0:left);
$this.css({'left':left,'cursor':'w-resize'});
if(options.cookieid && !nocookie) setcookie(options.cookieid+'_isshow','show',options.cookietime);
}else{
if($leftContainer.width()<64 || $leftContainer.is(':hidden')){
dragerClick('show');
}else{
dragerClick('hide');
}
}
};
var dragging=function(){
$this.off('mousedown').on('mousedown',function(e){
e.preventDefault();
var x=e.clientX;
var ox=x-$this.offset().left;
var width=$this.width();
$(document).mousemove(function(e){
e.preventDefault();
var xx=e.clientX;
if((xx-ox+width)>clientWidth){
xx=clientWidth+ox-width;
}
if(xx-ox<=0){
xx=ox;
}
setPosition(xx-ox);
});
$(document).mouseup(function(e) {
$(document).off('mouseup').off('mousemove');
var xx=e.clientX;
if((xx-ox+width)>clientWidth){
xx=clientWidth+ox-width;
}
if(xx-ox<=0){
xx=ox;
}
setPosition(xx-ox,true);
});
});
};
var Layout=function(){
var headerHeight=jQuery('.bs-top-container').outerHeight(true);
var clientHeight = Math.max(document.documentElement.clientHeight, document.body.clientHeight);
jQuery('.bs-main-container').css('margin-top',headerHeight?headerHeight:0);
jQuery('.bs-main-container,.left-drager').css('height',clientHeight-headerHeight-1);
jQuery('.left-drager').css('top',headerHeight?headerHeight:0);
if(typeof(resizefunc)==='function'){
resizefunc();
}
leftHide();
};
var leftHide=function(){
if(document.documentElement.clientWidth<opt.leftHide){
dragerClick('hide',true);
}else{
if(options.cookieid && getcookie(options.cookieid+'_isshow')){
var isshow=getcookie(options.cookieid+'_isshow');
if(isshow==='hide'){
dragerClick('hide',true);
}else{
dragerClick('show',true);
}
}else{
dragerClick('show',true);
}
}
};
var init=function(){
Layout();
$this.find('.left-drager-op').off('click').on('click',function(){
dragerClick();
});
jQuery('.lyear-aside-toggler').off('click').on('click',function(){
if($leftContainer.width()<64 || $leftContainer.is(':hidden')){
dragerClick('show');
}else{
dragerClick('hide');
}
});
var isshow='';
if(options.cookieid && getcookie(options.cookieid+'_isshow')){
isshow=getcookie(options.cookieid+'_isshow');
if(isshow==='hide'){
dragerClick('hide',true);
}else{
dragerClick('show');
}
}else{
if($leftContainer.width()<64 || $leftContainer.is(':hidden')){
dragerClick('hide');
}else{
dragerClick('show');
}
}
dragging();
var resizeTimer=null;
window.onresize=function(){
if(resizeTimer){
window.clearTimeout(resizeTimer);
}
window.setTimeout(function(){Layout();},100);
};
leftHide();
};
init();
};
})(jQuery);

2
static/lyear/js/layer/layer.js
View File

@ -291,7 +291,7 @@ function(e, t) {
o = "object" == typeof t.offset;
e.offsetTop = (n.height() - a[1]) / 2,
e.offsetLeft = (n.width() - a[0]) / 2,
o ? (e.offsetTop = t.offset[0], e.offsetLeft = t.offset[1] || e.offsetLeft) : "auto" !== t.offset && ("t" === t.offset ? e.offsetTop = 0 : "r" === t.offset ? e.offsetLeft = n.width() - a[0] : "b" === t.offset ? e.offsetTop = n.height() - a[1] : "l" === t.offset ? e.offsetLeft = 0 : "lt" === t.offset ? (e.offsetTop = 0, e.offsetLeft = 0) : "lb" === t.offset ? (e.offsetTop = n.height() - a[1], e.offsetLeft = 0) : "rt" === t.offset ? (e.offsetTop = 0, e.offsetLeft = n.width() - a[0]) : "rb" === t.offset ? (e.offsetTop = n.height() - a[1], e.offsetLeft = n.width() - a[0]) : e.offsetTop = t.offset),
o ? (e.offsetTop = t.offset[0], e.offsetLeft = t.offset[1] || e.offsetLeft) : "auto" !== t.offset && ("t" === t.offset ? e.offsetTop = 0 : "r" === t.offset ? e.offsetLeft = n.width() - a[0] : "b" === t.offset ? e.offsetTop = n.height() - a[1] : "l" === t.offset ? e.offsetLeft = 0 : "lt" === t.offset ? (e.offsetTop = 0, e.offsetLeft = 0) : "lb" === t.offset ? (e.offsetTop = n.height() - a[1], e.offsetLeft = 0) : "rt" === t.offset ? (e.offsetTop = 15, e.offsetLeft = n.width() - a[0]-15) : "rb" === t.offset ? (e.offsetTop = n.height() - a[1], e.offsetLeft = n.width() - a[0]) : e.offsetTop = t.offset),
t.fixed || (e.offsetTop = /%$/.test(e.offsetTop) ? n.height() * parseFloat(e.offsetTop) / 100 : parseFloat(e.offsetTop), e.offsetLeft = /%$/.test(e.offsetLeft) ? n.width() * parseFloat(e.offsetLeft) / 100 : parseFloat(e.offsetLeft), e.offsetTop += n.scrollTop(), e.offsetLeft += n.scrollLeft()),
i.attr("minLeft") && (e.offsetTop = n.height() - (i.find(l[1]).outerHeight() || 0), e.offsetLeft = i.css("left")),
i.css({

8
static/lyear/js/layer/theme/lightyear/style.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
static/lyear/js/layui/css/layui.css
View File

File diff suppressed because one or more lines are too long

187
static/lyear/js/lyear-loading.js
View File

@ -1,186 +1 @@
;(function(){
$.fn.lyearloading = function(options) {
// DOM容器对象
var $this = $(this);
var defaults = {
opacity : 0.1, // 遮罩层的透明度，==0时没有遮罩层
backgroundColor : '#000000', // 遮罩层的颜色
imgUrl : '', // 加载动画使用图片
textColorClass : '', // 定义文字的颜色，当不使用图片时
spinnerColorClass : '', // 定义加载动画的颜色，当不使用图片时
spinnerSize : 'normal', // 定义加载动画的大小，当不使用图片时
spinnerText : '', // 显示的文字
zindex : 999, // 遮罩层的z-index值
};
// 融合配置项
var opts = $.extend({}, defaults, options);
// 默认样式
var maskStyle = {
'position' : 'absolute',
'width' : '100%',
'height' : '100%',
'top' : 0,
'left' : 0,
'background-color' : opts.backgroundColor,
'opacity' : opts.opacity,
'z-index' : opts.zindex,
}, textStyle = {
'position' : 'absolute',
'line-height' : '120%',
'text-align' : 'center',
'vertical-align' : 'middle',
'z-index' : opts.zindex + 1,
}, spinnerStyle = {
'position' : 'absolute',
'z-index' : opts.zindex + 1,
};
var defaultClass = 'lyear-loading';
// 初始化方法
this.init = function(){
if ($this.children('.' + defaultClass).length > 0) {
$this.children('.' + defaultClass).fadeIn(250)
} else {
var $maskHtml = $('<div />').addClass(defaultClass),
$textHtml = $('<span />').html($.trim(opts.spinnerText)).addClass(defaultClass).addClass(opts.textColorClass),
$spinnerHtml = opts.imgUrl ? $('<img />').attr('src', opts.imgUrl).addClass(defaultClass) : $('<div />').addClass('spinner-border').addClass(defaultClass).addClass(opts.spinnerColorClass).css(this.getSpinnerSize());
var toolMethods = {
resizeStyle: function() {
var $parent = $this.find('.' + defaultClass).parent(),
parentPosition = ('fixed,relative').indexOf($parent.css('position')),
isFixed = parentPosition > -1 || $parent[0] === $('.' + defaultClass)[0].offsetParent,
offsetP = isFixed ? { top: 0, left: 0 } : { top: $parent[0].offsetTop, left: $parent[0].offsetLeft },
parentW = $this.outerWidth(),
parentH = $this.outerHeight();
//if ($this.selector == 'body') { // jquery 2.*版本
if ($this[0].localName == 'body') {
maskStyle.position = 'fixed';
spinnerStyle.position = 'fixed';
textStyle.position = 'fixed';
spinnerStyle.top = $(window).height() / 2 - $spinnerHtml.outerHeight() / 2 + (opts.spinnerText ? (- 4 - $textHtml.height() / 2) : 0);
spinnerStyle.left = $(window).width() / 2 - $spinnerHtml.outerWidth() / 2;
textStyle.top = $(window).height() / 2 + $spinnerHtml.outerHeight() / 2 - 4;
textStyle.left = $(window).width() / 2 - $textHtml.outerWidth() / 2;
} else {
maskStyle.width = parentW;
maskStyle.height = parentH;
maskStyle.top = offsetP.top;
maskStyle.left = offsetP.left;
spinnerStyle.top = parentH / 2 - $spinnerHtml.outerHeight() / 2 + (opts.spinnerText ? (- 4 - $textHtml.height() / 2) : 0) + offsetP.top;
spinnerStyle.left = parentW / 2 - $spinnerHtml.outerWidth() / 2 + offsetP.left;
textStyle.top = parentH / 2 + $spinnerHtml.outerHeight() / 2 - 4 + offsetP.top;
textStyle.left = parentW / 2 - $textHtml.width() / 2 + offsetP.left;
}
$maskHtml.css(maskStyle);
$spinnerHtml.css(spinnerStyle);
$textHtml.css(textStyle);
}
};
// 遮罩层继承父元素的边框效果
maskStyle['border-top-left-radius'] = $this.css('border-top-left-radius');
maskStyle['border-top-right-radius'] = $this.css('border-top-right-radius');
maskStyle['border-bottom-left-radius'] = $this.css('border-bottom-left-radius');
maskStyle['border-bottom-right-radius'] = $this.css('border-bottom-right-radius');
opts.opacity && $maskHtml.css(maskStyle).appendTo($this);
$.trim(opts.spinnerText) && $textHtml.css(textStyle).appendTo($this);
$spinnerHtml.css(spinnerStyle).appendTo($this);
this.loadImage(opts.imgUrl, function (imgObj) {
toolMethods.resizeStyle();
}, function(e){
throw new Error(e);
});
$(window).off('resize.' + defaultClass).on('resize.' + defaultClass, function () {
toolMethods.resizeStyle();
});
}
}
this.hide = function(){
$this.children('.' + defaultClass).fadeOut(250);
}
this.show = function(){
$this.children('.' + defaultClass).fadeIn(250);
}
this.destroy = function() {
$this.children('.' + defaultClass).fadeOut(250, function() {
$(window).off('resize.' + defaultClass);
$(this).remove();
});
}
this.loadImage = function (url, callback, error) {
if (!url) {
return callback();
}
var imgObj;
imgObj = new Image();
imgObj.src = url;
if (imgObj.complete && callback) {
return callback();
}
imgObj.onload = function () {
imgObj.onload = null;
callback && callback();
};
imgObj.onerror = function (e) {
imgObj.onerror = null;
error && error(e);
};
return imgObj;
}
// 对loading设置大小的处理返回
this.getSpinnerSize = function() {
var sizeCss;
switch (options.spinnerSize) {
case 'sm' :
sizeCss = {'width': '12px', 'height' : '12px'};
break;
case 'nm' :
sizeCss = {'width': '24px', 'height' : '24px'};
break;
case 'md' :
sizeCss = {'width': '36px', 'height' : '36px'};
break;
case 'lg' :
sizeCss = {'width': '48px', 'height' : '48px'};
break;
default :
sizeCss = {'width': options.spinnerSize, 'height': options.spinnerSize};
}
return sizeCss;
};
// 自动执行初始化函数
this.init();
// 返回函数对象
return this;
}
})(jQuery);
jQuery,$.fn.lyearloading=function(e){var i=$(this),t=$.extend({},{opacity:.1,backgroundColor:"#000000",imgUrl:"",textColorClass:"",spinnerColorClass:"",spinnerSize:"normal",spinnerText:"",zindex:999},e),o={position:"absolute",width:"100%",height:"100%",top:0,left:0,"background-color":t.backgroundColor,opacity:t.opacity,"z-index":t.zindex},n={position:"absolute","line-height":"120%","text-align":"center","vertical-align":"middle","z-index":t.zindex+1},r={position:"absolute","z-index":t.zindex+1},s="lyear-loading";return this.init=function(){if(i.children(".lyear-loading").length>0)i.children(".lyear-loading").fadeIn(250);else{var e=$("<div />").addClass(s),d=$("<span />").html($.trim(t.spinnerText)).addClass(s).addClass(t.textColorClass),a=t.imgUrl?$("<img />").attr("src",t.imgUrl).addClass(s):$("<div />").addClass("spinner-border").addClass(s).addClass(t.spinnerColorClass).css(this.getSpinnerSize()),l={resizeStyle:function(){var s=i.find(".lyear-loading").parent(),l="fixed,relative".indexOf(s.css("position"))>-1||s[0]===$(".lyear-loading")[0].offsetParent?{top:0,left:0}:{top:s[0].offsetTop,left:s[0].offsetLeft},h=i.outerWidth(),p=i.outerHeight();"body"==i[0].localName?(o.position="fixed",r.position="fixed",n.position="fixed",r.top=$(window).height()/2-a.outerHeight()/2+(t.spinnerText?-4-d.height()/2:0),r.left=$(window).width()/2-a.outerWidth()/2,n.top=$(window).height()/2+a.outerHeight()/2-4,n.left=$(window).width()/2-d.outerWidth()/2):(o.width=h,o.height=p,o.top=l.top,o.left=l.left,r.top=p/2-a.outerHeight()/2+(t.spinnerText?-4-d.height()/2:0)+l.top,r.left=h/2-a.outerWidth()/2+l.left,n.top=p/2+a.outerHeight()/2-4+l.top,n.left=h/2-d.width()/2+l.left),e.css(o),a.css(r),d.css(n)}};o["border-top-left-radius"]=i.css("border-top-left-radius"),o["border-top-right-radius"]=i.css("border-top-right-radius"),o["border-bottom-left-radius"]=i.css("border-bottom-left-radius"),o["border-bottom-right-radius"]=i.css("border-bottom-right-radius"),t.opacity&&e.css(o).appendTo(i),$.trim(t.spinnerText)&&d.css(n).appendTo(i),a.css(r).appendTo(i),this.loadImage(t.imgUrl,function(e){l.resizeStyle()},function(e){throw new Error(e)}),$(window).off("resize.lyear-loading").on("resize.lyear-loading",function(){l.resizeStyle()})}},this.hide=function(){i.children(".lyear-loading").fadeOut(250)},this.show=function(){i.children(".lyear-loading").fadeIn(250)},this.destroy=function(){i.children(".lyear-loading").fadeOut(250,function(){$(window).off("resize.lyear-loading"),$(this).remove()})},this.loadImage=function(e,i,t){return e?((o=new Image).src=e,o.complete&&i?i():(o.onload=function(){o.onload=null,i&&i()},o.onerror=function(e){o.onerror=null,t&&t(e)},o)):i();var o},this.getSpinnerSize=function(){var i;switch(e.spinnerSize){case"sm":i={width:"12px",height:"12px"};break;case"nm":i={width:"24px",height:"24px"};break;case"md":i={width:"36px",height:"36px"};break;case"lg":i={width:"48px",height:"48px"};break;default:i={width:e.spinnerSize,height:e.spinnerSize}}return i},this.init(),this};

58
static/lyear/js/main.min.js vendored
View File

@ -206,41 +206,33 @@ jQuery(document).ready( function() {
}
});
// 处理主题配色下拉选中
$(".dropdown-skin :radio").each(function(){
var $this = $(this),
radioName = $this.attr('name');
switch (radioName) {
case 'site_theme':
$this.val() == data_theme && $this.prop("checked", true);
break;
case 'logo_bg':
$this.val() == data_logobg && $this.prop("checked", true);
break;
case 'header_bg':
$this.val() == data_headerbg && $this.prop("checked", true);
break;
case 'sidebar_bg':
$this.val() == data_sidebarbg && $this.prop("checked", true);
}
});
// 设置主题配色
setTheme = function(input_name, data_name) {
$("input[name='" + input_name + "']").click(function(){
var check_theme = $(this).val();
$('body').attr(data_name, check_theme);
setcookie('the_'+input_name, check_theme);
});
}
setTheme('site_theme', 'data-theme');
setTheme('sidebar_bg', 'data-sidebarbg');
setTheme('logo_bg', 'data-logobg');
setTheme('header_bg', 'data-headerbg');
$(".theme-toggle-btn").click(function(){
var currentTheme = $('body').attr('data-theme') || 'default';
var newTheme;
var newIconClass;
var oldIconClass;
if (currentTheme === 'dark') {
newTheme = 'default'; // 切换到明亮主题
newIconClass = 'mdi-white-balance-sunny';
oldIconClass = 'mdi-power-sleep';
} else {
newTheme = 'dark'; // 切换到黑暗主题
newIconClass = 'mdi-power-sleep';
oldIconClass = 'mdi-white-balance-sunny';
}
$(this).removeClass(oldIconClass).addClass(newIconClass);
$('body').attr('data-theme', newTheme);
setcookie('the_site_theme', newTheme);
});
// $("input[name='site_theme']").click(function(){
// var check_theme = $(this).val();
// $('body').attr('data-theme', check_theme);
// setcookie('the_site_theme', check_theme);
// });
});
if (jQuery('.left-drager').length) {
jQuery('.left-drager').leftDrager_layout();
}
// 参考国外模板的写法，获取当前的配置，以data-*（*指插件原有的配置名）
getDataOptions = function(el, castList) {
var options = {};

76
static/lyear/js/scroll-numbers.js
View File

@ -2,78 +2,4 @@
* 数字滚动增加显示
* 主要通过class类内的scroll-numbers获取目标元素数字内容
*/
var easing = {
quadratic: function (x){
return Math.sqrt(x);
}
};
//显示总数
function range(start, stop, step){
var array = [];
for(var i = start; i < stop; i += step) array.push(i);
return array;
}
//跨度间隔并返回终值
function interpolation(fps, easing, finalValue){
function scaleIt(value){return finalValue * value; }
var x = range(0, 1, 1/fps),
y = x.map(easing).map(scaleIt);
return y;
}
//数字滚动
function animateEl(values, duration, onAnimate){
var frameIndex = 0,
fps = values.length,
id = setInterval(anime, duration/fps );
function anime(){
var current = values[frameIndex],
isLastFrame = (frameIndex === fps - 1);
onAnimate(current, frameIndex, values);
if(isLastFrame){
clearInterval(id);
}else{
frameIndex++;
}
}
}
function round(value, decimals) {
return Number(Math.round(value+'e'+decimals)+'e-'+decimals);
}
function unformat(content){
var unlocalized = content.replace('.', '').replace(',', '.'),
value = parseFloat(unlocalized);
return value;
}
//格式化输出
function format(value){
return value.toString().replace('.', ',');
}
//添加事件监听器
window.addEventListener("DOMContentLoaded", function(){
var fps = 240,//滚动帧率
els = [].slice.call(document.querySelectorAll('.scroll-numbers'));
els.forEach(function(el){
var content = (el.firstChild.textContent).trim(),
decimalPlaces = content.split(',')[1] || '',
value = unformat(content),
values = interpolation(fps, easing.quadratic, value);
//滚动持续时间：1秒
animateEl(values, 1000, function (current, i, values){
var isLast = (i === values.length - 1),
value = round(current, decimalPlaces.length);
el.firstChild.textContent = isLast? content : format(value);
});
});
});
var easing={quadratic:function(n){return Math.sqrt(n)}};function range(n,t,r){for(var e=[],a=n;a<t;a+=r)e.push(a);return e}function interpolation(n,t,r){return range(0,1,1/n).map(t).map(function(n){return r*n})}function animateEl(n,t,r){var e=0,a=n.length,o=setInterval(function(){var t=n[e],i=e===a-1;r(t,e,n),i?clearInterval(o):e++},t/a)}function round(n,t){return Number(Math.round(n+"e"+t)+"e-"+t)}function unformat(n){var t=n.replace(".","").replace(",",".");return parseFloat(t)}function format(n){return n.toString().replace(".",",")}window.addEventListener("DOMContentLoaded",function(){[].slice.call(document.querySelectorAll(".scroll-numbers")).forEach(function(n){var t=n.firstChild.textContent.trim(),r=t.split(",")[1]||"",e=unformat(t);animateEl(interpolation(240,easing.quadratic,e),1e3,function(e,a,o){var i=a===o.length-1,u=round(e,r.length);n.firstChild.textContent=i?t:format(u)})})});

2
user/ajax.php
View File

@ -12,7 +12,7 @@ if (!defined('IN_DZZ')) {
define('NOROBOT', TRUE);
if ($_GET['action'] == 'checkusername') {
$username = trim($_GET['username']);
$username = isset($_GET['username']) ? trim($_GET['username']) : '';
$usernamelen = dstrlen($username);
if ($usernamelen < 3) {
showTips(array('error'=>lang( 'profile_nickname_tooshort')));

4
user/function/function_user.php
View File

@ -167,10 +167,10 @@ function getinvite()
if ($cookiecount == 2 || $_GET['invitecode']) {
$id = intval($cookies[0]);
$code = trim($cookies[1]);
$code = isset($cookies[1]) ? trim($cookies[1]) : '';
if ($_GET['invitecode']) {
$invite = C::t('user_invite')->fetch_by_code($_GET['invitecode']);
$code = trim($_GET['invitecode']);
$code = isset($_GET['invitecode']) ? trim($_GET['invitecode']) : '';
} else {
$invite = C::t('user_invite')->fetch($id);
}

2
user/login/logging/lostpasswd.php
View File

@ -33,7 +33,7 @@ if(isset($_GET['lostpwsubmit'])) {
}
$idstring = random(6);
C::t('user')->update($member['uid'], array('authstr' => "{$_G['timestamp']}\t1\t$idstring"));
C::t('user')->update($member['uid'], array('authstr' => "{$_G[timestamp]}\t1\t$idstring"));
//require_once libfile('function/mail');
$get_passwd_subject = lang('email', 'get_passwd_subject');
$get_passwd_message = lang(