he/DzzOffice
1
0
Fork 0
mirror of https://github.com/DzzXH/DzzOffice.git synced 2026-04-23 21:41:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

同步代码

Browse Source
This commit is contained in:
小胡
2024-08-18 15:46:48 +08:00
Unverified
parent 74c58bd5c0
commit 96042c3c91
41 changed files with 44 additions and 1116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/class/dzz/dzz_admincp.php
View File

@@ -88,7 +88,6 @@ class dzz_admincp
$this->cpaccess = 1;
} elseif ($this->cpsetting['checkip'] && ($session['ip'] != $this->core->var['clientip'])) {
showmessage($session['ip']);
$this->cpaccess = 1;
} elseif ($session['errorcount'] >= 0 && $session['errorcount'] <= 3) {

2
core/class/table/table_organization.php
View File

@@ -469,7 +469,7 @@ class table_organization extends dzz_table
self::setPathkeyByOrgid($setarr['orgid']);
if($setarr['type']=='0'){
//更新disp
foreach(DB::fetch_all("select orgid,disp form %t where forgid=%d and type='0' and disp>=%d and orgid!=%d",array($this->_table,$setarr['forgid'],intval($setarr['disp']),$setarr['orgid'] )) as $value){
foreach(DB::fetch_all("select orgid,disp from %t where forgid=%d and type='0' and disp>=%d and orgid!=%d",array($this->_table,$setarr['forgid'],intval($setarr['disp']),$setarr['orgid'] )) as $value){
parent::update($value['orgid'],array('disp'=>$value['disp']+1));
}
}

3
core/class/table/table_resources_version.php
View File

@@ -82,7 +82,7 @@ class table_resources_version extends dzz_table
if(empty($rid)) $rid=$vinfo['rid'];
$datainfo = C::t('resources')->fetch_info_by_rid($rid);
if($datainfo['vid']==$vinfo['vid']){//如果删除的是主版本，判断是否是最后一个版本，最后一个版本不让删除
if(!$nvid=DB::result_first("select vid form %t where rid=%s and vid!=%d order by vid DESC",array($this->_table,$rid,$vid))){
if(!$nvid=DB::result_first("select vid from %t where rid=%s and vid!=%d order by vid DESC",array($this->_table,$rid,$vid))){
return false;
}
}
@@ -98,6 +98,7 @@ class table_resources_version extends dzz_table
}
return true;
}
/* public function delete_by_version($icoid,$vid){
global $_G ;
$cachekey = 'resourcesversiondata_'.$icoid;

2
core/function/function_core.php
View File

@@ -30,7 +30,7 @@ function replacesitevar($string, $replaces = array())
$sitevars = array(
'{sitename}' => $_G['setting']['sitename'],
'{xhversion}' => CORE_XHVERSION,
'{xversion}' => CORE_VERSION,
'{version}' => CORE_VERSION,
'{years}' => date("Y"),
'{time}' => dgmdate(TIMESTAMP, 'Y-n-j H:i'),
'{adminemail}' => $_G['setting']['adminemail'],

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

@@ -16,9 +16,7 @@
<meta name="renderer" content="webkit">
<base href="{$_G['siteurl']}" />
<link rel="stylesheet" type="text/css" href="static/bootstrap/css/bootstrap.min.css?{VERHASH}" rel="preload">
<link rel="stylesheet" type="text/css" href="static/css/barber-shop.css?{VERHASH}" rel="preload">
<link rel="stylesheet" type="text/css" href="static/css/style.min.css?{VERHASH}" rel="preload">
<script type="text/javascript" src="static/js/pace.min.js?{VERHASH}"></script>
<link rel="stylesheet" type="text/css" href="static/dzzicon/icon.css?{VERHASH}" rel="preload">
<script type="text/javascript" src="static/jquery/jquery.min.js?{VERHASH}"></script>
<script type="text/javascript" src="static/jquery/jquery.json-2.4.min.js?{VERHASH}"></script>

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

@@ -15,7 +15,6 @@
<meta name="apple-touch-fullscreen" content="yes">
<meta name="renderer" content="webkit">
<base href="{$_G['siteurl']}" />
<link rel="stylesheet" type="text/css" href="static/css/barber-shop.css?{VERHASH}" rel="preload">
<link rel="stylesheet" type="text/css" href="static/bootstrap/css/bootstrap.min.css?{VERHASH}" rel="preload">
<link rel="stylesheet" type="text/css" href="static/css/app_manage.css?{VERHASH}" rel="preload">
<link rel="stylesheet" type="text/css" href="static/dzzicon/icon.css?{VERHASH}" rel="preload">
@@ -24,7 +23,6 @@
<link rel="stylesheet" type="text/css" href="static/dzzicon/materialdesignicons.min.css?{VERHASH}" rel="preload">
<link rel="stylesheet" type="text/css" href="static/css/animate.min.css?{VERHASH}" rel="preload">
<link rel="stylesheet" type="text/css" href="static/css/style.min.css?{VERHASH}" rel="preload">
<script type="text/javascript" src="static/js/pace.min.js?{VERHASH}"></script>
<script type="text/javascript" src="static/jquery/jquery.min.js?{VERHASH}"></script>
<script type="text/javascript" src="static/jquery/jquery.json-2.4.min.js?{VERHASH}"></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}';</script>