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

This commit is contained in:
小胡
2023-02-01 18:59:05 +08:00
Unverified
parent ba981c0f84
commit a05b4da81e
16 changed files with 101 additions and 95 deletions

View File

@@ -1,14 +1,6 @@
<!--{template common/header_simple_start}-->
<link href="static/css/common.css?{VERHASH}" rel="stylesheet" media="all">
<script type="text/javascript" src="static/js/jquery.leftDrager.js?{VERHASH}"></script>
<style>
.form-horizontal-left .control-label{
width:150px;
}
.form-horizontal-left .help-block{
padding-left:150px;
}
</style>
<!--{template common/header_simple_end}-->
<!--{template common/commer_header}-->
<div class="bs-container clearfix">

View File

@@ -1,14 +1,6 @@
<!--{template common/header_simple_start}-->
<link href="static/css/common.css?{VERHASH}" rel="stylesheet" media="all">
<script type="text/javascript" src="static/js/jquery.leftDrager.js?{VERHASH}"></script>
<style>
.form-horizontal-left .control-label{
width:150px;
}
.form-horizontal-left .help-block{
padding-left:150px;
}
</style>
<!--{template common/header_simple_end}-->
<!--{template common/commer_header}-->
<div class="bs-container clearfix">

View File

@@ -1,17 +1,6 @@
<!--{template common/header_simple_start}-->
<link href="static/css/common.css?{VERHASH}" rel="stylesheet" media="all">
<script type="text/javascript" src="static/js/jquery.leftDrager.js?{VERHASH}"></script>
<style>
.form-horizontal-left .control-label{
width:150px;
}
.form-horizontal-left .help-block{
padding-left:150px;
}
.main-content{
padding:30px 0;
}
</style>
<!--{template common/header_simple_end}-->
<!--{template common/commer_header}-->
<div class="bs-container clearfix">

View File

@@ -1,14 +1,6 @@
<!--{template common/header_simple_start}-->
<link href="static/css/common.css?{VERHASH}" rel="stylesheet" media="all">
<script type="text/javascript" src="static/js/jquery.leftDrager.js?{VERHASH}"></script>
<style>
.form-horizontal-left .control-label{
width:150px;
}
.form-horizontal-left .help-block{
padding-left:150px;
}
</style>
<!--{template common/header_simple_end}-->
<!--{template common/commer_header}-->
<div class="bs-container clearfix">

View File

@@ -1,17 +1,6 @@
<!--{template common/header_simple_start}-->
<link href="static/css/common.css?{VERHASH}" rel="stylesheet" media="all">
<script type="text/javascript" src="static/js/jquery.leftDrager.js?{VERHASH}"></script>
<style>
.form-horizontal-left .control-label{
width:150px;
}
.form-horizontal-left .help-block{
padding-left:150px;
}
.main-content{
padding:30px 0;
}
</style>
<!--{template common/header_simple_end}-->
<!--{template common/commer_header}-->
<div class="bs-container clearfix">

View File

@@ -572,14 +572,15 @@ class dzz_app extends dzz_base{
}
}
if ($this->var['member']['adminid']==1){
if ($this->var['member']['adminid']){
}elseif(in_array(CURSCRIPT, array('admin', 'user', 'api')) || defined('ALLOWGUEST') && ALLOWGUEST) {
}else{
}elseif($_GET['mod']=='system') {
}else{
if ($this->var['member']['uid']){
foreach($this->var['setting']['verify'] as $key=>$value){
$verify = C::t('user_verify')->fetch($this->var['member']['uid']);
if($value['available'] && $key==1){
if($verify['verify1']){
if($verify['verify1']==1){
}else {
dheader("Location: user.php?mod=profile&vid=1");
}
@@ -596,14 +597,16 @@ class dzz_app extends dzz_base{
if ($this->var['member']['uid']){
showmessage(lang('您无权使用该应用,请联系管理员。'));
}
}else{
}elseif ($this->var['member']['uid']){
$appuid= C::t('user_field')->fetch($this->var['member']['uid']);
$appuidz=explode(',',$appuid['applist']);
if (in_array($appidxu['appid'],$appuidz)){
}else{
showmessage(lang('您无权使用该应用,请联系管理员。'));
}
}
}else{
Hook::listen('check_login');
}
}
if(isset($this->var['setting']['nocacheheaders']) && $this->var['setting']['nocacheheaders']) {
@header("Expires: -1");

View File

@@ -1,8 +1,18 @@
<ul class="nav navbar-nav">
<!--{if $_G['uid']}-->
<!--{if !$_G['setting']['bbclosed'] || !$_G['adminid'] ==0}-->
{eval $verify = C::t('user_verify')->fetch($_G['uid']);}
<!--{if $verify[verify1]==1 || !$_G['adminid'] ==0}-->
{eval}
foreach($_G['setting']['verify'] as $key=>$value){
$verify = C::t('user_verify')->fetch($_G['uid']);
if($value['available'] && $key==1){
if($verify['verify1']==1){
}else {
$kai=1;
}
}
}
{/eval}
<!--{if $kai && $verify[verify1]==1 || $_G['adminid'] || $kai==0}-->
<li class="app_popup-parent">
<a href="javascript:;" id="desktop_app" data-href="index.php?mod=system&op=app_ajax&operation=app" class="app_popup_icon js-popbox" data-placement="bottom" data-trigger="focus" data-auto-adapt="true" data-toggle="popover"><span class="dzz dzz-apps basil"></span></a>
</li>

View File

@@ -38,7 +38,6 @@ html, body {
width: 13px;
height: 6px;
position: relative;
top: 20px;
visibility: hidden;
_vertical-align: middle;
_margin: 15px 0;
@@ -51,6 +50,11 @@ html, body {
border-bottom: 1px solid #EEEEEE;
/* border-top:1px solid #FFF;*/
display: flex;
flex-wrap:wrap;
}
.module-list-view .di{
display: flex;
width: 100%;
}
.module-list-view .item:first{
border-top:0;
@@ -98,8 +102,6 @@ html, body {
}
.module-list-view .item .name {
width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.module-list-view .list-share .item .name-text {
@@ -121,16 +123,12 @@ html, body {
}
.module-list-view .col {
float: left;
height: 51px;
line-height: 51px;
text-indent: 10px;
width: 10%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
display: flex;
align-content:center;
flex-wrap:wrap;
align-items:center;
}
.module-list-view .col1{
float: left;
@@ -158,9 +156,7 @@ html, body {
}
.module-list-view .item .btns {
position: absolute;
top: 0;
right: 4px;
height: 38px;
display: none;
}
.module-list-view .item .btns a.dzz,.select-toperate-center .btns a.dzz{
@@ -200,6 +196,17 @@ html, body {
z-index: 100;
border-radius: 2px;
}
.item-hover:hover .copy {
display: block
}
.copy {
padding: 0 0 0 44px;
width: 100%;
color: #666;display: none
}
.copy-hover{
display: block
}
.module-grid-view .item .backgound_radius {
display:none;
/*filter: Alpha(opacity=40);

View File

@@ -130,7 +130,6 @@ html, body {
.module-list-view .col {
float: left;
height: 51px;
line-height: 51px;
text-indent: 10px;
white-space: nowrap;
text-overflow: ellipsis;

View File

@@ -16,6 +16,7 @@ $typearr = array('image' => lang('photo'),
'document' => lang('type_attach'),
'link' => lang('type_link'),
'video' => lang('video'),
'folder' => lang('folder'),
'dzzdoc' => 'DZZ' . lang('type_attach'),
'attach' => lang('rest_attachment')
);
@@ -61,6 +62,7 @@ if ($_GET['do'] == 'delete') {
'mod' => 'filemanage',
'keyword' => $keyword,
'type' => $_GET['type'],
'ftype' => $_GET['ftype'],
'size' => $_GET['size'],
'dateline' => $_GET['dateline'],
'orgid' => $orgid,
@@ -72,11 +74,15 @@ if ($_GET['do'] == 'delete') {
$order = 'ORDER BY size DESC';
} elseif ($_GET['size'] == 'asc') {
$order = 'ORDER BY size ASC';
} elseif ($_GET['dateline'] == 'asc') {
} elseif ($_GET['ftype'] == 'desc') {
$order = 'ORDER BY ext DESC';
} elseif ($_GET['ftype'] == 'asc') {
$order = 'ORDER BY ext ASC';
}elseif ($_GET['dateline'] == 'asc') {
$order = 'ORDER BY dateline ASC';
} else {
}else {
$_GET['dateline'] = 'desc';
$order = 'ORDER BY size DESC';
$order = 'ORDER BY dateline DESC';
}
$sql = "type!='app' and type!='shortcut'";
$foldername = array();

View File

@@ -1,6 +1,7 @@
<?php
$lang = array (
'appname' => 'file management',
'appname' => 'file management',
'folder' => 'folder',
'rotation'=>'rotate',
'checkednum'=>'<span><span class="ex-number"></span> items selected',
'file_position'=>'file location',

View File

@@ -1,6 +1,7 @@
<?php
$lang = array (
'appname' => '文件管理',
'folder' => '文件夹',
'rotation'=>'旋转',
'checkednum'=>'<span>已选择<span class="ex-number"></span>项',
'file_position'=>'文件位置',

View File

@@ -123,18 +123,21 @@
</div>
</div>
<!--选中后的效果-->
<div class="col sharepame-selected" style="display: none;width:27%">{lang checkednum}</span> </div>
<div class="col sharepame-selected" style="display: none;width:25%">{lang checkednum}</span> </div>
<!-- 第一列 -->
<div node-type="title-col" data-key="name" class="col1 c1 show_first" style="width: 25%">
<div class="name"> <span>{lang filename}</span> <span node-type="order-status" class="asc desc" style="visibility: hidden;"></span> </div>
</div>
<!-- 其他列 -->
<div node-type="title-col" data-key="size" class="col" style="width: 10%;"> {lang file_size} <span node-type="order-status" class="asc $_GET[size]" style="visibility:<!--{if $_GET[size]}-->visible<!--{else}-->hidden<!--{/if}-->;"></span> </div>
<div node-type="title-col" data-key="type" class="col1" style="width: 10%;border-right: none;"> {lang file_type} <span node-type="order-status" class="asc desc" style="visibility: hidden;"></span> </div>
<div node-type="title-col" data-key="size" class="col" style="width: 10%;">{lang file_size}
<span node-type="order-status" class="asc $_GET[size]" style="visibility:<!--{if $_GET[size]}-->visible<!--{else}-->hidden<!--{/if}-->;"></span>
</div>
<div node-type="title-col" data-key="ftype" class="col" style="width: 10%;border-right: none;">{lang file_type}
<span node-type="order-status" class="asc $_GET[ftype]" style="visibility: <!--{if $_GET[ftype]}-->visible<!--{else}-->hidden<!--{/if}-->;"></span>
</div>
<div node-type="title-col" data-key="type" class="col1" style="width: 18%;border-right: none;"> {lang file_location} <span node-type="order-status" class="asc desc" style="visibility: hidden;"></span> </div>
<!--{if $_G[adminid]}-->
<div node-type="title-col" data-key="type" class="col1" style="width: 10%;border-right: none;"> {lang possessor}<span node-type="order-status" class="asc desc" style="visibility: hidden;"></span> </div>
<div node-type="title-col" data-key="type" class="col1" style="width: 7%;border-right: none;"> 引用</div>
<!--{/if}-->
<div node-type="title-col" data-key="dateline" class="col" style="width: 15%;"> {lang add_time} <span node-type="order-status" class="asc $_GET[dateline]" style="visibility: <!--{if $_GET[dateline]}-->visible<!--{else}-->hidden<!--{/if}-->;"></span> </div>
<div node-type="title-col" data-key="dateline" class="col1" style="width: 5%;"> {lang delete} </div>
@@ -142,8 +145,9 @@
</div>
<div node-type="list" class="list list-share">
<div class="list-wrapper clearfix">
<!--{loop $list $value}-->
<div node-type="item" data-dpath="$value[dpath]" data-rid="$value[rid]" <!--{if $value[type] == 'folder' && $value[oid]}--> data-containpath="$value[oid]"<!--{/if}--> data-type="$value[type]" class="item shareblock clearfix">
<!--{loop $list $value}-->
<div node-type="item" data-dpath="$value[dpath]" data-rid="$value[rid]" <!--{if $value[type] == 'folder' && $value[oid]}--> data-containpath="$value[oid]"<!--{/if}--> data-type="$value[type]" class="item shareblock clearfix">
<div class="di">
<!-- 第一列 -->
<div class="col size" style="width: 3%;text-indent: 0;padding-left: 10px;" >
<div class="checkbox-custom checkbox-primary">
@@ -156,23 +160,39 @@
<!--{if $value[img]}--><img class="icon" title="$value[name]" src="$value[img]" <!--{if $value[type]=='image' }--> data-original="$value[url]" data-dpath="$value[dpath]"
<!--{/if}-->/>
<!--{/if}-->
<span class="name-text-wrapper"> <span node-type="name-text" data-href="$value[shareurl]" class="name-text enabled">$value[name]</span> </span> </div>
<div class="btns">
<a node-type="btn-item" data-key="download" class="glyphicon glyphicon-download-alt" href="javascript:void(0);"></a>
</div>
<span class="name-text-wrapper"> <span node-type="name-text" data-href="$value[shareurl]" class="name-text enabled">$value[name]</span> </span>
</div>
<div class="btns">
<a node-type="btn-item" data-key="download" class="glyphicon glyphicon-download-alt" href="javascript:void(0);"></a>
</div>
</div>
<!-- 其他列 -->
<div class="col size" style="width: 10%" data-size="$value[size]">$value[fsize]</div>
<div class="col size" style="width:10%" data-size="$value[size]">$value[fsize]</div>
<div class="col type" style="width:10%" data-type="$value[ftype]">$value[ftype]</div>
<div class="col type" style="width:18%" data-type="$value[relpath]">$value[relpath]</div>
<!--{if $_G[adminid]}-->
<div class="col type" style="width:10%" data-type="$value[username]">$value[username]</div>
<div class="col type" style="width:7%" data-type="$value[copys]">$value[copys]</div>
<!--{/if}-->
<div class="col dateline" style="width: 15%" data-dateline="$value[dateline]">$value[fdateline]</div>
<div class="col delete" style="width: 5%" > <a class="" href="{BASESCRIPT}?mod=filemanage&do=delete&icoid=$value[rid]&refer={eval echo urlencode($refer);}" title="{lang delete}" style="color:rgb(85, 85, 85);font-size:20px;" onclick="if(confirm('{lang filemanage_del_file}')){return true}else{return false}"><i class="dzz dzz-delete"></i></a> </div>
<div class="col delete" style="width: 5%" >
<a class="" href="{BASESCRIPT}?mod=filemanage&do=delete&icoid=$value[rid]&refer={eval echo urlencode($refer);}" title="{lang delete}" style="color:rgb(85, 85, 85);font-size:20px;" onclick="if(confirm('{lang filemanage_del_file}')){return true}else{return false}"><i class="dzz dzz-delete"></i></a>
</div>
</div>
<!--{if $_G[adminid]}-->
<!--{if $value[type]=='folder'}--><!--{else}-->
<div class="copy">
<div>
文件位置:<!--{eval echo IO::getStream($value[path])}-->
</div>
<div>
直链地址:<!--{eval echo IO::getFileUri($value[path])}-->
</div>
<div>
引用:$value[copys]
</div>
</div>
<!--{/if}-->
<!--{/if}-->
</div>
<!--{/loop}-->
<!--{if $nextpage}-->
@@ -218,6 +238,7 @@ var theurl='$theurl';
jQuery(this).removeClass('item-hover');
});
jQuery(document).on('click', 'span[node-type=name-text],.module-grid-view .item', function() {
var item = jQuery(this).closest('.item');
var type = item.data('type');
@@ -242,13 +263,13 @@ var theurl='$theurl';
}
return false;
});
jQuery('.title .item .col[node-type=title-col][data-key=dateline],.title .item .col[node-type=title-col][data-key=size]').on('click', function() {
jQuery('.title .item .col[node-type=title-col][data-key=dateline],.title .item .col[node-type=title-col][data-key=size],.title .item .col[node-type=title-col][data-key=ftype]').on('click', function() {
var el = jQuery(this);
el.find('.asc').css('visibility', 'visible').toggleClass('desc');
el.siblings().find('.asc').css('visibility', 'hidden');
var param=el.data('key')+'='+ (el.find('.asc').hasClass('desc') ? 'desc' : 'asc');
var regx=new RegExp('&(dateline|size)=(asc|desc)','i');
var regx=new RegExp('&(dateline|size|ftype)=(asc|desc)','i');
var url=theurl.replace(regx,'')+'&'+param;
location.href=correcturl(url);
});
@@ -276,7 +297,6 @@ jQuery(document).off('click.shareclick').on('click.shareclick',".shareblock",fun
if(checkinput.prop('checked')){
checkinput.prop('checked',false);
jQuery(this).removeClass('item-active');
var rid=jQuery(this).find('input[name="del[]"]').data('rid');
var index = jQuery.inArray(rid,rids);
if(index != -1){

View File

@@ -87,7 +87,7 @@
</option>
</select>
</li>
<!--{if $_G[adminid]==1}-->
<!--{if $_G[adminid]}-->
<!--{if !isset($pfid) || $pfid <= 0}-->
<li class="dropdown org">
<input id="sel_orgid_{$org[orgid]}" type="hidden" name="orgid" value="$org[orgid]" onchange="selDepart(this)" />
@@ -119,7 +119,7 @@
<!--{loop $list $value}-->
<div node-type="item" data-dpath="$value[dpath]" data-rid="$value[rid]" <!--{if $value[type] == 'folder' && $value[oid]}--> data-containpath="$value[oid]"<!--{/if}--> data-type="$value[type]" class="item shareblock clearfix">
<!-- 第一列 -->
<div class="col size" style="text-indent: 0;padding-left: 5px;" >
<div class="col size" style="padding-left: 5px;" >
<div class="checkbox-custom checkbox-primary">
<input type="checkbox" name="del[]" value="$value[rid]" data-rid="$value[rid]">
<label></label>

View File

@@ -13,7 +13,15 @@ if (!defined('IN_DZZ')) {
Hook::listen('check_login');//检查是否登录,未登录跳转到登录界面
$navtitle=lang('basic_information').' - '.lang('myCountCenter');
$uid = intval($_G['uid']);
foreach($_G['setting']['verify'] as $key=>$value){
$verify = C::t('user_verify')->fetch($_G['uid']);
if($value['available'] && $key==1){
if($verify['verify1']==1){
}else {
$kai=1;
}
}
}
$verify = C::t('user_verify')->fetch($_G['uid']);//验证信息
$space = C::t('user_profile')->get_userprofile_by_uid($uid);//用户资料信息

View File

@@ -1,7 +1,6 @@
<div class="leconMenu">
<h3 class="bs-left-title">{lang myCountCenter}</h3>
<ul class="nav-stacked">
<!--{if $verify[verify1]==1 || $_G['adminid']}-->
<li <!--{if OP_NAME=='index' && !$vid}-->class="active"<!--{/if}-->><a href="user.php?mod=profile">{lang basic_information}</a></li>
<li <!--{if OP_NAME=='avatar'}-->class="active"<!--{/if}-->><a href="user.php?mod=profile&op=avatar">{lang Modify_the_picture}</a></li>
<li <!--{if OP_NAME=='password'}-->class="active"<!--{/if}-->><a href="user.php?mod=profile&op=password">{lang Safety management}</a></li>
@@ -12,12 +11,10 @@
</li>
<!--{/if}-->
<!--{/loop}-->
<!--{else}-->
<!--{if $kai && $verify[verify1]==1 || $_G['adminid'] || $kai==0}--><!--{else}-->
<script type="text/javascript">showDialog('<!--{if $verify[verify1]==-1}-->您提交的实名认证审核失败,请重新提交认证<!--{elseif $verify[uid]}-->您的实名认证信息已提交,请耐心等待审核<!--{else}-->请先完成实名认证<!--{/if}-->',"right",'系统提示')</script>
<li class="active">
<a href="user.php?mod=profile&vid=1">{lang Real-name authentication}</a>
</li>
<!--{/if}-->
<!--{/if}-->
<li><a href="user.php">{lang Personal data display}</a></li>
</ul>
</div>